diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightData.java @ 8295:9ab967eb2c51

At least since rev eb052d759fcc, there are no bed height epochs anymore.
author "Tom Gottfried <tom@intevation.de>"
date Thu, 18 Sep 2014 18:16:51 +0200
parents e4606eae8ea5
children 3a0522f1a532
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightData.java	Wed Sep 17 19:46:19 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightData.java	Thu Sep 18 18:16:51 2014 +0200
@@ -28,10 +28,8 @@
     private static final Logger log = Logger.getLogger(MiddleBedHeightData.class);
 
     public static final String I18N_SINGLE_NAME = "facet.bedheight_middle.single";
-    public static final String I18N_EPOCH_NAME  = "facet.bedheight_middle.epoch";
 
-    private int    startYear;
-    private int    endYear;
+    private int    year;
     private String evaluatedBy;
     private String description;
 
@@ -50,12 +48,11 @@
     private ArrayList empty;
 
 
-    protected MiddleBedHeightData(int start, int end, String eval, String desc,
+    protected MiddleBedHeightData(int year, int end, String eval, String desc,
         String curElevationModel, String oldElevationModel,
         String riverElevationModel, String type,
         String locationSystem, Integer soundingWidth) {
-        this.startYear   = start;
-        this.endYear     = end;
+        this.year   = year;
         this.evaluatedBy = eval;
         this.description = desc;
         this.curElevationModel = curElevationModel;
@@ -86,12 +83,8 @@
     }
 
 
-    public int getStartYear() {
-        return startYear;
-    }
-
-    public int getEndYear() {
-        return endYear;
+    public int getYear() {
+        return year;
     }
 
     public String getEvaluatedBy() {
@@ -214,22 +207,11 @@
 
 
     public String getSoundingName(CallContext context) {
-        if (getStartYear() == getEndYear()) {
-            return Resources.getMsg(
-                context.getMeta(),
-                I18N_SINGLE_NAME,
-                I18N_SINGLE_NAME,
-                new Object[] { getStartYear() }
-            );
-        }
-        else {
-            return Resources.getMsg(
-                context.getMeta(),
-                I18N_EPOCH_NAME,
-                I18N_EPOCH_NAME,
-                new Object[] { getStartYear(), getEndYear() }
-            );
-        }
+        return Resources.getMsg(
+            context.getMeta(),
+            I18N_SINGLE_NAME,
+            new Object[] { getYear() }
+        );
     }
 
     @Override

http://dive4elements.wald.intevation.org