# HG changeset patch # User Ingo Weinzierl # Date 1301392446 0 # Node ID b5c99532f898297730a6ed8c9bbee8b8b890d418 # Parent d03b8bbeb853220dbd7b9018d888688d31e6f400 Adapted the available calculation modes of WINFO and its order in the DESCRIBE document. flys-artifacts/trunk@1602 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r d03b8bbeb853 -r b5c99532f898 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Mon Mar 28 16:58:17 2011 +0000 +++ b/flys-artifacts/ChangeLog Tue Mar 29 09:54:06 2011 +0000 @@ -1,3 +1,15 @@ +2011-03-29 Ingo Weinzierl + + * src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java: + Modified the available calculation modes and its order in the DESCRIBE + document. + + * src/main/resources/messages.properties, + src/main/resources/messages_de_DE.properties, + src/main/resources/messages_en.properties, + src/main/resources/messages_de.properties: Adapted the names of + calculation modes. + 2011-03-28 Ingo Weinzierl * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: diff -r d03b8bbeb853 -r b5c99532f898 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java Mon Mar 28 16:58:17 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/CalculationSelect.java Tue Mar 29 09:54:06 2011 +0000 @@ -23,32 +23,32 @@ /** Constant value for the reference line calculation.*/ - public static final String CALCULATION_REFERENCE_LINE = - "calc.reference.line"; + public static final String CALCULATION_SURFACE_CURVE = + "calc.surface.curve"; /** Constant value for the differences calculation.*/ - public static final String CALCULATION_DIFFERENCES = - "calc.differences"; + public static final String CALCULATION_DURATION_CURVE = + "calc.duration.curve"; /** Constant value for the flood map calculation.*/ public static final String CALCULATION_FLOOD_MAP = "calc.flood.map"; /** Constant value for the profile calculation.*/ - public static final String CALCULATION_PROFILE = - "calc.profile"; + public static final String CALCULATION_DISCHARGE_LONGITUDINAL_CURVE = + "calc.discharge.longitudinal.section"; /** Constant value for the state discharge curve calculation.*/ - public static final String CALCULATION_STATE_DISCHARGE_CURVE = - "calc.state.discharge.curve"; + public static final String CALCULATION_DISCHARGE_CURVE = + "calc.discharge.curve"; /** An array that holds all available calculation modes.*/ public static final String[] CALCULATIONS = { - CALCULATION_REFERENCE_LINE, - CALCULATION_DIFFERENCES, + CALCULATION_SURFACE_CURVE, CALCULATION_FLOOD_MAP, - CALCULATION_PROFILE, - CALCULATION_STATE_DISCHARGE_CURVE }; + CALCULATION_DISCHARGE_CURVE, + CALCULATION_DURATION_CURVE, + CALCULATION_DISCHARGE_LONGITUDINAL_CURVE }; protected Element[] createItems( diff -r d03b8bbeb853 -r b5c99532f898 flys-artifacts/src/main/resources/messages.properties --- a/flys-artifacts/src/main/resources/messages.properties Mon Mar 28 16:58:17 2011 +0000 +++ b/flys-artifacts/src/main/resources/messages.properties Tue Mar 29 09:54:06 2011 +0000 @@ -3,11 +3,11 @@ state.winfo.location_distance = Location or distance selection state.winfo.wq = Input for W/Q data -calc.reference.line = Reference Line -calc.differences = Differences -calc.flood.map = Flood Map -calc.profile = Profile -calc.state.discharge.curve = State Discharge Curve +calc.surface.curve = Water Level/Surface Curve +calc.flood.map = Flood Plain +calc.discharge.curve = State Discharge Curve/Stage Discharge Relation +calc.duration.curve = Duration Curve +calc.discharge.longitudinal.section = TODO (W bei...) river = River calculation_mode = Calculation Mode diff -r d03b8bbeb853 -r b5c99532f898 flys-artifacts/src/main/resources/messages_de.properties --- a/flys-artifacts/src/main/resources/messages_de.properties Mon Mar 28 16:58:17 2011 +0000 +++ b/flys-artifacts/src/main/resources/messages_de.properties Tue Mar 29 09:54:06 2011 +0000 @@ -3,11 +3,11 @@ state.winfo.location_distance = Wahl des Berechnungsortes/strecke state.winfo.wq = Eingabe f\u00fcr W/Q Daten -calc.reference.line = Bezugslinie -calc.differences = Differenzen -calc.flood.map = \u00dcberschwemmungskarte -calc.profile = Steckbrief -calc.state.discharge.curve = Abflusskurve +calc.surface.curve = Wasserstand/Wasserspiegellage +calc.flood.map = \u00dcberschwemmungsfl\u00e4che +calc.discharge.curve = Abflusskurve/Abflusstafel +calc.duration.curve = Dauerlinie +calc.discharge.longitudinal.section = W bei ungleichm\u00e4\u00dfigem Abflussl\u00e4ngsschnitt river = Fluss calculation_mode = Berechnungsart diff -r d03b8bbeb853 -r b5c99532f898 flys-artifacts/src/main/resources/messages_de_DE.properties --- a/flys-artifacts/src/main/resources/messages_de_DE.properties Mon Mar 28 16:58:17 2011 +0000 +++ b/flys-artifacts/src/main/resources/messages_de_DE.properties Tue Mar 29 09:54:06 2011 +0000 @@ -3,11 +3,11 @@ state.winfo.location_distance = Wahl des Berechnungsortes/strecke state.winfo.wq = Eingabe f\u00fcr W/Q Daten -calc.reference.line = Bezugslinie -calc.differences = Differenzen -calc.flood.map = \u00dcberschwemmungskarte -calc.profile = Steckbrief -calc.state.discharge.curve = Abflusskurve +calc.surface.curve = Wasserstand/Wasserspiegellage +calc.flood.map = \u00dcberschwemmungsfl\u00e4che +calc.discharge.curve = Abflusskurve/Abflusstafel +calc.duration.curve = Dauerlinie +calc.discharge.longitudinal.section = W bei ungleichm\u00e4\u00dfigem Abflussl\u00e4ngsschnitt river = Fluss calculation_mode = Berechnungsart diff -r d03b8bbeb853 -r b5c99532f898 flys-artifacts/src/main/resources/messages_en.properties --- a/flys-artifacts/src/main/resources/messages_en.properties Mon Mar 28 16:58:17 2011 +0000 +++ b/flys-artifacts/src/main/resources/messages_en.properties Tue Mar 29 09:54:06 2011 +0000 @@ -3,11 +3,11 @@ state.winfo.location_distance = Location or distance selection state.winfo.wq = Input for W/Q data -calc.reference.line = Reference Line -calc.differences = Differences -calc.flood.map = Flood Map -calc.profile = Profile -calc.state.discharge.curve = State Discharge Curve +calc.surface.curve = Water Level/Surface Curve +calc.flood.map = Flood Plain +calc.discharge.curve = State Discharge Curve/Stage Discharge Relation +calc.duration.curve = Duration Curve +calc.discharge.longitudinal.section = TODO (W bei...) river = River calculation_mode = Calculation Mode