[PATCH] s/logger/log/ or removed unused logger
Wald Commits
scm-commit at wald.intevation.org
Thu Oct 2 11:04:43 CEST 2014
# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1412240654 -7200
# Node ID 061e85212d25c7f13e340fbfbe4205a9f2d2eb4c
# Parent ebf74d92be383ab665ad05747c1e805ef9ce41d3
s/logger/log/ or removed unused logger.
diff -r ebf74d92be38 -r 061e85212d25 artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/SedimentLoadSQTiSelect.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/SedimentLoadSQTiSelect.java Thu Oct 02 10:13:31 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/SedimentLoadSQTiSelect.java Thu Oct 02 11:04:14 2014 +0200
@@ -8,18 +8,12 @@
package org.dive4elements.river.artifacts.states.minfo;
-import org.apache.log4j.Logger;
-
import org.dive4elements.river.artifacts.states.DefaultState;
public class SedimentLoadSQTiSelect
extends DefaultState
{
- /** The logger used in this class. */
- private static Logger logger = Logger.getLogger(SedimentLoadSQTiSelect.class);
-
-
/**
* The default constructor that initializes an empty State object.
*/
diff -r ebf74d92be38 -r 061e85212d25 artifacts/src/main/java/org/dive4elements/river/exports/process/FixWQProcessor.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/FixWQProcessor.java Thu Oct 02 10:13:31 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/FixWQProcessor.java Thu Oct 02 11:04:14 2014 +0200
@@ -45,7 +45,7 @@
implements FacetTypes
{
- private static Logger logger = Logger.getLogger(FixWQProcessor.class);
+ private static Logger log = Logger.getLogger(FixWQProcessor.class);
private String I18N_AXIS_LABEL = "chart.discharge.curve.yaxis.label";
@@ -62,7 +62,7 @@
// TODO: Simplify this processor and move general facets/data to
// MiscDischargeProcessor or something...
String facetType = bundle.getFacetName();
- logger.debug("facet: " + facetType + " name: " + bundle.getFacetDescription());
+ log.debug("facet: " + facetType + " name: " + bundle.getFacetDescription());
if(facetType.startsWith(FIX_SECTOR_AVERAGE_WQ)) {
doSectorAverageOut(generator, bundle, theme, visible);
}
@@ -99,7 +99,7 @@
ThemeDocument theme,
boolean visible
) {
- logger.debug("doSectorAverageOut");
+ log.debug("doSectorAverageOut");
QWDDateRange qwdd = (QWDDateRange)bundle.getData(generator.getCallContext());
QWD qwd = qwdd != null ? qwdd.getQWD() : null;
@@ -129,7 +129,7 @@
}
}
else {
- logger.debug("doSectorAverageOut: qwd == null");
+ log.debug("doSectorAverageOut: qwd == null");
}
}
@@ -141,12 +141,12 @@
ThemeDocument theme,
boolean visible
) {
- logger.debug("doAnalysisEventsOut");
+ log.debug("doAnalysisEventsOut");
QWD qwd = (QWD)bundle.getData(generator.getCallContext());
if (qwd == null) {
- logger.debug("doAnalysisEventsOut: qwd == null");
+ log.debug("doAnalysisEventsOut: qwd == null");
return;
}
@@ -191,11 +191,11 @@
ArtifactAndFacet bundle,
ThemeDocument theme,
boolean visible) {
- logger.debug("doReferenceEventsOut");
+ log.debug("doReferenceEventsOut");
QWI qwd = (QWI)bundle.getData(generator.getCallContext());
if (qwd == null) {
- logger.debug("doReferenceEventsOut: qwds == null in " + bundle.getFacetDescription());
+ log.debug("doReferenceEventsOut: qwds == null in " + bundle.getFacetDescription());
return;
}
@@ -239,14 +239,14 @@
ThemeDocument theme,
boolean visible
) {
- logger.debug("doWQCurveOut");
+ log.debug("doWQCurveOut");
FixWQCurveFacet facet = (FixWQCurveFacet)bundle.getFacet();
FixFunction func = (FixFunction)facet.getData(
bundle.getArtifact(), generator.getCallContext());
if (func == null) {
- logger.warn("doWQCurveOut: Facet does not contain FixFunction");
+ log.warn("doWQCurveOut: Facet does not contain FixFunction");
return;
}
@@ -262,7 +262,7 @@
maxQ); // end
}
else {
- logger.warn("doWQCurveOut: maxQ <= 0");
+ log.warn("doWQCurveOut: maxQ <= 0");
}
}
@@ -272,7 +272,7 @@
ThemeDocument theme,
boolean visible
) {
- logger.debug("doOutlierOut");
+ log.debug("doOutlierOut");
QWI[] qws = (QWI[])bundle.getData(generator.getCallContext());
if(qws != null) {
@@ -304,7 +304,7 @@
}
}
else {
- logger.debug("doOutlierOut: qwd == null");
+ log.debug("doOutlierOut: qwd == null");
}
}
@@ -315,20 +315,20 @@
ThemeDocument theme,
boolean visible
) {
- logger.debug("doQSectorOut");
+ log.debug("doQSectorOut");
if (!visible) {
return;
}
Object qsectorsObj = bundle.getData(generator.getCallContext());
if (qsectorsObj == null || !(qsectorsObj instanceof List)) {
- logger.warn("No QSectors coming from data.");
+ log.warn("No QSectors coming from data.");
return;
}
List<?> qsectorsList = (List<?>) qsectorsObj;
if (qsectorsList.size() == 0 || !(qsectorsList.get(0) instanceof NamedDouble)) {
- logger.warn("No QSectors coming from data.");
+ log.warn("No QSectors coming from data.");
return;
}
@@ -388,7 +388,7 @@
Object data = bundle.getData(generator.getCallContext());
List<StickyAxisAnnotation> xy = new ArrayList<StickyAxisAnnotation>();
if (data instanceof double[][]) {
- logger.debug("Got double[][]");
+ log.debug("Got double[][]");
double [][] values = (double [][]) data;
for (int i = 0; i< values[0].length; i++) {
xy.add(new StickyAxisAnnotation(bundle.getFacetDescription(),
@@ -403,7 +403,7 @@
}
else {
// Assume its WKms.
- logger.debug("Got WKms");
+ log.debug("Got WKms");
/* TODO
WKms wkms = (WKms) data;
@@ -441,7 +441,7 @@
.getContextValue(CURRENT_KM);
if (wqkms == null || wqkms.getKms().length == 0 || ckm == null) {
- logger.info("addPointFromWQKms: No event data to show.");
+ log.info("addPointFromWQKms: No event data to show.");
return;
}
@@ -467,7 +467,7 @@
}
}
else {
- logger.debug("FixWQCurveGenerator: doWQOut: double[][]");
+ log.debug("FixWQCurveGenerator: doWQOut: double[][]");
double [][] values = (double [][]) data;
XYSeries series = new StyledXYSeries(bundle.getFacetDescription(), false, true, theme);
diff -r ebf74d92be38 -r 061e85212d25 artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadLSM3AProcessor.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadLSM3AProcessor.java Thu Oct 02 10:13:31 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadLSM3AProcessor.java Thu Oct 02 11:04:14 2014 +0200
@@ -7,15 +7,10 @@
*/
package org.dive4elements.river.exports.process;
-import org.apache.log4j.Logger;
-
import org.dive4elements.river.exports.DiagramGenerator;
public class SedimentLoadLSM3AProcessor extends SedimentLoadLSProcessor {
- private final static Logger logger =
- Logger.getLogger(SedimentLoadM3AProcessor.class);
-
public static final String I18N_YAXIS_LABEL =
"chart.sedimentload.ls.yaxis.label.m3pera";
public static final String I18N_YAXIS_LABEL_DEFAULT = "[m\u00b3/a]";
diff -r ebf74d92be38 -r 061e85212d25 artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadLSTAProcessor.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadLSTAProcessor.java Thu Oct 02 10:13:31 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadLSTAProcessor.java Thu Oct 02 11:04:14 2014 +0200
@@ -8,15 +8,10 @@
package org.dive4elements.river.exports.process;
-import org.apache.log4j.Logger;
-
import org.dive4elements.river.exports.DiagramGenerator;
public class SedimentLoadLSTAProcessor extends SedimentLoadLSProcessor{
- private final static Logger logger =
- Logger.getLogger(SedimentLoadTAProcessor.class);
-
public static final String I18N_YAXIS_LABEL =
"chart.sedimentload.ls.yaxis.label.tpera";
public static final String I18N_YAXIS_LABEL_DEFAULT = "[t/a]";
diff -r ebf74d92be38 -r 061e85212d25 artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadM3AProcessor.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadM3AProcessor.java Thu Oct 02 10:13:31 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadM3AProcessor.java Thu Oct 02 11:04:14 2014 +0200
@@ -7,15 +7,10 @@
*/
package org.dive4elements.river.exports.process;
-import org.apache.log4j.Logger;
-
import org.dive4elements.river.exports.DiagramGenerator;
public class SedimentLoadM3AProcessor extends SedimentLoadProcessor {
- private final static Logger log =
- Logger.getLogger(SedimentLoadM3AProcessor.class);
-
public static final String I18N_YAXIS_LABEL =
"chart.sedimentload.ls.yaxis.label.m3pera";
public static final String I18N_YAXIS_LABEL_DEFAULT = "[m\u00b3/a]";
More information about the Dive4Elements-commits
mailing list