diff --git a/brouter-core/src/main/java/btools/router/OsmPrePath.java b/brouter-core/src/main/java/btools/router/OsmPrePath.java index 4131d11..81de14d 100644 --- a/brouter-core/src/main/java/btools/router/OsmPrePath.java +++ b/brouter-core/src/main/java/btools/router/OsmPrePath.java @@ -7,7 +7,6 @@ package btools.router; import btools.mapaccess.OsmLink; import btools.mapaccess.OsmNode; -import btools.mapaccess.OsmTransferNode; public abstract class OsmPrePath { protected OsmNode sourceNode; diff --git a/brouter-core/src/main/java/btools/router/VoiceHintList.java b/brouter-core/src/main/java/btools/router/VoiceHintList.java index 61534bc..1ba1d42 100644 --- a/brouter-core/src/main/java/btools/router/VoiceHintList.java +++ b/brouter-core/src/main/java/btools/router/VoiceHintList.java @@ -7,7 +7,6 @@ package btools.router; import java.util.ArrayList; -import java.util.List; public class VoiceHintList { private String transportMode; diff --git a/brouter-core/src/test/java/btools/router/OsmNodeNamedTest.java b/brouter-core/src/test/java/btools/router/OsmNodeNamedTest.java index 49acae9..ce2eb47 100644 --- a/brouter-core/src/test/java/btools/router/OsmNodeNamedTest.java +++ b/brouter-core/src/test/java/btools/router/OsmNodeNamedTest.java @@ -1,11 +1,7 @@ package btools.router; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; import btools.util.CheapRuler; diff --git a/brouter-expressions/src/main/java/btools/expressions/BExpressionMetaData.java b/brouter-expressions/src/main/java/btools/expressions/BExpressionMetaData.java index 40c8749..e79c72b 100644 --- a/brouter-expressions/src/main/java/btools/expressions/BExpressionMetaData.java +++ b/brouter-expressions/src/main/java/btools/expressions/BExpressionMetaData.java @@ -9,16 +9,7 @@ package btools.expressions; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; -import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.StringTokenizer; -import java.util.TreeMap; - -import btools.util.BitCoderContext; -import btools.util.Crc32; public final class BExpressionMetaData { diff --git a/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java b/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java index c5b3a55..7c77016 100644 --- a/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java +++ b/brouter-expressions/src/main/java/btools/expressions/IntegrityCheckProfile.java @@ -1,7 +1,6 @@ package btools.expressions; import java.io.File; -import java.io.IOException; public class IntegrityCheckProfile { diff --git a/brouter-expressions/src/test/java/btools/expressions/EncodeDecodeTest.java b/brouter-expressions/src/test/java/btools/expressions/EncodeDecodeTest.java index d445c45..6979387 100644 --- a/brouter-expressions/src/test/java/btools/expressions/EncodeDecodeTest.java +++ b/brouter-expressions/src/test/java/btools/expressions/EncodeDecodeTest.java @@ -1,12 +1,11 @@ package btools.expressions; -import java.util.*; -import java.io.*; -import java.net.URL; - import org.junit.Assert; import org.junit.Test; +import java.io.File; +import java.net.URL; + public class EncodeDecodeTest { @Test public void encodeDecodeTest() { diff --git a/brouter-map-creator/src/main/java/btools/mapcreator/RelationStatistics.java b/brouter-map-creator/src/main/java/btools/mapcreator/RelationStatistics.java index d62f3a0..25aef0b 100644 --- a/brouter-map-creator/src/main/java/btools/mapcreator/RelationStatistics.java +++ b/brouter-map-creator/src/main/java/btools/mapcreator/RelationStatistics.java @@ -5,9 +5,6 @@ import java.io.EOFException; import java.io.File; import java.util.HashMap; -import btools.util.DenseLongMap; -import btools.util.TinyDenseLongMap; - /** * WayCutter does 2 step in map-processing: *

diff --git a/brouter-map-creator/src/test/java/btools/mapcreator/MapcreatorTest.java b/brouter-map-creator/src/test/java/btools/mapcreator/MapcreatorTest.java index 090d6d1..70110bd 100644 --- a/brouter-map-creator/src/test/java/btools/mapcreator/MapcreatorTest.java +++ b/brouter-map-creator/src/test/java/btools/mapcreator/MapcreatorTest.java @@ -1,13 +1,10 @@ package btools.mapcreator; -import java.util.Random; -import java.util.HashMap; - import org.junit.Assert; import org.junit.Test; -import java.net.URL; import java.io.File; +import java.net.URL; public class MapcreatorTest { @Test diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/DirectWeaver.java b/brouter-mapaccess/src/main/java/btools/mapaccess/DirectWeaver.java index 216d8dd..b3d25c8 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/DirectWeaver.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/DirectWeaver.java @@ -8,7 +8,6 @@ import btools.codec.TagValueValidator; import btools.codec.TagValueWrapper; import btools.codec.WaypointMatcher; import btools.util.ByteDataWriter; -import btools.util.IByteArrayUnifier; /** * DirectWeaver does the same decoding as MicroCache2, but decodes directly diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/MatchedWaypoint.java b/brouter-mapaccess/src/main/java/btools/mapaccess/MatchedWaypoint.java index f084f3f..8926e9a 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/MatchedWaypoint.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/MatchedWaypoint.java @@ -9,8 +9,6 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import btools.mapaccess.OsmNode; - public final class MatchedWaypoint { public OsmNode node1; public OsmNode node2; diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNodesMap.java b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNodesMap.java index b71c54d..5298886 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNodesMap.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNodesMap.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.HashMap; import btools.util.ByteArrayUnifier; -import btools.util.SortedHeap; public final class OsmNodesMap { private HashMap hmap = new HashMap(4096); @@ -130,7 +129,7 @@ public final class OsmNodesMap { } // is there an escape from this node - // to a hollow node (or destination node) ? + // to a hollow node (or destination node) ? public boolean canEscape(OsmNode n0) { boolean sawLowIDs = false; lastVisitID++; diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/WaypointMatcherImpl.java b/brouter-mapaccess/src/main/java/btools/mapaccess/WaypointMatcherImpl.java index 0d71d3d..11618da 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/WaypointMatcherImpl.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/WaypointMatcherImpl.java @@ -3,8 +3,6 @@ package btools.mapaccess; import java.util.List; import btools.codec.WaypointMatcher; -import btools.mapaccess.OsmNode; -import btools.mapaccess.OsmNodePairSet; import btools.util.CheapRuler; /** diff --git a/brouter-server/src/main/java/btools/server/request/ServerHandler.java b/brouter-server/src/main/java/btools/server/request/ServerHandler.java index 73641be..98fc5f3 100644 --- a/brouter-server/src/main/java/btools/server/request/ServerHandler.java +++ b/brouter-server/src/main/java/btools/server/request/ServerHandler.java @@ -1,12 +1,5 @@ package btools.server.request; -import btools.mapaccess.OsmNode; -import btools.router.OsmNodeNamed; -import btools.router.OsmNogoPolygon; -import btools.router.OsmTrack; -import btools.router.RoutingContext; -import btools.server.ServiceContext; - import java.io.BufferedWriter; import java.io.File; import java.io.StringWriter; @@ -14,6 +7,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import btools.router.OsmNodeNamed; +import btools.router.OsmNogoPolygon; +import btools.router.OsmTrack; +import btools.router.RoutingContext; +import btools.server.ServiceContext; + /** * URL query parameter handler for web and standalone server. Supports all * BRouter features without restrictions. diff --git a/brouter-util/src/main/java/btools/util/SortedHeap.java b/brouter-util/src/main/java/btools/util/SortedHeap.java index 564750f..0e69624 100644 --- a/brouter-util/src/main/java/btools/util/SortedHeap.java +++ b/brouter-util/src/main/java/btools/util/SortedHeap.java @@ -1,7 +1,5 @@ package btools.util; -import java.util.Random; - /** * Memory efficient and lightning fast heap to get the lowest-key value of a set of key-object pairs * diff --git a/brouter-util/src/test/java/btools/util/ByteDataIOTest.java b/brouter-util/src/test/java/btools/util/ByteDataIOTest.java index 82fee2f..6354271 100644 --- a/brouter-util/src/test/java/btools/util/ByteDataIOTest.java +++ b/brouter-util/src/test/java/btools/util/ByteDataIOTest.java @@ -1,8 +1,5 @@ package btools.util; -import java.util.Random; -import java.util.HashSet; - import org.junit.Assert; import org.junit.Test; diff --git a/brouter-util/src/test/java/btools/util/CheapAngleMeterTest.java b/brouter-util/src/test/java/btools/util/CheapAngleMeterTest.java index e5b7a3b..935e430 100644 --- a/brouter-util/src/test/java/btools/util/CheapAngleMeterTest.java +++ b/brouter-util/src/test/java/btools/util/CheapAngleMeterTest.java @@ -1,11 +1,7 @@ package btools.util; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Test; public class CheapAngleMeterTest { diff --git a/brouter-util/src/test/java/btools/util/ReducedMedianFilterTest.java b/brouter-util/src/test/java/btools/util/ReducedMedianFilterTest.java index 062073a..1c709d0 100644 --- a/brouter-util/src/test/java/btools/util/ReducedMedianFilterTest.java +++ b/brouter-util/src/test/java/btools/util/ReducedMedianFilterTest.java @@ -1,11 +1,10 @@ package btools.util; -import java.util.Random; -import java.io.*; - import org.junit.Assert; import org.junit.Test; +import java.io.IOException; + public class ReducedMedianFilterTest { @Test public void reducedMedianFilterTest() throws IOException { diff --git a/brouter-util/src/test/java/btools/util/SortedHeapTest.java b/brouter-util/src/test/java/btools/util/SortedHeapTest.java index d2538d7..8f31f01 100644 --- a/brouter-util/src/test/java/btools/util/SortedHeapTest.java +++ b/brouter-util/src/test/java/btools/util/SortedHeapTest.java @@ -1,12 +1,10 @@ package btools.util; -import java.util.Random; -import java.util.HashMap; -import java.util.HashSet; - import org.junit.Assert; import org.junit.Test; +import java.util.Random; + public class SortedHeapTest { @Test public void sortedHeapTest1() { diff --git a/config/pmd/pmd-ruleset.xml b/config/pmd/pmd-ruleset.xml index 8350b0f..99daa18 100644 --- a/config/pmd/pmd-ruleset.xml +++ b/config/pmd/pmd-ruleset.xml @@ -40,7 +40,6 @@ -