changeset 8082:6e618eb2ac96

Merged
author Sascha L. Teichmann <teichmann@intevation.de>
date Mon, 11 Aug 2014 16:42:31 +0200
parents 3ae11daff343 (diff) 13c3d861db1d (current diff)
children 3772d1433868
files
diffstat 5 files changed, 0 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportSedimentLoad.java	Mon Aug 11 15:41:12 2014 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/ImportSedimentLoad.java	Mon Aug 11 16:42:31 2014 +0200
@@ -6,7 +6,6 @@
 import org.dive4elements.river.model.GrainFraction;
 import org.dive4elements.river.model.SedimentLoad;
 import org.dive4elements.river.model.TimeInterval;
-import org.dive4elements.river.model.MeasurementStation;
 import org.hibernate.Query;
 import org.hibernate.Session;
 
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/AbstractSedimentLoadParser.java	Mon Aug 11 15:41:12 2014 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/AbstractSedimentLoadParser.java	Mon Aug 11 16:42:31 2014 +0200
@@ -14,8 +14,6 @@
 import java.text.NumberFormat;
 import java.text.ParseException;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentLoadLSParser.java	Mon Aug 11 15:41:12 2014 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentLoadLSParser.java	Mon Aug 11 16:42:31 2014 +0200
@@ -8,10 +8,6 @@
 
 package org.dive4elements.river.importer.parsers;
 
-import java.io.File;
-import java.io.IOException;
-
-import java.text.NumberFormat;
 import java.text.ParseException;
 
 import java.util.ArrayList;
@@ -21,13 +17,10 @@
 
 import org.apache.log4j.Logger;
 
-import org.dive4elements.river.importer.ImportGrainFraction;
 import org.dive4elements.river.importer.ImportSedimentLoadLS;
 import org.dive4elements.river.importer.ImportSedimentLoadLSValue;
-import org.dive4elements.river.importer.ImportTimeInterval;
 import org.dive4elements.river.importer.ImportUnit;
 
-import org.dive4elements.river.model.GrainFraction;
 
 /** Parses sediment load longitudinal section files. */
 public class SedimentLoadLSParser extends AbstractSedimentLoadParser {
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentLoadParser.java	Mon Aug 11 15:41:12 2014 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentLoadParser.java	Mon Aug 11 16:42:31 2014 +0200
@@ -8,10 +8,6 @@
 
 package org.dive4elements.river.importer.parsers;
 
-import java.io.File;
-import java.io.IOException;
-
-import java.text.NumberFormat;
 import java.text.ParseException;
 
 import java.util.ArrayList;
@@ -20,14 +16,9 @@
 import org.apache.log4j.Logger;
 
 import org.dive4elements.river.importer.ImporterSession;
-import org.dive4elements.river.importer.ImportRiver;
-import org.dive4elements.river.importer.ImportGrainFraction;
 import org.dive4elements.river.importer.ImportSedimentLoad;
 import org.dive4elements.river.importer.ImportSedimentLoadValue;
-import org.dive4elements.river.importer.ImportTimeInterval;
-import org.dive4elements.river.importer.ImportMeasurementStation;
 
-import org.dive4elements.river.model.GrainFraction;
 import org.dive4elements.river.model.MeasurementStation;
 
 /** Parses sediment load longitudinal section files. */
--- a/backend/src/main/java/org/dive4elements/river/model/SedimentLoadLS.java	Mon Aug 11 15:41:12 2014 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/SedimentLoadLS.java	Mon Aug 11 16:42:31 2014 +0200
@@ -9,7 +9,6 @@
 package org.dive4elements.river.model;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.persistence.Entity;

http://dive4elements.wald.intevation.org