diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferencesState.java @ 7919:868f55932fe6

Removed serverside path for bed height epochs.
author Raimund Renkert <rrenkert@intevation.de>
date Fri, 06 Jun 2014 16:59:16 +0200
parents d9791fa3c8ad
children 10debf4b82be
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferencesState.java	Fri Jun 06 16:47:48 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferencesState.java	Fri Jun 06 16:59:16 2014 +0200
@@ -25,9 +25,6 @@
 import org.dive4elements.river.artifacts.model.DataFacet;
 import org.dive4elements.river.artifacts.model.FacetTypes;
 import org.dive4elements.river.artifacts.model.minfo.BedDiffCalculation;
-import org.dive4elements.river.artifacts.model.minfo.BedDiffEpochFacet;
-import org.dive4elements.river.artifacts.model.minfo.BedDiffEpochFilterFacet;
-import org.dive4elements.river.artifacts.model.minfo.BedDiffEpochResult;
 import org.dive4elements.river.artifacts.model.minfo.BedDiffYearFacet;
 import org.dive4elements.river.artifacts.model.minfo.BedDiffYearFilterFacet;
 import org.dive4elements.river.artifacts.model.minfo.BedDiffYearResult;
@@ -47,7 +44,6 @@
     /** The logger used in this class. */
     private static Logger logger = Logger.getLogger(DifferencesState.class);
     public static final String I18N_DIFF_YEAR = "beddifference.year";
-    public static final String I18N_DIFF_EPOCH = "beddifference.epoch";
 
     public static final String I18N_FACET_BED_DIFF_YEAR = "facet.bedheight.diff.year";
     public static final String I18N_FACET_BED_DIFF_YEAR_RAW = "facet.bedheight.diff.year.raw";
@@ -56,8 +52,6 @@
     public static final String I18N_FACET_BED_DIFF_SOUNDING = "facet.bedheight.diff.sounding";
     public static final String I18N_FACET_BED_DIFF_MORPH1 = "facet.bedheight.diff.morph1";
     public static final String I18N_FACET_BED_DIFF_MORPH2 = "facet.bedheight.diff.morph2";
-    public static final String I18N_FACET_BED_DIFF_EPOCH = "facet.bedheight.diff.epoch";
-    public static final String I18N_FACET_BED_DIFF_EPOCH_RAW = "facet.bedheight.diff.epoch.raw";
     public static final String I18N_FACET_BED_DIFF_HEIGHT1 = "facet.bedheight.diff.height1";
     public static final String I18N_FACET_BED_DIFF_HEIGHT1_RAW = "facet.bedheight.diff.height1.raw";
     public static final String I18N_FACET_BED_DIFF_HEIGHT2 = "facet.bedheight.diff.height2";
@@ -224,72 +218,6 @@
                     stateId,
                     hash));
             }
-            if (results[idx] instanceof BedDiffEpochResult) {
-                newFacets.add(new BedDiffEpochFacet(
-                    idx,
-                    BED_DIFFERENCE_EPOCH,
-                    createBedDiffEpochDescription(
-                        meta,
-                        (BedDiffEpochResult)results[idx],
-                        true),
-                    ComputeType.ADVANCE,
-                    stateId,
-                    hash));
-                newFacets.add(new BedDiffEpochFacet(
-                    idx,
-                    BED_DIFFERENCE_EPOCH_HEIGHT1,
-                    createBedDiffHeightEpochDescription(
-                        meta,
-                        (BedDiffEpochResult)results[idx],
-                        0,
-                        true),
-                    ComputeType.ADVANCE,
-                    stateId,
-                    hash));
-                newFacets.add(new BedDiffEpochFacet(
-                    idx,
-                    BED_DIFFERENCE_EPOCH_HEIGHT2,
-                    createBedDiffHeightEpochDescription(
-                        meta,
-                        (BedDiffEpochResult)results[idx],
-                        1,
-                        true),
-                    ComputeType.ADVANCE,
-                    stateId,
-                    hash));
-                newFacets.add(new BedDiffEpochFilterFacet(
-                    idx,
-                    BED_DIFFERENCE_EPOCH_FILTERED,
-                    createBedDiffEpochDescription(
-                        meta,
-                        (BedDiffEpochResult)results[idx],
-                        false),
-                    ComputeType.ADVANCE,
-                    stateId,
-                    hash));
-                newFacets.add(new BedDiffEpochFilterFacet(
-                    idx,
-                    BED_DIFFERENCE_EPOCH_HEIGHT1_FILTERED,
-                    createBedDiffHeightEpochDescription(
-                        meta,
-                        (BedDiffEpochResult)results[idx],
-                        0,
-                        false),
-                    ComputeType.ADVANCE,
-                    stateId,
-                    hash));
-                newFacets.add(new BedDiffEpochFilterFacet(
-                    idx,
-                    BED_DIFFERENCE_EPOCH_HEIGHT2_FILTERED,
-                    createBedDiffHeightEpochDescription(
-                        meta,
-                        (BedDiffEpochResult)results[idx],
-                        1,
-                        false),
-                    ComputeType.ADVANCE,
-                    stateId,
-                    hash));
-            }
         }
     }
 
