Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java (revision 30701) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java (revision 30737) @@ -20,5 +20,5 @@ public class ChosenRelation implements EditLayerChangeListener, MapViewPaintable, DataSetListener { protected Relation chosenRelation = null; - private Set chosenRelationListeners = new HashSet(); + private Set chosenRelationListeners = new HashSet<>(); public void set( Relation rel ) { Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java (revision 30701) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java (revision 30737) @@ -358,5 +358,5 @@ return; - Set relations = new TreeSet( + Set relations = new TreeSet<>( DefaultNameFormatter.getInstance().getRelationComparator()); for( OsmPrimitive element : newSelection ) { @@ -415,5 +415,5 @@ private static Map> loadRoles() { - Map> result = new HashMap>(); + Map> result = new HashMap<>(); try { ClassLoader classLoader = RelContextDialog.class.getClassLoader(); @@ -425,5 +425,5 @@ if( t.hasMoreTokens() ) { String type = t.nextToken(); - List roles = new ArrayList(); + List roles = new ArrayList<>(); while( t.hasMoreTokens() ) roles.add(t.nextToken()); @@ -442,5 +442,5 @@ JPanel panel = new JPanel(new GridBagLayout()); - List items = new ArrayList(); + List items = new ArrayList<>(); for( String role : roleBoxModel.getRoles() ) { if( role.length() > 1 ) @@ -527,5 +527,5 @@ Collection selected = Main.main.getCurrentDataSet().getSelected(); Relation r = chosenRelation.get(); - List commands = new ArrayList(); + List commands = new ArrayList<>(); for( int i = 0; i < r.getMembersCount(); i++ ) { RelationMember m = r.getMember(i); @@ -623,5 +623,5 @@ private class RoleComboBoxModel extends AbstractListModel implements ComboBoxModel { - private List roles = new ArrayList(); + private List roles = new ArrayList<>(); private int selectedIndex = -1; private JComboBox combobox; @@ -646,5 +646,5 @@ combobox.setEnabled(true); - List items = new ArrayList(); + List items = new ArrayList<>(); if( chosenRelation != null && chosenRelation.get() != null ) { if( chosenRelation.isMultipolygon() ) { Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java (revision 30701) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java (revision 30737) @@ -52,5 +52,5 @@ Relation r = new Relation(rel.get()); - Collection toAdd = new ArrayList(getCurrentDataSet().getSelected()); + Collection toAdd = new ArrayList<>(getCurrentDataSet().getSelected()); toAdd.remove(rel.get()); toAdd.removeAll(r.getMemberPrimitives()); @@ -132,5 +132,5 @@ state = 0; else { - Collection toAdd = new ArrayList(getCurrentDataSet().getSelected()); + Collection toAdd = new ArrayList<>(getCurrentDataSet().getSelected()); toAdd.remove(rel.get()); int selectedSize = toAdd.size(); Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java (revision 30701) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java (revision 30737) @@ -69,5 +69,5 @@ } else { if( TheRing.areAllOfThoseRings(selectedWays) ) { - List commands = new ArrayList(); + List commands = new ArrayList<>(); rels = TheRing.makeManySimpleMultipolygons(getCurrentDataSet().getSelectedWays(), commands); if( !commands.isEmpty() ) @@ -108,5 +108,5 @@ if( !list.isEmpty() && isBoundary ) { Main.main.undoRedo.add(new SequenceCommand(tr("Move tags from ways to relation"), list)); - list = new ArrayList(); + list = new ArrayList<>(); } if( isBoundary ) { @@ -179,5 +179,5 @@ */ private List fixWayTagsForBoundary( Relation rel ) { - List commands = new ArrayList(); + List commands = new ArrayList<>(); if( !rel.hasKey("boundary") || !rel.hasKey("admin_level") ) return commands; @@ -189,6 +189,6 @@ return commands; } - Set waysBoundary = new HashSet(); - Set waysAdminLevel = new HashSet(); + Set waysBoundary = new HashSet<>(); + Set waysAdminLevel = new HashSet<>(); for( OsmPrimitive p : rel.getMemberPrimitives() ) { if( p instanceof Way ) { @@ -222,5 +222,5 @@ } static public final List DEFAULT_LINEAR_TAGS = Arrays.asList(new String[] {"barrier", "source"}); - private static final Set REMOVE_FROM_BOUNDARY_TAGS = new TreeSet(Arrays.asList(new String[] { + private static final Set REMOVE_FROM_BOUNDARY_TAGS = new TreeSet<>(Arrays.asList(new String[] { "boundary", "boundary_type", "type", "admin_level" })); @@ -232,5 +232,5 @@ */ private List removeTagsFromInnerWays( Relation relation ) { - Map values = new HashMap(); + Map values = new HashMap<>(); if( relation.hasKeys() ) { @@ -240,8 +240,8 @@ } - List innerWays = new ArrayList(); - List outerWays = new ArrayList(); - - Set conflictingKeys = new TreeSet(); + List innerWays = new ArrayList<>(); + List outerWays = new ArrayList<>(); + + Set conflictingKeys = new TreeSet<>(); for( RelationMember m : relation.getMembers() ) { @@ -284,5 +284,5 @@ String name = values.get("name"); if( isBoundary ) { - Set keySet = new TreeSet(values.keySet()); + Set keySet = new TreeSet<>(values.keySet()); for( String key : keySet ) if( !REMOVE_FROM_BOUNDARY_TAGS.contains(key) ) @@ -292,9 +292,9 @@ values.put("area", "yes"); - List commands = new ArrayList(); + List commands = new ArrayList<>(); boolean moveTags = getPref("tags"); for( String key : values.keySet() ) { - List affectedWays = new ArrayList(); + List affectedWays = new ArrayList<>(); String value = values.get(key); Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadChosenRelationAction.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadChosenRelationAction.java (revision 30701) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadChosenRelationAction.java (revision 30737) @@ -68,5 +68,5 @@ protected void downloadIncomplete( Relation rel ) { if( rel.isNew() ) return; - Set ret = new HashSet(); + Set ret = new HashSet<>(); ret.addAll(rel.getIncompleteMembers()); if( ret.isEmpty() ) return; Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java (revision 30701) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java (revision 30737) @@ -43,5 +43,5 @@ Relation relation = rel.get(); if( relation == null ) return; - List objects = new ArrayList(); + List objects = new ArrayList<>(); objects.add(relation); objects.addAll(relation.getMemberPrimitives()); @@ -61,5 +61,5 @@ protected void downloadIncomplete( Relation rel ) { if( rel.isNew() ) return; - Set ret = new HashSet(); + Set ret = new HashSet<>(); ret.addAll(rel.getIncompleteMembers()); if( ret.isEmpty() ) return; Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java (revision 30701) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java (revision 30737) @@ -123,5 +123,5 @@ String[] keywords = filter == null ? new String[0] : filter.split("\\s+"); if( keywords.length > 0 ) { - List filteredKeywords = new ArrayList(keywords.length); + List filteredKeywords = new ArrayList<>(keywords.length); for( String s : keywords ) if( s.length() > 0 ) @@ -134,5 +134,5 @@ System.out.println("keyword["+i+"] = " + keywords[i]); - List relations = new ArrayList(); + List relations = new ArrayList<>(); if( getEditLayer() != null ) { for( Relation r : getEditLayer().data.getRelations() ) { @@ -168,5 +168,5 @@ */ protected class FindRelationListModel extends AbstractListModel { - private final ArrayList relations = new ArrayList(); + private final ArrayList relations = new ArrayList<>(); private DefaultListSelectionModel selectionModel; Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java (revision 30701) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java (revision 30737) @@ -55,5 +55,5 @@ public void actionPerformed( ActionEvent e ) { Relation r = rel.get(); - List ways = new ArrayList(); + List ways = new ArrayList<>(); boolean wont = false; for( RelationMember m : r.getMembers() ) { @@ -81,6 +81,6 @@ rel.clear(); - List newSelection = new ArrayList(); - List commands = new ArrayList(); + List newSelection = new ArrayList<>(); + List commands = new ArrayList<>(); Command c = DeleteCommand.delete(Main.main.getEditLayer(), Collections.singleton(r), true, true); if( c == null ) @@ -92,5 +92,5 @@ Map tags = p.ways.get(0).getKeys(); List relations = p.ways.get(0).getReferrers(); - Set noTags = new HashSet(r.keySet()); + Set noTags = new HashSet<>(r.keySet()); for( int i = 1; i < p.ways.size(); i++ ) { Way w = p.ways.get(i); @@ -115,5 +115,5 @@ if( w.getReferrers().equals(relations) ) { // check tags that remain - Set keys = new HashSet(w.keySet()); + Set keys = new HashSet<>(w.keySet()); keys.removeAll(tags.keySet()); keys.removeAll(IRRELEVANT_KEYS); Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java (revision 30701) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java (revision 30737) @@ -43,5 +43,5 @@ String base = Main.pref.get("url.openstreetmap-wiki", "http://wiki.openstreetmap.org/wiki/"); String lang = LanguageInfo.getWikiLanguagePrefix(); - final List uris = new ArrayList(); + final List uris = new ArrayList<>(); String type = URLEncoder.encode(rel.get().get("type"), "UTF-8"); Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SortAndFixAction.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SortAndFixAction.java (revision 30701) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SortAndFixAction.java (revision 30737) @@ -39,5 +39,5 @@ // construct all available fixers - fixers = new ArrayList(); + fixers = new ArrayList<>(); //should be before multipolygon as takes special case of multipolygon relation - boundary fixers.add(new BoundaryFixer()); // boundary, multipolygon, boundary=administrative Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SplittingMultipolygons.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SplittingMultipolygons.java (revision 30701) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SplittingMultipolygons.java (revision 30737) @@ -24,6 +24,6 @@ public static boolean canProcess( Collection ways ) { - List rings = new ArrayList(); - List arcs = new ArrayList(); + List rings = new ArrayList<>(); + List arcs = new ArrayList<>(); Area a = Main.main.getCurrentDataSet().getDataSourceArea(); for( Way way : ways ) { @@ -70,7 +70,7 @@ public static List process( Collection selectedWays ) { // System.out.println("---------------------------------------"); - List result = new ArrayList(); - List rings = new ArrayList(); - List arcs = new ArrayList(); + List result = new ArrayList<>(); + List rings = new ArrayList<>(); + List arcs = new ArrayList<>(); for( Way way : selectedWays ) { if( way.isClosed() ) @@ -81,5 +81,5 @@ for( Way ring : rings ) { - List commands = new ArrayList(); + List commands = new ArrayList<>(); Relation newRelation = SplittingMultipolygons.attachRingToNeighbours(ring, commands); if( newRelation != null && !commands.isEmpty() ) { @@ -90,5 +90,5 @@ for( Way arc : arcs) { - List commands = new ArrayList(); + List commands = new ArrayList<>(); Relation newRelation = SplittingMultipolygons.tryToCloseOneWay(arc, commands); if( newRelation != null && !commands.isEmpty() ) { @@ -105,5 +105,5 @@ private static void closePolygon( List base, List append ) { if( append.get(0).equals(base.get(0)) && append.get(append.size() - 1).equals(base.get(base.size() - 1)) ) { - List ap2 = new ArrayList(append); + List ap2 = new ArrayList<>(append); Collections.reverse(ap2); append = ap2; @@ -131,5 +131,5 @@ */ public static List splitWay( Way w, Node n1, Node n2, List commands ) { - List nodes = new ArrayList(w.getNodes()); + List nodes = new ArrayList<>(w.getNodes()); if( w.isClosed() ) nodes.remove(nodes.size() - 1); @@ -150,11 +150,11 @@ // make a list of segments - List> chunks = new ArrayList>(2); - List chunk = new ArrayList(); + List> chunks = new ArrayList<>(2); + List chunk = new ArrayList<>(); for( int i = 0; i < nodes.size(); i++ ) { chunk.add(nodes.get(i)); if( (w.isClosed() || chunk.size() > 1) && (i == index1 || i == index2) ) { chunks.add(chunk); - chunk = new ArrayList(); + chunk = new ArrayList<>(); chunk.add(nodes.get(i)); } @@ -177,6 +177,6 @@ // build a map of referencing relations - Map references = new HashMap(); - List relationCommands = new ArrayList(); + Map references = new HashMap<>(); + List relationCommands = new ArrayList<>(); for( OsmPrimitive p : w.getReferrers() ) { if( p instanceof Relation ) { @@ -191,5 +191,5 @@ // build ways - List result = new ArrayList(); + List result = new ArrayList<>(); Way updatedWay = commands == null ? w : new Way(w); updatedWay.setNodes(chunks.get(0)); @@ -245,5 +245,5 @@ // time to create a new multipolygon relation and a command stack - List commands = new ArrayList(); + List commands = new ArrayList<>(); Relation newRelation = new Relation(); newRelation.put("type", "multipolygon"); @@ -263,5 +263,5 @@ // now split the way, at last - List newWays = new ArrayList(splitWay(target, segment.firstNode(), segment.lastNode(), commands)); + List newWays = new ArrayList<>(splitWay(target, segment.firstNode(), segment.lastNode(), commands)); Way addingWay = null; @@ -269,5 +269,5 @@ Way utarget = newWays.get(1); Way alternate = newWays.get(0); - List testRing = new ArrayList(segment.getNodes()); + List testRing = new ArrayList<>(segment.getNodes()); closePolygon(testRing, utarget.getNodes()); addingWay = segmentInsidePolygon(alternate.getNode(0), alternate.getNode(1), testRing) ? alternate : utarget; @@ -292,5 +292,5 @@ */ private static List intersection( Collection list1, Collection list2 ) { - List result = new ArrayList(); + List result = new ArrayList<>(); for( T item : list1 ) if( list2.contains(item) ) @@ -305,5 +305,5 @@ if( !ring.isClosed() || ring.isIncomplete() ) return null; - Map touchingWays = new HashMap(); + Map touchingWays = new HashMap<>(); for( Node n : ring.getNodes() ) { for( OsmPrimitive p : n.getReferrers() ) { @@ -322,5 +322,5 @@ } - List otherWays = new ArrayList(); + List otherWays = new ArrayList<>(); for( Way w : touchingWays.keySet() ) if( touchingWays.get(w) ) { @@ -335,5 +335,5 @@ // now touchingWays has only ways that touch the ring twice - List commands = new ArrayList(); + List commands = new ArrayList<>(); TheRing theRing = new TheRing(ring); // this is actually useful @@ -345,5 +345,5 @@ otherRing.putSourceWayFirst(); - Map relationCache = new HashMap(); + Map relationCache = new HashMap<>(); for( TheRing otherRing : otherWays ) commands.addAll(otherRing.getCommands(false, relationCache)); Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/TheRing.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/TheRing.java (revision 30701) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/TheRing.java (revision 30737) @@ -37,10 +37,10 @@ public TheRing( Way source ) { this.source = source; - segments = new ArrayList(1); + segments = new ArrayList<>(1); segments.add(new RingSegment(source)); } public static boolean areAllOfThoseRings( Collection ways ) { - List rings = new ArrayList(); + List rings = new ArrayList<>(); for( Way way : ways ) { if( way.isClosed() ) @@ -70,5 +70,5 @@ public static List makeManySimpleMultipolygons( Collection selection, List commands ) { log("---------------------------------------"); - List rings = new ArrayList(selection.size()); + List rings = new ArrayList<>(selection.size()); for( Way w : selection ) rings.add(new TheRing(w)); @@ -77,6 +77,6 @@ rings.get(i).collide(rings.get(j)); redistributeSegments(rings); - List relations = new ArrayList(); - Map relationCache = new HashMap(); + List relations = new ArrayList<>(); + Map relationCache = new HashMap<>(); for( TheRing r : rings ) { commands.addAll(r.getCommands(relationCache)); @@ -247,5 +247,5 @@ public static void redistributeSegments( List rings ) { // build segments map - Map segmentMap = new HashMap(); + Map segmentMap = new HashMap<>(); for( TheRing ring : rings ) for( RingSegment seg : ring.segments ) @@ -317,6 +317,6 @@ // build a map of referencing relations - Map referencingRelations = new HashMap(); - List relationCommands = new ArrayList(); + Map referencingRelations = new HashMap<>(); + List relationCommands = new ArrayList<>(); for( OsmPrimitive p : source.getReferrers() ) { if( p instanceof Relation ) { @@ -342,5 +342,5 @@ // по�тому �охран�ет�� только первое изменение - List commands = new ArrayList(); + List commands = new ArrayList<>(); boolean foundOwnWay = false; for( RingSegment seg : segments ) { @@ -464,5 +464,5 @@ if( pos <= 0 || pos >= nodes.size() - 1 ) return null; - List newNodes = new ArrayList(nodes.subList(pos, nodes.size())); + List newNodes = new ArrayList<>(nodes.subList(pos, nodes.size())); nodes.subList(pos + 1, nodes.size()).clear(); return new RingSegment(newNodes); @@ -489,5 +489,5 @@ return null; - List newNodes = new ArrayList(); + List newNodes = new ArrayList<>(); if( pos2 > pos1 ) { newNodes.addAll(nodes.subList(pos2, nodes.size())); @@ -499,5 +499,5 @@ } else { newNodes.addAll(nodes.subList(pos2, pos1 + 1)); - nodes.addAll(new ArrayList(nodes.subList(0, pos2 + 1))); + nodes.addAll(new ArrayList<>(nodes.subList(0, pos2 + 1))); nodes.subList(0, pos1).clear(); } @@ -513,5 +513,5 @@ if( nodes == null ) throw new IllegalArgumentException("Won't give you wayNodes: it is a reference"); - List wayNodes = new ArrayList(nodes); + List wayNodes = new ArrayList<>(nodes); if( isRing ) wayNodes.add(wayNodes.get(0)); Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/AssociatedStreetFixer.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/AssociatedStreetFixer.java (revision 30701) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/AssociatedStreetFixer.java (revision 30737) @@ -100,5 +100,5 @@ // fill relation name - Map streetNames = new HashMap(); + Map streetNames = new HashMap<>(); for (RelationMember m : rel.getMembers()) if ("street".equals(m.getRole()) && m.isWay()) { @@ -126,5 +126,5 @@ } - List commandList = new ArrayList(); + List commandList = new ArrayList<>(); if (fixed) { commandList.add(new ChangeCommand(source, rel)); Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/MultipolygonFixer.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/MultipolygonFixer.java (revision 30701) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/MultipolygonFixer.java (revision 30737) @@ -52,5 +52,5 @@ */ protected Relation fixMultipolygonRoles( Relation source ) { - Collection ways = new ArrayList(); + Collection ways = new ArrayList<>(); for( OsmPrimitive p : source.getMemberPrimitives() ) if( p instanceof Way ) @@ -63,9 +63,9 @@ Relation r = new Relation(source); boolean fixed = false; - Set outerWays = new HashSet(); + Set outerWays = new HashSet<>(); for( MultipolygonBuilder.JoinedPolygon poly : mpc.outerWays ) for( Way w : poly.ways ) outerWays.add(w); - Set innerWays = new HashSet(); + Set innerWays = new HashSet<>(); for( MultipolygonBuilder.JoinedPolygon poly : mpc.innerWays ) for( Way w : poly.ways ) Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/RelationFixer.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/RelationFixer.java (revision 30701) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/RelationFixer.java (revision 30737) @@ -23,5 +23,5 @@ */ public RelationFixer(String... types) { - applicableTypes = new ArrayList(); + applicableTypes = new ArrayList<>(); for(String type: types) { applicableTypes.add(type);