Mercurial > dive4elements > river

changeset 3302:453d2d0c4258

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Organized and added missing imports. flys-artifacts/trunk@4987 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Fri, 13 Jul 2012 10:44:18 +0000
parents c8f670ae96e8
children 96daa8a4c48f
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/MapArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java flys-artifacts/src/main/java/de/intevation/flys/exports/MapGenerator.java flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java flys-artifacts/src/main/java/de/intevation/flys/wsplgen/FacetCreator.java flys-artifacts/src/main/java/de/intevation/flys/wsplgen/JobObserver.java flys-artifacts/src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java flys-artifacts/src/main/java/de/intevation/flys/wsplgen/Scheduler.java flys-artifacts/src/main/java/de/intevation/flys/wsplgen/WSPLGENCallable.java
diffstat 12 files changed, 63 insertions(+), 73 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Fri Jul 13 10:25:24 2012 +0000
+++ b/flys-artifacts/ChangeLog	Fri Jul 13 10:44:18 2012 +0000
@@ -1,3 +1,18 @@
+2012-07-13  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/wsplgen/WSPLGENCallable.java,
+	  src/main/java/de/intevation/flys/wsplgen/FacetCreator.java,
+	  src/main/java/de/intevation/flys/wsplgen/JobObserver.java,
+	  src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java,
+	  src/main/java/de/intevation/flys/wsplgen/Scheduler.java,
+	  src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java,
+	  src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java,
+	  src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java,
+	  src/main/java/de/intevation/flys/artifacts/MapArtifact.java,
+	  src/main/java/de/intevation/flys/utils/MapfileGenerator.java,
+	  src/main/java/de/intevation/flys/exports/MapGenerator.java: Organized
+	  and added missing imports.
+
 2012-07-13  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/utils/GeometryUtils.java: Added new
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/MapArtifact.java	Fri Jul 13 10:25:24 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/MapArtifact.java	Fri Jul 13 10:44:18 2012 +0000
@@ -27,7 +27,7 @@
 import de.intevation.flys.artifacts.RiverAxisArtifact.RiverAxisState;
 import de.intevation.flys.artifacts.states.DefaultState;
 import de.intevation.flys.artifacts.context.FLYSContext;
