Mercurial > dive4elements > river
changeset 8357:24d044866c2a
merged.
author | Raimund Renkert <rrenkert@intevation.de> |
---|---|
date | Wed, 01 Oct 2014 13:42:19 +0200 |
parents | e15d2fc7aab4 (current diff) 0d3d018fc632 (diff) |
children | 011e2290e801 |
files | artifacts/doc/conf/generators/discharge-diagrams.xml |
diffstat | 3 files changed, 1 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/generators/discharge-diagrams.xml Wed Oct 01 13:41:38 2014 +0200 +++ b/artifacts/doc/conf/generators/discharge-diagrams.xml Wed Oct 01 13:42:19 2014 +0200 @@ -4,7 +4,7 @@ <output-generator names="historical_discharge_wq,historical_discharge_wq_chartinfo" class="org.dive4elements.river.exports.DischargeGenerator" converter="org.dive4elements.river.exports.DiagramAttributes" - injectors="org.dive4elements.river.exports.injector.KmFromGaugeNumberInjector.java,org.dive4elements.river.exports.injector.PNPInjector"> + injectors="org.dive4elements.river.exports.injector.KmFromGaugeNumberInjector,org.dive4elements.river.exports.injector.PNPInjector"> <title key="chart.historical.discharge.title" default="chart.historical.discharge.title"/> &discharge-defaults; </output-generator>
--- a/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java Wed Oct 01 13:41:38 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java Wed Oct 01 13:42:19 2014 +0200 @@ -48,7 +48,6 @@ import org.dive4elements.river.jfree.XYMetaSeriesCollection; import org.dive4elements.river.themes.ThemeDocument; -import org.dive4elements.river.utils.RiverUtils; import org.jfree.chart.ChartFactory; import org.jfree.chart.JFreeChart; @@ -152,8 +151,6 @@ CallContext context ) { super.init(outName, request, out, context); - - RiverUtils.setKMFromRequestInContext(request, context); } private void setInvertedFromConfig() {
--- a/artifacts/src/main/java/org/dive4elements/river/utils/RiverUtils.java Wed Oct 01 13:41:38 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/utils/RiverUtils.java Wed Oct 01 13:42:19 2014 +0200 @@ -890,30 +890,5 @@ return q; } - /** Parses the request and checks if it contains a currentKM setting. - * If this is the case the currentKM is added to the context.*/ - public static void setKMFromRequestInContext(Document request, - CallContext context) { - Double dKm; - String km = XMLUtils.xpathString( - request, - XPATH_CHART_CURRENTKM, - ArtifactNamespaceContext.INSTANCE); - - if (km == null) { - return; - } - - try { - dKm = Double.valueOf(km); - } catch (NumberFormatException nfe) { - return; - } - - if (log.isDebugEnabled()) { - log.debug("currentKm = " + dKm); - } - context.putContextValue(CURRENT_KM, dKm); - } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :