Changeset 34117 in osm for applications/editors/josm

Timestamp:

2018-03-25T17:46:29+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 13558

Location:

applications/editors/josm/plugins/pt_assistant

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/pt_assistant/actions/AddStopPositionAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/pt_assistant/actions/EdgeSelectionAction.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/plugins/pt_assistant/ImportUtils.java (modified) (1 diff)

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

@@ -5 +5 @@
   <property name="commit.message" value="Commit message"/>
   <!-- enter the *lowest JOSM version this plugin is currently compatible with -->
-  <property name="plugin.main.version" value="12840"/>
+  <property name="plugin.main.version" value="13558"/>
 
   <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

@@ -139 +139 @@
         }
 
-        MainApplication.getLayerManager().getEditLayer().data.setSelected(newStopPos);
+        MainApplication.getLayerManager().getEditDataSet().setSelected(newStopPos);
 
         //join the node to the way only if the node is new

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

@@ -135 +135 @@
     public void mouseClicked(MouseEvent e) {
 
-        DataSet ds = MainApplication.getLayerManager().getEditLayer().data;
+        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
         Way initial = MainApplication.getMap().mapView.getNearestWay(e.getPoint(), OsmPrimitive::isUsable);
         if (initial != null) {

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

@@ -33 +33 @@
             OsmImporterData oid = importer.loadLayer(in, file, layerName, progressMonitor);
             OsmDataLayer layer = oid.getLayer();
-            return layer.data;
+            return layer.getDataSet();
 
         } catch (FileNotFoundException e) {