changeset 1113:5b38cdf65307

Cosmetics. flys-artifacts/trunk@2620 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Wed, 31 Aug 2011 10:41:16 +0000
parents aeae4d20f32f
children 9cc658cc4e20
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java
diffstat 6 files changed, 24 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Wed Aug 31 10:34:45 2011 +0000
+++ b/flys-artifacts/ChangeLog	Wed Aug 31 10:41:16 2011 +0000
@@ -1,3 +1,19 @@
+2011-08-31  Felix Wolfsteller <felix.wolfsteller@intevation.de>
+
+	Cosmetics.
+
+	* src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java,
+	  src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java,
+	  src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java,
+	  src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java:
+	  Removed obselete imports.
+
+	* src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java:
+	  Removed obselete imports, whitespaces.
+
+	* src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java:
+	  Whitespaces, docs.
+
 2011-08-31  Felix Wolfsteller <felix.wolfsteller@intevation.de>
 
 	Fix translations of Main Values Facets.
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java	Wed Aug 31 10:34:45 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java	Wed Aug 31 10:41:16 2011 +0000
@@ -23,20 +23,16 @@
 import de.intevation.artifactdatabase.state.State;
 import de.intevation.artifactdatabase.state.StateEngine;
 
-import de.intevation.artifactdatabase.data.StateData;
-
 import de.intevation.artifacts.common.utils.XMLUtils;
 
 import de.intevation.flys.artifacts.states.DefaultState;
 import de.intevation.flys.artifacts.cache.CacheFactory;
 import de.intevation.flys.artifacts.context.FLYSContext;
 import de.intevation.flys.artifacts.model.AnnotationsFactory;
-import de.intevation.flys.artifacts.model.RiverFactory;
 
 import de.intevation.flys.backend.SessionHolder;
 
 import de.intevation.flys.model.Annotation;
-import de.intevation.flys.model.River;
 
 import de.intevation.flys.utils.FLYSUtils;
 
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java	Wed Aug 31 10:34:45 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java	Wed Aug 31 10:41:16 2011 +0000
@@ -8,7 +8,6 @@
 import org.w3c.dom.Document;
 
 import de.intevation.artifactdatabase.data.DefaultStateData;
-import de.intevation.artifactdatabase.data.StateData;
 import de.intevation.artifactdatabase.state.Facet;
 import de.intevation.artifactdatabase.state.DefaultOutput;
 import de.intevation.artifactdatabase.state.State;
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java	Wed Aug 31 10:34:45 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesQFacet.java	Wed Aug 31 10:41:16 2011 +0000
@@ -5,7 +5,6 @@
 import de.intevation.artifactdatabase.state.DefaultFacet;
 import de.intevation.flys.artifacts.model.FacetTypes;
 import de.intevation.flys.artifacts.MainValuesArtifact;
-import de.intevation.flys.artifacts.resources.Resources;
 
 /**
  * Facet to show Main Q Values.
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java	Wed Aug 31 10:34:45 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java	Wed Aug 31 10:41:16 2011 +0000
@@ -66,7 +66,7 @@
     /** Trivial Constructor. */
     public ComputedDischargeCurveGenerator () {
         super();
-        annotations= new ArrayList<XYAnnotation>();
+        annotations = new ArrayList<XYAnnotation>();
     }
 
 
@@ -78,7 +78,7 @@
 
     @Override
     protected void addSubtitles(JFreeChart chart) {
-        double[] dist  = getRange();
+        double[] dist = getRange();
 
         Object[] args = new Object[] {
             getRiverName(),
@@ -225,6 +225,7 @@
         addFirstAxisSeries(series);
     }
 
+
     /**
      * Add datasets to plot.
      * @param plot plot to add datasets to.
@@ -237,7 +238,11 @@
             plot.setDataset(2, pseudoAnnotationData);
         }
     }
-        
+
+
+    /**
+     * Get the series name to display in legend.
+     */
     protected String getSeriesName(WQKms wqkms) {
         Object[] args = new Object[] {
             getRiverName(),
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java	Wed Aug 31 10:34:45 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java	Wed Aug 31 10:41:16 2011 +0000
@@ -1,8 +1,5 @@
 package de.intevation.flys.exports;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.log4j.Logger;
 
 import org.jfree.chart.JFreeChart;
@@ -11,9 +8,6 @@
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.chart.title.TextTitle;
 import org.jfree.data.Range;
-import org.jfree.data.xy.XYSeries;
-import org.jfree.data.xy.XYSeriesCollection;
-import org.jfree.ui.TextAnchor;
 
 import org.w3c.dom.Document;
 
@@ -26,9 +20,6 @@
 import de.intevation.flys.artifacts.model.FacetTypes;
 import de.intevation.flys.artifacts.model.WQKms;
 
-import de.intevation.flys.model.Annotation;
-import de.intevation.flys.jfree.StickyAxisAnnotation;
-
 
 /**
  * An OutGenerator that generates cross section graphs.

http://dive4elements.wald.intevation.org