Changeset 6025 in josm for trunk/src

Timestamp:

2013-06-26T10:14:24+02:00 (11 years ago)

Author:

akks

Message:

Highlight relation or object when user clicks the list in Relation List, Selection List or Properties dialog
[ idea by Felis Pimeja ] + added HighlighHelper class

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/RelationListDialog.java (modified) (5 diffs)
• dialogs/SelectionListDialog.java (modified) (3 diffs)
• dialogs/properties/PropertiesDialog.java (modified) (4 diffs)
• util/HighlightHelper.java (added)

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

@@ -66 +66 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.HighlightHelper;
 import org.openstreetmap.josm.gui.widgets.DisableShortcutsOnFocusGainedTextField;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
@@ -112 +113 @@
     private final AddSelectionToRelations addSelectionToRelations = new AddSelectionToRelations();
     
+    HighlightHelper highlightHelper = new HighlightHelper();
+    
     /**
      * Constructs <code>RelationListDialog</code>
@@ -183 +186 @@
     // inform all actions about list of relations they need
     private void updateActionsRelationLists() {
-        popupMenuHandler.setPrimitives(model.getSelectedRelations());
+        List<Relation> sel = model.getSelectedRelations();
+        popupMenuHandler.setPrimitives(sel);
+        
+        //update highlights
+        if (Main.isDisplayingMapView()) {
+            highlightHelper.highlightOnly(sel);
+            Main.map.mapView.repaint();
+        }
     }
     
@@ -298 +308 @@
             super(popupMenu);
         }
+
+        @Override
+        public void mouseExited(MouseEvent me) {
+            highlightHelper.clear();
+        }
         
         protected void setCurrentRelationAsSelection() {
@@ -306 +321 @@
             EditRelationAction.launchEditor(getSelected());
         }
-
+        
         @Override public void mouseClicked(MouseEvent e) {
             if (Main.main.getEditLayer() == null) return;

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

@@ -67 +67 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.HighlightHelper;
 import org.openstreetmap.josm.gui.widgets.ListPopupMenu;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
@@ -186 +187 @@
      */
     class MouseEventHandler extends PopupMenuLauncher {
+        private final HighlightHelper helper = new HighlightHelper();
         
         public MouseEventHandler() {
@@ -193 +195 @@
         @Override
         public void mouseClicked(MouseEvent e) {
+            int idx = lstPrimitives.locationToIndex(e.getPoint());
+            if (idx < 0) return;
             if (isDoubleClick(e)) {
-                int idx = lstPrimitives.locationToIndex(e.getPoint());
-                if (idx < 0) return;
                 OsmDataLayer layer = Main.main.getEditLayer();
                 if (layer == null) return;
                 layer.data.setSelected(Collections.singleton((OsmPrimitive)model.getElementAt(idx)));
-            }
+            } else if (Main.isDisplayingMapView()) {
+                helper.highlightOnly((OsmPrimitive)model.getElementAt(idx));
+                Main.map.mapView.repaint();
+            }
+        }
+
+        @Override
+        public void mouseExited(MouseEvent me) {
+            helper.clear();
+            super.mouseExited(me);
         }
     }

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

@@ -86 +86 @@
 import org.openstreetmap.josm.gui.tagging.TaggingPreset.PresetType;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.HighlightHelper;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.tools.GBC;
@@ -176 +177 @@
     private final SelectMembersAction addMembersToSelectionAction = new SelectMembersAction(true);
     
+    private final HighlightHelper highlightHelper= new HighlightHelper();
+    
     /**
      * The Add button (needed to be able to disable it)
@@ -255 +258 @@
         membershipTable.getSelectionModel().addListSelectionListener(deleteAction);
         
-
+        
         JScrollPane scrollPane = (JScrollPane) createLayout(bothTables, true, Arrays.asList(new SideButton[] {
                 this.btnAdd, this.btnEdit, this.btnDel
@@ -408 +411 @@
                 return row;
             }
+
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                //update highlights
+                if (Main.isDisplayingMapView()) {
+                    int row = membershipTable.rowAtPoint(e.getPoint());
+                    if (row>=0) {
+                        highlightHelper.highlightOnly((Relation) membershipTable.getValueAt(row, 0));
+                        Main.map.mapView.repaint();
+                    }
+                }
+                super.mouseClicked(e);
+            }
+
+            @Override
+            public void mouseExited(MouseEvent me) {
+                highlightHelper.clear();
+            }
         });
     }