Mercurial > dive4elements > river
changeset 1148:302461d5d071
Cosmetics.
flys-artifacts/trunk@2678 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Thu, 08 Sep 2011 11:29:04 +0000 |
| parents | e7d5452a7381 |
| children | 64b465699a24 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/WKmsOperation.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java |
| diffstat | 4 files changed, 21 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Thu Sep 08 11:24:27 2011 +0000 +++ b/flys-artifacts/ChangeLog Thu Sep 08 11:29:04 2011 +0000 @@ -1,3 +1,10 @@ +2011-09-08 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java, + src/main/java/de/intevation/flys/artifacts/math/WKmsOperation.java, + src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: + Cosmetics, docs. + 2011-09-08 Ingo Weinzierl <ingo@intevation.de> * src/main/java/de/intevation/flys/wsplgen/JobObserver.java: Small
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java Thu Sep 08 11:24:27 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java Thu Sep 08 11:29:04 2011 +0000 @@ -570,6 +570,7 @@ return new CalculationResult(data, new Calculation(msg)); } + /** * Returns the data computed by the discharge longitudinal section * computation.
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/WKmsOperation.java Thu Sep 08 11:24:27 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/WKmsOperation.java Thu Sep 08 11:29:04 2011 +0000 @@ -48,6 +48,10 @@ public abstract WKms operate(WKms a, WKms b); + /** + * Subtract two series from each other, interpolate values + * missing in one series in the other. + */ public static WKms subtract(WKms minuend, WKms subtrahend) { int M = minuend .size();
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java Thu Sep 08 11:24:27 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java Thu Sep 08 11:29:04 2011 +0000 @@ -21,30 +21,29 @@ */ public class CalculationSelect extends DefaultState { - /** The logger that is used in this class.*/ + /** The logger that is used in this class. */ private static Logger logger = Logger.getLogger(CalculationSelect.class); - public static final String FIELD_MODE = "calculation_mode"; - /** Constant value for the reference line calculation.*/ + /** Constant value for the reference line calculation. */ public static final String CALCULATION_SURFACE_CURVE = "calc.surface.curve"; - /** Constant value for the differences calculation.*/ + /** Constant value for the differences calculation. */ public static final String CALCULATION_DURATION_CURVE = "calc.duration.curve"; - /** Constant value for the flood map calculation.*/ + /** Constant value for the flood map calculation. */ public static final String CALCULATION_FLOOD_MAP = "calc.flood.map"; - /** Constant value for the profile calculation.*/ + /** Constant value for the profile calculation. */ public static final String CALCULATION_DISCHARGE_LONGITUDINAL_CURVE = "calc.discharge.longitudinal.section"; - /** Constant value for the state discharge curve calculation.*/ + /** Constant value for the state discharge curve calculation. */ public static final String CALCULATION_DISCHARGE_CURVE = "calc.discharge.curve"; @@ -57,12 +56,12 @@ CALCULATION_DISCHARGE_LONGITUDINAL_CURVE }; - /** Error message that is thrown if no mode has been chosen.*/ + /** Error message that is thrown if no mode has been chosen. */ public static final String ERROR_NO_CALCULATION_MODE = "error_feed_no_calculation_mode"; /** Error message that is thrown if an invalid calculation mode has been - * chosen.*/ + * chosen. */ public static final String ERROR_INVALID_CALCULATION_MODE = "error_feed_invalid_calculation_mode"; @@ -120,7 +119,7 @@ FLYSArtifact flys = (FLYSArtifact) artifact; StateData data = getData(flys, FIELD_MODE); - String calc = data != null ? (String) data.getValue() : null; + String calc = (data != null) ? (String) data.getValue() : null; if (calc == null) { throw new IllegalArgumentException(ERROR_NO_CALCULATION_MODE);