Changeset 32398 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java
- Timestamp:
- 2016-06-25T11:56:57+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java
r32395 r32398 38 38 this.rel = rel; 39 39 rel.addChosenRelationListener(this); 40 setEnabled(rel.get() != null && Main. main.getEditLayer() != null);40 setEnabled(rel.get() != null && Main.getLayerManager().getEditLayer() != null); 41 41 } 42 42 … … 44 44 public void actionPerformed(ActionEvent e) { 45 45 Relation relation = rel.get(); 46 if (relation == null 46 if (relation == null) return; 47 47 List<OsmPrimitive> objects = new ArrayList<>(); 48 48 objects.add(relation); 49 49 objects.addAll(relation.getMemberPrimitives()); 50 Main.worker.submit(new DownloadReferrersTask(Main. main.getEditLayer(), objects));50 Main.worker.submit(new DownloadReferrersTask(Main.getLayerManager().getEditLayer(), objects)); 51 51 } 52 52 53 53 @Override 54 54 public void chosenRelationChanged(Relation oldRelation, Relation newRelation) { 55 setEnabled(newRelation != null && Main. main.getEditLayer() != null);55 setEnabled(newRelation != null && Main.getLayerManager().getEditLayer() != null); 56 56 } 57 57 58 58 protected void downloadMembers(Relation rel) { 59 59 if (!rel.isNew()) { 60 Main.worker.submit(new DownloadRelationTask(Collections.singletonList(rel), Main. main.getEditLayer()));60 Main.worker.submit(new DownloadRelationTask(Collections.singletonList(rel), Main.getLayerManager().getEditLayer())); 61 61 } 62 62 } 63 63 64 64 protected void downloadIncomplete(Relation rel) { 65 if (rel.isNew() 65 if (rel.isNew()) return; 66 66 Set<OsmPrimitive> ret = new HashSet<>(); 67 67 ret.addAll(rel.getIncompleteMembers()); 68 if (ret.isEmpty() 69 Main.worker.submit(new DownloadRelationMemberTask(Collections.singletonList(rel), ret, Main. main.getEditLayer()));68 if (ret.isEmpty()) return; 69 Main.worker.submit(new DownloadRelationMemberTask(Collections.singletonList(rel), ret, Main.getLayerManager().getEditLayer())); 70 70 } 71 71 }
Note:
See TracChangeset
for help on using the changeset viewer.