# HG changeset patch # User Sascha L. Teichmann # Date 1263587970 0 # Node ID d47b478e662ba1826bb2d2501f07b363dd2e292f # Parent 0e0c64c821dc0aa26581361af514eed568c77d98 Cleaned up imports gnv-artifacts/trunk@549 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 0e0c64c821dc -r d47b478e662b gnv-artifacts/ChangeLog --- a/gnv-artifacts/ChangeLog Fri Jan 15 18:21:49 2010 +0000 +++ b/gnv-artifacts/ChangeLog Fri Jan 15 20:39:30 2010 +0000 @@ -1,3 +1,13 @@ +2010-01-15 Sascha L. Teichmann + + * src/main/java/de/intevation/gnv/artifacts/fis/product/Product.java, + src/main/java/de/intevation/gnv/artifacts/fis/product/DefaultProduct.java, + src/main/java/de/intevation/gnv/artifacts/fis/SelectProductArtifact.java, + src/main/java/de/intevation/gnv/artifacts/GNVProductArtifactFactory.java, + src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java, + src/main/java/de/intevation/gnv/math/AreaInterpolation.java: + Cleaned up imports. + 2010-01-15 Ingo Weinzierl Added support to step back to the point where the user is able to choose diff -r 0e0c64c821dc -r d47b478e662b gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Fri Jan 15 18:21:49 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Fri Jan 15 20:39:30 2010 +0000 @@ -3,8 +3,45 @@ */ package de.intevation.gnv.artifacts; +import de.intevation.artifactdatabase.Config; +import de.intevation.artifactdatabase.DefaultArtifact; +import de.intevation.artifactdatabase.ProxyArtifact; +import de.intevation.artifactdatabase.XMLUtils; + +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.ArtifactDatabase; +import de.intevation.artifacts.ArtifactFactory; +import de.intevation.artifacts.ArtifactNamespaceContext; +import de.intevation.artifacts.CallContext; +import de.intevation.artifacts.CallMeta; + +import de.intevation.gnv.artifacts.cache.CacheFactory; + +import de.intevation.gnv.artifacts.context.GNVArtifactContext; + +import de.intevation.gnv.artifacts.fis.product.Product; + +import de.intevation.gnv.artifacts.ressource.RessourceFactory; + +import de.intevation.gnv.state.DefaultInputData; +import de.intevation.gnv.state.InputData; +import de.intevation.gnv.state.InputValue; +import de.intevation.gnv.state.OutputMode; +import de.intevation.gnv.state.OutputState; +import de.intevation.gnv.state.State; +import de.intevation.gnv.state.StateBase; +import de.intevation.gnv.state.StateFactory; + +import de.intevation.gnv.state.exception.StateException; + +import de.intevation.gnv.transition.Transition; +import de.intevation.gnv.transition.TransitionFactory; + +import de.intevation.gnv.utils.ArtifactXMLUtilities; + import java.io.IOException; import java.io.OutputStream; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -17,40 +54,12 @@ import net.sf.ehcache.Cache; import org.apache.log4j.Logger; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import de.intevation.artifacts.Artifact; -import de.intevation.artifacts.ArtifactDatabase; -import de.intevation.artifactdatabase.ArtifactDatabaseImpl; -import de.intevation.artifactdatabase.Config; -import de.intevation.artifactdatabase.DefaultArtifact; -import de.intevation.artifactdatabase.ProxyArtifact; -import de.intevation.artifactdatabase.XMLUtils; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.artifacts.ArtifactNamespaceContext; -import de.intevation.artifacts.CallContext; -import de.intevation.artifacts.CallMeta; -import de.intevation.gnv.artifacts.cache.CacheFactory; -import de.intevation.gnv.artifacts.context.GNVArtifactContext; -import de.intevation.gnv.artifacts.fis.SelectProductArtifact; -import de.intevation.gnv.artifacts.fis.product.Product; -import de.intevation.gnv.artifacts.ressource.RessourceFactory; -import de.intevation.gnv.state.DefaultInputData; -import de.intevation.gnv.state.InputData; -import de.intevation.gnv.state.InputValue; -import de.intevation.gnv.state.OutputMode; -import de.intevation.gnv.state.OutputState; -import de.intevation.gnv.state.State; -import de.intevation.gnv.state.StateBase; -import de.intevation.gnv.state.StateFactory; -import de.intevation.gnv.state.exception.StateException; -import de.intevation.gnv.transition.Transition; -import de.intevation.gnv.transition.TransitionFactory; -import de.intevation.gnv.utils.ArtifactXMLUtilities; - /** * @author Tim Englich * @author Ingo Weinzierl diff -r 0e0c64c821dc -r d47b478e662b gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVProductArtifactFactory.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVProductArtifactFactory.java Fri Jan 15 18:21:49 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVProductArtifactFactory.java Fri Jan 15 20:39:30 2010 +0000 @@ -1,30 +1,31 @@ package de.intevation.gnv.artifacts; +import de.intevation.artifactdatabase.DefaultArtifactFactory; +import de.intevation.artifactdatabase.ProxyArtifact; +import de.intevation.artifactdatabase.XMLUtils; + +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.ArtifactFactory; + +import de.intevation.gnv.artifacts.fis.SelectProductArtifact; + +import de.intevation.gnv.artifacts.fis.product.DefaultProduct; + +import de.intevation.gnv.state.DefaultInputData; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import java.util.Set; import javax.xml.xpath.XPathConstants; +import org.apache.log4j.Logger; + import org.w3c.dom.Document; -import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import de.intevation.artifactdatabase.DefaultArtifactFactory; -import de.intevation.artifactdatabase.ProxyArtifact; -import de.intevation.artifactdatabase.XMLUtils; -import de.intevation.artifacts.Artifact; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.gnv.artifacts.fis.SelectProductArtifact; -import de.intevation.gnv.artifacts.fis.product.DefaultProduct; -import de.intevation.gnv.state.DefaultInputData; -import de.intevation.gnv.state.InputData; - -import org.apache.log4j.Logger; - /** * @author Ingo Weinzierl */ diff -r 0e0c64c821dc -r d47b478e662b gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/SelectProductArtifact.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/SelectProductArtifact.java Fri Jan 15 18:21:49 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/SelectProductArtifact.java Fri Jan 15 20:39:30 2010 +0000 @@ -1,37 +1,36 @@ package de.intevation.gnv.artifacts.fis; -import java.io.IOException; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import javax.xml.xpath.XPathConstants; - -import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - import de.intevation.artifactdatabase.DefaultArtifact; import de.intevation.artifactdatabase.ProxyArtifact; import de.intevation.artifactdatabase.XMLUtils; + import de.intevation.artifacts.Artifact; import de.intevation.artifacts.ArtifactFactory; import de.intevation.artifacts.ArtifactNamespaceContext; import de.intevation.artifacts.CallContext; import de.intevation.artifacts.CallMeta; + import de.intevation.gnv.artifacts.GNVArtifactBase; import de.intevation.gnv.artifacts.GNVProductArtifactFactory; -import de.intevation.gnv.artifacts.context.GNVArtifactContext; -import de.intevation.gnv.artifacts.fis.product.DefaultProduct; + import de.intevation.gnv.artifacts.fis.product.Product; + import de.intevation.gnv.artifacts.ressource.RessourceFactory; + import de.intevation.gnv.state.InputData; -import de.intevation.gnv.utils.ArtifactFactoryUtilities; +import java.io.IOException; +import java.io.OutputStream; + +import java.util.Collection; +import java.util.Iterator; +import java.util.Map; + +import org.apache.log4j.Logger; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; /** * @author Ingo Weinzierl diff -r 0e0c64c821dc -r d47b478e662b gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/DefaultProduct.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/DefaultProduct.java Fri Jan 15 18:21:49 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/DefaultProduct.java Fri Jan 15 20:39:30 2010 +0000 @@ -3,10 +3,9 @@ */ package de.intevation.gnv.artifacts.fis.product; -import java.util.Collection; +import de.intevation.gnv.state.InputData; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.gnv.state.InputData; +import java.util.Collection; /** * @author Tim Englich diff -r 0e0c64c821dc -r d47b478e662b gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/Product.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/Product.java Fri Jan 15 18:21:49 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/Product.java Fri Jan 15 20:39:30 2010 +0000 @@ -3,12 +3,12 @@ */ package de.intevation.gnv.artifacts.fis.product; +import de.intevation.gnv.state.InputData; + import java.io.Serializable; + import java.util.Collection; -import de.intevation.artifacts.ArtifactFactory; -import de.intevation.gnv.state.InputData; - /** * @author Tim Englich * diff -r 0e0c64c821dc -r d47b478e662b gnv-artifacts/src/main/java/de/intevation/gnv/math/AreaInterpolation.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/AreaInterpolation.java Fri Jan 15 18:21:49 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/AreaInterpolation.java Fri Jan 15 20:39:30 2010 +0000 @@ -1,20 +1,18 @@ package de.intevation.gnv.math; -import java.io.Serializable; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.HashMap; -import java.util.Collections; - -import java.awt.Dimension; - import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.Envelope; import com.vividsolutions.jts.index.quadtree.Quadtree; +import java.awt.Dimension; + +import java.io.Serializable; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + import org.apache.log4j.Logger; /**