Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/EventSelect.java @ 9415:9744ce3c3853
Rework of fixanalysis computation and dWt and WQ facets. Got rid of strange remapping and bitshifting code by explicitely saving the column information and using it in the facets.
The facets also put the valid station range into their xml-metadata
| author | gernotbelger |
|---|---|
| date | Thu, 16 Aug 2018 16:27:53 +0200 |
| parents | c7e5285d434f |
| children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/EventSelect.java Thu Aug 16 15:47:10 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/EventSelect.java Thu Aug 16 16:27:53 2018 +0200 @@ -14,10 +14,10 @@ import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.common.utils.XMLUtils.ElementCreator; import org.dive4elements.river.artifacts.D4EArtifact; -import org.dive4elements.river.artifacts.model.FixingsOverview; -import org.dive4elements.river.artifacts.model.FixingsOverview.Fixing; -import org.dive4elements.river.artifacts.model.FixingsOverview.IdFilter; -import org.dive4elements.river.artifacts.model.FixingsOverviewFactory; +import org.dive4elements.river.artifacts.model.fixings.FixingColumn; +import org.dive4elements.river.artifacts.model.fixings.FixingsOverview; +import org.dive4elements.river.artifacts.model.fixings.FixingsOverviewFactory; +import org.dive4elements.river.artifacts.model.fixings.FixingsOverview.IdFilter; import org.dive4elements.river.artifacts.states.DefaultState; import org.dive4elements.river.utils.RiverUtils; import org.w3c.dom.Element; @@ -73,7 +73,7 @@ log.debug("Create label for value: " + value); final IdFilter filter = new IdFilter(value); - final List<Fixing.Column> columns = overview.filter(null, filter); + final List<FixingColumn> columns = overview.filter(null, filter); return columns.isEmpty() ? "" : columns.get(0).getDescription(); } }