Changeset 30737 in osm for applications/editors/josm/plugins/utilsplugin2/src/org

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/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2

Files:

• actions/AddIntersectionsAction.java (modified) (1 diff)
• actions/AlignWayNodesAction.java (modified) (4 diffs)
• actions/ExtractPointAction.java (modified) (1 diff)
• actions/PasteRelationsAction.java (modified) (2 diffs)
• actions/SplitObjectAction.java (modified) (2 diffs)
• actions/SplitOnIntersectionsAction.java (modified) (3 diffs)
• actions/SymmetryAction.java (modified) (2 diffs)
• actions/TagBufferAction.java (modified) (4 diffs)
• actions/TagSourceAction.java (modified) (1 diff)
• actions/UnGlueRelationAction.java (modified) (1 diff)
• command/ChangeRelationMemberCommand.java (modified) (1 diff)
• curves/CircleArcMaker.java (modified) (4 diffs)
• curves/CurveAction.java (modified) (1 diff)
• customurl/URLList.java (modified) (2 diffs)
• customurl/UtilsPluginPreferences.java (modified) (1 diff)
• latlon/LatLonAction.java (modified) (1 diff)
• latlon/LatLonDialog.java (modified) (2 diffs)
• multitagger/MultiTagDialog.java (modified) (2 diffs)
• multitagger/MultiTaggerTableModel.java (modified) (1 diff)
• replacegeometry/ReplaceGeometryAction.java (modified) (1 diff)
• replacegeometry/ReplaceGeometryUtils.java (modified) (8 diffs)
• search/ConnectedMatch.java (modified) (2 diffs)
• search/InsideMatch.java (modified) (1 diff)
• search/IntersectingMatch.java (modified) (2 diffs)
• selection/AdjacentNodesAction.java (modified) (3 diffs)
• selection/AdjacentWaysAction.java (modified) (1 diff)
• selection/ConnectedWaysAction.java (modified) (1 diff)
• selection/IntersectedWaysAction.java (modified) (1 diff)
• selection/IntersectedWaysRecursiveAction.java (modified) (1 diff)
• selection/MiddleNodesAction.java (modified) (1 diff)
• selection/NodeWayUtils.java (modified) (10 diffs)
• selection/SelectHighwayAction.java (modified) (5 diffs)
• selection/SelectModNodesAction.java (modified) (1 diff)
• selection/SelectModWaysAction.java (modified) (1 diff)
• selection/SelectWayNodesAction.java (modified) (2 diffs)
• selection/UndoSelectionAction.java (modified) (1 diff)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/AddIntersectionsAction.java

@@ -47 +47 @@
         }
 
