Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/LoadMultipleYearSelectState.java @ 9168:d2472018740c
Fixed dateformat with 4-digit year, added query method for collision years of a river
| author | mschaefer |
|---|---|
| date | Thu, 21 Jun 2018 08:13:37 +0200 |
| parents | 2b13de1b0897 |
| children |
comparison
equal
deleted
inserted
replaced
| 9167:cb3a91dc4e3b | 9168:d2472018740c |
|---|---|
| 7 */ | 7 */ |
| 8 | 8 |
| 9 package org.dive4elements.river.artifacts.sinfo.collision; | 9 package org.dive4elements.river.artifacts.sinfo.collision; |
| 10 | 10 |
| 11 import java.util.HashMap; | 11 import java.util.HashMap; |
| 12 import java.util.List; | |
| 13 import java.util.Map; | 12 import java.util.Map; |
| 14 | 13 |
| 15 import org.apache.log4j.Logger; | 14 import org.apache.log4j.Logger; |
| 16 import org.dive4elements.artifacts.Artifact; | 15 import org.dive4elements.artifacts.Artifact; |
| 17 import org.dive4elements.artifacts.CallContext; | 16 import org.dive4elements.artifacts.CallContext; |
| 18 import org.dive4elements.artifacts.common.utils.XMLUtils.ElementCreator; | 17 import org.dive4elements.artifacts.common.utils.XMLUtils.ElementCreator; |
| 19 import org.dive4elements.river.artifacts.model.CollisionHibernateFactory; | |
| 20 import org.dive4elements.river.artifacts.sinfo.SINFOArtifact; | 18 import org.dive4elements.river.artifacts.sinfo.SINFOArtifact; |
| 21 import org.dive4elements.river.artifacts.states.AddTableDataHelper; | 19 import org.dive4elements.river.artifacts.states.AddTableDataHelper; |
| 22 import org.dive4elements.river.artifacts.states.DefaultState; | 20 import org.dive4elements.river.artifacts.states.DefaultState; |
| 23 import org.dive4elements.river.model.sinfo.Collision; | 21 import org.dive4elements.river.model.sinfo.Collision; |
| 24 import org.w3c.dom.Element; | 22 import org.w3c.dom.Element; |
| 53 helper.addColumn(0, "pinfrom", "60", "common.client.ui.selection", "ICON", "CENTER", "from"); | 51 helper.addColumn(0, "pinfrom", "60", "common.client.ui.selection", "ICON", "CENTER", "from"); |
| 54 helper.addColumn(1, "year", "60", "year", "INTEGER", "LEFT", null); | 52 helper.addColumn(1, "year", "60", "year", "INTEGER", "LEFT", null); |
| 55 | 53 |
| 56 final CollisionAccess access = new CollisionAccess((SINFOArtifact) artifact); // Der River wurde im vorigen State bereits gesetzt | 54 final CollisionAccess access = new CollisionAccess((SINFOArtifact) artifact); // Der River wurde im vorigen State bereits gesetzt |
| 57 | 55 |
| 58 final List<Collision> collisions = CollisionHibernateFactory.getCollisionsByRiver(access.getRiver()); | 56 // final List<Collision> collisions = CollisionHibernateFactory.getCollisionsByRiver(access.getRiver()); |
| 59 for (final Collision coll : collisions) { | 57 // for (final Collision coll : collisions) { |
| 60 final Integer year = coll.getYear(); | 58 for (final Integer year : Collision.getYearsOfRiver(access.getRiver())) { |
| 59 // final Integer year = coll.getYear(); | |
| 61 final Map<String, String> row = new HashMap<>(); | 60 final Map<String, String> row = new HashMap<>(); |
| 62 row.put("year", year.toString()); // Nullpointer? | 61 row.put("year", year.toString()); // Nullpointer? |
| 63 helper.addRow(row); | 62 helper.addRow(row); |
| 64 | |
| 65 } | 63 } |
| 66 helper.submitMapToXml(); | 64 helper.submitMapToXml(); |
| 67 } | 65 } |
| 68 } | 66 } |
| 69 catch (final IllegalArgumentException iae) { | 67 catch (final IllegalArgumentException iae) { |