Mercurial > dive4elements > river
changeset 1848:3918bd7eb4e1
Cosmetics, removed duplicate code.
flys-artifacts/trunk@3192 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 09 Nov 2011 12:55:13 +0000 |
| parents | 8e5b4ea2851c |
| children | 5d5dd44d613e |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java |
| diffstat | 2 files changed, 9 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Wed Nov 09 12:48:36 2011 +0000 +++ b/flys-artifacts/ChangeLog Wed Nov 09 12:55:13 2011 +0000 @@ -1,3 +1,8 @@ +2011-11-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: + Removed duplicate code. + 2011-11-09 Felix Wolfsteller <felix.wolfsteller@intevation.de> * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java Wed Nov 09 12:48:36 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java Wed Nov 09 12:55:13 2011 +0000 @@ -126,15 +126,11 @@ visible); } else if (name.equals(COMPUTED_DISCHARGE_MAINVALUES_Q) - || name.equals(MAINVALUES_Q)) - { - doMainValueQAnnotations( - nativeFacet.getData(artifact, context), facet, theme, visible); - } - else if (name.equals(COMPUTED_DISCHARGE_MAINVALUES_W) + || name.equals(MAINVALUES_Q) + || name.equals(COMPUTED_DISCHARGE_MAINVALUES_W) || name.equals(MAINVALUES_W)) { - doMainValueWAnnotations( + doMainValueAnnotations( nativeFacet.getData(artifact, context), facet, theme, visible); } else { @@ -184,7 +180,7 @@ /** * Store W MainValues as annotations for later plotting. */ - protected void doMainValueWAnnotations( + protected void doMainValueAnnotations( Object o, Facet facet, Document theme, @@ -197,26 +193,5 @@ fa.setLabel(facet.getDescription()); addAnnotations(fa, visible); } - - - /** - * Store Q MainValues as annotations for later plotting. - */ - protected void doMainValueQAnnotations( - Object o, - Facet facet, - Document theme, - boolean visible - ) { - logger.debug("ComputedDischargeCurveGenerator set Q MainValues."); - - FLYSAnnotation fa = (FLYSAnnotation) o; - fa.setTheme(theme); - fa.setLabel(facet.getDescription()); - addAnnotations(fa, visible); - } - - - } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :