diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DefaultState.java @ 697:b972eba2ed8a facets-slt

Removed ComputeCallback because this was thought too complicated. Fixed issue with facets not be re-generated if same state is entered again. flys-artifacts/branches/facets-slt@2143 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Fri, 17 Jun 2011 10:40:54 +0000
parents 06689035024c
children c09c9e05ecfa
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DefaultState.java	Fri Jun 17 09:19:43 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DefaultState.java	Fri Jun 17 10:40:54 2011 +0000
@@ -4,6 +4,7 @@
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
+import java.util.List;
 
 import org.apache.log4j.Logger;
 
@@ -19,11 +20,14 @@
 import de.intevation.artifacts.common.utils.XMLUtils;
 
 import de.intevation.artifactdatabase.ProtocolUtils;
+
 import de.intevation.artifactdatabase.data.StateData;
+
 import de.intevation.artifactdatabase.state.AbstractState;
+import de.intevation.artifactdatabase.state.Facet;
 
 import de.intevation.flys.artifacts.FLYSArtifact;
-import de.intevation.flys.artifacts.model.ComputeCallback;
+
 import de.intevation.flys.artifacts.resources.Resources;
 
 
@@ -35,6 +39,9 @@
     /** The logger that is used in this class.*/
     private static Logger logger = Logger.getLogger(DefaultState.class);
 
+    public static enum ComputeType {
+        FEED, ADVANCE
+    }
 
     protected StateData getData(FLYSArtifact artifact,  String name) {
         return artifact.getData(name);
@@ -257,10 +264,23 @@
         return null;
     }
 
+    public Object computeAdvance(
+        FLYSArtifact artifact,
+        String       hash,
+        CallContext  context, 
+        List<Facet>  facets, 
+        Object       old
+    ) {
+        return null;
+    }
 
-    public ComputeCallback createComputeCallback(
-        String hash, FLYSArtifact flys)
-    {
+    public Object computeFeed(
+        FLYSArtifact artifact,
+        String       hash,
+        CallContext  context,
+        List<Facet>  facets, 
+        Object       old
+    ) {
         return null;
     }
 }

http://dive4elements.wald.intevation.org