[PATCH 3 of 5] Fix diverse coding issues

Wald Commits scm-commit at wald.intevation.org
Thu Jan 18 20:57:40 CET 2018


# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1516304245 -3600
# Branch 3.2.x
# Node ID 0071702ba03fce9c9b35c4806bee24d1206c4b40
# Parent  5e38e2924c07b415ee07e1f68c6b875d2a09e3ca
Fix diverse coding issues.

diff -r 5e38e2924c07 -r 0071702ba03f artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/BedQualityDistanceSelect.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/BedQualityDistanceSelect.java	Thu Jan 18 20:12:01 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/BedQualityDistanceSelect.java	Thu Jan 18 20:37:25 2018 +0100
@@ -8,7 +8,6 @@
 
 package org.dive4elements.river.artifacts.states.minfo;
 
-import java.util.Date;
 import java.util.List;
 
 import org.w3c.dom.Element;
diff -r 5e38e2924c07 -r 0071702ba03f artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java	Thu Jan 18 20:12:01 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java	Thu Jan 18 20:37:25 2018 +0100
@@ -423,13 +423,13 @@
         if (rx == null) {
             log.warn("Range for x axis not set." +
                         " Using default values: 0 - 1.");
-            rx = new TimeBounds(0l, 1l);
+            rx = new TimeBounds(0L, 1L);
         }
 
         if (ry == null) {
             log.warn("Range for y axis not set." +
                         " Using default values: 0 - 1.");
-            ry = new DoubleBounds(0l, 1l);
+            ry = new DoubleBounds(0L, 1L);
         }
 
         log.debug("X Bounds at index " + index + " is: " + rx);
diff -r 5e38e2924c07 -r 0071702ba03f backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java
--- a/backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java	Thu Jan 18 20:12:01 2018 +0100
+++ b/backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java	Thu Jan 18 20:37:25 2018 +0100
@@ -163,7 +163,8 @@
 
             // Copy all DBCP properties removing the prefix
             for (Iterator iter = props.entrySet().iterator();
-                 iter.hasNext(); ) {
+                 iter.hasNext();
+            ) {
                 Map.Entry entry = (Map.Entry)iter.next();
                 String    key   = (String)entry.getKey();
                 if (key.startsWith(PREFIX)) {


More information about the Dive4Elements-commits mailing list