changeset 2158:1ea555bf3c6b

Removed state validation. flys-artifacts/trunk@3744 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Raimund Renkert <raimund.renkert@intevation.de>
date Fri, 20 Jan 2012 16:22:00 +0000
parents c4ceade9d50e
children ebfca80dae09
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/ChartArtifact.java
diffstat 2 files changed, 22 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Fri Jan 20 13:20:37 2012 +0000
+++ b/flys-artifacts/ChangeLog	Fri Jan 20 16:22:00 2012 +0000
@@ -1,3 +1,10 @@
+2012-01-20  Raimund Renkert <raimund.renkert@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/ChartArtifact.java:
+	  Removed state validation. Validation prevents drawing the diffenrences
+	  diagramm and all states except of WDifferencesState always return
+	  true.
+
 2012-01-20  Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	* src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/ChartArtifact.java	Fri Jan 20 13:20:37 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/ChartArtifact.java	Fri Jan 20 16:22:00 2012 +0000
@@ -192,26 +192,24 @@
 
         try {
             DefaultState cur = (DefaultState) getCurrentState(context);
-            if (cur.validate(this)) {
-                List<Output> list = cur.getOutputs();
-                if (list != null && list.size() > 0) {
-                    logger.debug(
-                        "Append output modes for current state: " + cur.getID());
-
-                    List<Facet> fs = facets.get(cur.getID());
+            List<Output> list = cur.getOutputs();
+            if (list != null && list.size() > 0) {
+                logger.debug(
+                    "Append output modes for current state: " + cur.getID());
 
-                    if (fs != null && fs.size() > 0) {
-                        List<Output> generated = generateOutputs(list, fs);
+                List<Facet> fs = facets.get(cur.getID());
 
-                        logger.debug("Found " + fs.size() + " current facets.");
-                        if (!generated.isEmpty()) {
-                            ProtocolUtils.appendOutputModes(
-                                doc, outs, generated);
-                        }
+                if (fs != null && fs.size() > 0) {
+                    List<Output> generated = generateOutputs(list, fs);
+
+                    logger.debug("Found " + fs.size() + " current facets.");
+                    if (!generated.isEmpty()) {
+                        ProtocolUtils.appendOutputModes(
+                            doc, outs, generated);
                     }
-                    else {
-                        logger.debug("No facets found for the current state.");
-                    }
+                }
+                else {
+                    logger.debug("No facets found for the current state.");
                 }
             }
         }

http://dive4elements.wald.intevation.org