--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java	Wed Jul 09 17:10:18 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java	Wed Jul 09 17:33:57 2014 +0200
@@ -216,7 +216,7 @@
      * @param river name of river.
      * @param type
      */
-    public static SedimentLoad[] getLoads(
+    public static SedimentLoadLSData[] getLoads(
         String river,
         String type,
         double startKm,
@@ -237,10 +237,10 @@
 
         if (element != null) {
             log.debug("SedimentLoad found in cache");
-            return (SedimentLoad[])element.getValue();
+            return (SedimentLoadLSData[])element.getValue();
         }
 
-        SedimentLoad[] values =
+        SedimentLoadLSData[] values =
             getSedimentLoadsUncached(river, type, startKm, endKm);
 
         if (values != null && key != null) {
@@ -256,7 +256,7 @@
      * @param type "epoch", "off_epoch" or "single"
      * @return A Sedimentload filled with values from db or cache.
      */
-    public static SedimentLoad getLoadWithData(
+    public static SedimentLoadLSData getLoadWithData(
         String river,
         String type,
         double startKm,
@@ -285,10 +285,10 @@
 
         if (element != null) {
             log.debug("SedimentLoad found in cache");
-            return (SedimentLoad)element.getValue();
+            return (SedimentLoadLSData)element.getValue();
         }
 
-        SedimentLoad values = getSedimentLoadWithDataUncached(
+        SedimentLoadLSData values = getSedimentLoadWithDataUncached(
             river,
             type,
             startKm,
@@ -386,7 +386,7 @@
      * @param type the sediment load type (year or epoch)
      * @return according sediment loads.
      */
-    public static SedimentLoad[] getSedimentLoadsUncached(
+    public static SedimentLoadLSData[] getSedimentLoadsUncached(
         String river,
         String type,
         double startKm,
@@ -405,10 +405,10 @@
             sqlQuery.setDouble("startKm", startKm);
             sqlQuery.setDouble("endKm", endKm);
             List<Object []> results = sqlQuery.list();
-            SedimentLoad[] loads = new SedimentLoad[results.size()];
+            SedimentLoadLSData[] loads = new SedimentLoadLSData[results.size()];
             for (int i = 0, R = results.size(); i < R; i++) {
                 Object[] row = results.get(i);
-                loads[i] = new SedimentLoad(
+                loads[i] = new SedimentLoadLSData(
                     (String) row[0],
                     (Date) row[1],
                     null,
@@ -427,10 +427,10 @@
             sqlQuery.setDouble("endKm", endKm);
             List<Object []> results = sqlQuery.list();
 
-            SedimentLoad[] loads = new SedimentLoad[results.size()];
+            SedimentLoadLSData[] loads = new SedimentLoadLSData[results.size()];
             for (int i = 0, R = results.size(); i < R; i++) {
                 Object[] row = results.get(i);
-                loads[i] = new SedimentLoad(
+                loads[i] = new SedimentLoadLSData(
                     (String) row[0],
                     (Date) row[1],
                     (Date) row[2],
@@ -448,10 +448,10 @@
             sqlQuery.setDouble("endKm", endKm);
             List<Object []> results = sqlQuery.list();
 
-            SedimentLoad[] loads = new SedimentLoad[results.size()];
+            SedimentLoadLSData[] loads = new SedimentLoadLSData[results.size()];
             for (int i = 0, R = results.size(); i < R; i++) {
                 Object[] row = results.get(i);
-                loads[i] = new SedimentLoad(
+                loads[i] = new SedimentLoadLSData(
                     ((Date) row[0]).toString() + (Date) row[1],
                     (Date) row[0],
                     (Date) row[1],
@@ -463,7 +463,7 @@
         else {
              log.warn("getSedimentLoadsUncached does not understand type " + type);
         }
-        return new SedimentLoad[0];
+        return new SedimentLoadLSData[0];
     }
 
     /**
@@ -473,7 +473,7 @@
      *
      * @return according sediment load.
      */
-    public static SedimentLoad getSedimentLoadWithDataUncached(
+    public static SedimentLoadLSData getSedimentLoadWithDataUncached(
         String id,
         String river
     ) {
@@ -518,13 +518,13 @@
         sqlQuery.setInteger("id", Integer.valueOf(id));
 
         List<Object []> results = sqlQuery.list();
-        SedimentLoad load = new SedimentLoad();
+        SedimentLoadLSData load = new SedimentLoadLSData();
         if (results.isEmpty()) {
             log.warn("Empty result for year calculation.");
         }
         else {
             Object[] row = results.get(0);
-            load = new SedimentLoad(
+            load = new SedimentLoadLSData(
                     (String) row[0], //description
                     null,//(Date) row[1], //start
                     null,  //end
@@ -569,7 +569,7 @@
      *
      * @return according sediment loads.
      */
-    public static SedimentLoad getSedimentLoadWithDataUncached(
+    public static SedimentLoadLSData getSedimentLoadWithDataUncached(
         String river,
         String type,
         double startKm,
@@ -629,13 +629,13 @@
             sqlQuery.setDate("end", end.getTime());
             sqlQuery.setString("grain", "total");
             List<Object []> results = sqlQuery.list();
-            SedimentLoad load = new SedimentLoad();
+            SedimentLoadLSData load = new SedimentLoadLSData();
             if (results.isEmpty()) {
                 log.warn("Empty result for year calculation.");
             }
             else {
                 Object[] row = results.get(0);
-                load = new SedimentLoad(
+                load = new SedimentLoadLSData(
                         (String) row[0], //description
                         (Date) row[1], //start
                         null,  //end
@@ -678,13 +678,13 @@
             List<Object[]> results = null;
             results = sqlQuery.list();
 
-            SedimentLoad load = null;
+            SedimentLoadLSData load = null;
             if (results.isEmpty()) {
                 log.warn("No total results for off-epoch");
             }
             else {
                 Object[] row = results.get(0);
-                load = new SedimentLoad(
+                load = new SedimentLoadLSData(
                         (String) row[0],
                         (Date) row[1],
                         (Date) row[4],
@@ -705,7 +705,7 @@
             load = getValues("susp_sand", sqlQuery, load, floatStations);
             return load;
         }
-        return new SedimentLoad();
+        return new SedimentLoadLSData();
     }
 
     protected static Range findMeasurementStationRange(
@@ -743,10 +743,10 @@
      *                  and values are found, return a new load.
      * @return param load or new load if null.
      */
-    protected static SedimentLoad getValues (
+    protected static SedimentLoadLSData getValues (
         String fraction,
         SQLQuery query,
-        SedimentLoad load,
+        SedimentLoadLSData load,
         TreeMap<Double, MeasurementStation> stations
     ) {
         query.setString("grain", fraction);
@@ -755,7 +755,7 @@
         // We have the first results for this query, create new load.
         if (!results.isEmpty() && load == null) {
            Object[] row = results.get(0);
-           load = new SedimentLoad(
+           load = new SedimentLoadLSData(
                    (String) row[0],
                    (Date) row[1],
                    (Date) row[4],
@@ -790,7 +790,7 @@
 
     /** Set a fraction value of load to given km, value and range. */
     private static void setLoadFraction(
-        SedimentLoad load, double km, double v, Range range, String fraction) {
+        SedimentLoadLSData load, double km, double v, Range range, String fraction) {
         if (fraction.equals("coarse")) {
             load.setCoarse(km, v, range);
         }
@@ -817,7 +817,7 @@
         }
     }
 
-    public static SedimentLoad getLoadUnknown(
+    public static SedimentLoadLSData getLoadUnknown(
         String river,
         String description,
         String type
@@ -837,10 +837,10 @@
 
         if (element != null) {
             log.debug("SedimentLoad found in cache");
-            return (SedimentLoad)element.getValue();
+            return (SedimentLoadLSData)element.getValue();
         }
 
-        SedimentLoad values =
+        SedimentLoadLSData values =
             getSedimentLoadUnknownUncached(river, description, type);
 
         if (values != null && key != null) {
@@ -857,7 +857,7 @@
      * @param type the sediment load type (year or epoch)
      * @return according sediment loads.
      */
-    public static SedimentLoad getSedimentLoadUnknownUncached(
+    public static SedimentLoadLSData getSedimentLoadUnknownUncached(
         String river,
         String description,
         String type
@@ -882,12 +882,12 @@
             sqlQuery.setInteger("type", 0);
         }
         List<Object []> results = sqlQuery.list();
-        SedimentLoad load = new SedimentLoad();
+        SedimentLoadLSData load = new SedimentLoadLSData();
         if (results.isEmpty()) {
-            return new SedimentLoad();
+            return new SedimentLoadLSData();
         }
         Object[] row = results.get(0);
-        load = new SedimentLoad(
+        load = new SedimentLoadLSData(
             (String) row[0],
             (Date) row[1],
             (Date) row[2],
@@ -909,7 +909,7 @@
      * @param unit Restrict result set to those of given unit.
      * @param type Type like year, epoch, off_epoch
      */
-    public static SedimentLoad[] getSedimentLoadUnknown(
+    public static SedimentLoadLSData[] getSedimentLoadUnknown(
         String river,
         String unit,
         String type) {
@@ -927,10 +927,10 @@
             sqlQuery.setInteger("type", 0);
         }
         List<Object[]> results = sqlQuery.list();
-        SedimentLoad[] loads = new SedimentLoad[results.size()];
+        SedimentLoadLSData[] loads = new SedimentLoadLSData[results.size()];
         int counter = 0;
         for (Object[] row: results) {
-            loads[counter] = new SedimentLoad(
+            loads[counter] = new SedimentLoadLSData(
                 (String)row[0], (Date)row[1], (Date)row[2], false, "");
             counter++;
         }