diff flys-backend/src/main/java/de/intevation/flys/importer/parsers/SedimentYieldParser.java @ 5439:7aeb2c101628

removed unit from model and importer for grain fractions (its always mm, otherwise a typo)
author Tom Gottfried <tom.gottfried@intevation.de>
date Tue, 26 Mar 2013 18:04:59 +0100
parents 8e66a200a0b9
children b3dd14fc13a6
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/SedimentYieldParser.java	Tue Mar 26 17:35:39 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/SedimentYieldParser.java	Tue Mar 26 18:04:59 2013 +0100
@@ -285,7 +285,6 @@
             String upperA = a.group(4);
             String upperB = a.group(5);
 
-            String unitStr = a.group(7);
             String lower = lowerA != null ? lowerA : lowerB;
             String upper = upperA != null ? upperA : upperB;
 
@@ -293,8 +292,7 @@
                 return new ImportGrainFraction(
                     getGrainFractionTypeName(this.description),
                     nf.parse(lower).doubleValue(),
-                    nf.parse(upper).doubleValue(),
-                    new ImportUnit(unitStr)
+                    nf.parse(upper).doubleValue()
                 );
             }
             catch (ParseException pe) {
@@ -308,7 +306,6 @@
             String lowerB  = b.group(5);
             String upperA  = b.group(6);
             String upperB  = b.group(7);
-            String unitStr = b.group(9);
 
             String lower = lowerA != null ? lowerA : lowerB;
             String upper = upperA != null ? upperA : upperB;
@@ -317,8 +314,7 @@
                 return new ImportGrainFraction(
                     getGrainFractionTypeName(this.description),
                     nf.parse(lower).doubleValue(),
-                    nf.parse(upper).doubleValue(),
-                    new ImportUnit(unitStr)
+                    nf.parse(upper).doubleValue()
                 );
             }
             catch (ParseException pe) {
@@ -330,7 +326,6 @@
         if (c.matches()) {
             String oper     = c.group(1);
             String valueStr = c.group(3);
-            String unitStr  = c.group(6);
 
             try {
                 Double value = nf.parse(valueStr).doubleValue();
@@ -339,16 +334,14 @@
                     return new ImportGrainFraction(
                         getGrainFractionTypeName(this.description),
                         value,
-                        null,
-                        new ImportUnit(unitStr)
+                        null
                     );
                 }
                 else {
                     return new ImportGrainFraction(
                         getGrainFractionTypeName(this.description),
                         null,
-                        value,
-                        new ImportUnit(unitStr)
+                        value
                     );
                 }
             }

http://dive4elements.wald.intevation.org