Changeset 32398 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadChosenRelationAction.java

Timestamp:

2016-06-25T11:56:57+02:00 (10 years ago)

Author:

donvip

Message:

checkstyle

File:

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

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

@@ -31 +31 @@
 
     public DownloadChosenRelationAction(ChosenRelation rel) {
-        super();
-        //        putValue(NAME, "D");
         putValue(SMALL_ICON, ImageProvider.get("relcontext", "download"));
         putValue(SHORT_DESCRIPTION, tr("Download incomplete members for the chosen relation"));
@@ -43 +41 @@
     public void actionPerformed(ActionEvent e) {
         Relation relation = rel.get();
-        if (relation == null || relation.isNew() ) return;
+        if (relation == null || relation.isNew()) return;
         int total = relation.getMembersCount();
         int incomplete = relation.getIncompleteMembers().size();
-        //        if (incomplete <= 5 || (incomplete <= 10 && incomplete * 3 < total) )
-        if (incomplete <= 10 && incomplete * 3 < total ) {
+        if (incomplete <= 10 && incomplete * 3 < total) {
             downloadIncomplete(relation);
         } else {
@@ -70 +67 @@
     protected void downloadMembers(Relation rel) {
         if (!rel.isNew()) {
-            Main.worker.submit(new DownloadRelationTask(Collections.singletonList(rel), Main.main.getEditLayer()));
+            Main.worker.submit(new DownloadRelationTask(Collections.singletonList(rel), Main.getLayerManager().getEditLayer()));
         }
     }
 
     protected void downloadIncomplete(Relation rel) {
-        if (rel.isNew() ) return;
+        if (rel.isNew()) return;
         Set<OsmPrimitive> ret = new HashSet<>();
         ret.addAll(rel.getIncompleteMembers());
-        if (ret.isEmpty() ) return;
-        Main.worker.submit(new DownloadRelationMemberTask(Collections.singletonList(rel), ret, Main.main.getEditLayer()));
+        if (ret.isEmpty()) return;
+        Main.worker.submit(new DownloadRelationMemberTask(Collections.singletonList(rel), ret, Main.getLayerManager().getEditLayer()));
     }
 }