[PATCH] Removed NASTY package clash. We had too org.dive4elements.river.util packages

[Wald Commits]

# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1409828455 -7200
# Node ID a1ceacf15d3af3297e238622d48de488d4e88386
# Parent  76e1e9d81ce2fb5f761ed3d139610ed59b588997
Removed NASTY package clash. We had too org.dive4elements.river.util packages.

diff -r 76e1e9d81ce2 -r a1ceacf15d3a artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedDifferencesAccess.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedDifferencesAccess.java	Thu Sep 04 12:03:02 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedDifferencesAccess.java	Thu Sep 04 13:00:55 2014 +0200
@@ -15,7 +15,7 @@
 import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.artifacts.D4EArtifact;
 import org.dive4elements.river.utils.RiverUtils;
-import org.dive4elements.river.utils.StringUtil;
+import org.dive4elements.river.backend.utils.StringUtil;
 
 
 public class BedDifferencesAccess
diff -r 76e1e9d81ce2 -r a1ceacf15d3a artifacts/src/main/java/org/dive4elements/river/artifacts/model/LinearInterpolated.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/LinearInterpolated.java	Thu Sep 04 12:03:02 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/LinearInterpolated.java	Thu Sep 04 13:00:55 2014 +0200
@@ -21,7 +21,7 @@
 
 import org.dive4elements.river.artifacts.math.Linear;
 
-import org.dive4elements.river.utils.EpsilonComparator;
+import org.dive4elements.river.backend.utils.EpsilonComparator;
 
 public class LinearInterpolated
 implements   Serializable
diff -r 76e1e9d81ce2 -r a1ceacf15d3a artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java	Thu Sep 04 12:03:02 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java	Thu Sep 04 13:00:55 2014 +0200
@@ -17,7 +17,7 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import org.dive4elements.river.utils.EpsilonComparator;
+import org.dive4elements.river.backend.utils.EpsilonComparator;
 
 public class SedimentLoadData implements Serializable
 {
diff -r 76e1e9d81ce2 -r a1ceacf15d3a artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataValueFilter.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataValueFilter.java	Thu Sep 04 12:03:02 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataValueFilter.java	Thu Sep 04 13:00:55 2014 +0200
@@ -12,7 +12,7 @@
 import java.util.Date;
 import java.util.List;
 
-import org.dive4elements.river.utils.DateUtil;
+import org.dive4elements.river.backend.utils.DateUtil;
 
 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadData.Value;
 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadData.Value.Filter;
diff -r 76e1e9d81ce2 -r a1ceacf15d3a artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadLSData.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadLSData.java	Thu Sep 04 12:03:02 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadLSData.java	Thu Sep 04 13:00:55 2014 +0200
@@ -15,7 +15,7 @@
 
 import org.dive4elements.river.artifacts.model.NamedObjectImpl;
 import org.dive4elements.river.artifacts.model.Range;
-import org.dive4elements.river.utils.EpsilonComparator;
+import org.dive4elements.river.backend.utils.EpsilonComparator;
 
 import org.apache.log4j.Logger;
 
diff -r 76e1e9d81ce2 -r a1ceacf15d3a artifacts/src/main/java/org/dive4elements/river/artifacts/states/WDifferencesState.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WDifferencesState.java	Thu Sep 04 12:03:02 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WDifferencesState.java	Thu Sep 04 13:00:55 2014 +0200
@@ -41,7 +41,7 @@
 import org.dive4elements.river.artifacts.resources.Resources;
 
 import org.dive4elements.river.utils.RiverUtils;
-import org.dive4elements.river.utils.StringUtil;
+import org.dive4elements.river.backend.utils.StringUtil;
 
 /** State of a WINFOArtifact to get differences of data of other artifacts. */
 public class WDifferencesState
diff -r 76e1e9d81ce2 -r a1ceacf15d3a artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelPairSelectState.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelPairSelectState.java	Thu Sep 04 12:03:02 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelPairSelectState.java	Thu Sep 04 13:00:55 2014 +0200
@@ -26,7 +26,7 @@
 import org.dive4elements.river.artifacts.model.FacetTypes;
 import org.dive4elements.river.artifacts.resources.Resources;
 
-import org.dive4elements.river.utils.StringUtil;
+import org.dive4elements.river.backend.utils.StringUtil;
 
 /**
  * State in which the user selects 1 to n pairs of Waterlevels and alikes.
diff -r 76e1e9d81ce2 -r a1ceacf15d3a artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelSelectState.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelSelectState.java	Thu Sep 04 12:03:02 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelSelectState.java	Thu Sep 04 13:00:55 2014 +0200
@@ -28,7 +28,7 @@
 import org.dive4elements.river.artifacts.model.fixings.FixRealizingResult;
 import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.utils.RiverUtils;
-import org.dive4elements.river.utils.StringUtil;
+import org.dive4elements.river.backend.utils.StringUtil;
 
 
 /**
diff -r 76e1e9d81ce2 -r a1ceacf15d3a artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferenceSelect.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferenceSelect.java	Thu Sep 04 12:03:02 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferenceSelect.java	Thu Sep 04 13:00:55 2014 +0200
@@ -17,7 +17,7 @@
 import org.dive4elements.artifacts.common.utils.XMLUtils.ElementCreator;
 import org.dive4elements.river.artifacts.D4EArtifact;
 import org.dive4elements.river.artifacts.states.DefaultState;
-import org.dive4elements.river.utils.StringUtil;
+import org.dive4elements.river.backend.utils.StringUtil;
 
 /**
  * @author <a href="mailto:raimund.renkert at intevation.de">Raimund Renkert</a>
diff -r 76e1e9d81ce2 -r a1ceacf15d3a artifacts/src/main/java/org/dive4elements/river/utils/RiverUtils.java
--- a/artifacts/src/main/java/org/dive4elements/river/utils/RiverUtils.java	Thu Sep 04 12:03:02 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/utils/RiverUtils.java	Thu Sep 04 13:00:55 2014 +0200
@@ -28,6 +28,7 @@
 import org.dive4elements.river.model.Gauge;
 import org.dive4elements.river.model.MainValue;
 import org.dive4elements.river.model.River;
+import org.dive4elements.river.backend.utils.StringUtil;
 
 import gnu.trove.TDoubleArrayList;
 import gnu.trove.TIntArrayList;