# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1350380181 -7200
# Node ID 71a4b664a16a4d1c5c66ca5adb3be311152db71d
# Parent  1ba0927855b4a2f5b8cb0fe690a037159da6da12# Parent  5589b1fd459d6581a27d0b7fd3525e89358c43b2
Merged.

diff -r 5589b1fd459d -r 71a4b664a16a flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java	Tue Oct 16 11:28:33 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java	Tue Oct 16 11:36:21 2012 +0200
@@ -113,6 +113,7 @@
         facets           = new HashMap<String, List<Facet>>();
     }
 
+
     /**
      * This method appends the static data - that has already been inserted by
      * the user - to the static node of the DESCRIBE document.
@@ -258,6 +259,7 @@
         return copy;
     }
 
+
     /**
      * Return a copy of the facet mapping.
      * @return Mapping of state-ids to facets.
@@ -411,6 +413,7 @@
         return doc;
     }
 
+
     /**
      * This method returns a description of this artifact.
      *
diff -r 5589b1fd459d -r 71a4b664a16a flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java	Tue Oct 16 11:28:33 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java	Tue Oct 16 11:36:21 2012 +0200
@@ -55,6 +55,7 @@
 extends      FixChartGenerator
 implements   FacetTypes
 {
+    /** Private logger. */
     private static Logger logger =
             Logger.getLogger(FixWQCurveGenerator.class);
 
@@ -92,6 +93,7 @@
     }
 
 
+    /** Needed to access data to create subtitle. */
     private FLYSArtifact artifact;
 
 
@@ -365,13 +367,13 @@
             Double ckm = (Double) context.getContextValue(CURRENT_KM);
             double location = (ckm != null)
                     ? ckm.doubleValue()
-                            : getRange()[0];
-                    double w = StaticWKmsArtifact.getWAtKmLin(data, location);
-                    xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(),
-                            (float) w, StickyAxisAnnotation.SimpleAxis.Y_AXIS));
+                    : getRange()[0];
+            double w = StaticWKmsArtifact.getWAtKmLin(data, location);
+            xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(),
+                    (float) w, StickyAxisAnnotation.SimpleAxis.Y_AXIS));
 
-                    doAnnotations(new FLYSAnnotation(facet.getDescription(), xy),
-                            aandf, theme, visible);
+            doAnnotations(new FLYSAnnotation(facet.getDescription(), xy),
+                    aandf, theme, visible);
         }
     }
 
diff -r 5589b1fd459d -r 71a4b664a16a flys-client/ChangeLog
--- a/flys-client/ChangeLog	Tue Oct 16 11:28:33 2012 +0200
+++ b/flys-client/ChangeLog	Tue Oct 16 11:36:21 2012 +0200
@@ -1,3 +1,8 @@
+2012-10-16	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/client/ui/fixation/FixationPanel.java:
+	  Do not crash when input helper is used in non-Fixation settings.
+
 2012-10-15	Björn Ricks	<bjoern.ricks@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/client/FLYS.java:
diff -r 5589b1fd459d -r 71a4b664a16a flys-client/src/main/java/de/intevation/flys/client/client/ui/fixation/FixationPanel.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/fixation/FixationPanel.java	Tue Oct 16 11:28:33 2012 +0200
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/fixation/FixationPanel.java	Tue Oct 16 11:36:21 2012 +0200
@@ -146,6 +146,10 @@
         createCallback();
 
         String callBack = "fixationCallback(this.checked, this.name)";
+
+        if (this.artifact instanceof FixAnalysisArtifact == false)
+            return chartContainer;
+
         FixAnalysisArtifact art = (FixAnalysisArtifact) this.artifact;
 
         overviewService.generateOverview(
diff -r 5589b1fd459d -r 71a4b664a16a flys-client/src/main/java/de/intevation/flys/client/shared/model/FacetRecord.java
--- a/flys-client/src/main/java/de/intevation/flys/client/shared/model/FacetRecord.java	Tue Oct 16 11:28:33 2012 +0200
+++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/FacetRecord.java	Tue Oct 16 11:36:21 2012 +0200
@@ -8,6 +8,7 @@
  */
 public class FacetRecord extends ListGridRecord {
 
+    /** Underlying theme. */
     protected Theme theme;