Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcFacet.java @ 9487:504f63512379
Sinfo collisions: calculation of multiple epochs, avoiding duplicate collision events in the details report
author | mschaefer |
---|---|
date | Tue, 18 Sep 2018 12:21:17 +0200 |
parents | 08f46ccd37ba |
children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcFacet.java Mon Sep 17 19:07:57 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalcFacet.java Tue Sep 18 12:21:17 2018 +0200 @@ -22,22 +22,22 @@ public class CollisionCalcFacet extends ResultFacet { private static final long serialVersionUID = 1; - private int year; + private String years; private CollisionCalcFacet() { super(); // required for clone operation deepCopy() } - public CollisionCalcFacet(final int facetIndex, final int resultIndex, final int year, final String name, final String description, + public CollisionCalcFacet(final int facetIndex, final int resultIndex, final String years, final String name, final String description, final String yAxisLabelKey, final ComputeType type, final String hash, final String stateId) { + super(facetIndex, resultIndex, name, description, yAxisLabelKey, type, stateId, hash); - - this.year = year; + this.years = years; } - public int getYear() { - return this.year; + public String getYears() { + return this.years; } /** Copy deeply. */ @@ -50,7 +50,7 @@ copy.type = this.type; copy.hash = this.hash; copy.stateId = this.stateId; - copy.year = this.year; + copy.years = this.years; return copy; } } \ No newline at end of file