diff 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
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/LoadMultipleYearSelectState.java	Wed Jun 20 18:25:58 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/LoadMultipleYearSelectState.java	Thu Jun 21 08:13:37 2018 +0200
@@ -9,14 +9,12 @@
 package org.dive4elements.river.artifacts.sinfo.collision;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
 import org.dive4elements.artifacts.Artifact;
 import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.artifacts.common.utils.XMLUtils.ElementCreator;
-import org.dive4elements.river.artifacts.model.CollisionHibernateFactory;
 import org.dive4elements.river.artifacts.sinfo.SINFOArtifact;
 import org.dive4elements.river.artifacts.states.AddTableDataHelper;
 import org.dive4elements.river.artifacts.states.DefaultState;
@@ -55,13 +53,13 @@
 
                 final CollisionAccess access = new CollisionAccess((SINFOArtifact) artifact); // Der River wurde im vorigen State bereits gesetzt
 
-                final List<Collision> collisions = CollisionHibernateFactory.getCollisionsByRiver(access.getRiver());
-                for (final Collision coll : collisions) {
-                    final Integer year = coll.getYear();
+                // final List<Collision> collisions = CollisionHibernateFactory.getCollisionsByRiver(access.getRiver());
+                // for (final Collision coll : collisions) {
+                for (final Integer year : Collision.getYearsOfRiver(access.getRiver())) {
+                    // final Integer year = coll.getYear();
                     final Map<String, String> row = new HashMap<>();
                     row.put("year", year.toString()); // Nullpointer?
                     helper.addRow(row);
-
                 }
                 helper.submitMapToXml();
             }

http://dive4elements.wald.intevation.org