diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixWaterlevelFacet.java @ 9495:bb278c927b66

Datenkorb bezugswasserstände längsschnitte + minor fixes
author gernotbelger
date Tue, 25 Sep 2018 16:43:51 +0200
parents b992c7f6b3ad
children
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixWaterlevelFacet.java	Mon Sep 24 18:01:10 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixWaterlevelFacet.java	Tue Sep 25 16:43:51 2018 +0200
@@ -9,51 +9,44 @@
 package org.dive4elements.river.artifacts.model.fixings;
 
 import org.dive4elements.artifactdatabase.state.Facet;
-
 import org.dive4elements.river.artifacts.model.CalculationResult;
 import org.dive4elements.river.artifacts.model.WQKms;
+import org.dive4elements.river.artifacts.model.WQKmsResult;
 import org.dive4elements.river.artifacts.model.WaterlevelFacet;
-
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
 
 /** Waterlevel from fix realize compute. */
-public class FixWaterlevelFacet
-extends      WaterlevelFacet
-{
+public class FixWaterlevelFacet extends WaterlevelFacet {
     public FixWaterlevelFacet() {
     }
 
-    public FixWaterlevelFacet(int index, String name, String description) {
+    public FixWaterlevelFacet(final int index, final String name, final String description) {
         super(index, name, description, ComputeType.ADVANCE, null, null);
     }
 
-    public FixWaterlevelFacet(
-        int         index,
-        String      name,
-        String      description,
-        ComputeType type,
-        String      hash,
-        String      stateID
-    ) {
+    public FixWaterlevelFacet(final int index, final String name, final String description, final ComputeType type, final String hash, final String stateID) {
         // Note that in super, hash and stateID are on switched positions.
         // on super.super it is this way around again.
         super(index, name, description, type, stateID, hash);
     }
 
     @Override
-    protected WQKms [] getWQKms(CalculationResult res) {
-        FixRealizingResult fr = (FixRealizingResult)res.getData();
-        return fr != null ? fr.getWQKms() : null;
+    protected WQKms[] getWQKms(final CalculationResult res) {
+        if (res.getData() instanceof WQKmsResult) {
+            final WQKmsResult fr = (WQKmsResult) res.getData();
+            return fr != null ? fr.getWQKms() : null;
+        }
+        return null;
     }
 
     /** Copy deeply. */
     @Override
     public Facet deepCopy() {
-        FixWaterlevelFacet copy = new FixWaterlevelFacet();
+        final FixWaterlevelFacet copy = new FixWaterlevelFacet();
         copy.set(this);
-        copy.type    = type;
-        copy.hash    = hash;
-        copy.stateId = stateId;
+        copy.type = this.type;
+        copy.hash = this.hash;
+        copy.stateId = this.stateId;
         return copy;
     }
 }

http://dive4elements.wald.intevation.org