Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcProcessor.java @ 9617:1d4262a68f1f
#12 Minuend/Subtrahend + MergeConflict #19 CollisionCalculation
author | dnt_bjoernsen <d.tironi@bjoernsen.de> |
---|---|
date | Thu, 10 Oct 2019 15:29:02 +0200 |
parents | 504f63512379 |
children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcProcessor.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcProcessor.java Thu Oct 10 15:29:02 2019 +0200 @@ -69,15 +69,15 @@ } public static final Facet createFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result, - final int resultIndex, final int year, final int themeCount) { + final int resultIndex, final int themeCount, final int rangeIndex) { // REMARK: we are using themeCount as facet index, because we get several lines (with the same facet name) for the same // result index; however name and index are used on client side as unique id. final CollisionCalcOverviewResult ccoResult = (CollisionCalcOverviewResult) result; - final String years = CollisionCalculation.yearsToString(ccoResult.getIsEpochs(), ccoResult.getYears().get(themeCount)); + final String years = CollisionCalculation.yearsToString(ccoResult.getIsEpochs(), ccoResult.getYears().get(rangeIndex)); final String facetDescription = Resources.getMsg(context.getMeta(), I18N_SERIES_NAME_PATTERN, I18N_SERIES_NAME_PATTERN, years); - return new CollisionCalcFacet(themeCount, resultIndex, years, COLLISION_FACETS[themeCount % 3], facetDescription, I18N_AXIS_LABEL, - ComputeType.ADVANCE, hash, id); + return new CollisionCalcFacet(themeCount, resultIndex, years, COLLISION_FACETS[themeCount % 3], facetDescription, I18N_AXIS_LABEL, ComputeType.ADVANCE, + hash, id); } } \ No newline at end of file