Mercurial > dive4elements > river
changeset 1117:ea80e652f033
Reordered some parameters in a FLYSArtifact method.
flys-artifacts/trunk@2624 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Wed, 31 Aug 2011 12:44:07 +0000 |
| parents | 05e4ef0f9489 |
| children | 7398280b11a0 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DataFacet.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/ReportFacet.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WaterlevelFacet.java |
| diffstat | 5 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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 ) {
--- 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); }
--- 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(); }
--- 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();