Changeset 33884 in osm for applications/editors

Timestamp:

2017-11-25T01:15:23+01:00 (7 years ago)

Author:

donvip

Message:

fix deprecation warnings

Location:

applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant

Files:

• actions/SplitRoundaboutTest.java (modified) (5 diffs)
• data/StopToWayAssignerTest.java (modified) (1 diff)

applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutTest.java

@@ -16 +16 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.SplitWayAction;
-import org.openstreetmap.josm.actions.SplitWayAction.SplitWayResult;
+import org.openstreetmap.josm.command.SplitWayCommand;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -24 +23 @@
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.io.IllegalDataException;
@@ -30 +30 @@
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
+/**
+ * Unit tests of {@link SplitRoundabout}.
+ */
 public class SplitRoundaboutTest extends AbstractTest {
 
@@ -47 +50 @@
         ds = OsmReader.parseDataSet(new FileInputStream(AbstractTest.PATH_TO_ROUNDABOUT), null);
         layer = new OsmDataLayer(ds, OsmDataLayer.createNewName(), null);
-        Main.getLayerManager().addLayer(layer);
+        MainApplication.getLayerManager().addLayer(layer);
 
-        Main.pref.put("pt_assistant.roundabout-splitter.alignalways", true);
+        Main.pref.putBoolean("pt_assistant.roundabout-splitter.alignalways", true);
         action = new SplitRoundaboutAction();
         r1 = (Way) ds.getPrimitiveById(new SimplePrimitiveId(293302077L, OsmPrimitiveType.WAY));
@@ -61 +64 @@
         action.getRemoveRoundaboutFromRelationsCommand(w).executeCommand();
         List<Node> splitNodes = action.getSplitNodes(w);
-        SplitWayResult result = SplitWayAction.split(layer, w, splitNodes, Collections.emptyList());
-        result.getCommand().executeCommand();
+        SplitWayCommand result = SplitWayCommand.split(w, splitNodes, Collections.emptyList());
+        result.executeCommand();
         Collection<Way> splitWays = result.getNewWays();
         splitWays.add(result.getOriginalWay());

applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/data/StopToWayAssignerTest.java

@@ -14 +14 @@
 import org.openstreetmap.josm.plugins.pt_assistant.utils.StopToWayAssigner;
 
+/**
+ * Unit tests of {@link StopToWayAssigner}.
+ */
 public class StopToWayAssignerTest extends AbstractTest {