changeset 742:c09c9e05ecfa

Removed trailing whitespace. flys-artifacts/trunk@2243 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Sun, 26 Jun 2011 17:18:59 +0000 (2011-06-26)
parents e54203e52097
children e95e6df97e55
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/Identity.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/Linear.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation1.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation4.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DataFacet.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQKms.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/meta/ResultData.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DefaultState.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveInfoGenerator.java flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java flys-artifacts/src/main/java/de/intevation/flys/exports/ReportGenerator.java
diffstat 26 files changed, 51 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/ChangeLog	Sun Jun 26 17:18:59 2011 +0000
@@ -1,3 +1,7 @@
+2011-06-26  Sascha L. Teichmann <sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/**/*.java: Removed trailing whitespace.
+
 2011-06-26  Sascha L. Teichmann <sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java	Sun Jun 26 17:18:59 2011 +0000
@@ -1064,7 +1064,7 @@
             String key   = entry.getKey();
             Object value = entry.getValue().getValue();
 
-            hash ^= ((long)key.hashCode() << shift) 
+            hash ^= ((long)key.hashCode() << shift)
                  |  ((long)value.hashCode() << (shift + 3));
             shift += 2;
         }
@@ -1081,8 +1081,8 @@
      * @param context The CallContext.
      */
     public Object compute(
-        CallContext context, 
-        ComputeType type, 
+        CallContext context,
+        ComputeType type,
         boolean     generateFacets
     ) {
         return compute(context, hash(), type, generateFacets);
@@ -1103,7 +1103,7 @@
     public Object compute(
         CallContext context,
         String      hash,
-        ComputeType type, 
+        ComputeType type,
         boolean     generateFacets
     ) {
         DefaultState current = (DefaultState) getCurrentState(context);
@@ -1114,7 +1114,7 @@
         CallContext context,
         String      stateID,
         String      hash,
-        ComputeType type, 
+        ComputeType type,
         boolean     generateFacets
     ) {
         DefaultState current = stateID == null
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java	Sun Jun 26 17:18:59 2011 +0000
@@ -205,7 +205,7 @@
             }
 
             PolynomialSplineFunction spline;
-            
+
             try {
                 spline = interpolator.interpolate(x, y);
             }
@@ -225,7 +225,7 @@
                 }
 
                 for (back = Math.max(back, 0);
-                     back < i && km[back] < end; 
+                     back < i && km[back] < end;
                      ++back
                 ) {
                     // to 3/4 point fill with spline values
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/Identity.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/Identity.java	Sun Jun 26 17:18:59 2011 +0000
@@ -1,6 +1,6 @@
 package de.intevation.flys.artifacts.math;
 
-public final class Identity 
+public final class Identity
 implements         Function
 {
     public static final Identity IDENTITY = new Identity();
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/Linear.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/Linear.java	Sun Jun 26 17:18:59 2011 +0000
@@ -1,6 +1,6 @@
 package de.intevation.flys.artifacts.math;
 
-public final class Linear 
+public final class Linear
 implements         Function
 {
     private double m;
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation.java	Sun Jun 26 17:18:59 2011 +0000
@@ -13,7 +13,7 @@
 public class Calculation
 implements   Serializable
 {
-    public static class Problem 
+    public static class Problem
     implements          Serializable
     {
         protected Double km;
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation1.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation1.java	Sun Jun 26 17:18:59 2011 +0000
@@ -18,8 +18,8 @@
     }
 
     public Calculation1(
-        double [] kms, 
-        double [] qs, 
+        double [] kms,
+        double [] qs,
         double [] ws,
         double    refKm
     ) {
@@ -55,7 +55,7 @@
                 WQKms result = new WQKms(kms, oqs, ows, prefix + origData[i]);
                 if (oldNumProblems != newNumProblems) {
                     logger.debug(
-                        qs[i] + " caused " + (newNumProblems-oldNumProblems) + 
+                        qs[i] + " caused " + (newNumProblems-oldNumProblems) +
                         " new problem(s).");
                     result.removeNaNs();
                 }
@@ -64,7 +64,7 @@
 
             oldNumProblems = newNumProblems;
         }
-        
+
         return new CalculationResult(
             results.toArray(new WQKms[results.size()]),
             this);
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation4.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation4.java	Sun Jun 26 17:18:59 2011 +0000
@@ -61,7 +61,7 @@
             else {
                 double ref = gauge.getStation().doubleValue();
                 logger.debug(
-                    "reference gauge: " + gauge.getName() + 
+                    "reference gauge: " + gauge.getName() +
                     " (km " + ref + ")");
                 segment.setReferencePoint(ref);
             }
@@ -199,10 +199,10 @@
                         Segment si1 = segments.get(i-1);
                         Segment si  = segments.get(i);
                         if (debug) {
-                            logger.debug("check " + pos + " in " + 
+                            logger.debug("check " + pos + " in " +
                                 si1.referencePoint + " - " + si.referencePoint);
                         }
-                        if (pos >= si1.referencePoint 
+                        if (pos >= si1.referencePoint
                         &&  pos <= si. referencePoint) {
                             s1 = si1;
                             s2 = si;
@@ -242,7 +242,7 @@
 
                             if (debug) {
                                 logger.debug(
-                                    anchor.referencePoint + ": " + 
+                                    anchor.referencePoint + ": " +
                                     qA + " -> " + functions[i].value(qA) +
                                     " / " + free.referencePoint + ": " +
                                     qF + " -> " + functions[i].value(qF));
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DataFacet.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DataFacet.java	Sun Jun 26 17:18:59 2011 +0000
@@ -25,7 +25,7 @@
 
     public DataFacet(
         String      name,
-        String      description, 
+        String      description,
         ComputeType type,
         String      hash
     ) {
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQKms.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQKms.java	Sun Jun 26 17:18:59 2011 +0000
@@ -11,7 +11,7 @@
  *
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
-public class WQKms 
+public class WQKms
 extends      WQ
 {
     private static Logger logger = Logger.getLogger(WQKms.class);
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java	Sun Jun 26 17:18:59 2011 +0000
@@ -24,8 +24,8 @@
     }
 
     public WaterlevelFacet(
-        int         index, 
-        String      name, 
+        int         index,
+        String      name,
         String      description,
         ComputeType type,
         String      stateID,
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java	Sun Jun 26 17:18:59 2011 +0000
@@ -230,7 +230,7 @@
         }
 
         public double [][] interpolateWQ(
-            int           steps, 
+            int           steps,
             WstValueTable table,
             Calculation   errors
         ) {
@@ -246,8 +246,8 @@
 
             double [] splineQ = new double[W];
 
-            double minQ =  Double.MAX_VALUE; 
-            double maxQ = -Double.MAX_VALUE; 
+            double minQ =  Double.MAX_VALUE;
+            double maxQ = -Double.MAX_VALUE;
 
             for (int i = 0; i < W; ++i) {
                 double sq = table.getQIndex(i, km);
@@ -270,7 +270,7 @@
             SplineInterpolator interpolator = new SplineInterpolator();
 
             PolynomialSplineFunction spline;
-            
+
             try {
                 spline = interpolator.interpolate(splineQ, ws);
             }
@@ -333,8 +333,8 @@
                 ow = other.ws[index];
             }
             else {
-                tw = Linear.weight(weight, ws[index-1], ws[index]); 
-                ow = Linear.weight(weight, other.ws[index-1], other.ws[index]); 
+                tw = Linear.weight(weight, ws[index-1], ws[index]);
+                ow = Linear.weight(weight, other.ws[index-1], other.ws[index]);
             }
 
             return Linear.weight(kmWeight, tw, ow);
@@ -369,7 +369,7 @@
 
     public double [] interpolateW(
         double      km,
-        double []   qs, 
+        double []   qs,
         double []   ws,
         Calculation errors
     ) {
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java	Sun Jun 26 17:18:59 2011 +0000
@@ -114,7 +114,7 @@
     }
 
     protected static List<WstValueTable.Row> loadRows(
-        Session session, 
+        Session session,
         Wst     wst,
         int     numColumns
     ) {
@@ -210,7 +210,7 @@
             columns[lastColumn].setQRangeTree(qRangeTree);
         }
 
-        /* This is debug code to visualize the q ranges trees 
+        /* This is debug code to visualize the q ranges trees
 
         java.io.PrintWriter out = null;
         try {
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/meta/Builder.java	Sun Jun 26 17:18:59 2011 +0000
@@ -195,7 +195,7 @@
             return sb.toString();
         }
 
-        protected void build(Node parent, Node current) 
+        protected void build(Node parent, Node current)
         throws SQLException
         {
             String ns = current.getNamespaceURI();
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/meta/CompiledStatement.java	Sun Jun 26 17:18:59 2011 +0000
@@ -62,7 +62,7 @@
         return statement;
     }
 
-    public ResultData execute(Connection connection, StackFrames frames) 
+    public ResultData execute(Connection connection, StackFrames frames)
     throws SQLException
     {
         if (preparedStatement == null) {
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/meta/ResultData.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/meta/ResultData.java	Sun Jun 26 17:18:59 2011 +0000
@@ -17,7 +17,7 @@
         rows = new ArrayList<Object []>();
     }
 
-    public ResultData(ResultSetMetaData meta) 
+    public ResultData(ResultSetMetaData meta)
     throws SQLException
     {
         this();
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java	Sun Jun 26 17:18:59 2011 +0000
@@ -66,7 +66,7 @@
     public static  final String ERROR_INVALID_CALCULATION_MODE =
         "error_feed_invalid_calculation_mode";
 
-    
+
     public CalculationSelect() {
     }
 
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/ComputedDischargeCurveState.java	Sun Jun 26 17:18:59 2011 +0000
@@ -44,7 +44,7 @@
         FLYSArtifact artifact,
         String       hash,
         CallContext  context,
-        List<Facet>  facets, 
+        List<Facet>  facets,
         Object       old
     ) {
         WINFOArtifact winfo = (WINFOArtifact)artifact;
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DefaultState.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DefaultState.java	Sun Jun 26 17:18:59 2011 +0000
@@ -267,8 +267,8 @@
     public Object computeAdvance(
         FLYSArtifact artifact,
         String       hash,
-        CallContext  context, 
-        List<Facet>  facets, 
+        CallContext  context,
+        List<Facet>  facets,
         Object       old
     ) {
         return null;
@@ -278,7 +278,7 @@
         FLYSArtifact artifact,
         String       hash,
         CallContext  context,
-        List<Facet>  facets, 
+        List<Facet>  facets,
         Object       old
     ) {
         return null;
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java	Sun Jun 26 17:18:59 2011 +0000
@@ -33,7 +33,7 @@
         FLYSArtifact artifact,
         String       hash,
         CallContext  context,
-        List<Facet>  facets, 
+        List<Facet>  facets,
         Object       old
     ) {
         WINFOArtifact winfo = (WINFOArtifact)artifact;
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DurationCurveState.java	Sun Jun 26 17:18:59 2011 +0000
@@ -44,7 +44,7 @@
         FLYSArtifact artifact,
         String       hash,
         CallContext  context,
-        List<Facet>  facets, 
+        List<Facet>  facets,
         Object       old
     ) {
         WINFOArtifact winfo = (WINFOArtifact)artifact;
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java	Sun Jun 26 17:18:59 2011 +0000
@@ -33,7 +33,7 @@
 /**
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
-public class LocationDistanceSelect 
+public class LocationDistanceSelect
 extends      RangeState
 implements   FacetTypes
 {
@@ -310,7 +310,7 @@
         FLYSArtifact artifact,
         String       hash,
         CallContext  context,
-        List<Facet>  facets, 
+        List<Facet>  facets,
         Object       old
     ) {
         logger.debug("computeFeed");
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelState.java	Sun Jun 26 17:18:59 2011 +0000
@@ -32,7 +32,7 @@
         FLYSArtifact artifact,
         String       hash,
         CallContext  context,
-        List<Facet>  facets, 
+        List<Facet>  facets,
         Object       old
     ) {
         WINFOArtifact winfo = (WINFOArtifact)artifact;
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveInfoGenerator.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveInfoGenerator.java	Sun Jun 26 17:18:59 2011 +0000
@@ -2,7 +2,7 @@
 
 
 /**
- * A ChartInfoGenerator that generates meta information for specific computed 
+ * A ChartInfoGenerator that generates meta information for specific computed
  * discharge curves.
  *
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionExporter.java	Sun Jun 26 17:18:59 2011 +0000
@@ -45,7 +45,7 @@
             if (d instanceof WQKms []) {
                 data.add((WQKms [])d);
             }
-        }        
+        }
     }
 
 
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ReportGenerator.java	Sun Jun 26 17:06:35 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ReportGenerator.java	Sun Jun 26 17:18:59 2011 +0000
@@ -19,7 +19,7 @@
 import org.w3c.dom.Document;
 
 public class ReportGenerator
-implements   OutGenerator 
+implements   OutGenerator
 {
     private static Logger logger = Logger.getLogger(ReportGenerator.class);
 

http://dive4elements.wald.intevation.org