diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/DischargeLongitudinalSection.java @ 9479:2b83d3a96703

i18n TODO "benutzerdefiniert" = "custom" fixed
author gernotbelger
date Mon, 10 Sep 2018 15:31:55 +0200
parents 3f49835a00c3
children
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DischargeLongitudinalSection.java	Mon Sep 10 14:21:36 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DischargeLongitudinalSection.java	Mon Sep 10 15:31:55 2018 +0200
@@ -8,17 +8,16 @@
 
 package org.dive4elements.river.artifacts.states;
 
+import java.util.List;
+
+import org.apache.log4j.Logger;
 import org.dive4elements.artifactdatabase.state.Facet;
 import org.dive4elements.artifactdatabase.state.FacetActivity;
-
 import org.dive4elements.artifacts.Artifact;
 import org.dive4elements.artifacts.CallContext;
-
 import org.dive4elements.river.artifacts.ChartArtifact;
 import org.dive4elements.river.artifacts.D4EArtifact;
-
 import org.dive4elements.river.artifacts.access.Calculation4Access;
-
 import org.dive4elements.river.artifacts.model.Calculation4;
 import org.dive4elements.river.artifacts.model.CalculationResult;
 import org.dive4elements.river.artifacts.model.ConstantWQKms;
@@ -30,62 +29,41 @@
 import org.dive4elements.river.artifacts.model.WQCKms;
 import org.dive4elements.river.artifacts.model.WQKms;
 import org.dive4elements.river.artifacts.model.WaterlevelFacet;
-
-import java.util.List;
-
-import org.apache.log4j.Logger;
+import org.dive4elements.river.artifacts.resources.Resources;
 
-public class DischargeLongitudinalSection
-extends      DefaultState
-implements   FacetTypes
-{
-    private static Logger log =
-        Logger.getLogger(DischargeLongitudinalSection.class);
+public class DischargeLongitudinalSection extends DefaultState implements FacetTypes {
+    private static Logger log = Logger.getLogger(DischargeLongitudinalSection.class);
 
     static {
         // Active/deactivate facets.
-        FacetActivity.Registry.getInstance().register(
-            "winfo",
-            new FacetActivity() {
-                @Override
-                public Boolean isInitialActive(
-                    Artifact artifact,
-                    Facet    facet,
-                    String   output
-                ) {
-                    String name = facet.getName();
-                    if (name.equals(DISCHARGE_LONGITUDINAL_Q_INFOLD_CUT)) {
-                        return Boolean.FALSE;
-                    }
-                    return Boolean.TRUE;
+        FacetActivity.Registry.getInstance().register("winfo", new FacetActivity() {
+            @Override
+            public Boolean isInitialActive(final Artifact artifact, final Facet facet, final String output) {
+                final String name = facet.getName();
+                if (name.equals(DISCHARGE_LONGITUDINAL_Q_INFOLD_CUT)) {
+                    return Boolean.FALSE;
                 }
-            });
+                return Boolean.TRUE;
+            }
+        });
     }
 
     @Override
-    public Object computeAdvance(
-        D4EArtifact artifact,
-        String       hash,
-        CallContext  context,
-        List<Facet>  facets,
-        Object       old
-    ) {
+    public Object computeAdvance(final D4EArtifact artifact, final String hash, final CallContext context, final List<Facet> facets, final Object old) {
         if (artifact instanceof ChartArtifact) {
             facets.add(new EmptyFacet());
             return null;
         }
 
-        Calculation4Access access = new Calculation4Access(artifact);
+        final Calculation4Access access = new Calculation4Access(artifact);
 
-        CalculationResult res = old instanceof CalculationResult
-            ? (CalculationResult)old
-            : new Calculation4(access).calculate();
+        final CalculationResult res = old instanceof CalculationResult ? (CalculationResult) old : new Calculation4(access).calculate(context.getMeta());
 
         if (facets == null) {
             return res;
         }
 
-        WQKms [] wqkms = (WQKms [])res.getData();
+        final WQKms[] wqkms = (WQKms[]) res.getData();
 
         for (int i = 0; i < wqkms.length; i++) {
             String nameW = null;
@@ -94,8 +72,7 @@
             if (access.isQ()) {
                 nameQ = wqkms[i].getName();
                 nameW = "W(" + nameQ + ")";
-            }
-            else {
+            } else {
                 nameW = wqkms[i].getName();
                 nameQ = "Q(" + nameW + ")";
             }
@@ -104,43 +81,35 @@
             // for Q only curves.
             if (!(wqkms[i] instanceof ConstantWQKms)) {
 
-                Facet w = new WaterlevelFacet(
-                    i, DISCHARGE_LONGITUDINAL_W, nameW);
+                final Facet w = new WaterlevelFacet(i, DISCHARGE_LONGITUDINAL_W, nameW);
 
-                Facet s = new CrossSectionWaterLineFacet(i, nameW, ComputeType.ADVANCE, hash, getID(), Integer.valueOf(i));
+                final Facet s = new CrossSectionWaterLineFacet(i, nameW, ComputeType.ADVANCE, hash, getID(), Integer.valueOf(i));
 
-                Facet q = new WaterlevelFacet(
-                    i, DISCHARGE_LONGITUDINAL_Q, nameQ);
+                final Facet q = new WaterlevelFacet(i, DISCHARGE_LONGITUDINAL_Q, nameQ);
                 facets.add(s);
                 facets.add(w);
                 facets.add(q);
-            }
-            else {
+            } else {
                 Facet q;
                 if (nameQ.contains("geschnitten")) {
-                    q = new WaterlevelFacet(
-                        i, DISCHARGE_LONGITUDINAL_Q_INFOLD_CUT, nameQ);
-                }
-                else {
-                    q = new WaterlevelFacet(
-                        i, DISCHARGE_LONGITUDINAL_Q_INFOLD, nameQ);
+                    q = new WaterlevelFacet(i, DISCHARGE_LONGITUDINAL_Q_INFOLD_CUT, nameQ);
+                } else {
+                    q = new WaterlevelFacet(i, DISCHARGE_LONGITUDINAL_Q_INFOLD, nameQ);
                 }
                 facets.add(q);
             }
 
+            final String custom = Resources.getMsg(context.getMeta(), "common.custom");
             if (wqkms[i] instanceof WQCKms) {
                 // TODO DO i18n
 
-                String nameC = nameW.replace(
-                    "benutzerdefiniert",
-                    "benutzerdefiniert [korrigiert]");
+                final String nameC = nameW.replace(custom, Resources.getMsg(context.getMeta(), "custom.corrected"));
 
-                Facet c = new WaterlevelFacet(
-                    i, DISCHARGE_LONGITUDINAL_C, nameC);
+                final Facet c = new WaterlevelFacet(i, DISCHARGE_LONGITUDINAL_C, nameC);
 
                 // Here, avoid index clash with Facet "s" above and
                 // signal the WINFO later that we want to access Cs.
-                Facet r = new CrossSectionWaterLineFacet(i + 1, nameC, ComputeType.ADVANCE, hash, getID(), Integer.valueOf(i + 1));
+                final Facet r = new CrossSectionWaterLineFacet(i + 1, nameC, ComputeType.ADVANCE, hash, getID(), Integer.valueOf(i + 1));
 
                 facets.add(c);
                 facets.add(r);

http://dive4elements.wald.intevation.org