Mercurial > dive4elements > river

changeset 5446:3bd786772798

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed obsolete imports.
author Sascha L. Teichmann <teichmann@intevation.de>
date Wed, 27 Mar 2013 10:06:49 +0100
parents 3c7e7d47939f
children 7876163fc40e
files flys-backend/src/main/java/de/intevation/flys/importer/ImportBedHeightEpoch.java flys-backend/src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java flys-backend/src/main/java/de/intevation/flys/importer/ImportDischargeZone.java flys-backend/src/main/java/de/intevation/flys/importer/ImportFlowVelocityMeasurement.java flys-backend/src/main/java/de/intevation/flys/importer/ImportFlowVelocityMeasurementValue.java flys-backend/src/main/java/de/intevation/flys/importer/ImportFlowVelocityModel.java flys-backend/src/main/java/de/intevation/flys/importer/ImportFlowVelocityModelValue.java flys-backend/src/main/java/de/intevation/flys/importer/ImportMeasurementStation.java flys-backend/src/main/java/de/intevation/flys/importer/ImportMorphWidth.java flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java flys-backend/src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java flys-backend/src/main/java/de/intevation/flys/importer/ImportSedimentYield.java flys-backend/src/main/java/de/intevation/flys/importer/parsers/SQRelationParser.java flys-backend/src/main/java/de/intevation/flys/model/GrainFraction.java
diffstat 14 files changed, 25 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportBedHeightEpoch.java	Wed Mar 27 09:51:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportBedHeightEpoch.java	Wed Mar 27 10:06:49 2013 +0100
@@ -1,13 +1,11 @@
 package de.intevation.flys.importer;
 
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.hibernate.exception.ConstraintViolationException;
 
 import de.intevation.flys.model.BedHeightEpoch;
 import de.intevation.flys.model.ElevationModel;
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java	Wed Mar 27 09:51:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportBedHeightSingle.java	Wed Mar 27 10:06:49 2013 +0100
@@ -3,13 +3,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import java.sql.SQLException;
-
 import org.apache.log4j.Logger;
 
 import org.hibernate.Session;
 import org.hibernate.Query;
-import org.hibernate.exception.ConstraintViolationException;
 
 import de.intevation.flys.model.BedHeightSingle;
 import de.intevation.flys.model.BedHeightType;
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportDischargeZone.java	Wed Mar 27 09:51:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportDischargeZone.java	Wed Mar 27 10:06:49 2013 +0100
@@ -1,14 +1,12 @@
 package de.intevation.flys.importer;
 
 import java.math.BigDecimal;
-import java.sql.SQLException;
 import java.util.List;
 
 import org.apache.log4j.Logger;
 
 import org.hibernate.Session;
 import org.hibernate.Query;
-import org.hibernate.exception.ConstraintViolationException;
 
 import de.intevation.flys.model.DischargeZone;
 import de.intevation.flys.model.River;
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportFlowVelocityMeasurement.java	Wed Mar 27 09:51:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportFlowVelocityMeasurement.java	Wed Mar 27 10:06:49 2013 +0100
@@ -1,6 +1,5 @@
 package de.intevation.flys.importer;
 
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -8,7 +7,6 @@
 
 import org.hibernate.Session;
 import org.hibernate.Query;
-import org.hibernate.exception.ConstraintViolationException;
 
 import de.intevation.flys.model.FlowVelocityMeasurement;
 import de.intevation.flys.model.River;
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportFlowVelocityMeasurementValue.java	Wed Mar 27 09:51:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportFlowVelocityMeasurementValue.java	Wed Mar 27 10:06:49 2013 +0100
@@ -1,7 +1,7 @@
 package de.intevation.flys.importer;
 
 import java.math.BigDecimal;
-import java.sql.SQLException;
+
 import java.util.Date;
 import java.util.List;
 
@@ -9,7 +9,6 @@
 
 import org.hibernate.Session;
 import org.hibernate.Query;
-import org.hibernate.exception.ConstraintViolationException;
 
 import de.intevation.flys.model.FlowVelocityMeasurement;
 import de.intevation.flys.model.FlowVelocityMeasurementValue;
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportFlowVelocityModel.java	Wed Mar 27 09:51:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportFlowVelocityModel.java	Wed Mar 27 10:06:49 2013 +0100
@@ -1,6 +1,5 @@
 package de.intevation.flys.importer;
 
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -8,7 +7,6 @@
 
 import org.hibernate.Session;
 import org.hibernate.Query;
