# HG changeset patch # User Sascha L. Teichmann # Date 1263586958 0 # Node ID 8330c1dbab3411260034864ed998a334e9944042 # Parent 79378c4babdede5b9c14a6a71cff81cc4d4a1ef9 Cleanup imports gnv/trunk@548 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 79378c4babde -r 8330c1dbab34 gnv/ChangeLog --- a/gnv/ChangeLog Thu Jan 14 10:34:39 2010 +0000 +++ b/gnv/ChangeLog Fri Jan 15 20:22:38 2010 +0000 @@ -1,3 +1,9 @@ +2010-01-15 Sascha L. Teichmann + + * src/main/java/de/intevation/gnv/action/PreviousArtifactStepAction.java, + src/main/java/de/intevation/gnv/util/XSLTransformer.java: + Cleanup imports. + 2010-01-14 Ingo Weinzierl * src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java: diff -r 79378c4babde -r 8330c1dbab34 gnv/src/main/java/de/intevation/gnv/action/PreviousArtifactStepAction.java --- a/gnv/src/main/java/de/intevation/gnv/action/PreviousArtifactStepAction.java Thu Jan 14 10:34:39 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/PreviousArtifactStepAction.java Fri Jan 15 20:22:38 2010 +0000 @@ -1,9 +1,17 @@ package de.intevation.gnv.action; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.Enumeration; +import de.intevation.gnv.action.sessionmodel.SessionModel; +import de.intevation.gnv.action.sessionmodel.SessionModelFactory; + +import de.intevation.gnv.artifactdatabase.client.ArtifactDatabaseClient; +import de.intevation.gnv.artifactdatabase.client.ArtifactDatabaseClientFactory; + +import de.intevation.gnv.artifactdatabase.objects.ArtifactDescription; +import de.intevation.gnv.artifactdatabase.objects.ArtifactObject; + +import de.intevation.gnv.util.ArtifactNamespaceContext; +import de.intevation.gnv.util.XMLUtils; +import de.intevation.gnv.util.XSLTransformer; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -11,24 +19,12 @@ import javax.xml.xpath.XPathConstants; import org.apache.log4j.Logger; + import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.w3c.dom.Node; -import de.intevation.gnv.action.sessionmodel.SessionModel; -import de.intevation.gnv.action.sessionmodel.SessionModelFactory; -import de.intevation.gnv.artifactdatabase.client.ArtifactDatabaseClient; -import de.intevation.gnv.artifactdatabase.client.ArtifactDatabaseClientFactory; -import de.intevation.gnv.artifactdatabase.objects.ArtifactDescription; -import de.intevation.gnv.artifactdatabase.objects.ArtifactObject; -import de.intevation.gnv.artifactdatabase.objects.ArtifactStatisticsSet; -import de.intevation.gnv.artifactdatabase.objects.DefaultInputParameter; -import de.intevation.gnv.artifactdatabase.objects.InputParameter; -import de.intevation.gnv.util.ArtifactNamespaceContext; -import de.intevation.gnv.util.XMLUtils; -import de.intevation.gnv.util.XSLTransformer; - +import org.w3c.dom.Node; /** * @author Ingo Weinzierl * diff -r 79378c4babde -r 8330c1dbab34 gnv/src/main/java/de/intevation/gnv/util/XSLTransformer.java --- a/gnv/src/main/java/de/intevation/gnv/util/XSLTransformer.java Thu Jan 14 10:34:39 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/util/XSLTransformer.java Fri Jan 15 20:22:38 2010 +0000 @@ -6,8 +6,8 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.UnsupportedEncodingException; + import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import javax.xml.transform.Source; @@ -16,13 +16,14 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.TransformerFactoryConfigurationError; + import javax.xml.transform.dom.DOMSource; + import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import de.intevation.gnv.action.sessionmodel.SessionModelFactory; +import org.apache.log4j.Logger; -import org.apache.log4j.Logger; import org.w3c.dom.Node; /** @@ -49,7 +50,7 @@ String templateFileName) { String resultValue = null; try { - XMLUtils xmlUtils = new XMLUtils(); + //XMLUtils xmlUtils = new XMLUtils(); Source templateSource = new StreamSource(new File(templateFileName)); TransformerFactory xformFactory = TransformerFactory.newInstance(); Transformer transformer = xformFactory