# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1257933136 0
# Node ID 4e8f0fd8ed79f7809f83113c3230e58609f515cb
# Parent  cad7c220adbcd23adff79241f03f5eaaa209b23c
BugFix: Storage of "feeded" MinMaxValues will now work. issue79

gnv-artifacts/trunk@319 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r cad7c220adbc -r 4e8f0fd8ed79 gnv-artifacts/ChangeLog
--- a/gnv-artifacts/ChangeLog	Wed Nov 11 08:31:59 2009 +0000
+++ b/gnv-artifacts/ChangeLog	Wed Nov 11 09:52:16 2009 +0000
@@ -1,3 +1,18 @@
+2009-11-11  Tim Englich  <tim.englich@intevation.de>
+
+	* src/main/java/de/intevation/gnv/transition/describedata/MinMaxDescribeData.java,
+	  src/main/java/de/intevation/gnv/transition/describedata/DefaultMinMaxDescribeData.java: 
+	  Added getName and added Constants for minValue and maxValue Id to
+	  enable the storage of this Values which would be put using the
+	  feed command.
+	
+	* src/main/java/de/intevation/gnv/transition/TransitionBase.java (describe):
+	  Changed the usage of the Name of the MinMaxTransition from getMinName to getName.
+	   
+	* src/main/java/de/intevation/gnv/transition/MinMaxTransition.java (purifyResult): 
+	  Changed the Constructor of MinMaxTransition according to API-Changes of
+	  DefaultMinMaxDescribeData
+	
 2009-11-11  Tim Englich  <tim.englich@intevation.de>
 
 	* doc/conf/products/verticalprofile/conf_mesh.xml,
diff -r cad7c220adbc -r 4e8f0fd8ed79 gnv-artifacts/src/main/java/de/intevation/gnv/transition/MinMaxTransition.java
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/MinMaxTransition.java	Wed Nov 11 08:31:59 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/MinMaxTransition.java	Wed Nov 11 09:52:16 2009 +0000
@@ -46,12 +46,11 @@
             describeData = new ArrayList<Object>();
         }
         if (result != null && result.size() == 1) {
-
-            String minName = this.dataName;
-            String maxName = this.dataName;
+            
             Result value = result.iterator().next();
-            DescribeData values = new DefaultMinMaxDescribeData(minName,
-                    maxName, value.getObject("MIN"), value.getObject("MAX"));
+            DescribeData values = new DefaultMinMaxDescribeData(this.dataName, 
+                                                               value.getObject("MIN"), 
+                                                               value.getObject("MAX"));
             log.debug(values.toString());
             describeData.add(values);
         } else {
diff -r cad7c220adbc -r 4e8f0fd8ed79 gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java	Wed Nov 11 08:31:59 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java	Wed Nov 11 09:52:16 2009 +0000
@@ -599,14 +599,14 @@
                     
                     Element groupNode = xmlutilities.createXFormElement(
                             document, "group");
-                    groupNode.setAttribute("ref", minMaxDescibeData.getMinName());
+                    groupNode.setAttribute("ref", minMaxDescibeData.getName());
                     Element groupNodeLableNode = xmlutilities
                             .createXFormElement(document, "label");
                     groupNodeLableNode.setTextContent(RessourceFactory
                             .getInstance().getRessource(
                                     callMeta.getLanguages(),
-                                    minMaxDescibeData.getMinName(),
-                                    minMaxDescibeData.getMinName()));
+                                    minMaxDescibeData.getName(),
+                                    minMaxDescibeData.getName()));
                     groupNode.appendChild(groupNodeLableNode);
 
                     Element inputMinNode = xmlutilities.createXFormElement(
diff -r cad7c220adbc -r 4e8f0fd8ed79 gnv-artifacts/src/main/java/de/intevation/gnv/transition/describedata/DefaultMinMaxDescribeData.java
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/describedata/DefaultMinMaxDescribeData.java	Wed Nov 11 08:31:59 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/describedata/DefaultMinMaxDescribeData.java	Wed Nov 11 09:52:16 2009 +0000
@@ -17,19 +17,19 @@
     private Object minValue = null;
 
     private Object maxValue = null;
+    
+    private String name = null; 
 
-    private String minName = null;
+    private final static String minName = "minvalue";
 
-    private String maxName = null;
+    private final static String maxName = "maxvalue";
 
     /**
      * Constructor
      */
-    public DefaultMinMaxDescribeData(String minName, String maxName,
-                                     Object minValue, Object maxValue) {
+    public DefaultMinMaxDescribeData(String name, Object minValue, Object maxValue) {
         super();
-        this.minName = minName;
-        this.maxName = maxName;
+        this.name = name;
         this.minValue = minValue;
         this.maxValue = maxValue;
     }
@@ -61,14 +61,14 @@
      * @see de.intevation.gnv.transition.describedata.MinMaxDescribeData#getName()
      */
     public String getMinName() {
-        return this.minName;
+        return minName;
     }
 
     /**
      * @see de.intevation.gnv.transition.describedata.MinMaxDescribeData#getMaxName()
      */
     public String getMaxName() {
-        return this.maxName;
+        return maxName;
     }
 
     /**
@@ -85,4 +85,8 @@
         this.minValue = minValue;
     }
 
+    public String getName() {
+       return this.name;
+    }
+
 }
diff -r cad7c220adbc -r 4e8f0fd8ed79 gnv-artifacts/src/main/java/de/intevation/gnv/transition/describedata/MinMaxDescribeData.java
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/describedata/MinMaxDescribeData.java	Wed Nov 11 08:31:59 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/describedata/MinMaxDescribeData.java	Wed Nov 11 09:52:16 2009 +0000
@@ -17,6 +17,8 @@
 
     public void setMaxValue(Object maxValue);
 
+    public String getName();
+    
     public String getMinName();
 
     public String getMaxName();