Mercurial > dive4elements > river
changeset 7118:4605d6ca4ee9
Removed obsolete imports. Minor code cosmetics.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Tue, 24 Sep 2013 16:23:18 +0200 |
| parents | 3c7471b929d1 |
| children | 988dde49ae65 |
| files | artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator2.java artifacts/src/main/java/org/dive4elements/river/exports/process/WDiffProcessor.java |
| diffstat | 2 files changed, 6 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator2.java Tue Sep 24 12:29:44 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator2.java Tue Sep 24 16:23:18 2013 +0200 @@ -8,10 +8,6 @@ package org.dive4elements.river.exports; -import org.apache.log4j.Logger; -import org.jfree.chart.axis.NumberAxis; - - public class LongitudinalSectionGenerator2 extends DiagramGenerator { public static final String I18N_CHART_SHORT_SUBTITLE = @@ -20,22 +16,21 @@ public static final String I18N_CHART_LOCATION_SUBTITLE = "chart.longitudinal.section.locsubtitle"; - private static Logger logger = - Logger.getLogger(LongitudinalSectionGenerator.class); - @Override public String getDefaultChartSubtitle() { double[] dist = getRange(); - Object[] args = null; if (dist == null || dist.length != 2 || Double.isNaN(dist[0]) || Double.isNaN(dist[1])) { - args = new Object[] {getRiverName()}; + Object [] args = new Object[] {getRiverName()}; return msg(I18N_CHART_SHORT_SUBTITLE, "", args); - } else if (Math.abs(dist[0] - dist[1]) < 1E-5) { - args = new Object[] {getRiverName(), dist[1]}; + } + + if (Math.abs(dist[0] - dist[1]) < 1E-5) { + Object [] args = new Object[] {getRiverName(), dist[1]}; return msg(I18N_CHART_LOCATION_SUBTITLE, "", args); } + return super.getDefaultChartSubtitle(); } }
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/WDiffProcessor.java Tue Sep 24 12:29:44 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/WDiffProcessor.java Tue Sep 24 16:23:18 2013 +0200 @@ -8,10 +8,7 @@ package org.dive4elements.river.exports.process; -import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.river.artifacts.model.FacetTypes; -import org.dive4elements.river.artifacts.model.WKms; -import org.dive4elements.river.themes.ThemeDocument; import org.dive4elements.river.exports.DiagramGenerator; public class WDiffProcessor extends WOutProcessor {