# HG changeset patch # User Sascha L. Teichmann # Date 1349514504 -7200 # Node ID 3dc26ec2558da1865906a9a787c5512a0e3c28e4 # Parent ca208b2f35a071365e99d1f18797c05cbcfec8b4 Removed dead code diff -r ca208b2f35a0 -r 3dc26ec2558d flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Sat Oct 06 10:38:41 2012 +0200 +++ b/flys-artifacts/ChangeLog Sat Oct 06 11:08:24 2012 +0200 @@ -1,3 +1,18 @@ +2012-10-06 Sascha L. Teichmann + + * main/java/de/intevation/flys/exports/LegendProcessor.java: + Removed superfluous import. + + * main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java, + main/java/de/intevation/flys/exports/CrossSectionGenerator.java, + main/java/de/intevation/flys/exports/FlowVelocityGenerator.java, + main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java, + main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java, + main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, + main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java, + main/java/de/intevation/flys/utils/MapfileGenerator.java: + Removed dead code. + 2012-10-06 Sascha L. Teichmann * src/main/java/de/intevation/flys/exports/LegendProcessor.java: diff -r ca208b2f35a0 -r 3dc26ec2558d flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java Sat Oct 06 10:38:41 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java Sat Oct 06 11:08:24 2012 +0200 @@ -96,7 +96,7 @@ return; } - Facet facet = artifactFacet.getFacet(); + //XXX DEAD CODE // Facet facet = artifactFacet.getFacet(); if (name.equals(COMPUTED_DISCHARGE_Q)) { doQOut((WQKms) artifactFacet.getData(context), artifactFacet, attr, visible); @@ -249,7 +249,7 @@ logger.debug("its wkms time, baby"); WKms data = (WKms) wqkms; // Assume its WKms. - double location = getRange()[0]; + // XXX DEAD CODE // double location = getRange()[0]; double w = StaticWKmsArtifact.getWAtKmLin(data, getRange()[0]); xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(), (float) w, StickyAxisAnnotation.SimpleAxis.Y_AXIS)); diff -r ca208b2f35a0 -r 3dc26ec2558d flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java Sat Oct 06 10:38:41 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java Sat Oct 06 11:08:24 2012 +0200 @@ -163,7 +163,7 @@ // Paints for the boxes/lines. Stroke basicStroke = new BasicStroke(1.0f); - Paint linePaint = new Color(255, 0,0,60); + // XXX: DEAD CODE // Paint linePaint = new Color(255, 0,0,60); Paint fillPaint = new Color(0, 255,0,60); Paint tranPaint = new Color(0, 0,0, 0); @@ -177,13 +177,13 @@ // Access text styling, if any. Document theme = fa.getTheme(); TextStyle textStyle = null; - LineStyle lineStyle = null; + // XXX: DEAD CODE // LineStyle lineStyle = null; // Get Themeing information and add legend item. if (theme != null) { ThemeAccess themeAccess = new ThemeAccess(theme); textStyle = themeAccess.parseTextStyle(); - lineStyle = themeAccess.parseLineStyle(); + // XXX: DEAD CODE // lineStyle = themeAccess.parseLineStyle(); if (fa.getLabel() != null) { LegendItemCollection lic = new LegendItemCollection(); LegendItemCollection old = plot.getFixedLegendItems(); diff -r ca208b2f35a0 -r 3dc26ec2558d flys-artifacts/src/main/java/de/intevation/flys/exports/FlowVelocityGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/FlowVelocityGenerator.java Sat Oct 06 10:38:41 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/FlowVelocityGenerator.java Sat Oct 06 11:08:24 2012 +0200 @@ -148,8 +148,6 @@ * Get internationalized label for the y axis. */ protected String getVAxisLabel() { - FLYSArtifact flys = (FLYSArtifact) master; - return msg(I18N_YAXIS_LABEL, I18N_YAXIS_LABEL_DEFAULT); } @@ -158,8 +156,6 @@ * Get internationalized label for the y axis. */ protected String getTAxisLabel() { - FLYSArtifact flys = (FLYSArtifact) master; - return msg(I18N_2YAXIS_LABEL, I18N_2YAXIS_LABEL_DEFAULT); } diff -r ca208b2f35a0 -r 3dc26ec2558d flys-artifacts/src/main/java/de/intevation/flys/exports/LegendProcessor.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/LegendProcessor.java Sat Oct 06 10:38:41 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/LegendProcessor.java Sat Oct 06 11:08:24 2012 +0200 @@ -6,7 +6,6 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; import org.jfree.chart.LegendItem; import org.jfree.chart.LegendItemCollection; diff -r ca208b2f35a0 -r 3dc26ec2558d flys-artifacts/src/main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java Sat Oct 06 10:38:41 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java Sat Oct 06 11:08:24 2012 +0200 @@ -127,8 +127,6 @@ * Get internationalized label for the y axis. */ protected String getHAxisLabel() { - FLYSArtifact flys = (FLYSArtifact) master; - return msg(I18N_YAXIS_LABEL, I18N_YAXIS_LABEL_DEFAULT); } diff -r ca208b2f35a0 -r 3dc26ec2558d flys-artifacts/src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java Sat Oct 06 10:38:41 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java Sat Oct 06 11:08:24 2012 +0200 @@ -1,17 +1,11 @@ package de.intevation.flys.exports; -import org.apache.log4j.Logger; - /** * An OutGenerator that generates reference curves. */ public class NormalizedReferenceCurveGenerator extends ReferenceCurveGenerator { - /** House logger. */ - private static Logger logger = - Logger.getLogger(NormalizedReferenceCurveGenerator.class); - public static final String I18N_NORMALIZED_CHART_TITLE = "chart.normalized.reference.curve.title"; diff -r ca208b2f35a0 -r 3dc26ec2558d flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java Sat Oct 06 10:38:41 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java Sat Oct 06 11:08:24 2012 +0200 @@ -3,7 +3,6 @@ import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.model.WKms; -import org.apache.log4j.Logger; import org.jfree.chart.JFreeChart; import org.jfree.chart.plot.XYPlot; @@ -25,10 +24,6 @@ } } - /** The logger that is used in this generator. */ - private static Logger logger = - Logger.getLogger(WDifferencesCurveGenerator.class); - /** Key for internationalized title of WDiff charts. */ public final static String I18N_WDIFF_TITLE = "chart.w_differences.title"; diff -r ca208b2f35a0 -r 3dc26ec2558d flys-artifacts/src/main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java Sat Oct 06 10:38:41 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/sq/SQRelationGenerator.java Sat Oct 06 11:08:24 2012 +0200 @@ -134,7 +134,6 @@ String desc = artifactAndFacet.getFacetDescription(); logger.debug("doSQCurveOut: " + desc); - Facet f = artifactAndFacet.getFacet(); SQFunction func = (SQFunction) artifactAndFacet.getData(context); if (func == null) { @@ -171,7 +170,6 @@ String desc = artifactAndFacet.getFacetDescription(); logger.debug("doSQOut: " + desc); - Facet f = artifactAndFacet.getFacet(); SQ[] sqs = (SQ[]) artifactAndFacet.getData(context); if (sqs == null) { logger.debug("No SQs found for facet"); diff -r ca208b2f35a0 -r 3dc26ec2558d flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java Sat Oct 06 10:38:41 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java Sat Oct 06 11:08:24 2012 +0200 @@ -59,13 +59,8 @@ private static MapfileGenerator instance; - private File mapfile; private File shapefileDirectory; - private String mapServerUrl; - private String templatePath; - private String velocityLogfile; - private VelocityEngine velocityEngine; private final boolean lock[];