# HG changeset patch # User Sascha L. Teichmann # Date 1269853825 0 # Node ID d49e8695786c561811f4cbf157843a7c15a3ba0f # Parent d3062dc8626af19895a13b7b54b36f67d97ece28 Ordered imports. Removed needless imports. Removed empty headers. gnv/trunk@855 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r d3062dc8626a -r d49e8695786c gnv/ChangeLog --- a/gnv/ChangeLog Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/ChangeLog Mon Mar 29 09:10:25 2010 +0000 @@ -1,3 +1,8 @@ +2010-03-29 Sascha L. Teichmann + + * rc/main/java/de/intevation/gnv/**/*.java: + Ordered imports. Removed needless imports. Removed empty headers. + 2010-03-29 Ingo Weinzierl Issue30 diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/ArtifactDatabaseActionBase.java --- a/gnv/src/main/java/de/intevation/gnv/action/ArtifactDatabaseActionBase.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/ArtifactDatabaseActionBase.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.action; import javax.servlet.http.HttpServletRequest; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/ChangeOptionsAction.java --- a/gnv/src/main/java/de/intevation/gnv/action/ChangeOptionsAction.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/ChangeOptionsAction.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,7 +1,19 @@ package de.intevation.gnv.action; +import de.intevation.gnv.action.sessionmodel.DiagrammOptions; +import de.intevation.gnv.action.sessionmodel.SessionModel; +import de.intevation.gnv.action.sessionmodel.SessionModelFactory; + +import de.intevation.gnv.artifactdatabase.objects.ArtifactDescription; +import de.intevation.gnv.artifactdatabase.objects.OutputMode; +import de.intevation.gnv.artifactdatabase.objects.OutputParameter; + +import de.intevation.gnv.propertiesreader.PropertiesReader; +import de.intevation.gnv.propertiesreader.PropertiesReaderFactory; + import java.text.NumberFormat; import java.text.ParseException; + import java.util.Collection; import java.util.Iterator; import java.util.Locale; @@ -11,19 +23,11 @@ import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; + import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import de.intevation.gnv.action.sessionmodel.DiagrammOptions; -import de.intevation.gnv.action.sessionmodel.SessionModel; -import de.intevation.gnv.action.sessionmodel.SessionModelFactory; -import de.intevation.gnv.artifactdatabase.objects.ArtifactDescription; -import de.intevation.gnv.artifactdatabase.objects.OutputMode; -import de.intevation.gnv.artifactdatabase.objects.OutputParameter; -import de.intevation.gnv.propertiesreader.PropertiesReaderFactory; -import de.intevation.gnv.propertiesreader.PropertiesReader; - /** * @author Tim Englich * diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/CommunicationKeys.java --- a/gnv/src/main/java/de/intevation/gnv/action/CommunicationKeys.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/CommunicationKeys.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,9 +1,7 @@ package de.intevation.gnv.action; /** - * * @author Tim Englich - * */ public class CommunicationKeys { /** diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/CreateChartAction.java --- a/gnv/src/main/java/de/intevation/gnv/action/CreateChartAction.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/CreateChartAction.java Mon Mar 29 09:10:25 2010 +0000 @@ -12,7 +12,6 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; - /** * @author Ingo Weinzierl (ingo.weinzierl@intevation.de) */ diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/CreateHistogramAction.java --- a/gnv/src/main/java/de/intevation/gnv/action/CreateHistogramAction.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/CreateHistogramAction.java Mon Mar 29 09:10:25 2010 +0000 @@ -12,7 +12,6 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; - /** * @author Ingo Weinzierl (ingo.weinzierl@intevation.de) */ diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/DescribeUIAction.java --- a/gnv/src/main/java/de/intevation/gnv/action/DescribeUIAction.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/DescribeUIAction.java Mon Mar 29 09:10:25 2010 +0000 @@ -20,6 +20,7 @@ import org.apache.log4j.Logger; import org.apache.struts.Globals; + import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/DoExportAction.java --- a/gnv/src/main/java/de/intevation/gnv/action/DoExportAction.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/DoExportAction.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.action; import de.intevation.gnv.action.sessionmodel.SessionModel; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/DoOutputAction.java --- a/gnv/src/main/java/de/intevation/gnv/action/DoOutputAction.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/DoOutputAction.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.action; import de.intevation.gnv.action.sessionmodel.SessionModel; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/FetchArtifactFactoriesAction.java --- a/gnv/src/main/java/de/intevation/gnv/action/FetchArtifactFactoriesAction.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/FetchArtifactFactoriesAction.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,14 +1,11 @@ -/** - * - */ package de.intevation.gnv.action; import de.intevation.gnv.action.sessionmodel.SessionModel; import de.intevation.gnv.action.sessionmodel.SessionModelFactory; import de.intevation.gnv.artifactdatabase.client.ArtifactDatabaseClientFactory; + import de.intevation.gnv.artifactdatabase.client.exception.ArtifactDatabaseClientException; -import de.intevation.gnv.artifactdatabase.client.exception.ArtifactDatabaseInputException; import de.intevation.gnv.artifactdatabase.objects.ArtifactObject; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/LoadAction.java --- a/gnv/src/main/java/de/intevation/gnv/action/LoadAction.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/LoadAction.java Mon Mar 29 09:10:25 2010 +0000 @@ -2,15 +2,19 @@ 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.Artifact; import de.intevation.gnv.artifactdatabase.objects.ArtifactFactory; + import de.intevation.gnv.util.ArtifactNamespaceContext; import de.intevation.gnv.util.XMLUtils; +import java.io.IOException; import java.io.InputStream; -import java.io.IOException; + import java.util.List; import javax.servlet.http.HttpServletRequest; @@ -18,6 +22,7 @@ import org.apache.commons.fileupload.FileItemIterator; import org.apache.commons.fileupload.FileItemStream; + import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.log4j.Logger; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java --- a/gnv/src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,13 +1,11 @@ -/** - * - */ package de.intevation.gnv.action; + 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.client.exception.ArtifactDatabaseClientException; + import de.intevation.gnv.artifactdatabase.client.exception.ArtifactDatabaseInputException; import de.intevation.gnv.artifactdatabase.objects.ArtifactDescription; @@ -28,7 +26,6 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; - /** * @author Tim Englich * @author Ingo Weinzierl (ingo.weinzierl@intevation.de) diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/PreviousArtifactStepAction.java --- a/gnv/src/main/java/de/intevation/gnv/action/PreviousArtifactStepAction.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/PreviousArtifactStepAction.java Mon Mar 29 09:10:25 2010 +0000 @@ -18,7 +18,6 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; - /** * @author Ingo Weinzierl * diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/SelectArtifactFactoryAction.java --- a/gnv/src/main/java/de/intevation/gnv/action/SelectArtifactFactoryAction.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/SelectArtifactFactoryAction.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,29 +1,24 @@ -/** - * - */ package de.intevation.gnv.action; +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.ArtifactObject; + import java.util.Collection; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; 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.util.XMLUtils; -import de.intevation.gnv.util.XSLTransformer; - /** * @author Tim Englich * diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/SelectFisAction.java --- a/gnv/src/main/java/de/intevation/gnv/action/SelectFisAction.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/SelectFisAction.java Mon Mar 29 09:10:25 2010 +0000 @@ -12,7 +12,6 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; - /** * @author Ingo Weinzierl */ diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/ShowStatisticAction.java --- a/gnv/src/main/java/de/intevation/gnv/action/ShowStatisticAction.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/ShowStatisticAction.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,21 +1,24 @@ package de.intevation.gnv.action; +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.ArtifactStatisticsSet; + import java.util.Collection; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; + import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -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.ArtifactStatisticsSet; - /** * @author Ingo Weinzierl (ingo.weinzierl@intevation.de) */ diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/WMSAction.java --- a/gnv/src/main/java/de/intevation/gnv/action/WMSAction.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/WMSAction.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,22 @@ package de.intevation.gnv.action; +import de.intevation.gnv.action.sessionmodel.DiagrammOptions; +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.ArtifactObject; +import de.intevation.gnv.artifactdatabase.objects.DefaultInputParameter; +import de.intevation.gnv.artifactdatabase.objects.InputParameter; +import de.intevation.gnv.artifactdatabase.objects.OutputMode; +import de.intevation.gnv.artifactdatabase.objects.OutputParameter; + +import de.intevation.gnv.util.XMLUtils; + import java.text.DateFormat; + import java.util.ArrayList; import java.util.Collection; import java.util.Date; @@ -10,22 +26,12 @@ import javax.servlet.http.HttpServletResponse; 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.Document; -import de.intevation.gnv.action.sessionmodel.DiagrammOptions; -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.ArtifactObject; -import de.intevation.gnv.artifactdatabase.objects.DefaultInputParameter; -import de.intevation.gnv.artifactdatabase.objects.InputParameter; -import de.intevation.gnv.artifactdatabase.objects.OutputMode; -import de.intevation.gnv.artifactdatabase.objects.OutputParameter; -import de.intevation.gnv.util.XMLUtils; +import org.w3c.dom.Document; /** * @author Ingo Weinzierl (ingo.weinzierl@intevation.de) diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/mapviewer/MapViewerCallAction.java --- a/gnv/src/main/java/de/intevation/gnv/action/mapviewer/MapViewerCallAction.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/mapviewer/MapViewerCallAction.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,7 +1,22 @@ package de.intevation.gnv.action.mapviewer; +import de.intevation.gnv.action.ArtifactDatabaseActionBase; + +import de.intevation.gnv.action.mapviewer.parser.ExternalCallParser; +import de.intevation.gnv.action.mapviewer.parser.XMLExternalCallParser; + +import de.intevation.gnv.action.sessionmodel.SessionModel; +import de.intevation.gnv.action.sessionmodel.SessionModelFactory; + +import de.intevation.gnv.artifactdatabase.client.ArtifactDatabaseClientFactory; + +import de.intevation.gnv.artifactdatabase.objects.ArtifactObject; + +import de.intevation.gnv.artifactdatabase.objects.map.MapService; + import java.io.ByteArrayInputStream; import java.io.InputStream; + import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -10,23 +25,13 @@ import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; + import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import de.intevation.gnv.action.ArtifactDatabaseActionBase; -import de.intevation.gnv.action.mapviewer.parser.ExternalCallParser; -import de.intevation.gnv.action.mapviewer.parser.XMLExternalCallParser; -import de.intevation.gnv.action.sessionmodel.SessionModel; -import de.intevation.gnv.action.sessionmodel.SessionModelFactory; -import de.intevation.gnv.artifactdatabase.client.ArtifactDatabaseClientFactory; -import de.intevation.gnv.artifactdatabase.objects.ArtifactObject; -import de.intevation.gnv.artifactdatabase.objects.map.MapService; - /** - * * @author Tim Englich - * */ public class MapViewerCallAction extends ArtifactDatabaseActionBase { diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/mapviewer/ShowMapViewerCallBodyAction.java --- a/gnv/src/main/java/de/intevation/gnv/action/mapviewer/ShowMapViewerCallBodyAction.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/mapviewer/ShowMapViewerCallBodyAction.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,21 +1,18 @@ -/** - * - */ package de.intevation.gnv.action.mapviewer; +import de.intevation.gnv.action.ArtifactDatabaseActionBase; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; + import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import de.intevation.gnv.action.ArtifactDatabaseActionBase; - /** * @author Tim Englich - * */ public class ShowMapViewerCallBodyAction extends ArtifactDatabaseActionBase { @@ -40,7 +37,4 @@ request.setAttribute("MAPVIEWERCALL", new Boolean(true)); return super.execute(mapping, form, request, response); } - - - } diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/mapviewer/parser/ExternalCallParser.java --- a/gnv/src/main/java/de/intevation/gnv/action/mapviewer/parser/ExternalCallParser.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/mapviewer/parser/ExternalCallParser.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,15 +1,11 @@ -/** - * - */ package de.intevation.gnv.action.mapviewer.parser; +import de.intevation.gnv.artifactdatabase.objects.map.MapService; + import java.util.Collection; -import de.intevation.gnv.artifactdatabase.objects.map.MapService; - /** * @author Tim Englich - * */ public interface ExternalCallParser { diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/mapviewer/parser/ExternalCallParserException.java --- a/gnv/src/main/java/de/intevation/gnv/action/mapviewer/parser/ExternalCallParserException.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/mapviewer/parser/ExternalCallParserException.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,7 +1,5 @@ -/** - * - */ package de.intevation.gnv.action.mapviewer.parser; + /** * @author Tim Englich * diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/mapviewer/parser/XMLExternalCallParser.java --- a/gnv/src/main/java/de/intevation/gnv/action/mapviewer/parser/XMLExternalCallParser.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/mapviewer/parser/XMLExternalCallParser.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,27 +1,25 @@ -/** - * - */ package de.intevation.gnv.action.mapviewer.parser; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collection; - - -import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - import de.intevation.gnv.artifactdatabase.objects.map.DefaultLayer; import de.intevation.gnv.artifactdatabase.objects.map.DefaultMapService; import de.intevation.gnv.artifactdatabase.objects.map.Layer; import de.intevation.gnv.artifactdatabase.objects.map.MapService; + import de.intevation.gnv.util.XMLUtils; +import java.io.InputStream; + +import java.util.ArrayList; +import java.util.Collection; + +import org.apache.log4j.Logger; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + /** * @author Tim Englich - * */ public class XMLExternalCallParser implements ExternalCallParser { diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/sessionmodel/DefaultSessionModel.java --- a/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/DefaultSessionModel.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/DefaultSessionModel.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,18 +1,15 @@ -/** - * - */ package de.intevation.gnv.action.sessionmodel; +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.OutputMode; + import java.util.Collection; import java.util.Iterator; import org.apache.log4j.Logger; -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.OutputMode; - /** * @author Tim Englich * diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/sessionmodel/DiagrammOptions.java --- a/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/DiagrammOptions.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/DiagrammOptions.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.action.sessionmodel; import java.util.HashMap; @@ -35,4 +32,4 @@ this.values.put(key, value); } -} \ No newline at end of file +} diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/sessionmodel/SessionModel.java --- a/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/SessionModel.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/SessionModel.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,16 +1,14 @@ -/** - * - */ package de.intevation.gnv.action.sessionmodel; -import java.io.Serializable; -import java.util.Collection; - 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.OutputMode; +import java.io.Serializable; + +import java.util.Collection; + /** * @author Tim Englich * diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/action/sessionmodel/SessionModelFactory.java --- a/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/SessionModelFactory.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/SessionModelFactory.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.action.sessionmodel; import javax.servlet.http.HttpServletRequest; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClient.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClient.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClient.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,21 +1,24 @@ package de.intevation.gnv.artifactdatabase.client; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Collection; -import java.util.Locale; - -import org.w3c.dom.Document; - import de.intevation.gnv.artifactdatabase.client.exception.ArtifactDatabaseClientException; import de.intevation.gnv.artifactdatabase.client.exception.ArtifactDatabaseInputException; + import de.intevation.gnv.artifactdatabase.objects.ArtifactDescription; import de.intevation.gnv.artifactdatabase.objects.ArtifactFactory; import de.intevation.gnv.artifactdatabase.objects.ArtifactObject; import de.intevation.gnv.artifactdatabase.objects.ArtifactStatisticsSet; import de.intevation.gnv.artifactdatabase.objects.InputParameter; + import de.intevation.gnv.artifactdatabase.objects.map.MapService; +import java.io.IOException; +import java.io.OutputStream; + +import java.util.Collection; +import java.util.Locale; + +import org.w3c.dom.Document; + /** * @author Tim Englich (tim.englich@intevation.de) * @author Ingo Weinzierl (ingo.weinzierl@intevation.de) diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClientFactory.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClientFactory.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClientFactory.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,12 +1,9 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.client; +import java.util.Locale; + import org.apache.log4j.Logger; -import java.util.Locale; - /** * @author Tim Englich * diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/DefaultArtifactDatabaseClient.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/DefaultArtifactDatabaseClient.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/DefaultArtifactDatabaseClient.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,36 +1,8 @@ package de.intevation.gnv.artifactdatabase.client; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -import org.apache.log4j.Logger; -import org.restlet.Client; -import org.restlet.data.ClientInfo; -import org.restlet.data.Language; -import org.restlet.data.Method; -import org.restlet.data.Preference; -import org.restlet.data.Protocol; -import org.restlet.data.Request; -import org.restlet.data.Response; -import org.restlet.representation.Representation; -import org.restlet.representation.StringRepresentation; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - import de.intevation.gnv.artifactdatabase.client.exception.ArtifactDatabaseClientException; import de.intevation.gnv.artifactdatabase.client.exception.ArtifactDatabaseInputException; + import de.intevation.gnv.artifactdatabase.objects.Artifact; import de.intevation.gnv.artifactdatabase.objects.ArtifactDescription; import de.intevation.gnv.artifactdatabase.objects.ArtifactFactory; @@ -47,12 +19,49 @@ import de.intevation.gnv.artifactdatabase.objects.OutputParameter; import de.intevation.gnv.artifactdatabase.objects.ParametrizedArtifactFactory; import de.intevation.gnv.artifactdatabase.objects.ParametrizedArtifactObject; + import de.intevation.gnv.artifactdatabase.objects.map.Layer; import de.intevation.gnv.artifactdatabase.objects.map.MapService; + import de.intevation.gnv.propertiesreader.PropertiesReader; import de.intevation.gnv.propertiesreader.PropertiesReaderFactory; + import de.intevation.gnv.util.XMLUtils; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.OutputStreamWriter; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +import org.apache.log4j.Logger; + +import org.restlet.Client; + +import org.restlet.data.ClientInfo; +import org.restlet.data.Language; +import org.restlet.data.Method; +import org.restlet.data.Preference; +import org.restlet.data.Protocol; +import org.restlet.data.Request; +import org.restlet.data.Response; + +import org.restlet.representation.Representation; +import org.restlet.representation.StringRepresentation; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + /** * @author Tim Englich (tim.englich@intevation.de) * @author Ingo Weinzierl (ingo.weinzierl@intevation.de) diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/exception/ArtifactDatabaseClientException.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/exception/ArtifactDatabaseClientException.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/exception/ArtifactDatabaseClientException.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.client.exception; /** diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/Artifact.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/Artifact.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/Artifact.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects; import java.util.Collection; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactDescription.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactDescription.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactDescription.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,9 +1,7 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects; import java.io.Serializable; + import java.util.Collection; import java.util.Map; @@ -79,4 +77,4 @@ */ public void setOutputModes(Map outputModes); -} \ No newline at end of file +} diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactFactory.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactFactory.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactFactory.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects; /** diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactObject.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactObject.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactObject.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects; import java.io.Serializable; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactStatisticValue.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactStatisticValue.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactStatisticValue.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects; import java.io.Serializable; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactStatisticsSet.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactStatisticsSet.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactStatisticsSet.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,9 +1,7 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects; import java.io.Serializable; + import java.util.Collection; /** diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultArtifactStatisticValue.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultArtifactStatisticValue.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultArtifactStatisticValue.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects; /** diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultArtifactStatisticsSet.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultArtifactStatisticsSet.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultArtifactStatisticsSet.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects; import java.util.ArrayList; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultInputParameter.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultInputParameter.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultInputParameter.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects; /** diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputMode.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputMode.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputMode.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects; import java.util.Collection; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputParameter.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputParameter.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputParameter.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects; /** diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/InputParameter.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/InputParameter.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/InputParameter.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects; import java.io.Serializable; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/OutputMode.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/OutputMode.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/OutputMode.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,9 +1,7 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects; import java.io.Serializable; + import java.util.Collection; /** diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/OutputParameter.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/OutputParameter.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/OutputParameter.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects; import java.io.Serializable; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ParametrizedArtifactFactory.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ParametrizedArtifactFactory.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ParametrizedArtifactFactory.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects; import java.util.Collection; @@ -9,7 +6,6 @@ /** * @author Tim Englich - * */ public class ParametrizedArtifactFactory extends ArtifactFactory implements ParametrizedArtifactObject { diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ParametrizedArtifactObject.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ParametrizedArtifactObject.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ParametrizedArtifactObject.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects; import java.util.Collection; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/DefaultLayer.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/DefaultLayer.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/DefaultLayer.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,10 +1,7 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects.map; + /** * @author Tim Englich - * */ public class DefaultLayer implements Layer { diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/DefaultMapService.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/DefaultMapService.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/DefaultMapService.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects.map; import java.util.Collection; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/Layer.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/Layer.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/Layer.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,7 +1,5 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects.map; + /** * @author Tim Englich * diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/MapService.java --- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/MapService.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/MapService.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.objects.map; import java.util.Collection; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/propertiesreader/MapPropertiesReader.java --- a/gnv/src/main/java/de/intevation/gnv/propertiesreader/MapPropertiesReader.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/propertiesreader/MapPropertiesReader.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.propertiesreader; import java.util.Map; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/propertiesreader/PropertiesReader.java --- a/gnv/src/main/java/de/intevation/gnv/propertiesreader/PropertiesReader.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/propertiesreader/PropertiesReader.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.propertiesreader; /** diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/propertiesreader/PropertiesReaderFactory.java --- a/gnv/src/main/java/de/intevation/gnv/propertiesreader/PropertiesReaderFactory.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/propertiesreader/PropertiesReaderFactory.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.propertiesreader; import java.util.Map; diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/propertiesreader/ServletPropertiesReader.java --- a/gnv/src/main/java/de/intevation/gnv/propertiesreader/ServletPropertiesReader.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/propertiesreader/ServletPropertiesReader.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.propertiesreader; import java.util.Enumeration; @@ -10,7 +7,6 @@ import javax.servlet.ServletConfig; import org.apache.log4j.Logger; - /** * @author Tim Englich * diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/servlet/GNVActionServlet.java --- a/gnv/src/main/java/de/intevation/gnv/servlet/GNVActionServlet.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/servlet/GNVActionServlet.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,17 +1,15 @@ -/* - * - */ package de.intevation.gnv.servlet; +import de.intevation.gnv.propertiesreader.PropertiesReaderFactory; + import javax.servlet.ServletConfig; import javax.servlet.ServletException; import org.apache.log4j.Logger; import org.apache.log4j.PropertyConfigurator; + import org.apache.struts.action.ActionServlet; -import de.intevation.gnv.propertiesreader.PropertiesReaderFactory; - /** * * @author Tim Englich diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/util/ArtifactNamespaceContext.java --- a/gnv/src/main/java/de/intevation/gnv/util/ArtifactNamespaceContext.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/util/ArtifactNamespaceContext.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,11 +1,11 @@ package de.intevation.gnv.util; +import java.util.Iterator; + import javax.xml.XMLConstants; import javax.xml.namespace.NamespaceContext; -import java.util.Iterator; - /** * @author Sascha L. Teichmann (sascha.teichmann@intevation) */ diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/util/XMLUtils.java --- a/gnv/src/main/java/de/intevation/gnv/util/XMLUtils.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/util/XMLUtils.java Mon Mar 29 09:10:25 2010 +0000 @@ -8,27 +8,34 @@ import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; + import javax.xml.transform.Transformer; import javax.xml.transform.TransformerConfigurationException; 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.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; import org.apache.log4j.Logger; + import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; + import org.xml.sax.SAXException; /** diff -r d3062dc8626a -r d49e8695786c gnv/src/main/java/de/intevation/gnv/util/XSLTransformer.java --- a/gnv/src/main/java/de/intevation/gnv/util/XSLTransformer.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/util/XSLTransformer.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,6 +1,3 @@ -/** - * - */ package de.intevation.gnv.util; import java.io.ByteArrayOutputStream; diff -r d3062dc8626a -r d49e8695786c gnv/src/test/java/de/intevation/gnv/action/mapviewer/parser/ExternalCallParserTestCase.java --- a/gnv/src/test/java/de/intevation/gnv/action/mapviewer/parser/ExternalCallParserTestCase.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/test/java/de/intevation/gnv/action/mapviewer/parser/ExternalCallParserTestCase.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,8 +1,12 @@ package de.intevation.gnv.action.mapviewer.parser; +import de.intevation.gnv.artifactdatabase.objects.map.Layer; +import de.intevation.gnv.artifactdatabase.objects.map.MapService; + import java.io.File; import java.io.FileInputStream; import java.io.InputStream; + import java.util.Collection; import java.util.Iterator; @@ -11,9 +15,6 @@ import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Logger; -import de.intevation.gnv.artifactdatabase.objects.map.Layer; -import de.intevation.gnv.artifactdatabase.objects.map.MapService; - public class ExternalCallParserTestCase extends TestCase { /** diff -r d3062dc8626a -r d49e8695786c gnv/src/test/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClientTestCase.java --- a/gnv/src/test/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClientTestCase.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/test/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClientTestCase.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,8 +1,12 @@ -/** - * - */ package de.intevation.gnv.artifactdatabase.client; +import de.intevation.gnv.artifactdatabase.objects.ArtifactDescription; +import de.intevation.gnv.artifactdatabase.objects.ArtifactObject; +import de.intevation.gnv.artifactdatabase.objects.DefaultInputParameter; +import de.intevation.gnv.artifactdatabase.objects.InputParameter; + +import de.intevation.gnv.util.XSLTransformer; + import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -13,12 +17,6 @@ import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Logger; -import de.intevation.gnv.artifactdatabase.objects.ArtifactDescription; -import de.intevation.gnv.artifactdatabase.objects.ArtifactObject; -import de.intevation.gnv.artifactdatabase.objects.DefaultInputParameter; -import de.intevation.gnv.artifactdatabase.objects.InputParameter; -import de.intevation.gnv.util.XSLTransformer; - /** * @author Tim Englich * diff -r d3062dc8626a -r d49e8695786c gnv/src/test/java/de/intevation/gnv/util/XSLTransformerTestCase.java --- a/gnv/src/test/java/de/intevation/gnv/util/XSLTransformerTestCase.java Mon Mar 29 08:46:21 2010 +0000 +++ b/gnv/src/test/java/de/intevation/gnv/util/XSLTransformerTestCase.java Mon Mar 29 09:10:25 2010 +0000 @@ -1,8 +1,7 @@ -/** - * - */ package de.intevation.gnv.util; +import de.intevation.gnv.artifactdatabase.client.DefaultArtifactDatabaseClient; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -11,10 +10,9 @@ import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Logger; + import org.w3c.dom.Document; -import de.intevation.gnv.artifactdatabase.client.DefaultArtifactDatabaseClient; - /** * @author Tim Englich *