Changeset 5821 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2013-04-02T00:55:56+02:00 (11 years ago)

Author:

Don-vip

Message:

see #7846 - Large code refactorization in management of popup menus to simplify interactions with plugins (needed at least for imagery-xml-bounds and tag2link plugins)

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• OsmPrimitiveAction.java (added)
• relation/AbstractRelationAction.java (modified) (2 diffs)
• relation/DownloadMembersAction.java (modified) (2 diffs)
• relation/DownloadSelectedIncompleteMembersAction.java (modified) (2 diffs)
• relation/DuplicateRelationAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java

@@ -7 +7 @@
 import javax.swing.AbstractAction;
 
+import org.openstreetmap.josm.actions.OsmPrimitiveAction;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
 /**
@@ -14 +17 @@
  * @since 5793
  */
-public abstract class AbstractRelationAction extends AbstractAction {
+public abstract class AbstractRelationAction extends AbstractAction implements OsmPrimitiveAction {
     protected Collection<Relation> relations = Collections.<Relation>emptySet();
 
-    /**
-     * Specifies the working set of relations.
-     * @param relations The new working set of relations. Can be null or empty
+    protected static final Collection<Relation> getRelations(Collection<? extends OsmPrimitive> primitives) {
+        if (primitives == null || primitives.isEmpty()) {
+            return Collections.<Relation>emptySet();
+        } else {
+            return new SubclassFilteredCollection<OsmPrimitive, Relation>(
+                    primitives, OsmPrimitive.relationPredicate);
+        }
+    }
+    
+    /* (non-Javadoc)
+     * @see org.openstreetmap.josm.actions.relation.RelationAction#setPrimitives
      */
-    public void setRelations(Collection<Relation> relations) {
-        if (relations==null) {
-            this.relations = Collections.<Relation>emptySet();
-        } else {
-            this.relations = relations;
-        }
+    @Override
+    public void setPrimitives(Collection<? extends OsmPrimitive> primitives) {
+        this.relations = getRelations(primitives);
         updateEnabledState();
     }

trunk/src/org/openstreetmap/josm/actions/relation/DownloadMembersAction.java

@@ -6 +6 @@
 
 import java.awt.event.ActionEvent;
+import java.util.Collection;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationTask;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
  * The action for downloading members of relations
-
+ * @since 5793
  */
 public class DownloadMembersAction extends AbstractRelationAction {
@@ -32 +37 @@
         Main.worker.submit(new DownloadRelationTask(relations, Main.map.mapView.getEditLayer()));
     }
+
+    @Override
+    public void setPrimitives(Collection<? extends OsmPrimitive> primitives) {
+        // selected non-new relations
+        this.relations = Utils.filter(getRelations(primitives), new Predicate<Relation>(){
+            @Override public boolean evaluate(Relation r) {
+                return !r.isNew();
+            }});
+        updateEnabledState();
+    }
 }

trunk/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationMemberTask;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -51 +53 @@
                 Main.map.mapView.getEditLayer()));
     }
+
+    @Override
+    public void setPrimitives(Collection<? extends OsmPrimitive> primitives) {
+        // selected relations with incomplete members
+        this.relations = Utils.filter(getRelations(primitives), new Predicate<Relation>(){
+            @Override public boolean evaluate(Relation r) {
+                return !r.isNew() && r.hasIncompleteMembers();
+            }});
+        updateEnabledState();
+    }
 }

trunk/src/org/openstreetmap/josm/actions/relation/DuplicateRelationAction.java

@@ -17 +17 @@
  */
 public class DuplicateRelationAction extends AbstractRelationAction {
+    
+    /**
+     * Constructs a new {@code DuplicateRelationAction}. 
+     */
     public DuplicateRelationAction() {
         putValue(SHORT_DESCRIPTION, tr("Create a copy of this relation and open it in another editor window"));