-import org.hibernate.exception.ConstraintViolationException;
 
 import de.intevation.flys.model.DischargeZone;
 import de.intevation.flys.model.FlowVelocityModel;
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportFlowVelocityModelValue.java	Wed Mar 27 09:51:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportFlowVelocityModelValue.java	Wed Mar 27 10:06:49 2013 +0100
@@ -1,12 +1,11 @@
 package de.intevation.flys.importer;
 
 import java.math.BigDecimal;
-import java.sql.SQLException;
+
 import java.util.List;
 
 import org.hibernate.Session;
 import org.hibernate.Query;
-import org.hibernate.exception.ConstraintViolationException;
 
 import de.intevation.flys.model.FlowVelocityModel;
 import de.intevation.flys.model.FlowVelocityModelValue;
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportMeasurementStation.java	Wed Mar 27 09:51:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportMeasurementStation.java	Wed Mar 27 10:06:49 2013 +0100
@@ -1,11 +1,9 @@
 package de.intevation.flys.importer;
 
-import java.sql.SQLException;
 import java.util.List;
 
 import org.apache.log4j.Logger;
 import org.hibernate.Session;
-import org.hibernate.exception.ConstraintViolationException;
 
 import de.intevation.flys.model.Gauge;
 import de.intevation.flys.model.MeasurementStation;
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportMorphWidth.java	Wed Mar 27 09:51:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportMorphWidth.java	Wed Mar 27 10:06:49 2013 +0100
@@ -1,16 +1,15 @@
 package de.intevation.flys.importer;
 
-import java.sql.SQLException;
+import de.intevation.flys.model.MorphologicalWidth;
+import de.intevation.flys.model.River;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.hibernate.exception.ConstraintViolationException;
-
-import de.intevation.flys.model.MorphologicalWidth;
-import de.intevation.flys.model.River;
 
 
 public class ImportMorphWidth {
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java	Wed Mar 27 09:51:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java	Wed Mar 27 10:06:49 2013 +0100
@@ -1,23 +1,9 @@
 package de.intevation.flys.importer;
 
-import java.io.File;
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.log4j.Logger;
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.hibernate.exception.ConstraintViolationException;
+import de.intevation.artifacts.common.utils.FileTools.HashedFile;
 
 import de.intevation.artifacts.common.utils.FileTools;
-import de.intevation.artifacts.common.utils.FileTools.HashedFile;
+
 import de.intevation.flys.importer.parsers.AnnotationClassifier;
 import de.intevation.flys.importer.parsers.AnnotationsParser;
 import de.intevation.flys.importer.parsers.BedHeightEpochParser;
@@ -39,9 +25,26 @@
 import de.intevation.flys.importer.parsers.WaterlevelDifferencesParser;
 import de.intevation.flys.importer.parsers.WaterlevelParser;
 import de.intevation.flys.importer.parsers.WstParser;
+
 import de.intevation.flys.model.River;
 import de.intevation.flys.model.Unit;
 
+import java.io.File;
+import java.io.IOException;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+
+import org.hibernate.Query;
+import org.hibernate.Session;
+
 
 /** Import all river-related data (files) that can be found. */
 public class ImportRiver
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java	Wed Mar 27 09:51:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportSedimentDensity.java	Wed Mar 27 10:06:49 2013 +0100
@@ -1,13 +1,11 @@
 package de.intevation.flys.importer;
 
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.hibernate.exception.ConstraintViolationException;
 
 import de.intevation.flys.model.River;
 import de.intevation.flys.model.SedimentDensity;
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportSedimentYield.java	Wed Mar 27 09:51:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportSedimentYield.java	Wed Mar 27 10:06:49 2013 +0100
@@ -1,6 +1,5 @@
 package de.intevation.flys.importer;
 
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -8,7 +7,6 @@
 
 import org.hibernate.Session;
 import org.hibernate.Query;
-import org.hibernate.exception.ConstraintViolationException;
 
 import de.intevation.flys.model.GrainFraction;
 import de.intevation.flys.model.River;
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/SQRelationParser.java	Wed Mar 27 09:51:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/SQRelationParser.java	Wed Mar 27 10:06:49 2013 +0100
@@ -14,7 +14,6 @@
 import de.intevation.flys.importer.ImportSQRelation;
 import de.intevation.flys.importer.ImportSQRelationValue;
 import de.intevation.flys.importer.ImportTimeInterval;
-import de.intevation.flys.model.MeasurementStation;
 
 
 public class SQRelationParser extends LineParser {
--- a/flys-backend/src/main/java/de/intevation/flys/model/GrainFraction.java	Wed Mar 27 09:51:01 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/model/GrainFraction.java	Wed Mar 27 10:06:49 2013 +0100
@@ -9,8 +9,6 @@
 import javax.persistence.Column;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.GenerationType;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
 
 import org.apache.log4j.Logger;
http://dive4elements.wald.intevation.org