diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/WayLinker.java b/brouter-map-creator/src/main/java/btools/mapcreator/WayLinker.java index 195a16e..37220e3 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/WayLinker.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/WayLinker.java @@ -38,7 +38,6 @@ public class WayLinker extends MapCreatorBase implements Runnable { private File trafficTilesIn; private File dataTilesOut; private File borderFileIn; - private File restrictionsFileIn; private String dataTilesSuffix; @@ -157,7 +156,6 @@ public class WayLinker extends MapCreatorBase implements Runnable { this.trafficTilesIn = new File("../traffic"); this.dataTilesOut = dataTilesOut; this.borderFileIn = borderFileIn; - this.restrictionsFileIn = restrictionsFileIn; this.dataTilesSuffix = dataTilesSuffix; BExpressionMetaData meta = new BExpressionMetaData(); diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/DirectWeaver.java b/brouter-mapaccess/src/main/java/btools/mapaccess/DirectWeaver.java index b3d25c8..29b113d 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/DirectWeaver.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/DirectWeaver.java @@ -16,8 +16,6 @@ import btools.util.ByteDataWriter; public final class DirectWeaver extends ByteDataWriter { private long id64Base; - private int size = 0; - public DirectWeaver(StatCoderContext bc, DataBuffers dataBuffers, int lonIdx, int latIdx, int divisor, TagValueValidator wayValidator, WaypointMatcher waypointMatcher, OsmNodesMap hollowNodes) { super(null); int cellsize = 1000000 / divisor; @@ -31,7 +29,7 @@ public final class DirectWeaver extends ByteDataWriter { NoisyDiffCoder extLatDiff = new NoisyDiffCoder(bc); NoisyDiffCoder transEleDiff = new NoisyDiffCoder(bc); - size = bc.decodeNoisyNumber(5); + int size = bc.decodeNoisyNumber(5); int[] faid = size > dataBuffers.ibuf2.length ? new int[size] : dataBuffers.ibuf2; diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java b/brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java index 7cd4785..cef46b0 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java @@ -39,7 +39,7 @@ public final class NodesCache { private long cacheSum = 0; private long maxmemtiles; - private boolean detailed; + private boolean detailed; // NOPMD used in constructor private boolean garbageCollectionEnabled = false; private boolean ghostCleaningDone = false; diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java b/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java index 75ac995..921bd31 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/PhysicalFile.java @@ -19,7 +19,6 @@ final public class PhysicalFile { long[] fileIndex = new long[25]; int[] fileHeaderCrcs; - private int fileIndexCrc; public long creationTime; String fileName; @@ -75,7 +74,7 @@ final public class PhysicalFile { byte[] iobuffer = dataBuffers.iobuffer; ra = new RandomAccessFile(f, "r"); ra.readFully(iobuffer, 0, 200); - fileIndexCrc = Crc32.crc(iobuffer, 0, 200); + int fileIndexCrc = Crc32.crc(iobuffer, 0, 200); ByteDataReader dis = new ByteDataReader(iobuffer); for (int i = 0; i < 25; i++) { long lv = dis.readLong(); diff --git a/config/pmd/pmd-ruleset.xml b/config/pmd/pmd-ruleset.xml index a09ea44..0cf6e66 100644 --- a/config/pmd/pmd-ruleset.xml +++ b/config/pmd/pmd-ruleset.xml @@ -34,7 +34,6 @@ -