--- 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();