-        LinkedList<Command> cmds = new LinkedList<Command>();
+        LinkedList<Command> cmds = new LinkedList<>();
         Geometry.addIntersections(ways, false, cmds);
         if (!cmds.isEmpty()) {
             Main.main.undoRedo.add(new SequenceCommand(tr("Add nodes at intersections"),cmds));
-            Set<Node> nodes = new HashSet<Node>(10);
+            Set<Node> nodes = new HashSet<>(10);
             // find and select newly added nodes
             for (Command cmd: cmds) if (cmd instanceof AddCommand){

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/AlignWayNodesAction.java

@@ -45 +45 @@
         int firstNodePos = findFirstNode(way, selectedNodes);
         int lastNodePos = way.isClosed() ? firstNodePos : way.getNodesCount();
-        List<Node> nodes = new ArrayList<Node>();
+        List<Node> nodes = new ArrayList<>();
         int i = firstNodePos;
         boolean iterated = false;
@@ -75 +75 @@
         // Now, we have an ordered list of nodes, of which idx 0 and N-1 serve as guides
         // and 1..N-2 should be aligned with them
-        List<Command> commands = new ArrayList<Command>();
+        List<Command> commands = new ArrayList<>();
         double ax = nodes.get(0).getEastNorth().east();
         double ay = nodes.get(0).getEastNorth().north();
@@ -134 +134 @@
             List<Way> referrers = OsmPrimitive.getFilteredList(n.getReferrers(), Way.class);
             if( ways == null )
-                ways = new HashSet<Way>(referrers);
+                ways = new HashSet<>(referrers);
             else {
                 ways.retainAll(referrers);
@@ -143 +143 @@
 
     private Set<Node> filterNodes( Collection<? extends OsmPrimitive> selection ) {
-        Set<Node> result = new HashSet<Node>();
+        Set<Node> result = new HashSet<>();
         if( selection != null ) {
             for( OsmPrimitive p : selection )

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/ExtractPointAction.java

@@ -49 +49 @@
         Node nd = selectedNodes.get(0);
         Node ndCopy = new Node(nd.getCoor());
-        List<Command> cmds = new LinkedList<Command>();
+        List<Command> cmds = new LinkedList<>();
         
         Point p = Main.map.mapView.getMousePosition();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/PasteRelationsAction.java

@@ -30 +30 @@
             return;
 
-        Map<Relation, String> relations = new HashMap<Relation, String>();
+        Map<Relation, String> relations = new HashMap<>();
         for( PrimitiveData pdata : Main.pasteBuffer.getDirectlyAdded() ) {
             OsmPrimitive p = getCurrentDataSet().getPrimitiveById(pdata.getUniqueId(), pdata.getType());
@@ -50 +50 @@
         }
 
-        List<Command> commands = new ArrayList<Command>();
+        List<Command> commands = new ArrayList<>();
         for( Relation rel : relations.keySet() ) {
             Relation r = new Relation(rel);

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitObjectAction.java

@@ -92 +92 @@
         // is exactly one way that all nodes are part of.
         if (selectedWay == null && !selectedNodes.isEmpty()) {
-            Map<Way, Integer> wayOccurenceCounter = new HashMap<Way, Integer>();
+            Map<Way, Integer> wayOccurenceCounter = new HashMap<>();
             for (Node n : selectedNodes) {
                 for (Way w : OsmPrimitive.getFilteredList(n.getReferrers(), Way.class)) {
@@ -148 +148 @@
                 return;
             }
-            HashSet<Node> nds = new HashSet<Node>(selectedNodes);
+            HashSet<Node> nds = new HashSet<>(selectedNodes);
             nds.removeAll(selectedWay.getNodes());
             if (!nds.isEmpty()) {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitOnIntersectionsAction.java

@@ -33 +33 @@
     @Override
     public void actionPerformed( ActionEvent e ) {
-        List<Command> list = new ArrayList<Command>();
+        List<Command> list = new ArrayList<>();
         List<Way> selectedWays = OsmPrimitive.getFilteredList(getCurrentDataSet().getSelected(), Way.class);
-        Map<Way, List<Node>> splitWays = new HashMap<Way, List<Node>>();
+        Map<Way, List<Node>> splitWays = new HashMap<>();
 
         for( Way way : selectedWays ) {
@@ -61 +61 @@
                         splitWays.get(refs.get(0)).add(node);
                     else {
-                        List<Node> nodes = new ArrayList<Node>(1);
+                        List<Node> nodes = new ArrayList<>(1);
                         nodes.add(node);
                         splitWays.put(refs.get(0), nodes);
@@ -77 +77 @@
             List<List<Node>> wayChunks = SplitWayAction.buildSplitChunks(splitWay, splitWays.get(splitWay));
             if( wayChunks != null ) {
-                List<OsmPrimitive> sel = new ArrayList<OsmPrimitive>(selectedWays.size());
+                List<OsmPrimitive> sel = new ArrayList<>(selectedWays.size());
                 sel.addAll(selectedWays);
                 SplitWayAction.SplitWayResult result = SplitWayAction.splitWay(getEditLayer(), splitWay, wayChunks, sel);

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SymmetryAction.java

@@ -45 +45 @@
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
-        HashSet<Node> nodes = new HashSet<Node>();
+        HashSet<Node> nodes = new HashSet<>();
         EastNorth p1=null,p2=null;
         
@@ -74 +74 @@
         ne /= l; nn /= l; // normal unit vector
         
-        Collection<Command> cmds = new LinkedList<Command>();
+        Collection<Command> cmds = new LinkedList<>();
 
         for (Node n : nodes) {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagBufferAction.java

@@ -18 +18 @@
 public class TagBufferAction extends JosmAction {
     private static final String TITLE = tr("Copy tags from previous selection");
-    private Map<String, String> tags = new HashMap<String, String>();
-    private Map<String, String> currentTags = new HashMap<String, String>();
-    private Set<OsmPrimitive> selectionBuf = new HashSet<OsmPrimitive>();
+    private Map<String, String> tags = new HashMap<>();
+    private Map<String, String> currentTags = new HashMap<>();
+    private Set<OsmPrimitive> selectionBuf = new HashSet<>();
 
     public TagBufferAction() {
@@ -34 +34 @@
             return;
 
-        List<Command> commands = new ArrayList<Command>();
+        List<Command> commands = new ArrayList<>();
         for( String key : tags.keySet() ) {
             String value = tags.get(key);
@@ -92 +92 @@
     private void rememberSelectionTags() {
         // Fix #8350 - only care about tagged objects
-        Collection<OsmPrimitive> selectedTaggedObjects = new ArrayList<OsmPrimitive>(getCurrentDataSet().getSelected());
+        Collection<OsmPrimitive> selectedTaggedObjects = new ArrayList<>(getCurrentDataSet().getSelected());
         for (Iterator<OsmPrimitive> it = selectedTaggedObjects.iterator(); it.hasNext(); ) {
             if (!it.next().isTagged()) {
@@ -100 +100 @@
         if( !selectedTaggedObjects.isEmpty() ) {
             currentTags.clear();
-            Set<String> bad = new HashSet<String>();
+            Set<String> bad = new HashSet<>();
             for( OsmPrimitive p : selectedTaggedObjects ) {
                 if( currentTags.isEmpty() ) {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagSourceAction.java

@@ -19 +19 @@
     private static final String TITLE = tr("Add Source Tag");
     private String source;
-    private Set<OsmPrimitive> selectionBuf = new HashSet<OsmPrimitive>();
+    private Set<OsmPrimitive> selectionBuf = new HashSet<>();
     private boolean clickedTwice = false;
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/UnGlueRelationAction.java

@@ -49 +49 @@
     public void actionPerformed(ActionEvent e) {
 
-        LinkedList<Command> cmds = new LinkedList<Command>();
-        List<OsmPrimitive> newPrimitives = new LinkedList<OsmPrimitive>();
+        LinkedList<Command> cmds = new LinkedList<>();
+        List<OsmPrimitive> newPrimitives = new LinkedList<>();
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/command/ChangeRelationMemberCommand.java

@@ -34 +34 @@
             return;
         }
-        LinkedList<RelationMember> newrms = new LinkedList<RelationMember>();
+        LinkedList<RelationMember> newrms = new LinkedList<>();
         for (RelationMember rm : relation.getMembers()) {
             if (rm.getMember() == oldP) {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/curves/CircleArcMaker.java

@@ -23 +23 @@
 public class CircleArcMaker {
     public static Collection<Command> doCircleArc(List<Node> selectedNodes, List<Way> selectedWays, int angleSeparation) {
-        Collection<Command> cmds = new LinkedList<Command>();
+        Collection<Command> cmds = new LinkedList<>();
 
         //// Decides which nodes to use as anchors based on selection
@@ -61 +61 @@
         }
 
-        Set<Way> targetWays = new HashSet<Way>();
+        Set<Way> targetWays = new HashSet<>();
 
         boolean nodesHaveBeenChoosen = false;
@@ -127 +127 @@
 
         // // Calculate the new points in the arc
-        ReturnValue<Integer> p2Index = new ReturnValue<Integer>();
+        ReturnValue<Integer> p2Index = new ReturnValue<>();
         List<EastNorth> points = circleArcPoints(p1, p2, p3, angleSeparation, false, p2Index);
 
         //// Create the new arc nodes. Insert anchor nodes at correct positions.
-        List<Node> arcNodes = new ArrayList<Node>(points.size());
+        List<Node> arcNodes = new ArrayList<>(points.size());
         arcNodes.add(n1);
         {
@@ -269 +269 @@
         int numberOfNodesInArc = Math.max((int) Math.ceil((radialLength / Math.PI) * 180 / angleSeparation)+1,
                 3);
-        List<EastNorth> points = new ArrayList<EastNorth>(numberOfNodesInArc);
+        List<EastNorth> points = new ArrayList<>(numberOfNodesInArc);
 
         // Calculate the circle points in order

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/curves/CurveAction.java

@@ -53 +53 @@
         updatePreferences();
 
-        List<Node> selectedNodes = new ArrayList<Node>(getCurrentDataSet().getSelectedNodes());
-        List<Way> selectedWays = new ArrayList<Way>(getCurrentDataSet().getSelectedWays());
+        List<Node> selectedNodes = new ArrayList<>(getCurrentDataSet().getSelectedNodes());
+        List<Way> selectedWays = new ArrayList<>(getCurrentDataSet().getSelectedWays());
 
         // Collection<Command> cmds = doSpline(selectedNodes, selectedWays);

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/URLList.java

@@ -23 +23 @@
     }    
     public static List<String> resetURLList() {
-        List<String> items=new ArrayList<String>();
+        List<String> items=new ArrayList<>();
         items.add("Wikipedia");
         items.add("https://en.wikipedia.org/w/index.php?search={name}&fulltext=Search");
@@ -60 +60 @@
     
     public static  List<String> loadURLList() {
-        ArrayList<String> items=new ArrayList<String>();
+        ArrayList<String> items=new ArrayList<>();
         BufferedReader fr=null;
         try {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/UtilsPluginPreferences.java

@@ -134 +134 @@
         TableModel model = (table.getModel());
         String v;
-        ArrayList<String> lst=new ArrayList<String>();
+        ArrayList<String> lst=new ArrayList<>();
         int n=model.getRowCount();
         for (int i=0;i<n;i++) {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonAction.java

@@ -59 +59 @@
 
         // we create a list of commands that will modify the map in the way we want.
-        Collection<Command> cmds = new LinkedList<Command>();
+        Collection<Command> cmds = new LinkedList<>();
         // first we create all the nodes, then we do extra stuff based on what geometry type we need.
-        LinkedList<Node> nodes = new LinkedList<Node>();
+        LinkedList<Node> nodes = new LinkedList<>();
 
         for (LatLon ll : coordinates) {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonDialog.java

@@ -309 +309 @@
     private static LatLon[] parseLatLons(final String text) {
         String lines[] = text.split("\\r?\\n");
-        List<LatLon> latLons = new ArrayList<LatLon>();
+        List<LatLon> latLons = new ArrayList<>();
         for (String line : lines) {
             latLons.add(parseLatLon(line));
@@ -320 +320 @@
 
         final StringBuilder sb = new StringBuilder();
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         while (m.find()) {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java

@@ -145 +145 @@
 
     private void loadHistory() {
-        List<String> cmtHistory = new LinkedList<String>(
+        List<String> cmtHistory = new LinkedList<>(
                 Main.pref.getCollection(HISTORY_KEY, Arrays.asList(defaultHistory)));
         Collections.reverse(cmtHistory);
@@ -197 +197 @@
     
     public List<OsmPrimitive> getSelectedPrimitives() {
-        ArrayList<OsmPrimitive> sel = new ArrayList<OsmPrimitive>(100);
+        ArrayList<OsmPrimitive> sel = new ArrayList<>(100);
         for (int idx: tbl.getSelectedRows()) {
             sel.add(tableModel.getPrimitiveAt(tbl.convertRowIndexToModel(idx)));

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTaggerTableModel.java

@@ -29 +29 @@
 public class MultiTaggerTableModel extends AbstractTableModel implements SelectionChangedListener {
 
-    ArrayList<OsmPrimitive> list = new ArrayList<OsmPrimitive>(50);
+    ArrayList<OsmPrimitive> list = new ArrayList<>(50);
     String mainTags[] = new String[]{};
     boolean isSpecialTag[] = new boolean[]{};
-    Set<OsmPrimitiveType> shownTypes = new HashSet<OsmPrimitiveType>();
+    Set<OsmPrimitiveType> shownTypes = new HashSet<>();
     private boolean autoCommit = true;
-    List<Command> cmds = new ArrayList<Command>();
+    List<Command> cmds = new ArrayList<>();
     private boolean watchSelection = true;
     private JTable table;

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryAction.java

@@ -35 +35 @@
 
         // There must be two ways selected: one with id > 0 and one new.
-        List<OsmPrimitive> selection = new ArrayList<OsmPrimitive>(getCurrentDataSet().getSelected());
+        List<OsmPrimitive> selection = new ArrayList<>(getCurrentDataSet().getSelected());
         if (selection.size() != 2) {
             new Notification(

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java

@@ -116 +116 @@
         }
         // FIXME: handle different layers
-        List<Command> commands = new ArrayList<Command>();
+        List<Command> commands = new ArrayList<>();
         commands.add(MergeNodesAction.mergeNodes(Main.main.getEditLayer(), Arrays.asList(subjectNode, referenceNode), referenceNode));
 
@@ -143 +143 @@
         if (!subjectNode.isNew()) {
             // Prepare a list of nodes that are not important
-            Collection<Node> nodePool = new HashSet<Node>();
+            Collection<Node> nodePool = new HashSet<>();
             if (referenceObject instanceof Way) {
                 nodePool.addAll(getUnimportantNodes((Way) referenceObject));
@@ -161 +161 @@
         }
 
-        List<Command> commands = new ArrayList<Command>();
+        List<Command> commands = new ArrayList<>();
         AbstractMap<String, String> nodeTags = (AbstractMap<String, String>) subjectNode.getKeys();
 
@@ -248 +248 @@
         }
 
-        List<Command> commands = new ArrayList<Command>();
+        List<Command> commands = new ArrayList<>();
                 
         // merge tags
@@ -262 +262 @@
 
         // And the same for geometry, list nodes that can be freely deleted
-        List<Node> geometryPool = new LinkedList<Node>();
+        List<Node> geometryPool = new LinkedList<>();
         for( Node node : referenceWay.getNodes() ) {
             List<OsmPrimitive> referrers = node.getReferrers();
@@ -275 +275 @@
         // Find new nodes that are closest to the old ones, remove matching old ones from the pool
         // Assign node moves with least overall distance moved
-        Map<Node, Node> nodeAssoc = new HashMap<Node, Node>();
+        Map<Node, Node> nodeAssoc = new HashMap<>();
         if (geometryPool.size() > 0 && nodePool.size() > 0) {
             if (useRobust) {  // use robust, but slower assignment
@@ -319 +319 @@
                         tr("Exceeded iteration limit for robust method, using simpler method.")
                     ).setIcon(JOptionPane.WARNING_MESSAGE).show();     
-                    nodeAssoc = new HashMap<Node, Node>();
+                    nodeAssoc = new HashMap<>();
                 }
             }
@@ -375 +375 @@
      */
     protected static List<Node> getUnimportantNodes(Way way) {
-        List<Node> nodePool = new LinkedList<Node>();
+        List<Node> nodePool = new LinkedList<>();
         for (Node n : way.getNodes()) {
             List<OsmPrimitive> referrers = n.getReferrers();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/ConnectedMatch.java

@@ -29 +29 @@
      */
     private void init(boolean all) {
-        Collection<Way> matchedWays = new HashSet<Way>();
-        Set<Node> matchedNodes = new HashSet<Node>();
+        Collection<Way> matchedWays = new HashSet<>();
+        Set<Node> matchedNodes = new HashSet<>();
         // find all ways that match the expression
         Collection<Way> allWays = Main.main.getCurrentDataSet().getWays();
@@ -45 +45 @@
             }
         }
-        Set<Way> newWays = new HashSet<Way>();
+        Set<Way> newWays = new HashSet<>();
         if (all) {
             NodeWayUtils.addWaysConnectedToNodes(matchedNodes, newWays);

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/InsideMatch.java

@@ -30 +30 @@
      */
     private void init() {
-        Collection<OsmPrimitive> matchedAreas = new HashSet<OsmPrimitive>();
+        Collection<OsmPrimitive> matchedAreas = new HashSet<>();
         // find all ways that match the expression
         Collection<Way> ways = Main.main.getCurrentDataSet().getWays();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/search/IntersectingMatch.java

@@ -28 +28 @@
      */
     private void init(boolean all) {
-        Collection<Way> matchedWays = new HashSet<Way>();
+        Collection<Way> matchedWays = new HashSet<>();
         // find all ways that match the expression
         Collection<Way> allWays = Main.main.getCurrentDataSet().getWays();
@@ -36 +36 @@
             }
         }
-        Set<Way> newWays = new HashSet<Way>();
+        Set<Way> newWays = new HashSet<>();
         if (all) {
             NodeWayUtils.addWaysIntersectingWaysRecursively(allWays, matchedWays, newWays);

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentNodesAction.java

@@ -29 +29 @@
     }
 
-    private  Set<Way> activeWays = new HashSet<Way>();
+    private  Set<Way> activeWays = new HashSet<>();
 
     @Override
@@ -58 +58 @@
         // selecting nodes of selected ways
         if(selectedNodes.isEmpty()) {
-            HashSet<Node> newNodes = new HashSet<Node>();
+            HashSet<Node> newNodes = new HashSet<>();
             NodeWayUtils.addNodesConnectedToWays(selectedWays, newNodes);
             activeWays.clear();
@@ -69 +69 @@
         }
 
-        Set<Node> newNodes = new HashSet <Node>();
+        Set<Node> newNodes = new HashSet <>();
         for (Node node: selectedNodes) {
             for (Way w: activeWays) {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentWaysAction.java

@@ -38 +38 @@
 
         // select ways attached to already selected ways
-        Set<Way> newWays = new HashSet<Way>();
+        Set<Way> newWays = new HashSet<>();
         NodeWayUtils.addWaysConnectedToWays(selectedWays, newWays);
         newWays.addAll(selectedWays);

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/ConnectedWaysAction.java

@@ -33 +33 @@
         Set<Way> selectedWays = OsmPrimitive.getFilteredSet(getCurrentDataSet().getSelected(), Way.class);
 
-        Set<Way> newWays = new HashSet<Way>();
+        Set<Way> newWays = new HashSet<>();
 
         // selecting ways attached to selected nodes

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysAction.java

@@ -37 +37 @@
         // select ways attached to already selected ways
         if (!selectedWays.isEmpty()) {
-            Set<Way> newWays = new HashSet<Way>();
+            Set<Way> newWays = new HashSet<>();
             NodeWayUtils.addWaysIntersectingWays(
                     getCurrentDataSet().getWays(),

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysRecursiveAction.java

@@ -38 +38 @@
 
         if (!selectedWays.isEmpty()) {
-            Set<Way> newWays = new HashSet<Way>();
+            Set<Way> newWays = new HashSet<>();
             NodeWayUtils.addWaysIntersectingWaysRecursively(
                     getCurrentDataSet().getWays(),

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/MiddleNodesAction.java

@@ -46 +46 @@
         }
 
-        Set<Node> newNodes = new HashSet <Node>();
+        Set<Node> newNodes = new HashSet <>();
         NodeWayUtils.addMiddle(selectedNodes, newNodes);
         

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java

@@ -187 +187 @@
     public static void addWaysIntersectingWaysRecursively
         (Collection<Way> allWays, Collection<Way> initWays, Set<Way> newWays) {
-        Set<Way> foundWays = new HashSet<Way>();
+        Set<Way> foundWays = new HashSet<>();
         foundWays.addAll(initWays);
         newWays.addAll(initWays);
@@ -195 +195 @@
         do {
              c=0;
-             newFoundWays = new HashSet<Way>();
+             newFoundWays = new HashSet<>();
              for (Way w : foundWays){
                   c+=addWaysIntersectingWay(allWays, w, newFoundWays,newWays);
@@ -220 +220 @@
         do {
              c=0;
-             Set<Way> foundWays = new HashSet<Way>();
+             Set<Way> foundWays = new HashSet<>();
              foundWays.addAll(newWays);
              for (Way w : foundWays){
@@ -241 +241 @@
         Node n1 = it.next();
         Node n2 = it.next();
-        Set<Way> ways=new HashSet<Way>();
+        Set<Way> ways=new HashSet<>();
         ways.addAll(OsmPrimitive.getFilteredList(n1.getReferrers(), Way.class));
         for (Way w: ways) {
@@ -280 +280 @@
         Node curNode = w.lastNode();
         Node prevNode = w.getNode(w.getNodes().size()-2);
-        Set<Way> newestWays = new HashSet<Way>();
+        Set<Way> newestWays = new HashSet<>();
         while(true) {
 
@@ -361 +361 @@
        
         List<Node> searchNodes = data.searchNodes(box);
-        Set<Node> newestNodes = new HashSet<Node>();
-        Set<Way> newestWays = new HashSet<Way>();
+        Set<Node> newestNodes = new HashSet<>();
+        Set<Way> newestWays = new HashSet<>();
         for (Node n : searchNodes) {
             //if (Geometry.nodeInsidePolygon(n, polyNodes)) {
@@ -391 +391 @@
         
         List<Node> searchNodes = data.searchNodes(box);
-        Set<Node> newestNodes = new HashSet<Node>();
-        Set<Way> newestWays = new HashSet<Way>();
+        Set<Node> newestNodes = new HashSet<>();
+        Set<Way> newestWays = new HashSet<>();
         for (Node n : searchNodes) {
             //if (Geometry.nodeInsidePolygon(n, polyNodes)) {
@@ -483 +483 @@
         }
 
-        Set<Way> newWays = new HashSet<Way>();
-        Set<Node> newNodes = new HashSet<Node>();
+        Set<Way> newWays = new HashSet<>();
+        Set<Node> newNodes = new HashSet<>();
         // select nodes and ways inside slexcted ways and multipolygons
         if (!selectedWays.isEmpty()) {
@@ -503 +503 @@
         }
         
-        Set<OsmPrimitive> insideSelection = new HashSet<OsmPrimitive>();
+        Set<OsmPrimitive> insideSelection = new HashSet<>();
         if (!newWays.isEmpty() || !newNodes.isEmpty()) {
             insideSelection.addAll(newWays);
@@ -512 +512 @@
 
     private static List<EastNorth> buildPointList(Iterable<Way> ways) {
-        ArrayList<EastNorth> points = new ArrayList<EastNorth>(1000);
+        ArrayList<EastNorth> points = new ArrayList<>(1000);
         for (Way way: ways) {
             for (EastNorth en: getWayPoints(way)) {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectHighwayAction.java

@@ -54 +54 @@
 
     private Set<Way> selectNamedRoad( Way firstWay ) {
-        Set<Way> newWays = new HashSet<Way>();
+        Set<Way> newWays = new HashSet<>();
         String key = firstWay.hasKey("name") ? "name" : "ref";
         if( firstWay.hasKey(key) ) {
             String value = firstWay.get(key);
-            Queue<Node> nodeQueue = new LinkedList<Node>();
+            Queue<Node> nodeQueue = new LinkedList<>();
             nodeQueue.add(firstWay.firstNode());
             while( !nodeQueue.isEmpty() ) {
@@ -83 +83 @@
             intersection = firstTree.getIntersection(secondTree);
         }
-        Set<Way> newWays = new HashSet<Way>();
+        Set<Way> newWays = new HashSet<>();
         newWays.addAll(firstTree.getPath(intersection));
         newWays.addAll(secondTree.getPath(intersection));
@@ -142 +142 @@
 
         public HighwayTree( Way from, int minHighwayRank ) {
-            tree = new ArrayList<Way>(1);
-            refs = new ArrayList<Integer>(1);
+            tree = new ArrayList<>(1);
+            refs = new ArrayList<>(1);
             tree.add(from);
             refs.add(Integer.valueOf(-1));
             this.minHighwayRank = minHighwayRank;
-            nodesToCheck = new ArrayList<Node>(2);
-            nodeRefs = new ArrayList<Integer>(2);
+            nodesToCheck = new ArrayList<>(2);
+            nodeRefs = new ArrayList<>(2);
             nodesToCheck.add(from.firstNode());
             nodesToCheck.add(from.lastNode());
@@ -156 +156 @@
         
         public void processNextLevel() {
-            List<Node> newNodes = new ArrayList<Node>();
-            List<Integer> newIdx = new ArrayList<Integer>();
+            List<Node> newNodes = new ArrayList<>();
+            List<Integer> newIdx = new ArrayList<>();
             for( int i = 0; i < nodesToCheck.size(); i++ ) {
                 Node node = nodesToCheck.get(i);
@@ -197 +197 @@
             if( pos < 0 )
                 throw new ArrayIndexOutOfBoundsException("Way " + to + " is not in the tree.");
-            List<Way> result = new ArrayList<Way>(1);
+            List<Way> result = new ArrayList<>(1);
             while( pos >= 0 ) {
                 result.add(tree.get(pos));

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java

@@ -52 +52 @@
         }
 
-        Set<Node> nodes = new HashSet<Node>(10);
+        Set<Node> nodes = new HashSet<>(10);
         do {  //  select next history element
             if (idx>0) idx--; else idx=num-1;

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java

@@ -52 +52 @@
         }
 
-        Set<Way> ways = new HashSet<Way>(10);
+        Set<Way> ways = new HashSet<>(10);
         do {  //  select next history element
             if (idx>0) idx--; else idx=num-1;

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectWayNodesAction.java

@@ -54 +54 @@
                 Node n = (Node) p;
                 if (selectedNodes == null) {
-                    selectedNodes = new ArrayList<Node>();
+                    selectedNodes = new ArrayList<>();
                 }
                 selectedNodes.add(n);
@@ -68 +68 @@
         for (Node n : w.getNodes()) {
             if (selectedNodes == null) {
-                selectedNodes = new ArrayList<Node>();
+                selectedNodes = new ArrayList<>();
             }
             selectedNodes.add(n);

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UndoSelectionAction.java

@@ -48 +48 @@
         }
         int k=0;
-        Set<OsmPrimitive> newsel = new HashSet<OsmPrimitive>();
+        Set<OsmPrimitive> newsel = new HashSet<>();
         do {
             if (index+1<history.size()) index++; else index=0;