Ignore:
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/reltoolbox/src/relcontext
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java

    r29531 r30737  
    2020public class ChosenRelation implements EditLayerChangeListener, MapViewPaintable, DataSetListener {
    2121    protected Relation chosenRelation = null;
    22     private Set<ChosenRelationListener> chosenRelationListeners = new HashSet<ChosenRelationListener>();
     22    private Set<ChosenRelationListener> chosenRelationListeners = new HashSet<>();
    2323
    2424    public void set( Relation rel ) {

  • applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

    r30532 r30737  
    358358            return;
    359359
    360         Set<Relation> relations = new TreeSet<Relation>(
     360        Set<Relation> relations = new TreeSet<>(
    361361                DefaultNameFormatter.getInstance().getRelationComparator());
    362362        for( OsmPrimitive element : newSelection ) {
    … …  
    415415
    416416    private static Map<String, List<String>> loadRoles() {
    417         Map<String, List<String>> result = new HashMap<String, List<String>>();
     417        Map<String, List<String>> result = new HashMap<>();
    418418        try {
    419419            ClassLoader classLoader = RelContextDialog.class.getClassLoader();
    … …  
    425425                if( t.hasMoreTokens() ) {
    426426                    String type = t.nextToken();
    427                     List<String> roles = new ArrayList<String>();
     427                    List<String> roles = new ArrayList<>();
    428428                    while( t.hasMoreTokens() )
    429429                        roles.add(t.nextToken());
    … …  
    442442        JPanel panel = new JPanel(new GridBagLayout());
    443443
    444         List<String> items = new ArrayList<String>();
     444        List<String> items = new ArrayList<>();
    445445        for( String role : roleBoxModel.getRoles() ) {
    446446            if( role.length() > 1 )
    … …  
    527527            Collection<OsmPrimitive> selected = Main.main.getCurrentDataSet().getSelected();
    528528            Relation r = chosenRelation.get();
    529             List<Command> commands = new ArrayList<Command>();
     529            List<Command> commands = new ArrayList<>();
    530530            for( int i = 0; i < r.getMembersCount(); i++ ) {
    531531                RelationMember m = r.getMember(i);
    … …  
    623623       
    624624    private class RoleComboBoxModel extends AbstractListModel<String> implements ComboBoxModel<String> {
    625         private List<String> roles = new ArrayList<String>();
     625        private List<String> roles = new ArrayList<>();
    626626        private int selectedIndex = -1;
    627627        private JComboBox<String> combobox;
    … …  
    646646                combobox.setEnabled(true);
    647647
    648             List<String> items = new ArrayList<String>();
     648            List<String> items = new ArrayList<>();
    649649            if( chosenRelation != null && chosenRelation.get() != null ) {
    650650                if( chosenRelation.isMultipolygon() ) {

  • applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java

    r30701 r30737  
    5252        Relation r = new Relation(rel.get());
    5353
    54         Collection<OsmPrimitive> toAdd = new ArrayList<OsmPrimitive>(getCurrentDataSet().getSelected());
     54        Collection<OsmPrimitive> toAdd = new ArrayList<>(getCurrentDataSet().getSelected());
    5555        toAdd.remove(rel.get());
    5656        toAdd.removeAll(r.getMemberPrimitives());
    … …  
    132132            state = 0;
    133133        else {
    134             Collection<OsmPrimitive> toAdd = new ArrayList<OsmPrimitive>(getCurrentDataSet().getSelected());
     134            Collection<OsmPrimitive> toAdd = new ArrayList<>(getCurrentDataSet().getSelected());
    135135            toAdd.remove(rel.get());
    136136            int selectedSize = toAdd.size();

  • applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java

    r30701 r30737  
    6969            } else {
    7070                if( TheRing.areAllOfThoseRings(selectedWays) ) {
    71                     List<Command> commands = new ArrayList<Command>();
     71                    List<Command> commands = new ArrayList<>();
    7272                    rels = TheRing.makeManySimpleMultipolygons(getCurrentDataSet().getSelectedWays(), commands);
    7373                    if( !commands.isEmpty() )
    … …  
    108108        if( !list.isEmpty() && isBoundary ) {
    109109            Main.main.undoRedo.add(new SequenceCommand(tr("Move tags from ways to relation"), list));
    110             list = new ArrayList<Command>();
     110            list = new ArrayList<>();
    111111        }
    112112        if( isBoundary ) {
    … …  
    179179     */
    180180    private List<Command> fixWayTagsForBoundary( Relation rel ) {
    181         List<Command> commands = new ArrayList<Command>();
     181        List<Command> commands = new ArrayList<>();
    182182        if( !rel.hasKey("boundary") || !rel.hasKey("admin_level") )
    183183            return commands;
    … …  
    189189            return commands;
    190190        }
    191         Set<OsmPrimitive> waysBoundary = new HashSet<OsmPrimitive>();
    192         Set<OsmPrimitive> waysAdminLevel = new HashSet<OsmPrimitive>();
     191        Set<OsmPrimitive> waysBoundary = new HashSet<>();
     192        Set<OsmPrimitive> waysAdminLevel = new HashSet<>();
    193193        for( OsmPrimitive p : rel.getMemberPrimitives() ) {
    194194            if( p instanceof Way ) {
    … …  
    222222    }
    223223    static public final List<String> DEFAULT_LINEAR_TAGS = Arrays.asList(new String[] {"barrier", "source"});
    224     private static final Set<String> REMOVE_FROM_BOUNDARY_TAGS = new TreeSet<String>(Arrays.asList(new String[] {
     224    private static final Set<String> REMOVE_FROM_BOUNDARY_TAGS = new TreeSet<>(Arrays.asList(new String[] {
    225225                "boundary", "boundary_type", "type", "admin_level"
    226226            }));
    … …  
    232232     */
    233233    private List<Command> removeTagsFromInnerWays( Relation relation ) {
    234         Map<String, String> values = new HashMap<String, String>();
     234        Map<String, String> values = new HashMap<>();
    235235
    236236        if( relation.hasKeys() ) {
    … …  
    240240        }
    241241
    242         List<Way> innerWays = new ArrayList<Way>();
    243         List<Way> outerWays = new ArrayList<Way>();
    244 
    245         Set<String> conflictingKeys = new TreeSet<String>();
     242        List<Way> innerWays = new ArrayList<>();
     243        List<Way> outerWays = new ArrayList<>();
     244
     245        Set<String> conflictingKeys = new TreeSet<>();
    246246
    247247        for( RelationMember m : relation.getMembers() ) {
    … …  
    284284        String name = values.get("name");
    285285        if( isBoundary ) {
    286             Set<String> keySet = new TreeSet<String>(values.keySet());
     286            Set<String> keySet = new TreeSet<>(values.keySet());
    287287            for( String key : keySet )
    288288                if( !REMOVE_FROM_BOUNDARY_TAGS.contains(key) )
    … …  
    292292        values.put("area", "yes");
    293293
    294         List<Command> commands = new ArrayList<Command>();
     294        List<Command> commands = new ArrayList<>();
    295295        boolean moveTags = getPref("tags");
    296296
    297297        for( String key : values.keySet() ) {
    298             List<OsmPrimitive> affectedWays = new ArrayList<OsmPrimitive>();
     298            List<OsmPrimitive> affectedWays = new ArrayList<>();
    299299            String value = values.get(key);
    300300

  • applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadChosenRelationAction.java

    r30145 r30737  
    6868    protected void downloadIncomplete( Relation rel ) {
    6969        if( rel.isNew() ) return;
    70         Set<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
     70        Set<OsmPrimitive> ret = new HashSet<>();
    7171        ret.addAll(rel.getIncompleteMembers());
    7272        if( ret.isEmpty() ) return;

  • applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java

    r30264 r30737  
    4343        Relation relation = rel.get();
    4444        if( relation == null ) return;
    45         List<OsmPrimitive> objects = new ArrayList<OsmPrimitive>();
     45        List<OsmPrimitive> objects = new ArrayList<>();
    4646        objects.add(relation);
    4747        objects.addAll(relation.getMemberPrimitives());
    … …  
    6161    protected void downloadIncomplete( Relation rel ) {
    6262        if( rel.isNew() ) return;
    63         Set<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
     63        Set<OsmPrimitive> ret = new HashSet<>();
    6464        ret.addAll(rel.getIncompleteMembers());
    6565        if( ret.isEmpty() ) return;

  • applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java

    r30532 r30737  
    123123        String[] keywords = filter == null ? new String[0] : filter.split("\\s+");
    124124        if( keywords.length > 0 ) {
    125             List<String> filteredKeywords = new ArrayList<String>(keywords.length);
     125            List<String> filteredKeywords = new ArrayList<>(keywords.length);
    126126            for( String s : keywords )
    127127                if( s.length() > 0 )
    … …  
    134134            System.out.println("keyword["+i+"] = " + keywords[i]);
    135135
    136         List<Relation> relations = new ArrayList<Relation>();
     136        List<Relation> relations = new ArrayList<>();
    137137        if( getEditLayer() != null ) {
    138138            for( Relation r : getEditLayer().data.getRelations() ) {
    … …  
    168168     */
    169169    protected class FindRelationListModel extends AbstractListModel<Relation> {
    170         private final ArrayList<Relation> relations = new ArrayList<Relation>();
     170        private final ArrayList<Relation> relations = new ArrayList<>();
    171171        private DefaultListSelectionModel selectionModel;
    172172

  • applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

    r30587 r30737  
    5555    public void actionPerformed( ActionEvent e ) {
    5656        Relation r = rel.get();
    57         List<Way> ways = new ArrayList<Way>();
     57        List<Way> ways = new ArrayList<>();
    5858        boolean wont = false;
    5959        for( RelationMember m : r.getMembers() ) {
    … …  
    8181       
    8282        rel.clear();
    83         List<Way> newSelection = new ArrayList<Way>();
    84         List<Command> commands = new ArrayList<Command>();
     83        List<Way> newSelection = new ArrayList<>();
     84        List<Command> commands = new ArrayList<>();
    8585        Command c = DeleteCommand.delete(Main.main.getEditLayer(), Collections.singleton(r), true, true);
    8686        if( c == null )
    … …  
    9292            Map<String, String> tags = p.ways.get(0).getKeys();
    9393            List<OsmPrimitive> relations = p.ways.get(0).getReferrers();
    94             Set<String> noTags = new HashSet<String>(r.keySet());
     94            Set<String> noTags = new HashSet<>(r.keySet());
    9595            for( int i = 1; i < p.ways.size(); i++ ) {
    9696                Way w = p.ways.get(i);
    … …  
    115115                if( w.getReferrers().equals(relations) ) {
    116116                    // check tags that remain
    117                     Set<String> keys = new HashSet<String>(w.keySet());
     117                    Set<String> keys = new HashSet<>(w.keySet());
    118118                    keys.removeAll(tags.keySet());
    119119                    keys.removeAll(IRRELEVANT_KEYS);

  • applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/RelationHelpAction.java

    r25711 r30737  
    4343            String base = Main.pref.get("url.openstreetmap-wiki", "http://wiki.openstreetmap.org/wiki/");
    4444            String lang = LanguageInfo.getWikiLanguagePrefix();
    45             final List<URI> uris = new ArrayList<URI>();
     45            final List<URI> uris = new ArrayList<>();
    4646            String type = URLEncoder.encode(rel.get().get("type"), "UTF-8");
    4747

  • applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SortAndFixAction.java

    r28703 r30737  
    3939
    4040        // construct all available fixers
    41         fixers = new ArrayList<RelationFixer>();
     41        fixers = new ArrayList<>();
    4242        //should be before multipolygon as takes special case of multipolygon relation - boundary
    4343        fixers.add(new BoundaryFixer()); // boundary, multipolygon, boundary=administrative

  • applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SplittingMultipolygons.java

    r29854 r30737  
    2424
    2525    public static boolean canProcess( Collection<Way> ways ) {
    26         List<Way> rings = new ArrayList<Way>();
    27         List<Way> arcs = new ArrayList<Way>();
     26        List<Way> rings = new ArrayList<>();
     27        List<Way> arcs = new ArrayList<>();
    2828        Area a = Main.main.getCurrentDataSet().getDataSourceArea();
    2929        for( Way way : ways ) {
    … …  
    7070    public static List<Relation> process( Collection<Way> selectedWays ) {
    7171//      System.out.println("---------------------------------------");
    72         List<Relation> result = new ArrayList<Relation>();
    73         List<Way> rings = new ArrayList<Way>();
    74         List<Way> arcs = new ArrayList<Way>();
     72        List<Relation> result = new ArrayList<>();
     73        List<Way> rings = new ArrayList<>();
     74        List<Way> arcs = new ArrayList<>();
    7575        for( Way way : selectedWays ) {
    7676            if( way.isClosed() )
    … …  
    8181
    8282        for( Way ring : rings ) {
    83             List<Command> commands = new ArrayList<Command>();
     83            List<Command> commands = new ArrayList<>();
    8484            Relation newRelation = SplittingMultipolygons.attachRingToNeighbours(ring, commands);
    8585            if( newRelation != null && !commands.isEmpty() ) {
    … …  
    9090
    9191        for( Way arc : arcs) {
    92             List<Command> commands = new ArrayList<Command>();
     92            List<Command> commands = new ArrayList<>();
    9393            Relation newRelation = SplittingMultipolygons.tryToCloseOneWay(arc, commands);
    9494            if( newRelation != null && !commands.isEmpty() ) {
    … …  
    105105    private static void closePolygon( List<Node> base, List<Node> append ) {
    106106        if( append.get(0).equals(base.get(0)) && append.get(append.size() - 1).equals(base.get(base.size() - 1)) ) {
    107             List<Node> ap2 = new ArrayList<Node>(append);
     107            List<Node> ap2 = new ArrayList<>(append);
    108108            Collections.reverse(ap2);
    109109            append = ap2;
    … …  
    131131     */
    132132    public static List<Way> splitWay( Way w, Node n1, Node n2, List<Command> commands ) {
    133         List<Node> nodes = new ArrayList<Node>(w.getNodes());
     133        List<Node> nodes = new ArrayList<>(w.getNodes());
    134134        if( w.isClosed() )
    135135            nodes.remove(nodes.size() - 1);
    … …  
    150150
    151151        // make a list of segments
    152         List<List<Node>> chunks = new ArrayList<List<Node>>(2);
    153         List<Node> chunk = new ArrayList<Node>();
     152        List<List<Node>> chunks = new ArrayList<>(2);
     153        List<Node> chunk = new ArrayList<>();
    154154        for( int i = 0; i < nodes.size(); i++ ) {
    155155            chunk.add(nodes.get(i));
    156156            if( (w.isClosed() || chunk.size() > 1) && (i == index1 || i == index2) ) {
    157157                chunks.add(chunk);
    158                 chunk = new ArrayList<Node>();
     158                chunk = new ArrayList<>();
    159159                chunk.add(nodes.get(i));
    160160            }
    … …  
    177177
    178178        // build a map of referencing relations
    179         Map<Relation, Integer> references = new HashMap<Relation, Integer>();
    180         List<Command> relationCommands = new ArrayList<Command>();
     179        Map<Relation, Integer> references = new HashMap<>();
     180        List<Command> relationCommands = new ArrayList<>();
    181181        for( OsmPrimitive p : w.getReferrers() ) {
    182182            if( p instanceof Relation ) {
    … …  
    191191
    192192        // build ways
    193         List<Way> result = new ArrayList<Way>();
     193        List<Way> result = new ArrayList<>();
    194194        Way updatedWay = commands == null ? w : new Way(w);
    195195        updatedWay.setNodes(chunks.get(0));
    … …  
    245245
    246246        // time to create a new multipolygon relation and a command stack
    247         List<Command> commands = new ArrayList<Command>();
     247        List<Command> commands = new ArrayList<>();
    248248        Relation newRelation = new Relation();
    249249        newRelation.put("type", "multipolygon");
    … …  
    263263
    264264        // now split the way, at last
    265         List<Way> newWays = new ArrayList<Way>(splitWay(target, segment.firstNode(), segment.lastNode(), commands));
     265        List<Way> newWays = new ArrayList<>(splitWay(target, segment.firstNode(), segment.lastNode(), commands));
    266266
    267267        Way addingWay = null;
    … …  
    269269            Way utarget = newWays.get(1);
    270270            Way alternate = newWays.get(0);
    271             List<Node> testRing = new ArrayList<Node>(segment.getNodes());
     271            List<Node> testRing = new ArrayList<>(segment.getNodes());
    272272            closePolygon(testRing, utarget.getNodes());
    273273            addingWay = segmentInsidePolygon(alternate.getNode(0), alternate.getNode(1), testRing) ? alternate : utarget;
    … …  
    292292     */
    293293    private static <T> List<T> intersection( Collection<T> list1, Collection<T> list2 ) {
    294         List<T> result = new ArrayList<T>();
     294        List<T> result = new ArrayList<>();
    295295        for( T item : list1 )
    296296            if( list2.contains(item) )
    … …  
    305305        if( !ring.isClosed() || ring.isIncomplete() )
    306306            return null;
    307         Map<Way, Boolean> touchingWays = new HashMap<Way, Boolean>();
     307        Map<Way, Boolean> touchingWays = new HashMap<>();
    308308        for( Node n : ring.getNodes() ) {
    309309            for( OsmPrimitive p : n.getReferrers() ) {
    … …  
    322322        }
    323323       
    324         List<TheRing> otherWays = new ArrayList<TheRing>();
     324        List<TheRing> otherWays = new ArrayList<>();
    325325        for( Way w : touchingWays.keySet() )
    326326            if( touchingWays.get(w) ) {
    … …  
    335335       
    336336        // now touchingWays has only ways that touch the ring twice
    337         List<Command> commands = new ArrayList<Command>();
     337        List<Command> commands = new ArrayList<>();
    338338        TheRing theRing = new TheRing(ring); // this is actually useful
    339339       
    … …  
    345345            otherRing.putSourceWayFirst();
    346346       
    347         Map<Relation, Relation> relationCache = new HashMap<Relation, Relation>();
     347        Map<Relation, Relation> relationCache = new HashMap<>();
    348348        for( TheRing otherRing : otherWays )
    349349            commands.addAll(otherRing.getCommands(false, relationCache));

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

    r29535 r30737  
    3737    public TheRing( Way source ) {
    3838        this.source = source;
    39         segments = new ArrayList<RingSegment>(1);
     39        segments = new ArrayList<>(1);
    4040        segments.add(new RingSegment(source));
    4141    }
    4242   
    4343    public static boolean areAllOfThoseRings( Collection<Way> ways ) {
    44         List<Way> rings = new ArrayList<Way>();
     44        List<Way> rings = new ArrayList<>();
    4545        for( Way way : ways ) {
    4646            if( way.isClosed() )
    … …  
    7070    public static List<Relation> makeManySimpleMultipolygons( Collection<Way> selection, List<Command> commands ) {
    7171        log("---------------------------------------");
    72         List<TheRing> rings = new ArrayList<TheRing>(selection.size());
     72        List<TheRing> rings = new ArrayList<>(selection.size());
    7373        for( Way w : selection )
    7474            rings.add(new TheRing(w));
    … …  
    7777                rings.get(i).collide(rings.get(j));
    7878        redistributeSegments(rings);
    79         List<Relation> relations = new ArrayList<Relation>();
    80         Map<Relation, Relation> relationCache = new HashMap<Relation, Relation>();
     79        List<Relation> relations = new ArrayList<>();
     80        Map<Relation, Relation> relationCache = new HashMap<>();
    8181        for( TheRing r : rings ) {
    8282            commands.addAll(r.getCommands(relationCache));
    … …  
    247247    public static void redistributeSegments( List<TheRing> rings ) {
    248248        // build segments map
    249         Map<RingSegment, TheRing> segmentMap = new HashMap<RingSegment, TheRing>();
     249        Map<RingSegment, TheRing> segmentMap = new HashMap<>();
    250250        for( TheRing ring : rings )
    251251            for( RingSegment seg : ring.segments )
    … …  
    317317
    318318        // build a map of referencing relations
    319         Map<Relation, Integer> referencingRelations = new HashMap<Relation, Integer>();
    320         List<Command> relationCommands = new ArrayList<Command>();
     319        Map<Relation, Integer> referencingRelations = new HashMap<>();
     320        List<Command> relationCommands = new ArrayList<>();
    321321        for( OsmPrimitive p : source.getReferrers() ) {
    322322            if( p instanceof Relation ) {
    … …  
    342342        // поÑ�тому Ñ�охранÑ�етÑ�Ñ� только первое изменение
    343343
    344         List<Command> commands = new ArrayList<Command>();
     344        List<Command> commands = new ArrayList<>();
    345345        boolean foundOwnWay = false;
    346346        for( RingSegment seg : segments ) {
    … …  
    464464            if( pos <= 0 || pos >= nodes.size() - 1 )
    465465                return null;
    466             List<Node> newNodes = new ArrayList<Node>(nodes.subList(pos, nodes.size()));
     466            List<Node> newNodes = new ArrayList<>(nodes.subList(pos, nodes.size()));
    467467            nodes.subList(pos + 1, nodes.size()).clear();
    468468            return new RingSegment(newNodes);
    … …  
    489489                return null;
    490490
    491             List<Node> newNodes = new ArrayList<Node>();
     491            List<Node> newNodes = new ArrayList<>();
    492492            if( pos2 > pos1 ) {
    493493                newNodes.addAll(nodes.subList(pos2, nodes.size()));
    … …  
    499499            } else {
    500500                newNodes.addAll(nodes.subList(pos2, pos1 + 1));
    501                 nodes.addAll(new ArrayList<Node>(nodes.subList(0, pos2 + 1)));
     501                nodes.addAll(new ArrayList<>(nodes.subList(0, pos2 + 1)));
    502502                nodes.subList(0, pos1).clear();
    503503            }
    … …  
    513513            if( nodes == null )
    514514                throw new IllegalArgumentException("Won't give you wayNodes: it is a reference");
    515             List<Node> wayNodes = new ArrayList<Node>(nodes);
     515            List<Node> wayNodes = new ArrayList<>(nodes);
    516516            if( isRing )
    517517                wayNodes.add(wayNodes.get(0));

  • applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/AssociatedStreetFixer.java

    r28762 r30737  
    100100
    101101                // fill relation name
    102                 Map<String, Integer> streetNames = new HashMap<String, Integer>();
     102                Map<String, Integer> streetNames = new HashMap<>();
    103103                for (RelationMember m : rel.getMembers())
    104104                        if ("street".equals(m.getRole()) && m.isWay()) {
    … …  
    126126                }
    127127
    128                 List<Command> commandList = new ArrayList<Command>();
     128                List<Command> commandList = new ArrayList<>();
    129129                if (fixed) {
    130130                        commandList.add(new ChangeCommand(source, rel));

  • applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/MultipolygonFixer.java

    r30587 r30737  
    5252     */
    5353    protected Relation fixMultipolygonRoles( Relation source ) {
    54         Collection<Way> ways = new ArrayList<Way>();
     54        Collection<Way> ways = new ArrayList<>();
    5555        for( OsmPrimitive p : source.getMemberPrimitives() )
    5656            if( p instanceof Way )
    … …  
    6363        Relation r = new Relation(source);
    6464        boolean fixed = false;
    65         Set<Way> outerWays = new HashSet<Way>();
     65        Set<Way> outerWays = new HashSet<>();
    6666        for( MultipolygonBuilder.JoinedPolygon poly : mpc.outerWays )
    6767            for( Way w : poly.ways )
    6868                outerWays.add(w);
    69         Set<Way> innerWays = new HashSet<Way>();
     69        Set<Way> innerWays = new HashSet<>();
    7070        for( MultipolygonBuilder.JoinedPolygon poly : mpc.innerWays )
    7171            for( Way w : poly.ways )

  • applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/RelationFixer.java

    r28703 r30737  
    2323         */
    2424        public RelationFixer(String... types) {
    25             applicableTypes = new ArrayList<String>();
     25            applicableTypes = new ArrayList<>();
    2626                for(String type: types) {
    2727                        applicableTypes.add(type);
Note: See TracChangeset for help on using the changeset viewer.