Changeset 30145 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java

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)

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java (modified) (3 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java

@@ -37 +37 @@
         this.rel = rel;
         rel.addChosenRelationListener(this);
-        setEnabled(rel.get() != null && Main.map.mapView.getEditLayer() != null);
+        setEnabled(rel.get() != null && Main.main.getEditLayer() != null);
     }
 
@@ -46 +46 @@
         objects.add(relation);
         objects.addAll(relation.getMemberPrimitives());
-        Main.worker.submit(new DownloadReferrersTask(Main.map.mapView.getEditLayer(), objects));
+        Main.worker.submit(new DownloadReferrersTask(Main.main.getEditLayer(), objects));
     }
 
     public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
-        setEnabled(newRelation != null && Main.map.mapView.getEditLayer() != null);
+        setEnabled(newRelation != null && Main.main.getEditLayer() != null);
     }
 
     protected void downloadMembers( Relation rel ) {
         if( !rel.isNew() ) {
-            Main.worker.submit(new DownloadRelationTask(Collections.singletonList(rel), Main.map.mapView.getEditLayer()));
+            Main.worker.submit(new DownloadRelationTask(Collections.singletonList(rel), Main.main.getEditLayer()));
         }
     }
@@ -64 +64 @@
         ret.addAll(rel.getIncompleteMembers());
         if( ret.isEmpty() ) return;
-        Main.worker.submit(new DownloadRelationMemberTask(Collections.singletonList(rel), ret, Main.map.mapView.getEditLayer()));
+        Main.worker.submit(new DownloadRelationMemberTask(Collections.singletonList(rel), ret, Main.main.getEditLayer()));
     }
 }