# HG changeset patch # User Sascha L. Teichmann # Date 1358959348 -3600 # Node ID 88014b9852d041a707365162d8d941cb1a7cef5c # Parent 97a0fa4dff8e2f6ea1552ddb05b3690896ec959c Removed obsolete imports and dead code. diff -r 97a0fa4dff8e -r 88014b9852d0 flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java Wed Jan 23 17:36:18 2013 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSDBArtifact.java Wed Jan 23 17:42:28 2013 +0100 @@ -3,27 +3,32 @@ import com.vividsolutions.jts.geom.Envelope; import de.intevation.artifactdatabase.data.DefaultStateData; + import de.intevation.artifactdatabase.state.Facet; import de.intevation.artifactdatabase.state.State; + import de.intevation.artifacts.Artifact; import de.intevation.artifacts.ArtifactFactory; import de.intevation.artifacts.CallMeta; + import de.intevation.artifacts.common.utils.FileTools; + import de.intevation.flys.artifacts.model.map.WMSDBLayerFacet; + import de.intevation.flys.artifacts.resources.Resources; + import de.intevation.flys.artifacts.states.DefaultState; -import de.intevation.flys.backend.SessionFactoryProvider; + import de.intevation.flys.utils.FLYSUtils; import de.intevation.flys.utils.MapUtils; import java.io.File; + import java.util.ArrayList; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.apache.log4j.Logger; -import org.hibernate.impl.SessionFactoryImpl; + import org.w3c.dom.Document; @@ -31,13 +36,6 @@ private static final Logger logger = Logger.getLogger(WMSDBArtifact.class); - public static final Pattern DB_URL_PATTERN = - Pattern.compile("(.*)\\/\\/(.*):([0-9]+)\\/([a-zA-Z]+)"); - - public static final Pattern DB_PSQL_URL_PATTERN = - Pattern.compile("(.*)\\/\\/(.*):([0-9]+)\\/([a-zA-Z0-9]+)"); - - @Override public void setup( String identifier, diff -r 97a0fa4dff8e -r 88014b9852d0 flys-artifacts/src/main/java/de/intevation/flys/utils/RiverMapfileGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/utils/RiverMapfileGenerator.java Wed Jan 23 17:36:18 2013 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/RiverMapfileGenerator.java Wed Jan 23 17:42:28 2013 +0100 @@ -5,20 +5,21 @@ import de.intevation.flys.artifacts.model.LayerInfo; import de.intevation.flys.artifacts.model.RiverFactory; -import de.intevation.flys.backend.SessionFactoryProvider; + import de.intevation.flys.model.River; import de.intevation.flys.model.RiverAxis; import java.io.File; import java.io.FileNotFoundException; + import java.util.ArrayList; import java.util.List; -import java.util.regex.Matcher; + import java.util.regex.Pattern; import org.apache.log4j.Logger; + import org.apache.velocity.Template; -import org.hibernate.impl.SessionFactoryImpl; public class RiverMapfileGenerator extends MapfileGenerator {