@@ -315,34 +243,6 @@
         }
     }
 
-    private String createBedDiffHeightEpochDescription(
-        CallMeta meta,
-        BedDiffEpochResult result,
-        int ndx,
-        boolean raw
-    ) {
-        DateFormat df = Formatter.getDateFormatter(meta, "yyyy");
-        String range =
-            df.format(result.getStart())
-            + " - " +
-            df.format(result.getEnd());
-
-        String i18nHeight1 = I18N_FACET_BED_DIFF_HEIGHT1;
-        String i18nHeight2 = I18N_FACET_BED_DIFF_HEIGHT2;
-        if (raw) {
-            i18nHeight1 = I18N_FACET_BED_DIFF_HEIGHT1_RAW;
-            i18nHeight2 = I18N_FACET_BED_DIFF_HEIGHT2_RAW;
-        }
-        if (ndx == 0) {
-            return Resources.getMsg(meta, i18nHeight1,
-                i18nHeight1, new Object[] { range });
-        }
-        else {
-            return Resources.getMsg(meta, i18nHeight2,
-                i18nHeight2, new Object[] {range});
-        }
-    }
-
     protected String createBedDiffYearDescription(
         CallMeta meta,
         BedDiffYearResult result,
@@ -389,23 +289,6 @@
         return Resources.getMsg(meta, i18n, i18n, new Object[] { range });
     }
 
-    protected String createBedDiffEpochDescription(
-        CallMeta meta,
-        BedDiffEpochResult result,
-        boolean raw) {
-        DateFormat df = Formatter.getDateFormatter(meta, "yyyy");
-        String range =
-            df.format(result.getStart())
-            + " - " +
-            df.format(result.getEnd());
-
-        String i18n = I18N_FACET_BED_DIFF_EPOCH;
-        if (raw) {
-            i18n = I18N_FACET_BED_DIFF_EPOCH_RAW;
-        }
-        return Resources.getMsg(meta, i18n, i18n, new Object[] { range });
-    }
-
     static {
         // Active/deactivate facets.
         FacetActivity.Registry.getInstance().register(
@@ -418,12 +301,7 @@
                     String   output
                 ) {
                     String name = facet.getName();
-                    if (name.equals(BED_DIFFERENCE_EPOCH) ||
-                        name.equals(BED_DIFFERENCE_EPOCH_HEIGHT1) ||
-                        name.equals(BED_DIFFERENCE_EPOCH_HEIGHT2) ||
-                        name.equals(BED_DIFFERENCE_EPOCH_HEIGHT1_FILTERED) ||
-                        name.equals(BED_DIFFERENCE_EPOCH_HEIGHT2_FILTERED) ||
-                        name.equals(BED_DIFFERENCE_HEIGHT_YEAR) ||
+                    if (name.equals(BED_DIFFERENCE_HEIGHT_YEAR) ||
                         name.equals(BED_DIFFERENCE_YEAR) ||
                         name.equals(BED_DIFFERENCE_YEAR_HEIGHT1) ||
                         name.equals(BED_DIFFERENCE_YEAR_HEIGHT2) ||
@@ -432,7 +310,6 @@
                         return Boolean.FALSE;
                     }
                     else if (name.equals(BED_DIFFERENCE_SOUNDING_WIDTH) ||
-                        name.equals(BED_DIFFERENCE_EPOCH_FILTERED) ||
                         name.equals(BED_DIFFERENCE_HEIGHT_YEAR_FILTERED) ||
                         name.equals(BED_DIFFERENCE_YEAR_FILTERED)) {
                         return Boolean.TRUE;

http://dive4elements.wald.intevation.org