Mercurial > dive4elements > gnv-client
changeset 681:15ac78a91d1b
Removed trailing whitespace.
gnv/trunk@852 c6561f87-3c4e-4783-a992-168aeb5c3f6f
line wrap: on
line diff
--- a/gnv/ChangeLog Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/ChangeLog Mon Mar 29 08:04:15 2010 +0000 @@ -1,3 +1,9 @@ +2010-03-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/gnv/**/*.java: + Removed trailing whitespace. + find -name \*.java | xargs sed -i 's/[ \t]\+$//' + 2010-03-26 Ingo Weinzierl <ingo.weinzierl@intevation.de> Issue197
--- a/gnv/src/main/java/de/intevation/gnv/action/ArtifactDatabaseActionBase.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/ArtifactDatabaseActionBase.java Mon Mar 29 08:04:15 2010 +0000 @@ -15,7 +15,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class ArtifactDatabaseActionBase extends Action { @@ -53,7 +53,7 @@ /** * Returns the ExceptionForward for the ArtifactDatabaseActions - * + * * @param mapping * @return */
--- a/gnv/src/main/java/de/intevation/gnv/action/ChangeOptionsAction.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/ChangeOptionsAction.java Mon Mar 29 08:04:15 2010 +0000 @@ -26,7 +26,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class ChangeOptionsAction extends DescribeUIAction { /**
--- a/gnv/src/main/java/de/intevation/gnv/action/CommunicationKeys.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/CommunicationKeys.java Mon Mar 29 08:04:15 2010 +0000 @@ -1,9 +1,9 @@ package de.intevation.gnv.action; /** - * + * * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class CommunicationKeys { /**
--- a/gnv/src/main/java/de/intevation/gnv/action/DescribeUIAction.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/DescribeUIAction.java Mon Mar 29 08:04:15 2010 +0000 @@ -113,7 +113,7 @@ request.getRealPath(XSL_SHEET_STATIC)); if (staticUI != null && staticUI.length() > 1) - request.setAttribute("staticui", staticUI); + request.setAttribute("staticui", staticUI); } return super.execute(mapping, form, request, response);
--- a/gnv/src/main/java/de/intevation/gnv/action/DoExportAction.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/DoExportAction.java Mon Mar 29 08:04:15 2010 +0000 @@ -32,7 +32,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class DoExportAction extends ArtifactDatabaseActionBase { @@ -185,7 +185,7 @@ if (target.equals("chart")) { fileName = fileName + mimeType.substring(mimeType.indexOf("/") + 1); - } + } else if (target.equals("histogram")) { fileName = fileName + mimeType.substring(mimeType.indexOf("/") + 1);
--- a/gnv/src/main/java/de/intevation/gnv/action/DoOutputAction.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/DoOutputAction.java Mon Mar 29 08:04:15 2010 +0000 @@ -31,7 +31,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class DoOutputAction extends ArtifactDatabaseActionBase {
--- a/gnv/src/main/java/de/intevation/gnv/action/FetchArtifactFactoriesAction.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/FetchArtifactFactoriesAction.java Mon Mar 29 08:04:15 2010 +0000 @@ -26,7 +26,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> * @author Ingo Weinzierl (ingo.weinzierl@intevation.de) - * + * */ public class FetchArtifactFactoriesAction extends ArtifactDatabaseActionBase { /**
--- a/gnv/src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java Mon Mar 29 08:04:15 2010 +0000 @@ -32,7 +32,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> * @author Ingo Weinzierl (ingo.weinzierl@intevation.de) - * + * */ public class NextArtifactStepAction extends DescribeUIAction { @@ -93,10 +93,10 @@ } else { target = ad.getReachableStates().iterator().next(); } - + try { adc.doNextStep( - sm.getSelectedArtifactFactory(), + sm.getSelectedArtifactFactory(), sm.getCurrentArtifact(), target, ips @@ -116,7 +116,7 @@ CommunicationKeys.REQUEST_EXCEPTION_MESSAGE_ID, e.getMessage()); } - + Map tmpOuts = ad.getOutputModes(); request.setAttribute( "furthertargets", @@ -129,9 +129,9 @@ sm.getCurrentArtifact(), true ); - + request.setAttribute("diagramm", true); - + } catch (ArtifactDatabaseInputException e) { log.debug("================ CATCH ME ======================"); @@ -147,12 +147,12 @@ CommunicationKeys.REQUEST_EXCEPTION_MESSAGE_ID, e.getMessage()); } - + request.setAttribute("furthertargets", false); } }else{ log.warn("SessionTimeout has occured"); - request.setAttribute(CommunicationKeys.REQUEST_EXCEPTION_MESSAGE_ID, + request.setAttribute(CommunicationKeys.REQUEST_EXCEPTION_MESSAGE_ID, "SessionTimeout has occured"); new FetchArtifactFactoriesAction().execute(mapping, form, request, response); }
--- a/gnv/src/main/java/de/intevation/gnv/action/PreviousArtifactStepAction.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/PreviousArtifactStepAction.java Mon Mar 29 08:04:15 2010 +0000 @@ -54,7 +54,7 @@ if (ad == null) { logger.warn("Session timed out."); request.setAttribute( - CommunicationKeys.REQUEST_EXCEPTION_MESSAGE_ID, + CommunicationKeys.REQUEST_EXCEPTION_MESSAGE_ID, "SessionTimeout has occured"); new FetchArtifactFactoriesAction().execute( mapping, form, request, response);
--- a/gnv/src/main/java/de/intevation/gnv/action/SelectArtifactFactoryAction.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/SelectArtifactFactoryAction.java Mon Mar 29 08:04:15 2010 +0000 @@ -26,7 +26,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class SelectArtifactFactoryAction extends ArtifactDatabaseActionBase { /** @@ -90,7 +90,7 @@ dynamicUINode, "UTF-8", request.getRealPath("WEB-INF/config/templates/describe-ui.xsl")); - + request.setAttribute("ui", ui); }
--- a/gnv/src/main/java/de/intevation/gnv/action/WMSAction.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/WMSAction.java Mon Mar 29 08:04:15 2010 +0000 @@ -123,7 +123,7 @@ DateFormat.LONG, DateFormat.LONG, request.getLocale()); - + try { long tmp = Long.parseLong(tmpTTL); ttl = df.format(new Date(tmp)); @@ -148,7 +148,7 @@ request.setAttribute("mapfile", mapfilePath); request.setAttribute("layer", layer); request.setAttribute("ttl", ttl); - if (mapserverPath != null && + if (mapserverPath != null && mapfilePath != null && layer != null){ request.setAttribute("wms_published", Boolean.TRUE);
--- a/gnv/src/main/java/de/intevation/gnv/action/mapviewer/MapViewerCallAction.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/mapviewer/MapViewerCallAction.java Mon Mar 29 08:04:15 2010 +0000 @@ -24,7 +24,7 @@ import de.intevation.gnv.artifactdatabase.objects.map.MapService; /** - * + * * @author Tim Englich <tim.englich@intevation.de> * */ @@ -58,7 +58,7 @@ }else{ inputStream = request.getInputStream(); } - + if (inputStream != null){ try { ExternalCallParser ecp = new XMLExternalCallParser(inputStream); @@ -66,25 +66,25 @@ String geometry = ecp.getGeometry(); String srs = ecp.getSRS(); Collection<MapService> mapServices = ecp.getMapServices(); - - Collection<ArtifactObject> availableFactories = + + Collection<ArtifactObject> availableFactories = ArtifactDatabaseClientFactory .getInstance() .getArtifactDatabaseClient(getLocale(request)) .getArtifactFactoryMetaInformation(mapServices, geometry, srs); - - Collection<ArtifactObject> providedFactories = + + Collection<ArtifactObject> providedFactories = ArtifactDatabaseClientFactory .getInstance() .getArtifactDatabaseClient(getLocale(request)) .getArtifactFactories(); - + // Sort out which ArtifactFactories should not be used. - Collection<ArtifactObject> usedFactories = + Collection<ArtifactObject> usedFactories = new ArrayList<ArtifactObject>(availableFactories.size()); - + Iterator<ArtifactObject> it = availableFactories.iterator(); while (it.hasNext()){ ArtifactObject ao = it.next(); @@ -92,7 +92,7 @@ usedFactories.add(ao); } } - + SessionModel sm = SessionModelFactory .getInstance() .getSessionModel(request);
--- a/gnv/src/main/java/de/intevation/gnv/action/mapviewer/ShowMapViewerCallBodyAction.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/mapviewer/ShowMapViewerCallBodyAction.java Mon Mar 29 08:04:15 2010 +0000 @@ -24,7 +24,7 @@ */ private static Logger log = Logger .getLogger(ShowMapViewerCallBodyAction.class); - + /** * Constructor */ @@ -40,7 +40,7 @@ request.setAttribute("MAPVIEWERCALL", new Boolean(true)); return super.execute(mapping, form, request, response); } - - + + }
--- a/gnv/src/main/java/de/intevation/gnv/action/mapviewer/parser/ExternalCallParser.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/mapviewer/parser/ExternalCallParser.java Mon Mar 29 08:04:15 2010 +0000 @@ -13,12 +13,12 @@ */ public interface ExternalCallParser { - + String getGeometry(); - + String getSRS(); - + Collection<MapService> getMapServices(); - + void parse() throws ExternalCallParserException; }
--- a/gnv/src/main/java/de/intevation/gnv/action/mapviewer/parser/XMLExternalCallParser.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/mapviewer/parser/XMLExternalCallParser.java Mon Mar 29 08:04:15 2010 +0000 @@ -24,12 +24,12 @@ * */ public class XMLExternalCallParser implements ExternalCallParser { - + /** * the logger, used to log exceptions and additonaly information */ private static Logger log = Logger.getLogger(XMLExternalCallParser.class); - + private static String XPATH_GEOMETRY = "/gnviewer/location/data"; private static String XPATH_SRS = "/gnviewer/location/srs"; private static String XPATH_MAPSERVICES_NODESET = "/gnviewer/mapservices/mapservice"; @@ -38,12 +38,12 @@ private static String ATTRIBUTE_NAME = "name"; private static String ATTRIBUTE_TYPE = "type"; private static String ATTRIBUTE_URL = "url"; - + private String geometry = null; private String srs = null; - + private Collection<MapService> mapServices = null; - + private InputStream inputStream = null; /** @@ -75,10 +75,10 @@ XMLUtils xmlUtils = new XMLUtils(); Document document = xmlUtils.readDocument(this.inputStream); if (document != null){ - + this.geometry = xmlUtils.getStringXPath(document, XPATH_GEOMETRY); this.srs = xmlUtils.getStringXPath(document, XPATH_SRS); - NodeList mapservicesNodes = + NodeList mapservicesNodes = xmlUtils.getNodeSetXPath(document, XPATH_MAPSERVICES_NODESET); if (mapservicesNodes != null){ this.mapServices = new ArrayList<MapService>(mapservicesNodes.getLength()); @@ -95,18 +95,18 @@ }else{ log.debug("No Layer given for this Mapservice"); } - MapService mapService = + MapService mapService = new DefaultMapService(mapserviceID, layer, mapserviceType, mapserviceUrl); this.mapServices.add(mapService); } - + }else{ String errMsg = "XML-Document does not contain any Mapservices which are required."; log.error(errMsg); throw new ExternalCallParserException(errMsg); } - + }else{ String errMsg = "XML-Document could not be read from InputStream."; log.error(errMsg); @@ -118,7 +118,7 @@ throw new ExternalCallParserException(errMsg); } } - + /** * This Method extracts all Layers and put them into the Collection. * @param layer @@ -133,9 +133,9 @@ String id = layerNode.getAttribute(ATTRIBUTE_ID); String name = layerNode.getAttribute(ATTRIBUTE_NAME); NodeList localLayerNodes = xmlUtils.getNodeSetXPath(layerNode, XPATH_LAYER); - Layer tmpLayer = new DefaultLayer(id, name, - (localLayerNodes != null && - localLayerNodes.getLength() > 0), + Layer tmpLayer = new DefaultLayer(id, name, + (localLayerNodes != null && + localLayerNodes.getLength() > 0), groupId); layer.add(tmpLayer); if (localLayerNodes != null && localLayerNodes.getLength() > 0){
--- a/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/DefaultSessionModel.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/DefaultSessionModel.java Mon Mar 29 08:04:15 2010 +0000 @@ -15,7 +15,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class DefaultSessionModel implements SessionModel {
--- a/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/DiagrammOptions.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/DiagrammOptions.java Mon Mar 29 08:04:15 2010 +0000 @@ -8,7 +8,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class DiagrammOptions {
--- a/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/SessionModel.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/SessionModel.java Mon Mar 29 08:04:15 2010 +0000 @@ -13,7 +13,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public interface SessionModel extends Serializable {
--- a/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/SessionModelFactory.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/sessionmodel/SessionModelFactory.java Mon Mar 29 08:04:15 2010 +0000 @@ -9,7 +9,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class SessionModelFactory { @@ -33,7 +33,7 @@ /** * This Method provides an singleton Instance of this Class. - * + * * @return an singleton Instance of this Class */ public synchronized static SessionModelFactory getInstance() { @@ -45,7 +45,7 @@ /** * Getting the ArtifactDatabaseClient - * + * * @return the ArtifactDatabaseClient */ public SessionModel getSessionModel(HttpServletRequest request) {
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClient.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClient.java Mon Mar 29 08:04:15 2010 +0000 @@ -28,7 +28,7 @@ /** * Return the Artifactfactories which can be resolved. - * + * * @return the Artifactfactories which can be resolved. * @throws ArtifactDatabaseClientException */ @@ -36,7 +36,7 @@ throws ArtifactDatabaseClientException, ArtifactDatabaseInputException; /** - * + * * @param artifactFactory * @return the new Artifact * @throws ArtifactDatabaseClientException @@ -45,7 +45,7 @@ throws ArtifactDatabaseClientException, ArtifactDatabaseInputException; /** - * + * * @param currentArtifact * @return the Current Artifact * @throws ArtifactDatabaseClientException @@ -57,7 +57,7 @@ throws ArtifactDatabaseClientException, ArtifactDatabaseInputException; /** - * + * * @param artifactFactory * @param currentArtifact * @param target @@ -91,7 +91,7 @@ throws ArtifactDatabaseClientException, ArtifactDatabaseInputException; /** - * + * * @param artifactFactory * @param currentArtifact * @param stream @@ -144,13 +144,13 @@ ArtifactObject artifactFactory, ArtifactObject currentArtifact) throws ArtifactDatabaseClientException; - + public void setLocale(Locale locale); - + public Collection<ArtifactObject> getArtifactFactoryMetaInformation( - Collection<MapService> mapServices, - String geometry, + Collection<MapService> mapServices, + String geometry, String srs) throws ArtifactDatabaseClientException, ArtifactDatabaseInputException; - + }
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClientFactory.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClientFactory.java Mon Mar 29 08:04:15 2010 +0000 @@ -9,7 +9,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class ArtifactDatabaseClientFactory { @@ -33,7 +33,7 @@ /** * This Method provides an singleton Instance of this Class. - * + * * @return an singleton Instance of this Class */ public static synchronized ArtifactDatabaseClientFactory getInstance() { @@ -52,7 +52,7 @@ DefaultArtifactDatabaseClient adc = new DefaultArtifactDatabaseClient(); adc.setLocale(locale); return adc; - + } }
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/DefaultArtifactDatabaseClient.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/DefaultArtifactDatabaseClient.java Mon Mar 29 08:04:15 2010 +0000 @@ -107,7 +107,7 @@ * Constructor */ public DefaultArtifactDatabaseClient() { - + } /** @@ -155,22 +155,22 @@ "@art:name"); String description = xmlUtils.getStringXPath( artifactFactoryNode, "@art:description"); - + NodeList parameterNodeList = xmlUtils.getNodeSetXPath( artifactFactoryNode, "art:parameter"); - - if ((parameterNodeList != null && - parameterNodeList.getLength() > 0) || + + if ((parameterNodeList != null && + parameterNodeList.getLength() > 0) || geometry != null){ - Collection<String> parameters = + Collection<String> parameters = new ArrayList<String>(parameterNodeList.getLength()); for (int j = 0; j < parameterNodeList.getLength(); j++){ Element parameterNode = (Element)parameterNodeList.item(j); parameters.add(parameterNode.getAttribute("id")); } - ParametrizedArtifactObject pao = - new ParametrizedArtifactFactory(name, + ParametrizedArtifactObject pao = + new ParametrizedArtifactFactory(name, description, server); pao.addParameters("parameter", parameters); @@ -322,9 +322,9 @@ Element factoryNode = this.createArtifactElement(document, "factory"); factoryNode.setAttribute("name", artifactFactory.getId()); rootNode.appendChild(factoryNode); - + if (artifactFactory instanceof ParametrizedArtifactObject){ - Map<String, Collection<String>> parameterMap = + Map<String, Collection<String>> parameterMap = ((ParametrizedArtifactObject)artifactFactory).getParameters(); if (parameterMap != null && !parameterMap.isEmpty() ){ Iterator<String> keyIt = parameterMap.keySet().iterator(); @@ -333,7 +333,7 @@ Iterator<String> valueIt = parameterMap.get(key).iterator(); while (valueIt.hasNext()){ String value = valueIt.next(); - Element parameterNode = + Element parameterNode = this.createArtifactElement(document, "parameter"); parameterNode.setAttribute("name", key); parameterNode.setAttribute("value", value); @@ -397,19 +397,19 @@ Document request = this.createDescribeRequestBody(currentArtifact, includeUI); InputStream describeResult = this.doPostRequest(url, request); - - return this.readDescription(new XMLUtils().readDocument(describeResult), + + return this.readDescription(new XMLUtils().readDocument(describeResult), currentArtifact); } catch (IOException e) { log.error(e, e); throw new ArtifactDatabaseClientException(e); } } - - + + private Document createDescribeRequestBody(ArtifactObject currentArtifact, boolean includeUI){ - + Document document = new XMLUtils().newDocument(); Node rootNode = this.createRootNode(document); @@ -493,7 +493,7 @@ NodeList exportNodes = xmlUtils.getNodeSetXPath( outputModeNode, "art:exports/art:export"); Map exports = null; - + if (exportNodes != null) { int size = exportNodes.getLength(); exports = new HashMap<String, ExportMode>(size); @@ -568,7 +568,7 @@ try { // 1 Feed this.doFeed(artifactFactory, currentArtifact, inputParameter); - + // 2. Noch einmal Describe um das jetzt zu erreichende Ziel zu ermitteln ArtifactDescription ad = getCurrentStepDescription( artifactFactory, @@ -578,10 +578,10 @@ ); target = ad.getReachableStates().iterator().next(); - + // 3 Advance doAdvance(artifactFactory, currentArtifact, target); - + // 3 Describe return this.getCurrentStepDescription(artifactFactory, currentArtifact,true); @@ -890,7 +890,7 @@ { log.debug("DefaultArtifactDatabaseClient.calculateStatistics"); Collection<ArtifactStatisticsSet> resultValues = null; - + try { String targetName = "statistics"; String requestUrl = this.getArtifactUrl(artifactFactory, @@ -901,7 +901,7 @@ InputStream is = this.doPostRequest(requestUrl, requestBody); Document resultDocument = xmlUtils.readDocument(is); if (resultDocument != null) { - + NodeList statisticSetNodes = xmlUtils.getNodeSetXPath(resultDocument, "/art:statistics/art:statistic"); resultValues = new ArrayList<ArtifactStatisticsSet> @@ -909,7 +909,7 @@ for (int i = 0; i < statisticSetNodes.getLength(); i++) { Element statisticSetNode = (Element)statisticSetNodes.item(i); String name = statisticSetNode.getAttribute("name"); - ArtifactStatisticsSet set = + ArtifactStatisticsSet set = new DefaultArtifactStatisticsSet(name); NodeList resultNodes = xmlUtils.getNodeSetXPath(statisticSetNode, "art:statistic-value"); @@ -953,14 +953,14 @@ try { this.initialize(); Iterator<String> it = artifactDatabases.iterator(); - Document requestBody = this.createMetaDataRequestBody(mapServices, - geometry, + Document requestBody = this.createMetaDataRequestBody(mapServices, + geometry, srs); while (it.hasNext()) { String server = it.next(); String url = server + "/service/metadata/"; log.debug(url); - + InputStream resultStream = this.doPostRequest(url, requestBody); resultValues = this.parseMetaDataResult(resultStream, server,geometry); } @@ -969,9 +969,9 @@ } return resultValues; } - + private Collection<ArtifactObject> parseMetaDataResult( - InputStream inputStream, + InputStream inputStream, String server, String geometry) throws ArtifactDatabaseClientException, ArtifactDatabaseInputException { @@ -980,7 +980,7 @@ this.check4ExceptionReport(document); return this.getArtifactFactories(document, server,geometry); } - + private Document createMetaDataRequestBody(Collection<MapService> mapServices, String geometry, String srs){ @@ -988,12 +988,12 @@ Document document = new XMLUtils().newDocument(); Node rootNode = this.createArtifactElement(document, "GetMetaData"); document.appendChild(rootNode); - + Element locationNode = this.createArtifactElement(document, "location"); locationNode.setAttribute("srs", srs); locationNode.appendChild(document.createTextNode(geometry)); rootNode.appendChild(locationNode); - + Element mapServicesNode = this.createArtifactElement(document, "mapservices"); Iterator<MapService> it = mapServices.iterator();
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/exception/ArtifactDatabaseClientException.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/exception/ArtifactDatabaseClientException.java Mon Mar 29 08:04:15 2010 +0000 @@ -5,7 +5,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class ArtifactDatabaseClientException extends Exception { @@ -23,7 +23,7 @@ /** * Constructor - * + * * @param arg0 */ public ArtifactDatabaseClientException(String arg0) { @@ -32,7 +32,7 @@ /** * Constructor - * + * * @param arg0 */ public ArtifactDatabaseClientException(Throwable arg0) { @@ -41,7 +41,7 @@ /** * Constructor - * + * * @param arg0 * @param arg1 */
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/exception/ArtifactDatabaseInputException.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/client/exception/ArtifactDatabaseInputException.java Mon Mar 29 08:04:15 2010 +0000 @@ -19,7 +19,7 @@ /** * Constructor - * + * * @param arg0 */ public ArtifactDatabaseInputException(String arg0) { @@ -28,7 +28,7 @@ /** * Constructor - * + * * @param arg0 */ public ArtifactDatabaseInputException(Throwable arg0) { @@ -37,7 +37,7 @@ /** * Constructor - * + * * @param arg0 * @param arg1 */
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/Artifact.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/Artifact.java Mon Mar 29 08:04:15 2010 +0000 @@ -10,7 +10,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class Artifact implements ArtifactObject, ArtifactDescription { @@ -19,7 +19,7 @@ * The UID of this Class */ private static final long serialVersionUID = 8606869493141810364L; - + private String id = null; private String hash = null; private boolean selected = false;
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactDescription.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactDescription.java Mon Mar 29 08:04:15 2010 +0000 @@ -11,7 +11,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public interface ArtifactDescription extends Serializable {
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactFactory.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactFactory.java Mon Mar 29 08:04:15 2010 +0000 @@ -5,7 +5,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class ArtifactFactory implements ArtifactObject { @@ -31,7 +31,7 @@ /** * Constructor - * + * * @param name * @param description * @param dataBaseUrl
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactObject.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactObject.java Mon Mar 29 08:04:15 2010 +0000 @@ -7,7 +7,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public interface ArtifactObject extends Serializable {
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactStatisticValue.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactStatisticValue.java Mon Mar 29 08:04:15 2010 +0000 @@ -7,7 +7,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public interface ArtifactStatisticValue extends Serializable {
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactStatisticsSet.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactStatisticsSet.java Mon Mar 29 08:04:15 2010 +0000 @@ -11,12 +11,12 @@ * */ public interface ArtifactStatisticsSet extends Serializable { - - + + String getName(); - + Collection<ArtifactStatisticValue> getStatisticValues(); - + void addStatisticValues(ArtifactStatisticValue value); }
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultArtifactStatisticValue.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultArtifactStatisticValue.java Mon Mar 29 08:04:15 2010 +0000 @@ -5,7 +5,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class DefaultArtifactStatisticValue implements ArtifactStatisticValue {
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultArtifactStatisticsSet.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultArtifactStatisticsSet.java Mon Mar 29 08:04:15 2010 +0000 @@ -18,8 +18,8 @@ private static final long serialVersionUID = 6738878381515708602L; private String name = null; - - private Collection<ArtifactStatisticValue> statisticValues = + + private Collection<ArtifactStatisticValue> statisticValues = new ArrayList<ArtifactStatisticValue>(); /** * Constructor
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultInputParameter.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultInputParameter.java Mon Mar 29 08:04:15 2010 +0000 @@ -5,7 +5,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class DefaultInputParameter implements InputParameter { @@ -20,7 +20,7 @@ /** * Constructor - * + * * @param name * @param values */
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputMode.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputMode.java Mon Mar 29 08:04:15 2010 +0000 @@ -8,7 +8,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class DefaultOutputMode implements OutputMode {
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputParameter.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputParameter.java Mon Mar 29 08:04:15 2010 +0000 @@ -5,7 +5,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class DefaultOutputParameter implements OutputParameter { @@ -24,7 +24,7 @@ /** * Constructor - * + * * @param name * @param value * @param description
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/InputParameter.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/InputParameter.java Mon Mar 29 08:04:15 2010 +0000 @@ -7,7 +7,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public interface InputParameter extends Serializable {
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/OutputMode.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/OutputMode.java Mon Mar 29 08:04:15 2010 +0000 @@ -8,7 +8,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public interface OutputMode extends Serializable{
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/OutputParameter.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/OutputParameter.java Mon Mar 29 08:04:15 2010 +0000 @@ -7,7 +7,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public interface OutputParameter extends Serializable{
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ParametrizedArtifactFactory.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ParametrizedArtifactFactory.java Mon Mar 29 08:04:15 2010 +0000 @@ -20,7 +20,7 @@ private static final long serialVersionUID = 4516368434861819032L; private Map<String, Collection<String>> parameters = null; - + /** * Constructor * @param name
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ParametrizedArtifactObject.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/ParametrizedArtifactObject.java Mon Mar 29 08:04:15 2010 +0000 @@ -11,14 +11,14 @@ * */ public interface ParametrizedArtifactObject extends ArtifactObject { - + /** * Returns the Parameters which could be used to manage (e.g. create) an * ArtifactObject. * @return */ Map<String, Collection<String>> getParameters(); - + void addParameters(String key, Collection<String> values); }
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/DefaultLayer.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/DefaultLayer.java Mon Mar 29 08:04:15 2010 +0000 @@ -8,13 +8,13 @@ */ public class DefaultLayer implements Layer { - + private String id = null; - + private String name = null; - + private boolean groupLayer = false; - + private String parentId = null; /** * Constructor @@ -56,7 +56,7 @@ public String parentID() { return this.parentId; } - + @Override public String toString() { return "ID: "+ this.id + " Name: "+this.name+
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/DefaultMapService.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/DefaultMapService.java Mon Mar 29 08:04:15 2010 +0000 @@ -12,18 +12,18 @@ public class DefaultMapService implements MapService { private String id = null; - + private Collection<Layer> layer = null; - + private String type = null; - + private String url = null; /** * Constructor */ - public DefaultMapService(String id, Collection<Layer> layer, + public DefaultMapService(String id, Collection<Layer> layer, String type, String url) { super(); this.id = id;
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/Layer.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/Layer.java Mon Mar 29 08:04:15 2010 +0000 @@ -7,7 +7,7 @@ * */ public interface Layer { - + String getName(); String getID(); boolean isGroupLayer();
--- a/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/MapService.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/artifactdatabase/objects/map/MapService.java Mon Mar 29 08:04:15 2010 +0000 @@ -10,14 +10,14 @@ * */ public interface MapService { - - + + String getID(); - + String getURL(); - + String getType(); - + Collection<Layer> getLayer(); }
--- a/gnv/src/main/java/de/intevation/gnv/propertiesreader/MapPropertiesReader.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/propertiesreader/MapPropertiesReader.java Mon Mar 29 08:04:15 2010 +0000 @@ -9,7 +9,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class MapPropertiesReader implements PropertiesReader { /**
--- a/gnv/src/main/java/de/intevation/gnv/propertiesreader/PropertiesReader.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/propertiesreader/PropertiesReader.java Mon Mar 29 08:04:15 2010 +0000 @@ -5,7 +5,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public interface PropertiesReader {
--- a/gnv/src/main/java/de/intevation/gnv/propertiesreader/PropertiesReaderFactory.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/propertiesreader/PropertiesReaderFactory.java Mon Mar 29 08:04:15 2010 +0000 @@ -11,7 +11,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class PropertiesReaderFactory { @@ -39,7 +39,7 @@ /** * This Method provides an singleton Instance of this Class. - * + * * @return an singleton Instance of this Class */ public static PropertiesReaderFactory getInstance() { @@ -51,7 +51,7 @@ /** * Getting the ConnectionPool - * + * * @return the ConnectionPool */ public PropertiesReader getPropertiesReader() { @@ -60,7 +60,7 @@ /** * Getting the ConnectionPool - * + * * @param config * The Config that should be read */
--- a/gnv/src/main/java/de/intevation/gnv/propertiesreader/ServletPropertiesReader.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/propertiesreader/ServletPropertiesReader.java Mon Mar 29 08:04:15 2010 +0000 @@ -13,7 +13,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class ServletPropertiesReader implements PropertiesReader {
--- a/gnv/src/main/java/de/intevation/gnv/util/XMLUtils.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/util/XMLUtils.java Mon Mar 29 08:04:15 2010 +0000 @@ -241,6 +241,6 @@ } return false; - } + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:
--- a/gnv/src/main/java/de/intevation/gnv/util/XSLTransformer.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/util/XSLTransformer.java Mon Mar 29 08:04:15 2010 +0000 @@ -28,7 +28,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class XSLTransformer { /**
--- a/gnv/src/test/java/de/intevation/gnv/action/mapviewer/parser/ExternalCallParserTestCase.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/test/java/de/intevation/gnv/action/mapviewer/parser/ExternalCallParserTestCase.java Mon Mar 29 08:04:15 2010 +0000 @@ -15,7 +15,7 @@ import de.intevation.gnv.artifactdatabase.objects.map.MapService; public class ExternalCallParserTestCase extends TestCase { - + /** * the logger, used to log exceptions and additonaly information */ @@ -25,7 +25,7 @@ BasicConfigurator.configure(); log = Logger.getLogger(ExternalCallParserTestCase.class); } - + public ExternalCallParserTestCase() { super(); } @@ -33,7 +33,7 @@ public ExternalCallParserTestCase(String name) { super(name); } - + public void testParseExternalCall() { log.debug("Execute testParseExternalCall"); try { @@ -54,7 +54,7 @@ Iterator<MapService> it = mapServices.iterator(); MapService mapService1 = it.next(); MapService mapService2 = it.next(); - + log.debug("MapService 1"); log.debug("ID: "+mapService1.getID()); log.debug("URL: "+mapService1.getURL()); @@ -66,7 +66,7 @@ while(layerIt1.hasNext()){ log.debug(layerIt1.next().toString()); } - + log.debug("MapService 2"); log.debug("ID: "+mapService2.getID()); log.debug("URL: "+mapService2.getURL()); @@ -78,12 +78,12 @@ while(layerIt2.hasNext()){ log.debug(layerIt2.next().toString()); } - + } catch (Exception e) { log.error(e,e); fail(); } - + } }
--- a/gnv/src/test/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClientTestCase.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/test/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClientTestCase.java Mon Mar 29 08:04:15 2010 +0000 @@ -21,7 +21,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class ArtifactDatabaseClientTestCase extends TestCase { @@ -37,7 +37,7 @@ /** * Constructor - * + * * @param namemessage */ public ArtifactDatabaseClientTestCase(String name) {
--- a/gnv/src/test/java/de/intevation/gnv/util/XSLTransformerTestCase.java Fri Mar 26 09:22:32 2010 +0000 +++ b/gnv/src/test/java/de/intevation/gnv/util/XSLTransformerTestCase.java Mon Mar 29 08:04:15 2010 +0000 @@ -17,7 +17,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class XSLTransformerTestCase extends TestCase {