dive4elements/river: artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionAccess.java comparison

Changed to list of DateRange, added methods in DateRange to support year ranges

comparison

equal deleted inserted replaced

-:cd24db77f044
+:9b4f5e61c02e
 * documentation coming with Dive4Elements River for details.
 */
 package org.dive4elements.river.artifacts.sinfo.collision;
+import java.util.Arrays;
+import java.util.List;
 import org.dive4elements.river.artifacts.access.RangeAccess;
 import org.dive4elements.river.artifacts.common.EpochYearAccessHelper;
+import org.dive4elements.river.artifacts.model.DateRange;
 import org.dive4elements.river.artifacts.sinfo.SINFOArtifact;
 import org.dive4elements.river.artifacts.sinfo.SinfoCalcMode;
 /**
 * Access to the flow depth calculation type specific SInfo artifact data.
 public int[] getYears() {
 return this.helper.getYears("state.sinfo.year", "years");
 }
-public int[][] getEpochs() {
+public List<DateRange> getEpochs() {
 return this.helper.getEpochs("state.sinfo.epoch", "epochs");
 }
+/**
+* String expression of the years or epoches collection, resp.
+*/
+public String getYearsHeader() {
+if (getYears() != null) {
+final String ys = Arrays.toString(getYears());
+return ys.substring(1, ys.length() - 1);
+}
+else {
+String ys = "";
+String sep = "";
+for (final DateRange dr : getEpochs()) {
+ys += String.format("%s%d-%d", sep, dr.getFromYear(), dr.getToYear());
+sep = ", ";
+}
+return ys;
+}
+}
 }

Mercurial > dive4elements > river