diff --git a/brouter-codec/src/main/java/btools/codec/TagValueValidator.java b/brouter-codec/src/main/java/btools/codec/TagValueValidator.java
index 4b88dfc..70220d6 100644
--- a/brouter-codec/src/main/java/btools/codec/TagValueValidator.java
+++ b/brouter-codec/src/main/java/btools/codec/TagValueValidator.java
@@ -6,11 +6,11 @@ public interface TagValueValidator {
* @param tagValueSet the way description to check
* @return 0 = nothing, 1=no matching, 2=normal
*/
- public int accessType(byte[] tagValueSet);
+ int accessType(byte[] tagValueSet);
- public byte[] unify(byte[] tagValueSet, int offset, int len);
+ byte[] unify(byte[] tagValueSet, int offset, int len);
- public boolean isLookupIdxUsed(int idx);
+ boolean isLookupIdxUsed(int idx);
- public void setDecodeForbidden(boolean decodeForbidden);
+ void setDecodeForbidden(boolean decodeForbidden);
}
diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmPos.java b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmPos.java
index 15ece82..e0c262b 100644
--- a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmPos.java
+++ b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmPos.java
@@ -7,16 +7,16 @@ package btools.mapaccess;
public interface OsmPos {
- public int getILat();
+ int getILat();
- public int getILon();
+ int getILon();
- public short getSElev();
+ short getSElev();
- public double getElev();
+ double getElev();
- public int calcDistance(OsmPos p);
+ int calcDistance(OsmPos p);
- public long getIdFromPos();
+ long getIdFromPos();
}
diff --git a/brouter-util/src/main/java/btools/util/MixCoderDataInputStream.java b/brouter-util/src/main/java/btools/util/MixCoderDataInputStream.java
index 31acac9..60a0524 100644
--- a/brouter-util/src/main/java/btools/util/MixCoderDataInputStream.java
+++ b/brouter-util/src/main/java/btools/util/MixCoderDataInputStream.java
@@ -37,7 +37,7 @@ public final class MixCoderDataInputStream extends DataInputStream {
return lastValue;
}
- public final boolean decodeBit() throws IOException {
+ public boolean decodeBit() throws IOException {
fillBuffer();
boolean value = ((b & 1) != 0);
b >>>= 1;
@@ -45,7 +45,7 @@ public final class MixCoderDataInputStream extends DataInputStream {
return value;
}
- public final int decodeVarBits2() throws IOException {
+ public int decodeVarBits2() throws IOException {
int range = 0;
while (!decodeBit()) {
range = 2 * range + 1;
@@ -58,7 +58,7 @@ public final class MixCoderDataInputStream extends DataInputStream {
*
* @see #encodeBounded
*/
- public final int decodeBounded(int max) throws IOException {
+ public int decodeBounded(int max) throws IOException {
int value = 0;
int im = 1; // integer mask
while ((value | im) <= max) {
@@ -75,7 +75,7 @@ public final class MixCoderDataInputStream extends DataInputStream {
* @see #encodeVarBits
*/
- public final int decodeVarBits() throws IOException {
+ public int decodeVarBits() throws IOException {
fillBuffer();
int b12 = b & 0xfff;
int len = vl_length[b12];
diff --git a/brouter-util/src/main/java/btools/util/MixCoderDataOutputStream.java b/brouter-util/src/main/java/btools/util/MixCoderDataOutputStream.java
index 99f8aec..ea32b5c 100644
--- a/brouter-util/src/main/java/btools/util/MixCoderDataOutputStream.java
+++ b/brouter-util/src/main/java/btools/util/MixCoderDataOutputStream.java
@@ -59,7 +59,7 @@ public final class MixCoderDataOutputStream extends DataOutputStream {
}
}
- public final void encodeBit(boolean value) throws IOException {
+ public void encodeBit(boolean value) throws IOException {
if (bm == 0x100) {
writeByte((byte) b);
bm = 1;
@@ -71,7 +71,7 @@ public final class MixCoderDataOutputStream extends DataOutputStream {
bm <<= 1;
}
- public final void encodeVarBits(int value) throws IOException {
+ public void encodeVarBits(int value) throws IOException {
int range = 0;
while (value > range) {
encodeBit(false);
@@ -82,7 +82,7 @@ public final class MixCoderDataOutputStream extends DataOutputStream {
encodeBounded(range, value);
}
- public final void encodeBounded(int max, int value) throws IOException {
+ public void encodeBounded(int max, int value) throws IOException {
int im = 1; // integer mask
while (im <= max) {
if (bm == 0x100) {
diff --git a/brouter-util/src/main/java/btools/util/ProgressListener.java b/brouter-util/src/main/java/btools/util/ProgressListener.java
index 88179ee..193d5bc 100644
--- a/brouter-util/src/main/java/btools/util/ProgressListener.java
+++ b/brouter-util/src/main/java/btools/util/ProgressListener.java
@@ -2,7 +2,7 @@ package btools.util;
public interface ProgressListener {
- public void updateProgress(String task, int progress);
+ void updateProgress(String task, int progress);
- public boolean isCanceled();
+ boolean isCanceled();
}
diff --git a/config/pmd/pmd-ruleset.xml b/config/pmd/pmd-ruleset.xml
index 8b25040..8444511 100644
--- a/config/pmd/pmd-ruleset.xml
+++ b/config/pmd/pmd-ruleset.xml
@@ -34,7 +34,6 @@
-