Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFacet.java @ 7357:9d3e44ab25f2
Refactoring: Move functionality of BedHeightAccess into BedHeightFacet for now.
Idea is that Artifact and Access are lightweight. Access access the 'data'
('parameterization') attached to artifact, not the data delivered by means of
artifact and its parameterization.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Wed, 16 Oct 2013 10:42:45 +0200 |
parents | a0078e5e3b39 |
children | 793dfb2f4b7b |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFacet.java Wed Oct 16 10:33:09 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFacet.java Wed Oct 16 10:42:45 2013 +0200 @@ -13,7 +13,11 @@ import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.access.BedHeightAccess; import org.dive4elements.river.artifacts.model.BlackboardDataFacet; +import org.dive4elements.river.artifacts.model.minfo.BedHeight; +import org.dive4elements.river.artifacts.model.minfo.BedHeightFactory; import org.dive4elements.river.artifacts.model.FacetTypes; +import org.dive4elements.river.model.BedHeightSingle; +import org.dive4elements.river.model.BedHeightSingleValue; public class BedHeightFacet extends BlackboardDataFacet @@ -40,10 +44,29 @@ public Object getData(Artifact artifact, CallContext context) { BedHeightAccess access = new BedHeightAccess((D4EArtifact)artifact); if (type.equals("singlevalues")) { - return access.getSingleValues(); + /* Former doc (from BedHeightAccess): + * Return a {@link List} of {@link BedHeightSingleValue}s + * at the range of the artifact + * @return List of {@link BedHeightSingleValue}s + */ + BedHeightSingle single = BedHeightSingle.getBedHeightSingleById( + access.getHeightId()); + return BedHeightSingleValue.getBedHeightSingleValues(single, + access.getFrom(), + access.getTo()); } - return access.getHeight(); + else { + /* Former doc (from BedHeightAccess): + * Return the {@link BedHeight} at the height_id and time of the artifact + * @return {@link BedHeight} + */ + return BedHeightFactory.getHeight( + access.getType(), + access.getHeightId(), + access.getTime()); + } } + /** * Create a deep copy of this Facet. * @return a deep copy.