Changeset 6036 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2013-06-27T11:49:16+02:00 (11 years ago)

Author:

akks

Message:

Highlight selected members in Relation Editor dialog

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

@@ -8 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -24 +27 @@
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.ZoomToAction;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.MapView;
@@ -31 +36 @@
 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.OsmPrimitivesTable;
 
@@ -37 +43 @@
     /** the additional actions in popup menu */
     private ZoomToGapAction zoomToGap;
+    private HighlightHelper highlightHelper = new HighlightHelper();
 
     /**
@@ -66 +73 @@
                 KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0, false), "selectNextColumnCell");
 
+        initHighlighting();
+        
         // install custom navigation actions
         //
@@ -89 +98 @@
         return menu;
     }
-
+    
     @Override
     public Dimension getPreferredSize(){
@@ -104 +113 @@
     }
 
+    @Override
     public void makeMemberVisible(int index) {
         scrollRectToVisible(getCellRect(index, 0, true));
+    }
+
+    private void initHighlighting() {
+        getMemberTableModel().getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+            @Override
+            public void valueChanged(ListSelectionEvent lse) {
+                if (Main.isDisplayingMapView()) {
+                    Collection<RelationMember> sel = getMemberTableModel().getSelectedMembers();
+                    ArrayList<OsmPrimitive> toHighlight = new ArrayList<OsmPrimitive>();
+                    for (RelationMember r: sel) {
+                        if (r.getMember().isUsable()) {
+                            toHighlight.add(r.getMember());
+                        }
+                    }
+                    if (highlightHelper.highlightOnly(toHighlight)) {
+                        Main.map.mapView.repaint();
+                    }
+                }
+            }});
+        if (Main.isDisplayingMapView()) {
+            HighlightHelper.clearAllHighlighted();
+            Main.map.mapView.repaint();
+        }
     }
 
@@ -145 +178 @@
     private class SelectPreviousColumnCellAction extends AbstractAction {
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             int col = getSelectedColumn();
@@ -166 +200 @@
         super.unlinkAsListener();
         MapView.removeLayerChangeListener(zoomToGap);
+        highlightHelper.clear();
     }