Changeset 4536 in josm

Timestamp:

Oct 21, 2011 11:57:52 PM (19 months ago)

Author:

Don-vip

Message:

Improved plugin interaction with selection and popups of Relation, Selection and Properties dialogs.

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• RelationListDialog.java (modified) (2 diffs)
• SelectionListDialog.java (modified) (2 diffs)
• properties/PropertiesDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -30 +30 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import javax.swing.event.PopupMenuListener;
 
 import org.openstreetmap.josm.Main;
@@ -808 +809 @@
     }
 
+    public void addPopupMenuListener(PopupMenuListener l) {
+        popupMenu.addPopupMenuListener(l);
+    }
+
+    public void removePopupMenuListener(PopupMenuListener l) {
+        popupMenu.addPopupMenuListener(l);
+    }
+    
+    public Collection<Relation> getSelectedRelations() {
+        return model.getSelectedRelations();
+    }
+
     /* ---------------------------------------------------------------------------------- */
     /* DataSetListener                                                                    */

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -35 +35 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import javax.swing.event.PopupMenuListener;
 
 import org.openstreetmap.josm.Main;
@@ -224 +225 @@
         return popupMenu.add(a);
     }
-
+    
+    public void addPopupMenuListener(PopupMenuListener l) {
+        popupMenu.addPopupMenuListener(l);
+    }
+
+    public void removePopupMenuListener(PopupMenuListener l) {
+        popupMenu.addPopupMenuListener(l);
+    }
+    
+    public Collection<OsmPrimitive> getSelectedPrimitives() {
+        return model.getSelected();
+    }
+    
     /**
      * Updates the dialog title with a summary of the current JOSM selection

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -58 +58 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import javax.swing.event.PopupMenuListener;
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.DefaultTableModel;
@@ -71 +72 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.IRelation;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -1256 +1258 @@
     }
     
+    public void addPropertyPopupMenuListener(PopupMenuListener l) {
+        propertyMenu.addPopupMenuListener(l);
+    }
+
+    public void removePropertyPopupMenuListener(PopupMenuListener l) {
+        propertyMenu.addPopupMenuListener(l);
+    }
+    
+    @SuppressWarnings("unchecked")
+    public Tag getSelectedProperty() {
+        int row = propertyTable.getSelectedRow();
+        if (row == -1) return null;
+        TreeMap<String, Integer> map = (TreeMap<String, Integer>) propertyData.getValueAt(row, 1);
+        return new Tag(
+                propertyData.getValueAt(row, 0).toString(), 
+                map.size() > 1 ? "" : map.keySet().iterator().next());
+    }
+    
     public void addMembershipPopupMenuSeparator() {
         membershipMenu.addSeparator();
     }
-
+    
     public JMenuItem addMembershipPopupMenuAction(Action a) {
         return membershipMenu.add(a);
     }
     
+    public void addMembershipPopupMenuListener(PopupMenuListener l) {
+        membershipMenu.addPopupMenuListener(l);
+    }
+
+    public void removeMembershipPopupMenuListener(PopupMenuListener l) {
+        membershipMenu.addPopupMenuListener(l);
+    }
+    
+    public IRelation getSelectedMembershipRelation() {
+        int row = membershipTable.getSelectedRow();
+        return row > -1 ? (IRelation) membershipData.getValueAt(row, 0) : null;
+    }
+
     public static interface RelationRelated {
         public Relation getRelation();