diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java @ 5086:4f65d833680f dami

Merge Default onto Dami branch. Dami is now temporarily a public merge branch to fix problems created by the merge.
author Andre Heinecke <aheinecke@intevation.de>
date Mon, 25 Feb 2013 11:50:13 +0100
parents ce7d8e2a7e02
children 394841a66c14
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java	Mon Feb 25 11:46:36 2013 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java	Mon Feb 25 11:50:13 2013 +0100
@@ -174,11 +174,11 @@
     protected void initialize(Artifact artifact, Object context, CallMeta meta) {
         logger.debug("MainValuesArtifact.initialize");
         FLYSArtifact winfo = (FLYSArtifact) artifact;
-        RangeAccess rangeAccess = new RangeAccess(this, null);
+        RangeAccess rangeAccess = new RangeAccess(winfo, null);
         double [] locations = rangeAccess.getLocations();
         if (locations != null) {
             double location = locations[0];
-            addData("location", new DefaultStateData("location", null, null,
+            addData("ld_locations", new DefaultStateData("ld_locations", null, null,
                     String.valueOf(location)));
         }
         else {
@@ -245,7 +245,7 @@
         River river = FLYSUtils.getRiver(this);
 
         // TODO use helper to get location as double
-        String locationStr = getDataAsString("location");
+        String locationStr = getDataAsString("ld_locations");
 
         if (river == null || locationStr == null) {
             return null;
@@ -262,7 +262,7 @@
      * @return the location.
      */
     public double getLocation() {
-        double location = Double.parseDouble(getDataAsString("location"));
+        double location = Double.parseDouble(getDataAsString("ld_locations"));
         return location;
     }
 

http://dive4elements.wald.intevation.org