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

Timestamp:

2017-08-26T02:16:05+02:00 (8 years ago)

Author:

donvip

Message:

update to JOSM 12663

File:

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

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

@@ -13 +13 @@
 import javax.swing.AbstractAction;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadReferrersTask;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationMemberTask;
 import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationTask;
@@ -38 +38 @@
         this.rel = rel;
         rel.addChosenRelationListener(this);
-        setEnabled(rel.get() != null && Main.getLayerManager().getEditLayer() != null);
+        setEnabled(rel.get() != null && MainApplication.getLayerManager().getEditLayer() != null);
     }
 
@@ -48 +48 @@
         objects.add(relation);
         objects.addAll(relation.getMemberPrimitives());
-        Main.worker.submit(new DownloadReferrersTask(Main.getLayerManager().getEditLayer(), objects));
+        MainApplication.worker.submit(
+                new DownloadReferrersTask(MainApplication.getLayerManager().getEditLayer(), objects));
     }
 
     @Override
     public void chosenRelationChanged(Relation oldRelation, Relation newRelation) {
-        setEnabled(newRelation != null && Main.getLayerManager().getEditLayer() != null);
+        setEnabled(newRelation != null && MainApplication.getLayerManager().getEditLayer() != null);
     }
 
     protected void downloadMembers(Relation rel) {
         if (!rel.isNew()) {
-            Main.worker.submit(new DownloadRelationTask(Collections.singletonList(rel), Main.getLayerManager().getEditLayer()));
+            MainApplication.worker.submit(
+                    new DownloadRelationTask(Collections.singletonList(rel), MainApplication.getLayerManager().getEditLayer()));
         }
     }
@@ -67 +69 @@
         ret.addAll(rel.getIncompleteMembers());
         if (ret.isEmpty()) return;
-        Main.worker.submit(new DownloadRelationMemberTask(Collections.singletonList(rel), ret, Main.getLayerManager().getEditLayer()));
+        MainApplication.worker.submit(
+                new DownloadRelationMemberTask(Collections.singletonList(rel), ret, MainApplication.getLayerManager().getEditLayer()));
     }
 }