Mercurial > dive4elements > river
changeset 4041:75a90d9d2024
Register new calculation mode 'extreme'.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Fri, 05 Oct 2012 10:11:08 +0200 |
| parents | 363445873737 |
| children | 8d88e8118ba8 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java flys-artifacts/src/main/resources/messages.properties flys-artifacts/src/main/resources/messages_de.properties flys-artifacts/src/main/resources/messages_de_DE.properties flys-artifacts/src/main/resources/messages_en.properties |
| diffstat | 6 files changed, 24 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Fri Oct 05 10:09:07 2012 +0200 +++ b/flys-artifacts/ChangeLog Fri Oct 05 10:11:08 2012 +0200 @@ -1,3 +1,15 @@ +2012-10-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + Register new calculation mode "extreme". + + * flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: + + * src/main/resources/messages.properties, + src/main/resources/messages_de.properties, + src/main/resources/messages_de_DE.properties, + src/main/resources/messages_en.properties: + i18n. + 2012-10-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> * flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/ExtremeAccess.java,
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java Fri Oct 05 10:09:07 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java Fri Oct 05 10:11:08 2012 +0200 @@ -58,6 +58,10 @@ public static final String CALCULATION_HISTORICAL_DISCHARGE_CURVE = "calc.historical.discharge.curve"; + /** Constant value for the extreme W curve calculation. */ + public static final String CALCULATION_EXTREME = + "calc.extreme.curve"; + /** An array that holds all available calculation modes. */ public static final String[] CALCULATIONS = { CALCULATION_SURFACE_CURVE, @@ -67,7 +71,8 @@ CALCULATION_DURATION_CURVE, CALCULATION_DISCHARGE_LONGITUDINAL_CURVE, CALCULATION_W_DIFFERENCES, - CALCULATION_REFERENCE_CURVE }; + CALCULATION_REFERENCE_CURVE, + CALCULATION_EXTREME}; /** Error message that is thrown if no mode has been chosen. */ @@ -84,6 +89,7 @@ } + /** Create choices (i18ned). */ @Override protected Element[] createItems( XMLUtils.ElementCreator cr, @@ -107,6 +113,7 @@ } + /** Validate the chosen calculation. */ @Override public boolean validate(Artifact artifact) throws IllegalArgumentException
--- a/flys-artifacts/src/main/resources/messages.properties Fri Oct 05 10:09:07 2012 +0200 +++ b/flys-artifacts/src/main/resources/messages.properties Fri Oct 05 10:11:08 2012 +0200 @@ -67,6 +67,7 @@ calc.w.differences = Differences calc.historical.discharge.curve = Historical Discharge Curve calc.reference.curve = Reference Curve +calc.extreme.curve = Extreme Curves calc.fixation.default = Fixingg calc.fixation.vollmer = Generative Waterlevel calc.bed.middle = Middle Bed Height
--- a/flys-artifacts/src/main/resources/messages_de.properties Fri Oct 05 10:09:07 2012 +0200 +++ b/flys-artifacts/src/main/resources/messages_de.properties Fri Oct 05 10:11:08 2012 +0200 @@ -67,6 +67,7 @@ calc.w.differences = Differenzen calc.historical.discharge.curve = Hist. Abflusskurven calc.reference.curve = Bezugslinie +calc.extreme.curve = Auslagerung extremer Wasserspiegellagen calc.fixation.default = Fixierungsanalyse calc.fixation.vollmer = Ausgelagerte Wasserspiegellage calc.bed.middle = Mittlere Sohlh\u00f6he
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties Fri Oct 05 10:09:07 2012 +0200 +++ b/flys-artifacts/src/main/resources/messages_de_DE.properties Fri Oct 05 10:11:08 2012 +0200 @@ -67,6 +67,7 @@ calc.w.differences = Differenzen calc.historical.discharge.curve = Hist. Abflusskurven calc.reference.curve = Bezugslinie +calc.extreme.curve = Auslagerung extremer Wasserspiegellagen calc.fixation.default = Fixierung calc.fixation.vollmer = Ausgelagerte Wasserspiegellage calc.bed.middle = Mittlere Sohlh\u00f6he
--- a/flys-artifacts/src/main/resources/messages_en.properties Fri Oct 05 10:09:07 2012 +0200 +++ b/flys-artifacts/src/main/resources/messages_en.properties Fri Oct 05 10:11:08 2012 +0200 @@ -67,6 +67,7 @@ calc.w.differences = Differences calc.historical.discharge.curve = Historical Discharge Curve calc.reference.curve = Reference Curve +calc.extreme.curve = Extreme Curves calc.fixation.default = Fixation calc.fixation.vollmer = Balanced Waterlevel calc.bed.middle = Middle Bed Height