# HG changeset patch # User Sascha L. Teichmann # Date 1338915421 0 # Node ID 8f905390c10dbff7265d10bf196eff5fa885f107 # Parent a938b214b30337e0e941aa70937ceded36619480 Removed superfluous imports. flys-backend/trunk@4595 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r a938b214b303 -r 8f905390c10d flys-backend/ChangeLog --- a/flys-backend/ChangeLog Sun May 27 10:54:36 2012 +0000 +++ b/flys-backend/ChangeLog Tue Jun 05 16:57:01 2012 +0000 @@ -1,3 +1,9 @@ +2012-06-05 Sascha L. Teichmann + + * src/main/java/de/intevation/flys/model/GaugeLocation.java, + src/main/java/de/intevation/flys/importer/ImportRiver.java: + Removed superfluous imports. + 2012-05-27 Ingo Weinzierl * Tagged module as '2.7'. diff -r a938b214b303 -r 8f905390c10d flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java --- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java Sun May 27 10:54:36 2012 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java Tue Jun 05 16:57:01 2012 +0000 @@ -1,46 +1,46 @@ package de.intevation.flys.importer; -import java.math.BigDecimal; +import de.intevation.artifacts.common.utils.FileTools.HashedFile; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.HashSet; -import java.util.ArrayList; -import java.util.Date; -import java.util.Calendar; +import de.intevation.artifacts.common.utils.FileTools; + +import de.intevation.flys.importer.parsers.AnnotationClassifier; +import de.intevation.flys.importer.parsers.AnnotationsParser; +import de.intevation.flys.importer.parsers.BedHeightEpochParser; +import de.intevation.flys.importer.parsers.BedHeightSingleParser; +import de.intevation.flys.importer.parsers.FlowVelocityMeasurementParser; +import de.intevation.flys.importer.parsers.FlowVelocityModelParser; +import de.intevation.flys.importer.parsers.HYKParser; +import de.intevation.flys.importer.parsers.MorphologicalWidthParser; +import de.intevation.flys.importer.parsers.PRFParser; +import de.intevation.flys.importer.parsers.PegelGltParser; +import de.intevation.flys.importer.parsers.SedimentDensityParser; +import de.intevation.flys.importer.parsers.SedimentYieldParser; +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.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 de.intevation.artifacts.common.utils.FileTools; -import de.intevation.artifacts.common.utils.FileTools.HashedFile; - -import de.intevation.flys.model.River; -import de.intevation.flys.model.Unit; +import org.hibernate.Query; +import org.hibernate.Session; -import de.intevation.flys.importer.parsers.BedHeightEpochParser; -import de.intevation.flys.importer.parsers.BedHeightSingleParser; -import de.intevation.flys.importer.parsers.FlowVelocityModelParser; -import de.intevation.flys.importer.parsers.FlowVelocityMeasurementParser; -import de.intevation.flys.importer.parsers.PRFParser; -import de.intevation.flys.importer.parsers.HYKParser; -import de.intevation.flys.importer.parsers.MorphologicalWidthParser; -import de.intevation.flys.importer.parsers.AnnotationsParser; -import de.intevation.flys.importer.parsers.AnnotationClassifier; -import de.intevation.flys.importer.parsers.PegelGltParser; -import de.intevation.flys.importer.parsers.SedimentDensityParser; -import de.intevation.flys.importer.parsers.SedimentYieldParser; -import de.intevation.flys.importer.parsers.WstParser; -import de.intevation.flys.importer.parsers.WaterlevelDifferencesParser; -import de.intevation.flys.importer.parsers.WaterlevelParser; - -import org.hibernate.Session; -import org.hibernate.Query; import org.hibernate.exception.ConstraintViolationException; public class ImportRiver diff -r a938b214b303 -r 8f905390c10d flys-backend/src/main/java/de/intevation/flys/model/GaugeLocation.java --- a/flys-backend/src/main/java/de/intevation/flys/model/GaugeLocation.java Sun May 27 10:54:36 2012 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/model/GaugeLocation.java Tue Jun 05 16:57:01 2012 +0000 @@ -1,7 +1,11 @@ package de.intevation.flys.model; +import com.vividsolutions.jts.geom.Point; + +import de.intevation.flys.backend.SessionHolder; + import java.io.Serializable; -import java.math.BigDecimal; + import java.util.List; import javax.persistence.Column; @@ -11,14 +15,11 @@ import javax.persistence.OneToOne; import javax.persistence.Table; +import org.hibernate.Query; import org.hibernate.Session; -import org.hibernate.Query; + import org.hibernate.annotations.Type; -import com.vividsolutions.jts.geom.Point; - -import de.intevation.flys.backend.SessionHolder; - @Entity @Table(name = "gauge_location")