diff flys-backend/src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java @ 5452:5287440b57b3

merged.
author Raimund Renkert <rrenkert@intevation.de>
date Wed, 27 Mar 2013 11:48:53 +0100
parents 3bd786772798
children
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java	Wed Mar 27 11:47:56 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java	Wed Mar 27 11:48:53 2013 +0100
@@ -1,13 +1,11 @@
 package de.intevation.flys.importer;
 
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.hibernate.exception.ConstraintViolationException;
 
 import de.intevation.flys.model.River;
 import de.intevation.flys.model.SedimentDensity;
@@ -21,8 +19,6 @@
 
     protected ImportDepth depth;
 
-    protected ImportUnit unit;
-
     protected String description;
 
     protected List<ImportSedimentDensityValue> values;
@@ -40,10 +36,6 @@
         this.depth = depth;
     }
 
-    public void setUnit(ImportUnit unit) {
-        this.unit = unit;
-    }
-
     public void addValue(ImportSedimentDensityValue value) {
         values.add(value);
     }
@@ -74,23 +66,15 @@
             return null;
         }
 
-        if (unit == null) {
-            log.warn("cannot store sediment density '" + description
-                + "': no unit");
-            return null;
-        }
-
         if (peer == null) {
             Session session = ImporterSession.getInstance()
                 .getDatabaseSession();
 
             Query query = session.createQuery("from SedimentDensity where "
-                + "   river=:river and " + "   depth=:depth and "
-                + "   unit=:unit");
+                + "   river=:river and " + "   depth=:depth");
 
             query.setParameter("river", river);
             query.setParameter("depth", depth.getPeer());
-            query.setParameter("unit", unit.getPeer());
 
             List<SedimentDensity> density = query.list();
 
@@ -98,7 +82,7 @@
                 log.debug("Create new SedimentDensity DB instance.");
 
                 peer = new SedimentDensity(river, depth.getPeer(),
-                    unit.getPeer(), description);
+                    description);
 
                 session.save(peer);
             }

http://dive4elements.wald.intevation.org