Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/ManualPointsSingleState.java @ 9425:3f49835a00c3
Extended CrossSectionFacet so it may fetch different data from within the artifact result.
Also allows to have acces to the potentially already computed artifact result via its normal computation cache.
| author | gernotbelger |
|---|---|
| date | Fri, 17 Aug 2018 15:31:02 +0200 |
| parents | 5e38e2924c07 |
| children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/ManualPointsSingleState.java Fri Aug 17 14:29:05 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/ManualPointsSingleState.java Fri Aug 17 15:31:02 2018 +0200 @@ -58,8 +58,9 @@ * * @return null. */ - public Object compute( + private Object compute( D4EArtifact artifact, + ComputeType type, String hash, CallMeta meta, List<Facet> facets @@ -101,17 +102,13 @@ String fName = ct + "." + MANUALLINE; log.debug("have facet: " + y + " / " + name + " -> " + fName); - CrossSectionWaterLineFacet facet = - new CrossSectionWaterLineFacet( - i, - fName, - name); + final CrossSectionWaterLineFacet facet = new CrossSectionWaterLineFacet( i, fName, name, type, hash, getID(), Integer.valueOf(i)); facets.add(facet); } } catch(JSONException e){ - log.error("Could not decode json."); + log.error("Could not decode json.", e); } } @@ -133,7 +130,7 @@ CallMeta meta, List<Facet> facets ) { - return compute(artifact, hash, meta, facets); + return compute(artifact, ComputeType.INIT, hash, meta, facets); } @@ -146,7 +143,7 @@ List<Facet> facets, Object old ) { - return compute(artifact, hash, context.getMeta(), facets); + return compute(artifact, ComputeType.FEED, hash, context.getMeta(), facets); } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :