Changeset 25711 in osm for applications

Timestamp:

2011-03-25T16:40:33+01:00 (14 years ago)

Author:

zverik

Message:

context menu for relations, selected relations in relation list (reltoolbox plugin)

Location:

applications/editors/josm/plugins/relcontext/src/relcontext

Files:

• ChosenRelation.java (modified) (2 diffs)
• RelContextDialog.java (modified) (5 diffs)
• StaticChosenRelation.java (added)
• actions/DeleteChosenRelationAction.java (modified) (1 diff)
• actions/DownloadParentsAction.java (modified) (1 diff)
• actions/EditChosenRelationAction.java (modified) (1 diff)
• actions/RelationHelpAction.java (modified) (1 diff)
• actions/SelectInRelationPanelAction.java (modified) (1 diff)
• actions/SelectMembersAction.java (modified) (1 diff)
• actions/SelectRelationAction.java (modified) (1 diff)

applications/editors/josm/plugins/relcontext/src/relcontext/ChosenRelation.java

@@ -19 +19 @@
  */
 public class ChosenRelation implements EditLayerChangeListener, MapViewPaintable, DataSetListener {
-    private Relation chosenRelation = null;
+    protected Relation chosenRelation = null;
     private Set<ChosenRelationListener> chosenRelationListeners = new HashSet<ChosenRelationListener>();
 
@@ -73 +73 @@
     }
 
-    private void analyse() {
+    protected void analyse() {
         // todo
     }

applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java

@@ -1 +1 @@
 package relcontext;
 
+import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.command.Command;
@@ -74 +75 @@
         MapView.addEditLayerChangeListener(chosenRelation);
 
-        popupMenu = new ChosenRelationPopupMenu();
+        popupMenu = new ChosenRelationPopupMenu(chosenRelation);
         multiPopupMenu = new MultipolygonSettingsPopup();
 
@@ -178 +179 @@
         relationsTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         relationsTable.setTableHeader(null);
+        relationsTable.addMouseListener(new PopupMenuLauncher() {
+            @Override
+            public void launch(MouseEvent evt) {
+                Point p = evt.getPoint();
+                int row = relationsTable.rowAtPoint(p);
+                if (row > -1) {
+                    Relation relation = (Relation)relationsData.getValueAt(row, 0);
+                    JPopupMenu menu = new ChosenRelationPopupMenu(new StaticChosenRelation(relation));
+                    menu.show(relationsTable, p.x, p.y-5);
+                }
+            }
+        });
+
         TableColumnModel columns = relationsTable.getColumnModel();
         columns.getColumn(0).setCellRenderer(new OsmPrimitivRenderer() {
@@ -293 +307 @@
             relationsData.addRow(new Object[] {rel, role == null ? "" : role});
         }
+        for( OsmPrimitive element : newSelection )
+            if( element instanceof Relation && (chosenRelation.get() == null || !chosenRelation.get().equals(element) ) )
+                relationsData.addRow(new Object[] {element, ""});
     }
 
@@ -406 +423 @@
 
     private class ChosenRelationPopupMenu extends JPopupMenu {
-        public ChosenRelationPopupMenu() {
+        public ChosenRelationPopupMenu( ChosenRelation chosenRelation ) {
             add(new SelectMembersAction(chosenRelation));
             add(new SelectRelationAction(chosenRelation));

applications/editors/josm/plugins/relcontext/src/relcontext/actions/DeleteChosenRelationAction.java

@@ -19 +19 @@
         this.rel = rel;
         rel.addChosenRelationListener(this);
-        setEnabled(false);
+        setEnabled(rel.get() != null);
     }
 

applications/editors/josm/plugins/relcontext/src/relcontext/actions/DownloadParentsAction.java

@@ -34 +34 @@
         this.rel = rel;
         rel.addChosenRelationListener(this);
-        setEnabled(false);
+        setEnabled(rel.get() != null && Main.map.mapView.getEditLayer() != null);
     }
 

applications/editors/josm/plugins/relcontext/src/relcontext/actions/EditChosenRelationAction.java

@@ -26 +26 @@
         this.rel = rel;
         rel.addChosenRelationListener(this);
-        setEnabled(false);
+        setEnabled(rel.get() != null);
     }
 

applications/editors/josm/plugins/relcontext/src/relcontext/actions/RelationHelpAction.java

@@ -27 +27 @@
         this.rel = rel;
         rel.addChosenRelationListener(this);
-        setEnabled(false);
+        setEnabled(rel.get() != null);
     }
 

applications/editors/josm/plugins/relcontext/src/relcontext/actions/SelectInRelationPanelAction.java

@@ -20 +20 @@
         this.rel = rel;
         rel.addChosenRelationListener(this);
-        setEnabled(false);
+        setEnabled(rel.get() != null);
     }
 

applications/editors/josm/plugins/relcontext/src/relcontext/actions/SelectMembersAction.java

@@ -18 +18 @@
         this.rel = rel;
         rel.addChosenRelationListener(this);
-        setEnabled(false);
+        setEnabled(rel.get() != null);
     }
 

applications/editors/josm/plugins/relcontext/src/relcontext/actions/SelectRelationAction.java

@@ -19 +19 @@
         this.rel = rel;
         rel.addChosenRelationListener(this);
-        setEnabled(false);
+        setEnabled(rel.get() != null);
     }