changeset 3772:5a8f8fd5310c

The usual wipe after for ill configured Eclipses. flys-artifacts/trunk@5477 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Sat, 15 Sep 2012 18:11:51 +0000
parents 04309ca24614
children 59fe1c630f28
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedBedQualityResult.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedDensityFacet.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiameterFacet.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedLoadBedQualityResult.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedPorosityFacet.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityCalculation.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityResult.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedloadDiameterFacet.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedQualityInfoGenerator.java flys-artifacts/src/main/java/de/intevation/flys/jfree/JFreeUtil.java
diffstat 13 files changed, 54 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Sat Sep 15 13:42:44 2012 +0000
+++ b/flys-artifacts/ChangeLog	Sat Sep 15 18:11:51 2012 +0000
@@ -1,3 +1,21 @@
+2012-09-15	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/model/minfo/BedBedQualityResult.java:
+	  Removed superfluous imports.
+
+	* src/main/java/de/intevation/flys/jfree/JFreeUtil.java,
+	  src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiameterFacet.java,
+	  src/main/java/de/intevation/flys/artifacts/model/minfo/BedloadDiameterFacet.java,
+	  src/main/java/de/intevation/flys/artifacts/model/minfo/BedLoadBedQualityResult.java,
+	  src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityCalculation.java,
+	  src/main/java/de/intevation/flys/artifacts/model/minfo/BedDensityFacet.java,
+	  src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityResult.java,
+	  src/main/java/de/intevation/flys/artifacts/model/minfo/BedPorosityFacet.java,
+	  src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java,
+	  src/main/java/de/intevation/flys/exports/minfo/BedQualityInfoGenerator.java,
+	  src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java:
+	  Removed trailing whitespace.
+
 2012-09-15	Christian Lins	<christian.lins@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/resources/Resources.java,
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedBedQualityResult.java	Sat Sep 15 13:42:44 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedBedQualityResult.java	Sat Sep 15 18:11:51 2012 +0000
@@ -1,13 +1,8 @@
 package de.intevation.flys.artifacts.model.minfo;
 
-import org.apache.poi.hssf.record.formula.functions.T;
-
-import com.vividsolutions.jts.densify.Densifier;
-
 import gnu.trove.TDoubleArrayList;
 import de.intevation.flys.artifacts.model.DateRange;
 
