Mercurial > dive4elements > river

changeset 2607:247f3e98a14b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Abjusted services to new hierachy. flys-artifacts/trunk@4189 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Tue, 03 Apr 2012 11:15:13 +0000
parents 619f6dfec901
children 938e2f6c0c9a
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/CacheInvalidationService.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/FLYSService.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java
diffstat 5 files changed, 21 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Fri Mar 30 09:38:29 2012 +0000
+++ b/flys-artifacts/ChangeLog	Tue Apr 03 11:15:13 2012 +0000
@@ -1,3 +1,13 @@
+2012-04-03	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/services/CacheInvalidationService.java,
+	  src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java,
+	  src/main/java/de/intevation/flys/artifacts/services/FLYSService.java:
+	  Derive from XMLService now.
+
+	* src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java:
+	  Removed superfluous import.
+
 2012-03-30  Ingo Weinzierl <ingo@intevation.de>
 
 	flys/issue460 (W-Differenzen: Frühere Berechnungen aus den Datenkorb werden doppelt geladen)
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java	Fri Mar 30 09:38:29 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java	Tue Apr 03 11:15:13 2012 +0000
@@ -4,7 +4,6 @@
 
 import de.intevation.artifactdatabase.data.StateData;
 
-import de.intevation.artifactdatabase.state.Facet;
 import de.intevation.artifactdatabase.state.Output;
 import de.intevation.artifactdatabase.state.State;
 import de.intevation.artifactdatabase.state.StateEngine;
@@ -898,7 +897,7 @@
             else {
                 for (double q: qs) {
                     wsOut.add(ws[i]);
-                    qsOut.add(q);
+                    qsOut.add(q * 100d);
                 }
             }
             generatedWs |= qs.length != 1;
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/CacheInvalidationService.java	Fri Mar 30 09:38:29 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/CacheInvalidationService.java	Tue Apr 03 11:15:13 2012 +0000
@@ -5,7 +5,7 @@
 
 import de.intevation.artifacts.common.utils.XMLUtils;
 
-import de.intevation.artifactdatabase.DefaultService;
+import de.intevation.artifactdatabase.XMLService;
 
 import de.intevation.flys.artifacts.cache.CacheFactory;
 
@@ -16,10 +16,10 @@
 import org.w3c.dom.NodeList;
 
 public class CacheInvalidationService 
-extends      DefaultService
+extends      XMLService
 {
     @Override
-    public Document process(
+    public Document processXML(
         Document      data,
         GlobalContext globalContext,
         CallMeta      callMeta
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/FLYSService.java	Fri Mar 30 09:38:29 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/FLYSService.java	Tue Apr 03 11:15:13 2012 +0000
@@ -9,18 +9,18 @@
 import de.intevation.artifacts.CallMeta;
 import de.intevation.artifacts.GlobalContext;
 
-import de.intevation.artifactdatabase.DefaultService;
+import de.intevation.artifactdatabase.XMLService;
 
 import de.intevation.flys.backend.SessionHolder;
 
 
-public abstract class FLYSService extends DefaultService {
+public abstract class FLYSService extends XMLService {
 
     private static final Logger logger = Logger.getLogger(FLYSService.class);
 
 
     @Override
-    public Document process(
+    public Document processXML(
         Document      data,
         GlobalContext globalContext,
         CallMeta      callMeta
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java	Fri Mar 30 09:38:29 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java	Tue Apr 03 11:15:13 2012 +0000
@@ -21,7 +21,7 @@
 import de.intevation.artifacts.common.utils.XMLUtils;
 import de.intevation.artifacts.common.utils.XMLUtils.ElementCreator;
 
-import de.intevation.artifactdatabase.DefaultService;
+import de.intevation.artifactdatabase.XMLService;
 
 import de.intevation.flys.model.River;
 
@@ -33,7 +33,7 @@
  *
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
-public class MapInfoService extends DefaultService {
+public class MapInfoService extends XMLService {
 
     /** XPath that points to the river.*/
     public static final String XPATH_RIVER = "/mapinfo/river/text()";
@@ -76,7 +76,8 @@
             null, variables);
     }
 
-    public Document process(
+    @Override
+    public Document processXML(
         Document      data,
         GlobalContext globalContext,
         CallMeta      callMeta
http://dive4elements.wald.intevation.org