Changeset 30737 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/TheRing.java

Timestamp:

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

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/TheRing.java (modified) (10 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/TheRing.java

@@ -37 +37 @@
     public TheRing( Way source ) {
         this.source = source;
-        segments = new ArrayList<RingSegment>(1);
+        segments = new ArrayList<>(1);
         segments.add(new RingSegment(source));
     }
     
     public static boolean areAllOfThoseRings( Collection<Way> ways ) {
-        List<Way> rings = new ArrayList<Way>();
+        List<Way> rings = new ArrayList<>();
         for( Way way : ways ) {
             if( way.isClosed() )
@@ -70 +70 @@
     public static List<Relation> makeManySimpleMultipolygons( Collection<Way> selection, List<Command> commands ) {
         log("---------------------------------------");
-        List<TheRing> rings = new ArrayList<TheRing>(selection.size());
+        List<TheRing> rings = new ArrayList<>(selection.size());
         for( Way w : selection )
             rings.add(new TheRing(w));
@@ -77 +77 @@
                 rings.get(i).collide(rings.get(j));
         redistributeSegments(rings);
-        List<Relation> relations = new ArrayList<Relation>();
-        Map<Relation, Relation> relationCache = new HashMap<Relation, Relation>();
+        List<Relation> relations = new ArrayList<>();
+        Map<Relation, Relation> relationCache = new HashMap<>();
         for( TheRing r : rings ) {
             commands.addAll(r.getCommands(relationCache));
@@ -247 +247 @@
     public static void redistributeSegments( List<TheRing> rings ) {
         // build segments map
-        Map<RingSegment, TheRing> segmentMap = new HashMap<RingSegment, TheRing>();
+        Map<RingSegment, TheRing> segmentMap = new HashMap<>();
         for( TheRing ring : rings )
             for( RingSegment seg : ring.segments )
@@ -317 +317 @@
 
         // build a map of referencing relations
-        Map<Relation, Integer> referencingRelations = new HashMap<Relation, Integer>();
-        List<Command> relationCommands = new ArrayList<Command>();
+        Map<Relation, Integer> referencingRelations = new HashMap<>();
+        List<Command> relationCommands = new ArrayList<>();
         for( OsmPrimitive p : source.getReferrers() ) {
             if( p instanceof Relation ) {
@@ -342 +342 @@
         // по�тому �охран�ет�� только первое изменение
 
-        List<Command> commands = new ArrayList<Command>();
+        List<Command> commands = new ArrayList<>();
         boolean foundOwnWay = false;
         for( RingSegment seg : segments ) {
@@ -464 +464 @@
             if( pos <= 0 || pos >= nodes.size() - 1 )
                 return null;
-            List<Node> newNodes = new ArrayList<Node>(nodes.subList(pos, nodes.size()));
+            List<Node> newNodes = new ArrayList<>(nodes.subList(pos, nodes.size()));
             nodes.subList(pos + 1, nodes.size()).clear();
             return new RingSegment(newNodes);
@@ -489 +489 @@
                 return null;
 
-            List<Node> newNodes = new ArrayList<Node>();
+            List<Node> newNodes = new ArrayList<>();
             if( pos2 > pos1 ) {
                 newNodes.addAll(nodes.subList(pos2, nodes.size()));
@@ -499 +499 @@
             } else {
                 newNodes.addAll(nodes.subList(pos2, pos1 + 1));
-                nodes.addAll(new ArrayList<Node>(nodes.subList(0, pos2 + 1)));
+                nodes.addAll(new ArrayList<>(nodes.subList(0, pos2 + 1)));
                 nodes.subList(0, pos1).clear();
             }
@@ -513 +513 @@
             if( nodes == null )
                 throw new IllegalArgumentException("Won't give you wayNodes: it is a reference");
-            List<Node> wayNodes = new ArrayList<Node>(nodes);
+            List<Node> wayNodes = new ArrayList<>(nodes);
             if( isRing )
                 wayNodes.add(wayNodes.get(0));