# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1350905558 -7200
# Node ID 02a2d4b5bd1430248e049995326ace7eae5ce77c
# Parent  1cdbd8a0c994c885a80cdaacda7f759dee7df02f# Parent  810db532803a6314b0499ba0523902c20af12eda
Merged.

diff -r 1cdbd8a0c994 -r 02a2d4b5bd14 flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/DischargeInfoService.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/DischargeInfoService.java	Mon Oct 22 13:31:25 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/DischargeInfoService.java	Mon Oct 22 13:32:38 2012 +0200
@@ -3,8 +3,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Date;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
 
 import org.apache.log4j.Logger;
 
diff -r 1cdbd8a0c994 -r 02a2d4b5bd14 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/extreme/ExtremeQInput.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/extreme/ExtremeQInput.java	Mon Oct 22 13:31:25 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/extreme/ExtremeQInput.java	Mon Oct 22 13:32:38 2012 +0200
@@ -2,8 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Comparator;
-import java.util.Collections;
 
 import org.apache.log4j.Logger;
 
@@ -21,17 +19,19 @@
 
 import de.intevation.flys.artifacts.model.RiverFactory;
 import de.intevation.flys.artifacts.model.WstValueTable;
+/*
 import de.intevation.flys.model.Gauge;
+import de.intevation.flys.model.Wst;
+import de.intevation.flys.utils.FLYSUtils;
+*/
 import de.intevation.flys.artifacts.model.Range;
 import de.intevation.flys.model.River;
-import de.intevation.flys.model.Wst;
 
 import de.intevation.flys.artifacts.FLYSArtifact;
 
 import de.intevation.flys.artifacts.model.RangeWithValues;
 import de.intevation.flys.artifacts.states.DefaultState;
 import de.intevation.flys.artifacts.model.WstValueTableFactory;
-import de.intevation.flys.utils.FLYSUtils;
 
 
 /** TODO Subclass WQAdapted. */
diff -r 1cdbd8a0c994 -r 02a2d4b5bd14 flys-artifacts/src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java	Mon Oct 22 13:31:25 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java	Mon Oct 22 13:32:38 2012 +0200
@@ -9,7 +9,6 @@
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Locale;
-import java.util.TreeMap;
 
 import org.w3c.dom.Document;