Changeset 30737 in osm for applications/editors/josm/plugins/routes/src

Timestamp:

2014-10-18T23:07:52+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

Location:

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes

Files:

• ConvertedWay.java (modified) (1 diff)
• PathBuilder.java (modified) (3 diffs)
• RouteLayer.java (modified) (1 diff)
• RoutesPlugin.java (modified) (1 diff)
• xml/Routes.java (modified) (1 diff)
• xml/RoutesXMLLayer.java (modified) (1 diff)

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/ConvertedWay.java

@@ -43 +43 @@
     }
 
-    private List<Node> nodes = new ArrayList<Node>();
+    private List<Node> nodes = new ArrayList<>();
     private BitSet routes;
 

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/PathBuilder.java

@@ -14 +14 @@
 public class PathBuilder {
 
-    private Map<Way, BitSet> wayRoutes = new HashMap<Way, BitSet>();
+    private Map<Way, BitSet> wayRoutes = new HashMap<>();
     private Collection<ConvertedWay> convertedWays;
 
@@ -32 +32 @@
     public Collection<ConvertedWay> getConvertedWays() {
         if (convertedWays == null) {
-            Map<WayEnd, ConvertedWay> ways = new HashMap<WayEnd, ConvertedWay>();
+            Map<WayEnd, ConvertedWay> ways = new HashMap<>();
 
             for (Entry<Way, BitSet> wayEntry:wayRoutes.entrySet()) {
@@ -54 +54 @@
             }
 
-            Set<ConvertedWay> uniqueWays = new HashSet<ConvertedWay>();
+            Set<ConvertedWay> uniqueWays = new HashSet<>();
             uniqueWays.addAll(ways.values());
             convertedWays = uniqueWays;

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RouteLayer.java

@@ -35 +35 @@
     private final PathPainter pathPainter;
     private final PathBuilder pathBuilder = new PathBuilder();
-    private final List<RouteDefinition> routes = new ArrayList<RouteDefinition>();
+    private final List<RouteDefinition> routes = new ArrayList<>();
     private volatile boolean datasetChanged = true;
 

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RoutesPlugin.java

@@ -27 +27 @@
 public class RoutesPlugin extends Plugin implements LayerChangeListener {
 
-    private final List<RouteLayer> routeLayers = new ArrayList<RouteLayer>();
+    private final List<RouteLayer> routeLayers = new ArrayList<>();
     private boolean isShown;
 

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/xml/Routes.java

@@ -69 +69 @@
     public List<RoutesXMLLayer> getLayer() {
         if (layer == null) {
-            layer = new ArrayList<RoutesXMLLayer>();
+            layer = new ArrayList<>();
         }
         return this.layer;

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/xml/RoutesXMLLayer.java

@@ -74 +74 @@
     public List<RoutesXMLRoute> getRoute() {
         if (route == null) {
-            route = new ArrayList<RoutesXMLRoute>();
+            route = new ArrayList<>();
         }
         return this.route;