Changeset 30587 in osm for applications/editors/josm


Ignore:
Timestamp:
2014-08-15T18:02:25+02:00 (10 years ago)
Author:
donvip
Message:

[josm_reltoolbox] update to JOSM 7392

Location:
applications/editors/josm/plugins/reltoolbox
Files:
4 edited

Legend:

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

    r30416 r30587  
    44    <property name="commit.message" value="RelToolbox: make natural sort for relation and find relation lists"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="7001"/>
     6    <property name="plugin.main.version" value="7392"/>
    77
    88    <property name="plugin.author" value="Ilya Zverev"/>
  • applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java

    r30209 r30587  
    8888
    8989        // for now, just copying standard action
    90         MultipolygonCreate mpc = new MultipolygonCreate();
     90        MultipolygonBuilder mpc = new MultipolygonBuilder();
    9191        String error = mpc.makeFromWays(getCurrentDataSet().getSelectedWays());
    9292        if( error != null ) {
     
    100100        } else
    101101            rel.put("type", "multipolygon");
    102         for( MultipolygonCreate.JoinedPolygon poly : mpc.outerWays )
     102        for( MultipolygonBuilder.JoinedPolygon poly : mpc.outerWays )
    103103            for( Way w : poly.ways )
    104104                rel.addMember(new RelationMember("outer", w));
    105         for( MultipolygonCreate.JoinedPolygon poly : mpc.innerWays )
     105        for( MultipolygonBuilder.JoinedPolygon poly : mpc.innerWays )
    106106            for( Way w : poly.ways )
    107107                rel.addMember(new RelationMember("inner", w));
  • applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

    r29535 r30587  
    22
    33import static org.openstreetmap.josm.tools.I18n.tr;
     4
    45import java.awt.event.ActionEvent;
    5 import java.util.*;
     6import java.util.ArrayList;
     7import java.util.Arrays;
     8import java.util.Collections;
     9import java.util.HashSet;
     10import java.util.Iterator;
     11import java.util.List;
     12import java.util.Map;
     13import java.util.Set;
     14
    615import javax.swing.AbstractAction;
    716import javax.swing.JOptionPane;
     17
    818import org.openstreetmap.josm.Main;
    9 import org.openstreetmap.josm.command.*;
    10 import org.openstreetmap.josm.data.osm.*;
    11 import org.openstreetmap.josm.data.osm.MultipolygonCreate.JoinedPolygon;
     19import org.openstreetmap.josm.command.AddCommand;
     20import org.openstreetmap.josm.command.ChangeCommand;
     21import org.openstreetmap.josm.command.Command;
     22import org.openstreetmap.josm.command.DeleteCommand;
     23import org.openstreetmap.josm.command.SequenceCommand;
     24import org.openstreetmap.josm.data.osm.MultipolygonBuilder;
     25import org.openstreetmap.josm.data.osm.MultipolygonBuilder.JoinedPolygon;
     26import org.openstreetmap.josm.data.osm.OsmPrimitive;
     27import org.openstreetmap.josm.data.osm.Relation;
     28import org.openstreetmap.josm.data.osm.RelationMember;
     29import org.openstreetmap.josm.data.osm.Way;
    1230import org.openstreetmap.josm.gui.DefaultNameFormatter;
    1331import org.openstreetmap.josm.tools.ImageProvider;
     32
    1433import relcontext.ChosenRelation;
    1534import relcontext.ChosenRelationListener;
     
    4968        }
    5069       
    51         MultipolygonCreate mpc = new MultipolygonCreate();
     70        MultipolygonBuilder mpc = new MultipolygonBuilder();
    5271        String error = mpc.makeFromWays(ways);
    5372        if( error != null ) {
  • applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/MultipolygonFixer.java

    r28762 r30587  
    1010import org.openstreetmap.josm.command.ChangeCommand;
    1111import org.openstreetmap.josm.command.Command;
    12 import org.openstreetmap.josm.data.osm.MultipolygonCreate;
     12import org.openstreetmap.josm.data.osm.MultipolygonBuilder;
    1313import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1414import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
     
    5656            if( p instanceof Way )
    5757                ways.add((Way)p);
    58         MultipolygonCreate mpc = new MultipolygonCreate();
     58        MultipolygonBuilder mpc = new MultipolygonBuilder();
    5959        String error = mpc.makeFromWays(ways);
    6060        if( error != null )
     
    6464        boolean fixed = false;
    6565        Set<Way> outerWays = new HashSet<Way>();
    66         for( MultipolygonCreate.JoinedPolygon poly : mpc.outerWays )
     66        for( MultipolygonBuilder.JoinedPolygon poly : mpc.outerWays )
    6767            for( Way w : poly.ways )
    6868                outerWays.add(w);
    6969        Set<Way> innerWays = new HashSet<Way>();
    70         for( MultipolygonCreate.JoinedPolygon poly : mpc.innerWays )
     70        for( MultipolygonBuilder.JoinedPolygon poly : mpc.innerWays )
    7171            for( Way w : poly.ways )
    7272                innerWays.add(w);
Note: See TracChangeset for help on using the changeset viewer.