diff flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java @ 719:035c0095b427

Draw correction curve again. flys-artifacts/trunk@2193 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Tue, 21 Jun 2011 21:41:49 +0000
parents 45cd58a2a2bb
children 61c051e53f9b
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java	Tue Jun 21 18:10:49 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java	Tue Jun 21 21:41:49 2011 +0000
@@ -8,7 +8,7 @@
 import org.apache.log4j.Logger;
 
 import org.w3c.dom.Document;
-import org.w3c.dom.Node;
+import org.w3c.dom.Element;
 
 import org.jfree.data.Range;
 
@@ -117,20 +117,19 @@
     protected int[] getSize() {
         int[] size = new int[2];
 
-        Node sizeEl = (Node) XMLUtils.xpath(
+        Element sizeEl = (Element)XMLUtils.xpath(
             request,
             XPATH_CHART_SIZE,
             XPathConstants.NODE,
             ArtifactNamespaceContext.INSTANCE);
 
         if (sizeEl != null) {
-            String w = XMLUtils.xpathString(
-                sizeEl, "@art:width", ArtifactNamespaceContext.INSTANCE);
+            String uri = ArtifactNamespaceContext.NAMESPACE_URI;
 
-            String h = XMLUtils.xpathString(
-                sizeEl, "@art:height", ArtifactNamespaceContext.INSTANCE);
+            String w = sizeEl.getAttributeNS(uri, "width");
+            String h = sizeEl.getAttributeNS(uri, "height");
 
-            if (w != null && w.length() > 0 && h != null && h.length() > 0) {
+            if (w.length() > 0 && h.length() > 0) {
                 try {
                     size[0] = Integer.parseInt(w);
                     size[1] = Integer.parseInt(h);
@@ -146,7 +145,7 @@
 
 
     protected Range getDomainAxisRange() {
-        Node xrange = (Node) XMLUtils.xpath(
+        Element xrange = (Element)XMLUtils.xpath(
             request,
             XPATH_CHART_X_RANGE,
             XPathConstants.NODE,
@@ -156,15 +155,14 @@
             return null;
         }
 
-        String lower = XMLUtils.xpathString(
-            xrange, "@art:from", ArtifactNamespaceContext.INSTANCE);
+        String uri = ArtifactNamespaceContext.NAMESPACE_URI;
 
-        String upper = XMLUtils.xpathString(
-            xrange, "@art:to", ArtifactNamespaceContext.INSTANCE);
+        String lower = xrange.getAttributeNS(uri, "from");
+        String upper = xrange.getAttributeNS(uri, "to");
 
         logger.debug("FOUND X RANGE: " + lower + " -> " + upper);
 
-        if (lower != null && upper != null) {
+        if (lower.length() > 0 && upper.length() > 0) {
             try {
                 double from = Double.parseDouble(lower);
                 double to   = Double.parseDouble(upper);
@@ -192,7 +190,7 @@
 
 
     protected Range getValueAxisRange() {
-        Node yrange = (Node) XMLUtils.xpath(
+        Element yrange = (Element)XMLUtils.xpath(
             request,
             XPATH_CHART_Y_RANGE,
             XPathConstants.NODE,
@@ -202,13 +200,12 @@
             return null;
         }
 
-        String lower = XMLUtils.xpathString(
-            yrange, "@art:from", ArtifactNamespaceContext.INSTANCE);
+        String uri = ArtifactNamespaceContext.NAMESPACE_URI;
 
-        String upper = XMLUtils.xpathString(
-            yrange, "@art:to", ArtifactNamespaceContext.INSTANCE);
+        String lower = yrange.getAttributeNS(uri, "from");
+        String upper = yrange.getAttributeNS(uri, "to");
 
-        if (lower != null && upper != null) {
+        if (lower.length() > 0 && upper.length() > 0) {
             try {
                 double from = Double.parseDouble(lower);
                 double to   = Double.parseDouble(upper);

http://dive4elements.wald.intevation.org