diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/BedHeightsArtifact.java @ 4504:d7e1aee9d51e

Merged.
author Raimund Renkert <rrenkert@intevation.de>
date Wed, 14 Nov 2012 12:37:57 +0100
parents 5b0a545fceef
children b838d16c629e
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/BedHeightsArtifact.java	Wed Nov 14 12:36:30 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/BedHeightsArtifact.java	Wed Nov 14 12:37:57 2012 +0100
@@ -95,7 +95,7 @@
                     bedHName);
 
                 fs.add(bedHFacet);
-                facets.put(state.getID(), fs);
+                addFacets(state.getID(), fs);
             }
         }
 
@@ -111,47 +111,11 @@
     @Override
     protected List<State> getStates(Object context) {
         ArrayList<State> states = new ArrayList<State>();
-        states.add(getState());
+        states.add(state);
         return states;
     }
 
     /**
-     * Get the "current" state (there is but one).
-     * @param cc ignored.
-     * @return the "current" (only possible) state.
-     */
-    @Override
-    public State getCurrentState(Object cc) {
-        return getState();
-    }
-
-
-    /**
-     * Get the only possible state.
-     * @return the state.
-     */
-    protected State getState() {
-        return getState(null, null);
-    }
-
-
-    /**
-     * Get the state.
-     * @param context ignored.
-     * @param stateID ignored.
-     * @return the state.
-     */
-    @Override
-    protected State getState(Object context, String stateID) {
-        return (state != null)
-            ? state
-            : new StaticState(STATIC_STATE_NAME);
-    }
-
-    /**
-     * Get WKms from factory.
-     * @param idx param is not needed (TODO?)
-     * @return WKms according to parameterization (can be null);
      */
     public BedHeight getHeight() {
         return BedHeightFactory.getHeight(

http://dive4elements.wald.intevation.org