diff backend/src/main/java/org/dive4elements/river/importer/ImportSedimentYield.java @ 8025:c915e99d9e52

Renamed SedimentYield to SedimentLoadLS and SedimentYieldValue to SedimentLoadLSValue. Adjust the names of the parsers and the rest of the glue.
author Sascha L. Teichmann <teichmann@intevation.de>
date Wed, 09 Jul 2014 18:13:13 +0200
parents 078d56dffc8c
children
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportSedimentYield.java	Wed Jul 09 17:33:57 2014 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/ImportSedimentYield.java	Wed Jul 09 18:13:13 2014 +0200
@@ -18,7 +18,7 @@
 
 import org.dive4elements.river.model.GrainFraction;
 import org.dive4elements.river.model.River;
-import org.dive4elements.river.model.SedimentYield;
+import org.dive4elements.river.model.SedimentLoadLS;
 import org.dive4elements.river.model.TimeInterval;
 import org.dive4elements.river.model.Unit;
 
@@ -37,12 +37,12 @@
 
     private Integer kind;
 
-    private List<ImportSedimentYieldValue> values;
+    private List<ImportSedimentLoadLSValue> values;
 
-    private SedimentYield peer;
+    private SedimentLoadLS peer;
 
     public ImportSedimentYield(String description) {
-        this.values = new ArrayList<ImportSedimentYieldValue>();
+        this.values = new ArrayList<ImportSedimentLoadLSValue>();
         this.description = description;
     }
 
@@ -62,7 +62,7 @@
         this.kind = kind;
     }
 
-    public void addValue(ImportSedimentYieldValue value) {
+    public void addValue(ImportSedimentLoadLSValue value) {
         this.values.add(value);
     }
 
@@ -73,12 +73,12 @@
             grainFraction.storeDependencies();
         }
 
-        SedimentYield peer = getPeer(river);
+        SedimentLoadLS peer = getPeer(river);
 
         if (peer != null) {
             int i = 0;
 
-            for (ImportSedimentYieldValue value : values) {
+            for (ImportSedimentLoadLSValue value : values) {
                 value.storeDependencies(peer);
                 i++;
             }
@@ -87,7 +87,7 @@
         }
     }
 
-    public SedimentYield getPeer(River river) {
+    public SedimentLoadLS getPeer(River river) {
         log.debug("get peer");
 
         GrainFraction gf = grainFraction != null ? grainFraction.getPeer()
@@ -117,11 +117,11 @@
             query.setParameter("timeInterval", ti);
             query.setParameter("description", description);
 
-            List<SedimentYield> yields = query.list();
+            List<SedimentLoadLS> yields = query.list();
             if (yields.isEmpty()) {
                 log.debug("create new SedimentYield");
 
-                peer = new SedimentYield(river, u, ti, gf, description);
+                peer = new SedimentLoadLS(river, u, ti, gf, description);
                 peer.setKind(this.kind);
                 session.save(peer);
             }

http://dive4elements.wald.intevation.org