diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/CharDiameter.java @ 9390:f575ff573cbb

"Name der Peilung" columname minfo.
author gernotbelger
date Thu, 09 Aug 2018 15:22:31 +0200
parents e4606eae8ea5
children
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/CharDiameter.java	Thu Aug 09 12:03:30 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/CharDiameter.java	Thu Aug 09 15:22:31 2018 +0200
@@ -12,7 +12,6 @@
 import java.util.List;
 
 import org.apache.log4j.Logger;
-
 import org.dive4elements.artifacts.Artifact;
 import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.artifacts.CallMeta;
@@ -24,43 +23,28 @@
 
     private static final Logger log = Logger.getLogger(CharDiameter.class);
 
-    public static final String UI_PROVIDER = "parameter-matrix";
+    public static final String UI_PROVIDER = "parameter-matrix-char-diameter";
 
-    private static final String CHAR_DIAMETER_MIN  = "calc.bed.dmin";
-    private static final String CHAR_DIAMETER_MAX  = "calc.bed.dmax";
-    private static final String CHAR_DIAMETER_90  = "calc.bed.d90";
-    private static final String CHAR_DIAMETER_84  = "calc.bed.d84";
-    private static final String CHAR_DIAMETER_80  = "calc.bed.d80";
-    private static final String CHAR_DIAMETER_75  = "calc.bed.d75";
-    private static final String CHAR_DIAMETER_70  = "calc.bed.d70";
-    private static final String CHAR_DIAMETER_60  = "calc.bed.d60";
-    private static final String CHAR_DIAMETER_50  = "calc.bed.d50";
-    private static final String CHAR_DIAMETER_40  = "calc.bed.d40";
-    private static final String CHAR_DIAMETER_30  = "calc.bed.d30";
-    private static final String CHAR_DIAMETER_25  = "calc.bed.d25";
-    private static final String CHAR_DIAMETER_20  = "calc.bed.d20";
-    private static final String CHAR_DIAMETER_16  = "calc.bed.d16";
-    private static final String CHAR_DIAMETER_10  = "calc.bed.d10";
-    private static final String CHAR_DIAMETER_DM  = "calc.bed.dm";
+    private static final String CHAR_DIAMETER_MIN = "calc.bed.dmin";
+    private static final String CHAR_DIAMETER_MAX = "calc.bed.dmax";
+    private static final String CHAR_DIAMETER_90 = "calc.bed.d90";
+    private static final String CHAR_DIAMETER_84 = "calc.bed.d84";
+    private static final String CHAR_DIAMETER_80 = "calc.bed.d80";
+    private static final String CHAR_DIAMETER_75 = "calc.bed.d75";
+    private static final String CHAR_DIAMETER_70 = "calc.bed.d70";
+    private static final String CHAR_DIAMETER_60 = "calc.bed.d60";
+    private static final String CHAR_DIAMETER_50 = "calc.bed.d50";
+    private static final String CHAR_DIAMETER_40 = "calc.bed.d40";
+    private static final String CHAR_DIAMETER_30 = "calc.bed.d30";
+    private static final String CHAR_DIAMETER_25 = "calc.bed.d25";
+    private static final String CHAR_DIAMETER_20 = "calc.bed.d20";
+    private static final String CHAR_DIAMETER_16 = "calc.bed.d16";
+    private static final String CHAR_DIAMETER_10 = "calc.bed.d10";
+    private static final String CHAR_DIAMETER_DM = "calc.bed.dm";
 
-    public static final String[] CHAR_DIAMETER = {
-        CHAR_DIAMETER_DM,
-        CHAR_DIAMETER_10,
-        CHAR_DIAMETER_16,
-        CHAR_DIAMETER_20,
-        CHAR_DIAMETER_25,
-        CHAR_DIAMETER_30,
-        CHAR_DIAMETER_40,
-        CHAR_DIAMETER_50,
-        CHAR_DIAMETER_60,
-        CHAR_DIAMETER_70,
-        CHAR_DIAMETER_75,
-        CHAR_DIAMETER_80,
-        CHAR_DIAMETER_84,
-        CHAR_DIAMETER_90,
-        CHAR_DIAMETER_MAX,
-        CHAR_DIAMETER_MIN
-    };
+    public static final String[] CHAR_DIAMETER = { CHAR_DIAMETER_DM, CHAR_DIAMETER_10, CHAR_DIAMETER_16, CHAR_DIAMETER_20, CHAR_DIAMETER_25, CHAR_DIAMETER_30,
+            CHAR_DIAMETER_40, CHAR_DIAMETER_50, CHAR_DIAMETER_60, CHAR_DIAMETER_70, CHAR_DIAMETER_75, CHAR_DIAMETER_80, CHAR_DIAMETER_84, CHAR_DIAMETER_90,
+            CHAR_DIAMETER_MAX, CHAR_DIAMETER_MIN };
 
     @Override
     public String getUIProvider() {
@@ -68,29 +52,20 @@
     }
 
     @Override
-    protected KVP<String, String>[] getOptions(
-        Artifact artifact,
-        String parameterName,
-        CallContext context
-    )
-    throws IllegalArgumentException
-    {
-        CallMeta meta   = context.getMeta();
+    protected KVP<String, String>[] getOptions(final Artifact artifact, final String parameterName, final CallContext context) throws IllegalArgumentException {
+        final CallMeta meta = context.getMeta();
 
-        List<KVP<String, String>> rows = new ArrayList<KVP<String, String>>();
-        String key = parameterName;
-        for (int i = 0; i < CHAR_DIAMETER.length; ++i) {
-            String calc = CHAR_DIAMETER[i];
-            rows.add(new KVP (calc,
-                              Resources.getMsg(meta, calc, calc)));
+        final List<KVP<String, String>> rows = new ArrayList<>();
+        final String key = parameterName;
+        for (final String calc : CHAR_DIAMETER) {
+            rows.add(new KVP(calc, Resources.getMsg(meta, calc, calc)));
         }
 
         return rows.toArray(new KVP[rows.size()]);
     }
 
     @Override
-    protected String getLabelFor(CallContext cc, String parameterName,
-            String value) throws IllegalArgumentException {
+    protected String getLabelFor(final CallContext cc, final String parameterName, final String value) throws IllegalArgumentException {
 
         return Resources.getMsg(cc.getMeta(), value, value);
     }

http://dive4elements.wald.intevation.org