Changeset 30145 in osm for applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap

Timestamp:

2013-12-22T12:27:11+01:00 (11 years ago)

Author:

donvip

Message:

[josm-plugins] global replacement of Main.map.mapview.getEditLayer() by Main.main.getEditLayer() (avoids NPEs)

Location:

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list

Files:

• TurnRestrictionsInDatasetListModel.java (modified) (1 diff)
• TurnRestrictionsListDialog.java (modified) (1 diff)

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInDatasetListModel.java

@@ -77 +77 @@
     /* --------------------------------------------------------------------------- */   
     public void dataChanged(DataChangedEvent event) {       
-        OsmDataLayer layer = Main.map.mapView.getEditLayer();
+        OsmDataLayer layer = Main.main.getEditLayer();
         if (layer == null) {
             setTurnRestrictions(null);

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java

@@ -205 +205 @@
         protected Collection<RelationMember> getMembersForCurrentSelection(Relation r) {
             Collection<RelationMember> members = new HashSet<RelationMember>();
-            Collection<OsmPrimitive> selection = Main.map.mapView.getEditLayer().data.getSelected();
+            Collection<OsmPrimitive> selection = Main.main.getEditLayer().data.getSelected();
             for (RelationMember member: r.getMembers()) {
                 if (selection.contains(member.getMember())) {