-
 public class BedBedQualityResult
 extends BedQualityResult {
 
@@ -61,42 +56,42 @@
     public double getDiameterSub(int ndx) {
         return diameterSub.get(ndx);
     }
-    
+
     public double[][] getDiameterCapData() {
         return new double[][] {
             kms.toNativeArray(),
             diameterCap.toNativeArray()
         };
     }
-    
+
     public double[][] getDiameterSubData() {
         return new double[][] {
             kms.toNativeArray(),
             diameterSub.toNativeArray()
         };
     }
-    
+
     public double[][] getPorosityTopLayerData() {
         return new double[][] {
             kms.toNativeArray(),
             porosityCap.toNativeArray()
         };
     }
-    
+
     public double[][] getPorositySubLayerData() {
         return new double[][] {
             kms.toNativeArray(),
             porositySub.toNativeArray()
         };
     }
-    
+
     public double[][] getDensityTopLayerData() {
         return new double[][] {
             kms.toNativeArray(),
             loadDensityCap.toNativeArray()
         };
     }
-    
+
     public double[][] getDensitySubLayerData() {
         return new double[][] {
             kms.toNativeArray(),
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedDensityFacet.java	Sat Sep 15 13:42:44 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedDensityFacet.java	Sat Sep 15 18:11:51 2012 +0000
@@ -13,13 +13,13 @@
 
 /**
  * Facet for serving bed density data.
- * 
+ *
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
 public class BedDensityFacet extends DataFacet {
 
     private static final long serialVersionUID = 1L;
-    
+
     private static Logger logger = Logger.getLogger(BedDensityFacet.class);
 
     public BedDensityFacet() {
@@ -40,7 +40,7 @@
 
         Object[] data = (Object[]) res.getData(); // TODO CAST TO SPECIFIC CLASS
 
-        return data != null && data.length > index ? data[index] : null; 
+        return data != null && data.length > index ? data[index] : null;
     }
 
     /** Copy deeply. */
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiameterFacet.java	Sat Sep 15 13:42:44 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedDiameterFacet.java	Sat Sep 15 18:11:51 2012 +0000
@@ -13,7 +13,7 @@
 
 /**
  * Facet for serving bed diameter data.
- * 
+ *
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
 public class BedDiameterFacet extends DataFacet {
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedLoadBedQualityResult.java	Sat Sep 15 13:42:44 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedLoadBedQualityResult.java	Sat Sep 15 18:11:51 2012 +0000
@@ -4,7 +4,7 @@
 import gnu.trove.TDoubleArrayList;
 
 public class BedLoadBedQualityResult
-extends BedQualityResult 
+extends BedQualityResult
 {
     public BedLoadBedQualityResult (
         String type,
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedPorosityFacet.java	Sat Sep 15 13:42:44 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedPorosityFacet.java	Sat Sep 15 18:11:51 2012 +0000
@@ -13,7 +13,7 @@
 
 /**
  * Facet for serving bed porosity data.
- * 
+ *
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
 public class BedPorosityFacet extends DataFacet {
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityCalculation.java	Sat Sep 15 13:42:44 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityCalculation.java	Sat Sep 15 18:11:51 2012 +0000
@@ -99,7 +99,7 @@
                     to,
                     dr.getFrom(),
                     dr.getTo());
- 
+
             for (String bd : bedDiameter) {
                 BedQualityResult bedResult =
                     calculateBed(bedMeasurements, bd, dr);
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityResult.java	Sat Sep 15 13:42:44 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityResult.java	Sat Sep 15 18:11:51 2012 +0000
@@ -77,7 +77,7 @@
     public boolean isEmpty() {
         return empty;
     }
-    
+
     public double[][] getDiameterData() {
         return new double[][] {
             kms.toNativeArray(),
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedloadDiameterFacet.java	Sat Sep 15 13:42:44 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedloadDiameterFacet.java	Sat Sep 15 18:11:51 2012 +0000
@@ -13,13 +13,13 @@
 
 /**
  * Facet for serving bedload diameter data.
- * 
+ *
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
 public class BedloadDiameterFacet extends DataFacet {
 
     private static final long serialVersionUID = 1L;
-    
+
     private static Logger logger = Logger.getLogger(BedloadDiameterFacet.class);
 
     public BedloadDiameterFacet() {
@@ -41,7 +41,7 @@
 
         Object[] data = (Object[]) res.getData(); // TODO CAST TO SPECIFIC CLASS
 
-        return data != null && data.length > index ? data[index] : null; 
+        return data != null && data.length > index ? data[index] : null;
     }
 
     /** Copy deeply. */
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java	Sat Sep 15 13:42:44 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/BedQualityState.java	Sat Sep 15 18:11:51 2012 +0000
@@ -132,7 +132,7 @@
         DateRange range = result.getDateRange();
         Date from = range != null ? range.getFrom() : new Date();
         Date to = range != null ? range.getTo() : new Date();
-        
+
         String toplayer = Resources.getMsg(meta, I18N_TOPLAYER, I18N_TOPLAYER);
         return Resources.getMsg(meta, I18N_FACET_BED_POROSITY_TOPLAYER,
             I18N_FACET_BED_POROSITY_TOPLAYER, new Object[] { from, to, toplayer });
@@ -143,7 +143,7 @@
         DateRange range = result.getDateRange();
         Date from = range != null ? range.getFrom() : new Date();
         Date to = range != null ? range.getTo() : new Date();
-        
+
         String sublayer = Resources.getMsg(meta, I18N_SUBLAYER, I18N_SUBLAYER);
         return Resources.getMsg(meta, I18N_FACET_BED_POROSITY_SUBLAYER,
             I18N_FACET_BED_POROSITY_SUBLAYER, new Object[] { from, to, sublayer });
@@ -154,7 +154,7 @@
         DateRange range = result.getDateRange();
         Date from = range != null ? range.getFrom() : new Date();
         Date to = range != null ? range.getTo() : new Date();
-        
+
         String toplayer = Resources.getMsg(meta, I18N_TOPLAYER, I18N_TOPLAYER);
         return Resources.getMsg(meta, I18N_FACET_BED_DENSITY_TOPLAYER,
             I18N_FACET_BED_DENSITY_TOPLAYER, new Object[] { from, to, toplayer });
@@ -165,7 +165,7 @@
         DateRange range = result.getDateRange();
         Date from = range != null ? range.getFrom() : new Date();
         Date to = range != null ? range.getTo() : new Date();
-        
+
         String sublayer = Resources.getMsg(meta, I18N_SUBLAYER, I18N_SUBLAYER);
         return Resources.getMsg(meta, I18N_FACET_BED_DENSITY_SUBLAYER,
             I18N_FACET_BED_DENSITY_SUBLAYER, new Object[] { from, to, sublayer });
@@ -189,7 +189,7 @@
         DateRange range = result.getDateRange();
         Date from = range != null ? range.getFrom() : new Date();
         Date to = range != null ? range.getTo() : new Date();
-        
+
         String sublayer = Resources.getMsg(meta, I18N_SUBLAYER, I18N_SUBLAYER);
         return Resources.getMsg(meta, I18N_FACET_BED_DIAMETER_SUBLAYER,
             I18N_FACET_BED_DIAMETER_SUBLAYER, new Object[] { result.getType(),
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java	Sat Sep 15 13:42:44 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedQualityGenerator.java	Sat Sep 15 18:11:51 2012 +0000
@@ -17,7 +17,7 @@
 
 /**
  * An OutGenerator that generates bed quality charts.
- * 
+ *
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
 public class BedQualityGenerator extends XYChartGenerator implements FacetTypes {
@@ -66,7 +66,7 @@
 
     /**
      * Returns the default title for this chart.
-     * 
+     *
      * @return the default title for this chart.
      */
     @Override
@@ -122,7 +122,7 @@
 
     /**
      * Produce output.
-     * 
+     *
      * @param artifactAndFacet
      *            current facet.
      * @param attr
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedQualityInfoGenerator.java	Sat Sep 15 13:42:44 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/BedQualityInfoGenerator.java	Sat Sep 15 18:11:51 2012 +0000
@@ -6,7 +6,7 @@
 /**
  * A ChartInfoGenerator that generates meta information for specific computed
  * bed quality curves.
- * 
+ *
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
 public class BedQualityInfoGenerator extends ChartInfoGenerator {
--- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/JFreeUtil.java	Sat Sep 15 13:42:44 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/JFreeUtil.java	Sat Sep 15 18:11:51 2012 +0000
@@ -13,7 +13,7 @@
 import de.intevation.flys.artifacts.math.Function;
 
 public class JFreeUtil {
-    
+
     private static final Logger logger = Logger.getLogger(JFreeUtil.class);
 
     /** Do not instantiate. */
@@ -51,13 +51,13 @@
 
         return false;
     }
-    
-    
+
+
     /**
      * This function samples a randomized line that contains of x and y values
      * between <i>startX</i>, <i>endX</i>, <i>startY</i> and <i>endY</i>. The
      * number of points in the line is specified by <i>num</i>.
-     * 
+     *
      * @param num The number of points in the line.
      * @param startX The min value of the x values.
      * @param endX The max value of the x values.
@@ -77,22 +77,22 @@
         if (num <= 0) {
             throw new IllegalArgumentException("Parameter 'num' has to be > 0");
         }
-        
+
         Random random = new Random();
-        
+
         double[] x = new double[num];
         double[] y = new double[num];
-        
+
         for (int i = 0; i < num; i++) {
             double xFac = random.nextDouble();
             double yFac = random.nextDouble();
-            
+
             x[i] = startX + xFac * (endX - startX);
             y[i] = startY + yFac * (endY - startY);
-            
+
             logger.debug("Created new point: " + x[i] + "|" + y[i]);
         }
-        
+
         return new double[][] { x, y };
     }
 

http://dive4elements.wald.intevation.org