Mercurial > dive4elements > river

changeset 4552:ea40a5ded134

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged
author Sascha L. Teichmann <teichmann@intevation.de>
date Fri, 16 Nov 2012 12:01:38 +0100
parents 2fadc6c5cdad (diff) 9a2432485371 (current diff)
children d961bb99a5c2
files
diffstat 5 files changed, 7 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentDensity.java	Fri Nov 16 11:56:43 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentDensity.java	Fri Nov 16 12:01:38 2012 +0100
@@ -1,7 +1,6 @@
 package de.intevation.flys.artifacts.model.minfo;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -9,7 +8,6 @@
 import java.util.Set;
 
 import org.apache.log4j.Logger;
-import org.jfree.util.Log;
 
 
 public class SedimentDensity
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoad.java	Fri Nov 16 11:56:43 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoad.java	Fri Nov 16 12:01:38 2012 +0100
@@ -4,8 +4,6 @@
 import java.util.HashMap;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
-
 import de.intevation.flys.artifacts.model.NamedObjectImpl;
 
 
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoadFactory.java	Fri Nov 16 11:56:43 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoadFactory.java	Fri Nov 16 12:01:38 2012 +0100
@@ -2,7 +2,6 @@
 
 import gnu.trove.TDoubleArrayList;
 
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -13,7 +12,6 @@
 import org.apache.log4j.Logger;
 import org.hibernate.SQLQuery;
 import org.hibernate.Session;
-import org.hibernate.exception.SQLGrammarException;
 import org.hibernate.type.StandardBasicTypes;
 
 import de.intevation.flys.artifacts.cache.CacheFactory;
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/process/BedheightProcessor.java	Fri Nov 16 11:56:43 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/process/BedheightProcessor.java	Fri Nov 16 12:01:38 2012 +0100
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import javax.swing.text.html.HTMLDocument.HTMLReader.IsindexAction;
-
 import org.apache.log4j.Logger;
 import org.jfree.data.xy.XYSeries;
 import org.w3c.dom.Document;
@@ -23,8 +21,13 @@
     private final static String BEDHEIGHT = "bedheight";
 
     @Override
-    public void doOut(XYChartGenerator generator, ArtifactAndFacet aandf,
-            Document theme, boolean visible, int index) {
+    public void doOut(
+            XYChartGenerator generator,
+            ArtifactAndFacet aandf,
+            Document theme,
+            boolean visible,
+            int index
+    ) {
         CallContext context = generator.getCallContext();
         Object data = aandf.getData(context);
         if (data instanceof BedHeightSingle) {
@@ -73,5 +76,4 @@
 
         generator.addAxisSeries(series, index, visible);
     }
-
 }
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/SedimentDensityParser.java	Fri Nov 16 11:56:43 2012 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/SedimentDensityParser.java	Fri Nov 16 12:01:38 2012 +0100
@@ -5,7 +5,6 @@
 
 import java.math.BigDecimal;
 
-import java.text.DateFormat;
 import java.text.NumberFormat;
 import java.text.ParseException;
http://dive4elements.wald.intevation.org