Mercurial > dive4elements > gnv-client
changeset 652:078ba6799bd2
Cleanup imports
gnv-artifacts/trunk@743 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Sat, 06 Mar 2010 08:25:14 +0000 |
| parents | 7b3ee0ac9905 |
| children | 987584605a60 |
| files | gnv-artifacts/ChangeLog gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java gnv-artifacts/src/main/java/de/intevation/gnv/state/MeasurementState.java gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java |
| diffstat | 5 files changed, 47 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog Fri Mar 05 16:07:09 2010 +0000 +++ b/gnv-artifacts/ChangeLog Sat Mar 06 08:25:14 2010 +0000 @@ -1,3 +1,11 @@ +2010-03-06 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java, + src/main/java/de/intevation/gnv/state/StateBase.java, + src/main/java/de/intevation/gnv/state/MeasurementState.java, + src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java: + Cleaned up imports. + 2010-03-05 Ingo Weinzierl <ingo.weinzierl@intevation.de> * doc/conf/conf.xml: Set ttl to a better value. It has been set to 2min by
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Fri Mar 05 16:07:09 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Sat Mar 06 08:25:14 2010 +0000 @@ -3,8 +3,42 @@ */ package de.intevation.gnv.artifacts; +import de.intevation.artifactdatabase.Config; +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.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.ExportMode; +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.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; @@ -14,41 +48,13 @@ import javax.xml.xpath.XPathConstants; -import net.sf.ehcache.Cache; +import org.apache.log4j.Logger; -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.Config; -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.ExportMode; -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 (tim.englich@intevation.de) * @author Ingo Weinzierl (ingo.weinzierl@intevation.de)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/MeasurementState.java Fri Mar 05 16:07:09 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/MeasurementState.java Sat Mar 06 08:25:14 2010 +0000 @@ -1,16 +1,18 @@ package de.intevation.gnv.state; +import de.intevation.artifactdatabase.XMLUtils; + import de.intevation.artifacts.CallMeta; -import de.intevation.artifactdatabase.XMLUtils; import de.intevation.gnv.artifacts.ressource.RessourceFactory; + import de.intevation.gnv.geobackend.base.Result; import de.intevation.gnv.geobackend.base.ResultDescriptor; + import de.intevation.gnv.state.describedata.ExtendedKeyValueData; import de.intevation.gnv.state.describedata.KeyValueDescibeData; import de.intevation.gnv.state.describedata.NamedArrayList; import de.intevation.gnv.state.describedata.NamedCollection; -import de.intevation.gnv.transition.DefaultTransition; import java.util.ArrayList; import java.util.Arrays;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java Fri Mar 05 16:07:09 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java Sat Mar 06 08:25:14 2010 +0000 @@ -7,8 +7,6 @@ import de.intevation.artifacts.CallContext; import de.intevation.artifacts.CallMeta; -import de.intevation.gnv.artifacts.GNVArtifactBase; - import de.intevation.gnv.artifacts.cache.CacheFactory; import de.intevation.gnv.artifacts.ressource.RessourceFactory;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java Fri Mar 05 16:07:09 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java Sat Mar 06 08:25:14 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.state.timeseries; import au.com.bytecode.opencsv.CSVWriter; @@ -11,7 +8,6 @@ import de.intevation.artifacts.ArtifactNamespaceContext; import de.intevation.artifacts.CallContext; import de.intevation.artifacts.CallMeta; -import de.intevation.artifacts.PreferredLocale; import de.intevation.gnv.artifacts.context.GNVArtifactContext; @@ -83,7 +79,6 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; - /** * @author Tim Englich (tim.englich@intevation.de) * @author Ingo Weinzierl (ingo.weinzierl@intevation.de)