# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1314794647 0
# Node ID ea80e652f033cb3ddc1ba5cc468c9671b755e1c7
# Parent  05e4ef0f94895d8d124f7387ed20b9527fd4a7ad
Reordered some parameters in a FLYSArtifact method.

flys-artifacts/trunk@2624 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 05e4ef0f9489 -r ea80e652f033 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Wed Aug 31 12:23:05 2011 +0000
+++ b/flys-artifacts/ChangeLog	Wed Aug 31 12:44:07 2011 +0000
@@ -1,3 +1,14 @@
+2011-08-31  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Changed
+	  the parameter order of a compute(...) method. This makes me able to call
+	  this without a hash value.
+
+	* src/main/java/de/intevation/flys/artifacts/model/DataFacet.java,
+	  src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java,
+	  src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java:
+	  Adapted the parameter order of the compute() call (see above).
+
 2011-08-31  Felix Wolfsteller <felix.wolfsteller@intevation.de>
 
 	More bones to CrossSection sceleton.
diff -r 05e4ef0f9489 -r ea80e652f033 flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java	Wed Aug 31 12:23:05 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java	Wed Aug 31 12:44:07 2011 +0000
@@ -812,8 +812,8 @@
 
     public Object compute(
         CallContext context,
+        String      hash,
         String      stateID,
-        String      hash,
         ComputeType type,
         boolean     generateFacets
     ) {
diff -r 05e4ef0f9489 -r ea80e652f033 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DataFacet.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DataFacet.java	Wed Aug 31 12:23:05 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DataFacet.java	Wed Aug 31 12:44:07 2011 +0000
@@ -59,7 +59,7 @@
         String    theHash = (hash != null) ? hash : flys.hash();
 
         return stateId != null && stateId.length() > 0
-            ? flys.compute(context, stateId, theHash, type, false)
+            ? flys.compute(context, theHash, stateId, type, false)
             : flys.compute(context, theHash, type, false);
     }
 
diff -r 05e4ef0f9489 -r ea80e652f033 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java	Wed Aug 31 12:23:05 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java	Wed Aug 31 12:44:07 2011 +0000
@@ -46,7 +46,7 @@
         WINFOArtifact winfo = (WINFOArtifact)artifact;
 
         CalculationResult cr = (CalculationResult)winfo.compute(
-            context, stateId, hash, type, false);
+            context, hash, stateId, type, false);
 
         return cr.getReport();
     }
diff -r 05e4ef0f9489 -r ea80e652f033 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java	Wed Aug 31 12:23:05 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java	Wed Aug 31 12:44:07 2011 +0000
@@ -48,7 +48,7 @@
         WINFOArtifact winfo = (WINFOArtifact)artifact;
 
         CalculationResult res = (CalculationResult)
-            winfo.compute(context, stateID, hash, type, false);
+            winfo.compute(context, hash, stateID, type, false);
 
         WQKms [] wqkms = (WQKms [])res.getData();