-import de.intevation.flys.artifacts.model.WMSDBLayerFacet;
+import de.intevation.flys.artifacts.model.map.WMSDBLayerFacet;
 
 
 public class MapArtifact extends FLYSArtifact {
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java	Fri Jul 13 10:25:24 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java	Fri Jul 13 10:44:18 2012 +0000
@@ -31,7 +31,7 @@
 
 import de.intevation.flys.artifacts.resources.Resources;
 import de.intevation.flys.artifacts.states.DefaultState;
-import de.intevation.flys.artifacts.model.WMSDBLayerFacet;
+import de.intevation.flys.artifacts.model.map.WMSDBLayerFacet;
 import de.intevation.flys.utils.FLYSUtils;
 import de.intevation.flys.utils.MapfileGenerator;
 
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java	Fri Jul 13 10:25:24 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java	Fri Jul 13 10:44:18 2012 +0000
@@ -7,50 +7,43 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.log4j.Logger;
+import org.geotools.feature.FeatureCollection;
+import org.geotools.feature.FeatureCollections;
+import org.geotools.feature.simple.SimpleFeatureBuilder;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
+
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.Geometry;
 import com.vividsolutions.jts.geom.LineString;
 import com.vividsolutions.jts.geom.Polygon;
 
-import org.apache.log4j.Logger;
-
-import org.opengis.feature.simple.SimpleFeature;
-import org.opengis.feature.simple.SimpleFeatureType;
-
-import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.FeatureCollections;
-import org.geotools.feature.simple.SimpleFeatureBuilder;
-
+import de.intevation.artifactdatabase.state.Facet;
 import de.intevation.artifacts.Artifact;
 import de.intevation.artifacts.CallContext;
 import de.intevation.artifacts.CallMeta;
 import de.intevation.artifacts.GlobalContext;
-
 import de.intevation.artifacts.common.utils.FileTools;
-
-import de.intevation.artifactdatabase.state.Facet;
-
-import de.intevation.flys.model.CrossSectionTrack;
-import de.intevation.flys.model.DGM;
-import de.intevation.flys.model.Floodplain;
-import de.intevation.flys.model.RiverAxis;
-
 import de.intevation.flys.artifacts.FLYSArtifact;
 import de.intevation.flys.artifacts.context.FLYSContext;
 import de.intevation.flys.artifacts.model.CalculationMessage;
 import de.intevation.flys.artifacts.model.CalculationResult;
 import de.intevation.flys.artifacts.model.FacetTypes;
-import de.intevation.flys.artifacts.model.WMSLayerFacet;
 import de.intevation.flys.artifacts.model.WQKms;
-import de.intevation.flys.artifacts.model.WSPLGENCalculation;
-import de.intevation.flys.artifacts.model.WSPLGENJob;
-import de.intevation.flys.artifacts.model.WSPLGENReportFacet;
+import de.intevation.flys.artifacts.model.map.WMSLayerFacet;
+import de.intevation.flys.artifacts.model.map.WSPLGENCalculation;
+import de.intevation.flys.artifacts.model.map.WSPLGENJob;
+import de.intevation.flys.artifacts.model.map.WSPLGENReportFacet;
 import de.intevation.flys.artifacts.resources.Resources;
-import de.intevation.flys.artifacts.states.DefaultState.ComputeType;
 import de.intevation.flys.exports.WstWriter;
+import de.intevation.flys.model.CrossSectionTrack;
+import de.intevation.flys.model.DGM;
+import de.intevation.flys.model.Floodplain;
+import de.intevation.flys.model.RiverAxis;
 import de.intevation.flys.utils.FLYSUtils;
+import de.intevation.flys.utils.GeometryUtils;
 import de.intevation.flys.utils.MapfileGenerator;
-import de.intevation.flys.utils.GeometryUtils;
 import de.intevation.flys.wsplgen.FacetCreator;
 import de.intevation.flys.wsplgen.JobObserver;
 import de.intevation.flys.wsplgen.Scheduler;
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java	Fri Jul 13 10:25:24 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WMSBackgroundState.java	Fri Jul 13 10:44:18 2012 +0000
@@ -7,21 +7,16 @@
 import javax.xml.xpath.XPathConstants;
 
 import org.apache.log4j.Logger;
-
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
+import de.intevation.artifactdatabase.state.Facet;
 import de.intevation.artifacts.CallMeta;
-
 import de.intevation.artifacts.common.utils.Config;
 import de.intevation.artifacts.common.utils.XMLUtils;
-
-import de.intevation.artifactdatabase.state.Facet;
-
 import de.intevation.flys.artifacts.FLYSArtifact;
-import de.intevation.flys.artifacts.model.WMSLayerFacet;
+import de.intevation.flys.artifacts.model.map.WMSLayerFacet;
 import de.intevation.flys.artifacts.resources.Resources;
-import de.intevation.flys.artifacts.states.DefaultState.ComputeType;
 
 
 public class WMSBackgroundState extends OutputState {
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/MapGenerator.java	Fri Jul 13 10:25:24 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/MapGenerator.java	Fri Jul 13 10:44:18 2012 +0000
@@ -7,29 +7,25 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.log4j.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import org.apache.log4j.Logger;
-
 import com.vividsolutions.jts.geom.Envelope;
 
-import de.intevation.artifacts.Artifact;
-import de.intevation.artifacts.CallContext;
-
-import de.intevation.artifacts.common.ArtifactNamespaceContext;
-import de.intevation.artifacts.common.utils.XMLUtils;
-import de.intevation.artifacts.common.utils.XMLUtils.ElementCreator;
-
 import de.intevation.artifactdatabase.state.ArtifactAndFacet;
 import de.intevation.artifactdatabase.state.Facet;
 import de.intevation.artifactdatabase.state.Settings;
-
+import de.intevation.artifacts.Artifact;
+import de.intevation.artifacts.CallContext;
+import de.intevation.artifacts.common.ArtifactNamespaceContext;
+import de.intevation.artifacts.common.utils.XMLUtils;
+import de.intevation.artifacts.common.utils.XMLUtils.ElementCreator;
 import de.intevation.flys.artifacts.FLYSArtifact;
 import de.intevation.flys.artifacts.model.FacetTypes;
-import de.intevation.flys.artifacts.model.WMSDBLayerFacet;
-import de.intevation.flys.artifacts.model.WMSLayerFacet;
-import de.intevation.flys.artifacts.model.WSPLGENLayerFacet;
+import de.intevation.flys.artifacts.model.map.WMSDBLayerFacet;
+import de.intevation.flys.artifacts.model.map.WMSLayerFacet;
+import de.intevation.flys.artifacts.model.map.WSPLGENLayerFacet;
 import de.intevation.flys.utils.GeometryUtils;
 import de.intevation.flys.utils.MapfileGenerator;
 import de.intevation.flys.utils.ThemeUtil;
--- a/flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java	Fri Jul 13 10:25:24 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java	Fri Jul 13 10:44:18 2012 +0000
@@ -1,34 +1,30 @@
 package de.intevation.flys.utils;
 
 import java.io.File;
-import java.io.FilenameFilter;
 import java.io.FileNotFoundException;
 import java.io.FileWriter;
+import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.Writer;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 import org.apache.log4j.Logger;
-
-import org.geotools.data.shapefile.ShpFiles;
-import org.geotools.data.shapefile.shp.ShapefileReader;
-import org.geotools.data.shapefile.shp.ShapefileHeader;
-
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
+import org.geotools.data.shapefile.ShpFiles;
+import org.geotools.data.shapefile.shp.ShapefileHeader;
+import org.geotools.data.shapefile.shp.ShapefileReader;
 
 import de.intevation.artifacts.CallContext;
 import de.intevation.artifacts.common.utils.Config;
-
 import de.intevation.flys.artifacts.FLYSArtifact;
 import de.intevation.flys.artifacts.model.LayerInfo;
-import de.intevation.flys.artifacts.model.WMSLayerFacet;
-import de.intevation.flys.artifacts.model.WSPLGENLayerFacet;
-import de.intevation.flys.artifacts.model.WMSDBLayerFacet;
+import de.intevation.flys.artifacts.model.map.WMSDBLayerFacet;
+import de.intevation.flys.artifacts.model.map.WMSLayerFacet;
+import de.intevation.flys.artifacts.model.map.WSPLGENLayerFacet;
 import de.intevation.flys.artifacts.resources.Resources;
 
 /**
--- a/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/FacetCreator.java	Fri Jul 13 10:25:24 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/FacetCreator.java	Fri Jul 13 10:44:18 2012 +0000
@@ -7,18 +7,15 @@
 
 import com.vividsolutions.jts.geom.Envelope;
 
-import de.intevation.artifacts.CallContext;
-
 import de.intevation.artifactdatabase.state.Facet;
-
-import de.intevation.flys.model.CrossSectionTrack;
-
+import de.intevation.artifacts.CallContext;
 import de.intevation.flys.artifacts.FLYSArtifact;
 import de.intevation.flys.artifacts.model.FacetTypes;
-import de.intevation.flys.artifacts.model.WMSLayerFacet;
-import de.intevation.flys.artifacts.model.WSPLGENLayerFacet;
+import de.intevation.flys.artifacts.model.map.WMSLayerFacet;
+import de.intevation.flys.artifacts.model.map.WSPLGENLayerFacet;
 import de.intevation.flys.artifacts.resources.Resources;
 import de.intevation.flys.artifacts.states.DefaultState.ComputeType;
+import de.intevation.flys.model.CrossSectionTrack;
 import de.intevation.flys.utils.FLYSUtils;
 import de.intevation.flys.utils.GeometryUtils;
 import de.intevation.flys.utils.MapfileGenerator;
--- a/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/JobObserver.java	Fri Jul 13 10:25:24 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/JobObserver.java	Fri Jul 13 10:44:18 2012 +0000
@@ -1,16 +1,16 @@
 package de.intevation.flys.wsplgen;
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.IOException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.log4j.Logger;
 
 import de.intevation.flys.artifacts.model.CalculationMessage;
-import de.intevation.flys.artifacts.model.WSPLGENJob;
+import de.intevation.flys.artifacts.model.map.WSPLGENJob;
 
 
 public class JobObserver extends Thread {
--- a/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java	Fri Jul 13 10:25:24 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java	Fri Jul 13 10:44:18 2012 +0000
@@ -5,8 +5,8 @@
 
 import org.apache.log4j.Logger;
 
-import de.intevation.flys.artifacts.model.WSPLGENCalculation;
-import de.intevation.flys.artifacts.model.WSPLGENJob;
+import de.intevation.flys.artifacts.model.map.WSPLGENCalculation;
+import de.intevation.flys.artifacts.model.map.WSPLGENJob;
 
 
 public class ProblemObserver extends JobObserver {
--- a/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/Scheduler.java	Fri Jul 13 10:25:24 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/Scheduler.java	Fri Jul 13 10:44:18 2012 +0000
@@ -8,8 +8,7 @@
 import org.apache.log4j.Logger;
 
 import de.intevation.artifacts.CallContext;
-
-import de.intevation.flys.artifacts.model.WSPLGENJob;
+import de.intevation.flys.artifacts.model.map.WSPLGENJob;
 
 
 /**
--- a/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/WSPLGENCallable.java	Fri Jul 13 10:25:24 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/WSPLGENCallable.java	Fri Jul 13 10:44:18 2012 +0000
@@ -1,14 +1,13 @@
 package de.intevation.flys.wsplgen;
 
+import java.io.File;
 import java.io.IOException;
-import java.io.File;
 import java.util.concurrent.Callable;
 
 import org.apache.log4j.Logger;
 
 import de.intevation.artifacts.CallContext;
-
-import de.intevation.flys.artifacts.model.WSPLGENJob;
+import de.intevation.flys.artifacts.model.map.WSPLGENJob;
 
 
 /**
http://dive4elements.wald.intevation.org