diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/SoundingsSelect.java @ 9391:2da486c7c05f

salix historical sounding workflow changed
author gernotbelger
date Thu, 09 Aug 2018 17:25:13 +0200
parents f575ff573cbb
children ba3ad54edbae
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/SoundingsSelect.java	Thu Aug 09 15:22:31 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/SoundingsSelect.java	Thu Aug 09 17:25:13 2018 +0200
@@ -26,9 +26,9 @@
 import org.dive4elements.river.utils.RiverUtils;
 import org.w3c.dom.Element;
 
-public class SoundingsSelect extends DefaultState {
+public abstract class SoundingsSelect extends DefaultState {
 
-    public static final String SOUNDINGS = "soundings";
+    private static final String SOUNDINGS = "soundings";
 
     public static final String PREFIX_SINGLE = "single-";
 
@@ -36,12 +36,8 @@
     private static final Logger log = Logger.getLogger(SoundingsSelect.class);
 
     @Override
-    public String getUIProvider() {
-        return "parameter-matrix-sounding";
-    }
-
-    @Override
-    protected void appendItems(final Artifact artifact, final ElementCreator creator, final String name, final CallContext context, final Element select) {
+    protected final void appendItems(final Artifact artifact, final ElementCreator creator, final String name, final CallContext context,
+            final Element select) {
         try {
             creator.addAttr(select, "type", "multiattribute", true);
 
@@ -73,7 +69,7 @@
 
     }
 
-    protected KVP<String, String>[] getOptions(final Artifact artifact, final String parameterName, final CallContext context, final ElementCreator creator,
+    private KVP<String, String>[] getOptions(final Artifact artifact, final String parameterName, final CallContext context, final ElementCreator creator,
             final Element select) throws IllegalArgumentException {
         log.debug("Get options for parameter: '" + parameterName + "'");
 
@@ -94,7 +90,7 @@
         return kvp.toArray(new KVP[kvp.size()]);
     }
 
-    protected void appendSingles(final River river, final double kmLo, final double kmHi, final ElementCreator creator, final Element select,
+    private void appendSingles(final River river, final double kmLo, final double kmHi, final ElementCreator creator, final Element select,
             final CallContext context) {
         final List<BedHeight> singles = BedHeight.getBedHeights(river, kmLo, kmHi);
 
@@ -127,7 +123,7 @@
     }
 
     @Override
-    protected Element createStaticData(final D4EArtifact flys, final ElementCreator creator, final CallContext cc, final String name, final String value,
+    protected final Element createStaticData(final D4EArtifact flys, final ElementCreator creator, final CallContext cc, final String name, final String value,
             final String type) {
         final Element data = creator.create("data");
         creator.addAttr(data, "name", name, true);
@@ -147,7 +143,7 @@
         return data;
     }
 
-    protected String getLabelFor(final CallContext cc, final String parameterName, final String value) throws IllegalArgumentException {
+    private String getLabelFor(final CallContext cc, final String parameterName, final String value) throws IllegalArgumentException {
         if (!testParameterName(parameterName)) {
             throw new IllegalArgumentException("Invalid parameter for state: '" + parameterName + "'");
         }
@@ -158,7 +154,7 @@
         return value;
     }
 
-    protected String getLabelForSingle(final CallContext cc, final String value) {
+    private String getLabelForSingle(final CallContext cc, final String value) {
         final String id = value.replace(PREFIX_SINGLE, "");
         try {
             final BedHeight s = BedHeight.getBedHeightById(Integer.parseInt(id));
@@ -186,7 +182,7 @@
      * @return true, if parameterName is one of <i>MAIN_CHANNEL</i> or
      *         <i>TOTAL_CHANNEL</i>. Otherwise false.
      */
-    protected boolean testParameterName(final String parameterName) {
+    private boolean testParameterName(final String parameterName) {
         if (parameterName == null || parameterName.length() == 0) {
             return false;
         } else if (parameterName.equals(SOUNDINGS)) {

http://dive4elements.wald.intevation.org