[Dive4elements-commits] [PATCH 3 of 3] merge

Wald Commits scm-commit at wald.intevation.org
Thu Mar 14 12:44:16 CET 2013


# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1363261444 -3600
# Node ID 8aae8c26844f08cbed86f2366727ebec3f95a8e6
# Parent  3dc4c27982121871cbf1e42de28d043b19a94c7b
# Parent  394841a66c146db85a9640e3c2a27e083ecb51bf
merge

diff -r 3dc4c2798212 -r 8aae8c26844f flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java	Thu Mar 14 12:30:22 2013 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java	Thu Mar 14 12:44:04 2013 +0100
@@ -175,14 +175,15 @@
         logger.debug("MainValuesArtifact.initialize");
         FLYSArtifact winfo = (FLYSArtifact) artifact;
         RangeAccess rangeAccess = new RangeAccess(winfo, null);
-        double [] locations = rangeAccess.getLocations();
+        double [] locations = rangeAccess.getKmRange();
+
         if (locations != null) {
             double location = locations[0];
             addData("ld_locations", new DefaultStateData("ld_locations", null, null,
                     String.valueOf(location)));
         }
         else {
-            logger.warn("No location for mainvalues given.");
+            logger.error("No location for mainvalues given.");
         }
         importData(winfo, "river");
     }
@@ -247,7 +248,13 @@
         // TODO use helper to get location as double
         String locationStr = getDataAsString("ld_locations");
 
-        if (river == null || locationStr == null) {
+        if (river == null) {
+            logger.error("River is null");
+            return null;
+        }
+
+        if (locationStr == null) {
+            logger.error("Locationstr is null");
             return null;
         }
 


More information about the Dive4elements-commits mailing list