Changeset 17550 in osm for applications


Ignore:
Timestamp:
2009-09-09T00:25:42+02:00 (15 years ago)
Author:
guggis
Message:

Updating to JOSM r2082

Location:
applications/editors/josm/plugins/utilsplugin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/utilsplugin/build.xml

    r17437 r17550  
    2525                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    2626                <attribute name="Plugin-Description" value="Several utilities that make your life easier: e.g. simplify way, join areas, jump to position."/>
    27                 <attribute name="Plugin-Mainversion" value="2039"/>
     27                <attribute name="Plugin-Mainversion" value="2082"/>
    2828                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    2929            </manifest>
  • applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java

    r17436 r17550  
    444444        for (Relation r : Main.main.getCurrentDataSet().relations) {
    445445            if (r.isDeleted() || r.incomplete) continue;
    446             for (RelationMember rm : r.members) {
    447                 if (rm.member != osm) continue;
     446            for (RelationMember rm : r.getMembers()) {
     447                if (rm.getMember() != osm) continue;
    448448
    449449                Relation newRel = new Relation(r);
    450                 newRel.members.remove(rm);
     450                List<RelationMember> members = newRel.getMembers();
     451                members.remove(rm);
     452                newRel.setMembers(members);
    451453
    452454                cmds.add(new ChangeCommand(r, newRel));
    453                 RelationRole saverel =  new RelationRole(r, rm.role);
     455                RelationRole saverel =  new RelationRole(r, rm.getRole());
    454456                if(!result.contains(saverel)) result.add(saverel);
    455457                break;
     
    782784        newRel.put("type", "multipolygon");
    783785        for(Way w : inner)
    784             newRel.members.add(new RelationMember("inner", w));
     786            newRel.addMember(new RelationMember("inner", w));
    785787        cmds.add(new AddCommand(newRel));
    786788
     
    811813            // Add it back!
    812814            Relation newRel = new Relation(r.rel);
    813             newRel.members.add(new RelationMember(r.role, outer));
     815            newRel.addMember(new RelationMember(r.role, outer));
    814816            cmds.add(new ChangeCommand(r.rel, newRel));
    815817        }
     
    822824                // Found only one to be part of a multipolygon relation, so just add it back as well
    823825                newRel = new Relation(multiouters.get(0).rel);
    824                 newRel.members.add(new RelationMember(multiouters.get(0).role, outer));
     826                newRel.addMember(new RelationMember(multiouters.get(0).role, outer));
    825827                cmds.add(new ChangeCommand(multiouters.get(0).rel, newRel));
    826828                return;
     
    830832                for(RelationRole r : multiouters) {
    831833                    // Add members
    832                     for(RelationMember rm : r.rel.members)
    833                         if(!newRel.members.contains(rm)) newRel.members.add(rm);
     834                    for(RelationMember rm : r.rel.getMembers())
     835                        if(!newRel.getMembers().contains(rm)) newRel.addMember(rm);
    834836                    // Add tags
    835837                    for (String key : r.rel.keySet()) {
     
    839841                    cmds.add(new DeleteCommand(r.rel));
    840842                }
    841                 newRel.members.add(new RelationMember("outer", outer));
     843                newRel.addMember(new RelationMember("outer", outer));
    842844                cmds.add(new AddCommand(newRel));
    843845        }
Note: See TracChangeset for help on using the changeset viewer.