Changeset 28693 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java

Timestamp:

2012-09-07T16:40:13+02:00 (13 years ago)

Author:

larry0ua

Message:

'RelToolbox: refactored relation fixing code, added associatedStreet as a fixable relation'

File:

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

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

@@ -1 +1 @@
 package relcontext.actions;
 
-import java.util.*;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -11 +13 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -17 +20 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
+
 import relcontext.ChosenRelation;
 import relcontext.ChosenRelationListener;
@@ -30 +34 @@
     private static final String ACTION_NAME = "Add/remove member";
     private ChosenRelation rel;
+    private SortAndFixAction sortAndFix;
 
-    public AddRemoveMemberAction( ChosenRelation rel ) {
+    public AddRemoveMemberAction( ChosenRelation rel, SortAndFixAction sortAndFix ) {
         super(null, "relcontext/addremove", tr("Add/remove members from the chosen relation"),
                 Shortcut.registerShortcut("reltoolbox:addremove", tr("Relation Toolbox: {0}", tr("Add/remove members from the chosen relation")),
                 KeyEvent.VK_EQUALS, Shortcut.DIRECT), false);
         this.rel = rel;
+        this.sortAndFix = sortAndFix;
         rel.addChosenRelationListener(this);
         updateEnabledState();
@@ -51 +57 @@
 
         // 0. check if relation is broken (temporary)
-        boolean isBroken = !toAdd.isEmpty() && SortAndFixAction.needsFixing(r);
+        boolean isBroken = !toAdd.isEmpty() && sortAndFix.needsFixing(r);
 
         // 1. remove all present members
@@ -66 +72 @@
 
         // 3. check for roles again (temporary)
-        Command roleFix = !isBroken && SortAndFixAction.needsFixing(r) ? SortAndFixAction.fixRelation(r) : null;
+        Command roleFix = !isBroken && sortAndFix.needsFixing(r) ? sortAndFix.fixRelation(r) : null;
         if( roleFix != null )
             roleFix.executeCommand();