Changeset 33619 in osm for applications


Ignore:
Timestamp:
2017-09-17T19:32:09+02:00 (7 years ago)
Author:
donvip
Message:

update to JOSM 12828

Location:
applications/editors/josm/plugins/pt_assistant
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/pt_assistant/build.xml

    r33594 r33619  
    55  <property name="commit.message" value="Commit message"/>
    66  <!-- enter the *lowest JOSM version this plugin is currently compatible with -->
    7   <property name="plugin.main.version" value="12823"/>
     7  <property name="plugin.main.version" value="12828"/>
    88
    99  <property name="plugin.author" value="Darya Golovko darya0705@gmail.com"/>

  • applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/AddStopPositionAction.java

    r33571 r33619  
    1717
    1818import org.openstreetmap.josm.actions.JoinNodeWayAction;
    19 import org.openstreetmap.josm.actions.SplitWayAction;
    20 import org.openstreetmap.josm.actions.SplitWayAction.SplitWayResult;
    2119import org.openstreetmap.josm.actions.mapmode.MapMode;
    2220import org.openstreetmap.josm.command.AddCommand;
    … …  
    2422import org.openstreetmap.josm.command.Command;
    2523import org.openstreetmap.josm.command.SequenceCommand;
     24import org.openstreetmap.josm.command.SplitWayCommand;
    2625import org.openstreetmap.josm.data.osm.Node;
    2726import org.openstreetmap.josm.data.osm.OsmPrimitive;
    … …  
    136135
    137136        if (newNode) {
    138             MainApplication.undoRedo.add(new AddCommand(newStopPos));
     137            MainApplication.undoRedo.add(new AddCommand(getLayerManager().getEditDataSet(), newStopPos));
    139138        } else {
    140139            MainApplication.undoRedo.add(new ChangeCommand(n, newStopPos));
    … …  
    159158            return;
    160159
    161         SplitWayResult result = SplitWayAction.split(getLayerManager().getEditLayer(),
     160        SplitWayCommand result = SplitWayCommand.split(
    162161                affected, Collections.singletonList(newStopPos), Collections.emptyList());
    163162        if (result == null) //if the way is already split, return
    164163            return;
    165         MainApplication.undoRedo.add(result.getCommand());
     164        MainApplication.undoRedo.add(result);
    166165
    167166        List<Command> cmds = new ArrayList<>();

  • applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/CreatePlatformNodeAction.java

    r33571 r33619  
    1818import org.openstreetmap.josm.command.DeleteCommand;
    1919import org.openstreetmap.josm.command.SequenceCommand;
     20import org.openstreetmap.josm.data.osm.DataSet;
    2021import org.openstreetmap.josm.data.osm.Node;
    2122import org.openstreetmap.josm.data.osm.OsmPrimitive;
    … …  
    7980        SortedSet<String> refs = new TreeSet<>();
    8081
    81         MainApplication.undoRedo.add(new AddCommand(dummy1));
    82         MainApplication.undoRedo.add(new AddCommand(dummy2));
    83         MainApplication.undoRedo.add(new AddCommand(dummy3));
     82        DataSet ds = getLayerManager().getEditDataSet();
     83        MainApplication.undoRedo.add(new AddCommand(ds, dummy1));
     84        MainApplication.undoRedo.add(new AddCommand(ds, dummy2));
     85        MainApplication.undoRedo.add(new AddCommand(ds, dummy3));
    8486
    8587        refs.addAll(populateMap(stopPositionNode));

  • applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutAction.java

    r33571 r33619  
    2121import org.openstreetmap.josm.actions.AlignInCircleAction;
    2222import org.openstreetmap.josm.actions.JosmAction;
    23 import org.openstreetmap.josm.actions.SplitWayAction;
    24 import org.openstreetmap.josm.actions.SplitWayAction.SplitWayResult;
    2523import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
    2624import org.openstreetmap.josm.actions.relation.DownloadSelectedIncompleteMembersAction;
    … …  
    2826import org.openstreetmap.josm.command.Command;
    2927import org.openstreetmap.josm.command.SequenceCommand;
     28import org.openstreetmap.josm.command.SplitWayCommand;
    3029import org.openstreetmap.josm.data.Bounds;
    3130import org.openstreetmap.josm.data.osm.BBox;
    … …  
    111110        //split the roundabout on the designed nodes
    112111        List<Node> splitNodes = getSplitNodes(roundabout);
    113         SplitWayResult result = SplitWayAction.split(getLayerManager().getEditLayer(),
     112        SplitWayCommand result = SplitWayCommand.split(
    114113                roundabout, splitNodes, Collections.emptyList());
    115         MainApplication.undoRedo.add(result.getCommand());
     114        MainApplication.undoRedo.add(result);
    116115        Collection<Way> splitWays = result.getNewWays();
    117116        splitWays.add(result.getOriginalWay());

  • applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/Checker.java

    r33571 r33619  
    88import javax.swing.SwingUtilities;
    99
     10import org.openstreetmap.josm.Main;
    1011import org.openstreetmap.josm.actions.AutoScaleAction;
    1112import org.openstreetmap.josm.command.Command;
    … …  
    144145        }
    145146
    146         SelectCommand command = new SelectCommand(primitivesToZoom);
     147        SelectCommand command = new SelectCommand(Main.main.getEditDataSet(), primitivesToZoom);
    147148
    148149        List<OsmDataLayer> listOfLayers = MainApplication.getLayerManager().getLayersOfType(OsmDataLayer.class);

  • applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssistantValidatorTest.java

    r33503 r33619  
    516516                primitivesToSelect.add((OsmPrimitive) obj);
    517517            }
    518             SelectCommand selectCommand = new SelectCommand(primitivesToSelect);
    519             SwingUtilities.invokeLater(new Runnable() {
    520                 @Override
    521                 public void run() {
    522                     selectCommand.executeCommand();
    523                 }
    524             });
     518            SelectCommand selectCommand = new SelectCommand(Main.main.getEditDataSet(), primitivesToSelect);
     519            SwingUtilities.invokeLater(() -> selectCommand.executeCommand());
    525520        }
    526521
Note: See TracChangeset for help on using the changeset viewer.