changeset 2728:306b9d0f0fb3

Cosmetics. flys-artifacts/trunk@4461 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Tue, 22 May 2012 15:29:54 +0000
parents 7fdfb1770d21
children a441be7f1589
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/FixationArtifact.java flys-artifacts/src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java
diffstat 5 files changed, 23 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Tue May 22 13:34:17 2012 +0000
+++ b/flys-artifacts/ChangeLog	Tue May 22 15:29:54 2012 +0000
@@ -1,3 +1,17 @@
+2012-05-22  Felix Wolfsteller <felix.wolfsteller@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/FixationArtifact.java:
+	  Added vim line.
+
+	* src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java:
+	  Removed empty line.
+
+	* src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java:
+	  Removed invalid/not helpful comments.
+
+	* src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java
+	  (outputExists): Doc.
+
 2012-05-22	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/states/fixation/ReferencePeriod.java,
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FixationArtifact.java	Tue May 22 13:34:17 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FixationArtifact.java	Tue May 22 15:29:54 2012 +0000
@@ -173,3 +173,4 @@
     }
 
 }
+// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-artifacts/src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java	Tue May 22 13:34:17 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java	Tue May 22 15:29:54 2012 +0000
@@ -173,6 +173,12 @@
     }
 
 
+    /**
+     * True if current MasterArtifact has given output.
+     * @param name Name of the output of interest.
+     * @param context current context
+     * @return true iff current mater artifact has given output.
+     */
     protected boolean outputExists(String name, CallContext context) {
         FLYSArtifact master = getMasterArtifact(context);
         List<Output> outList = master.getOutputs(context);
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java	Tue May 22 13:34:17 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java	Tue May 22 15:29:54 2012 +0000
@@ -221,17 +221,13 @@
         logger.debug("CrossSectionGenerator.doCrossSectionWaterLineOut");
 
         Lines.LineData lines = (Lines.LineData) o;
-        // DO NOT SORT DATA! This destroys the gaps indicated by NaNs
+        // DO NOT SORT DATA! This destroys the gaps indicated by NaNs.
         StyledXYSeries series = new StyledXYSeries(seriesName, false, theme);
 
         // TODO i18n for all the label text and number format.
         if (ThemeUtil.parseShowWidth(theme)) {
             series.setLabel(series.getLabel() + ", b=" + lines.width + "m");
         }
-        else {
-            // Do not modify.
-            //series.setLabel(series.getLabel());
-        }
         if (ThemeUtil.parseShowLevel(theme) && lines.points.length >0
             && lines.points[1].length > 0) {
             series.setLabel(series.getLabel() + ", W=" + lines.points[1][0] + "NN+m");
@@ -239,9 +235,7 @@
         if (ThemeUtil.parseShowMiddleHeight(theme) && lines.width != 0) {
             series.setLabel(series.getLabel() + ",H=" + lines.area / lines.width + "m : " + lines.area + "/" + lines.width);    
         }
-        // TODO Missing: "mittlere hoehe" (and area but this geos to
-        //                                 the area theme).
-        
+
         StyledSeriesBuilder.addPoints(series, lines.points, false);
 
         addAxisSeries(series, 0, visible);
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java	Tue May 22 13:34:17 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java	Tue May 22 15:29:54 2012 +0000
@@ -133,7 +133,6 @@
         String name = artifactFacet.getFacetName();
         logger.debug("DischargeCurveGenerator.doOut: " + name);
 
-
         if (name.equals(DISCHARGE_CURVE)) {
             doDischargeOut(
                 (WINFOArtifact) artifactFacet.getArtifact(),

http://dive4elements.wald.intevation.org