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

Timestamp:

2009-08-07T20:59:59+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3207: Highlighting members in relation editor is broken

Location:

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

Files:

• GenericRelationEditor.java (modified) (7 diffs)
• MemberTableModel.java (modified) (2 diffs)

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

@@ -32 +32 @@
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
+import javax.swing.DefaultListSelectionModel;
 import javax.swing.JButton;
 import javax.swing.JComponent;
@@ -57 +58 @@
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.ConflictAddCommand;
+import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -200 +202 @@
 
         memberTableModel.setSelectedMembers(selectedMembers);
-        DataSet.selListeners.add(memberTableModel);
     }
 
@@ -336 +337 @@
         editor.setAutoCompletionList(acList);
 
-        memberTable.getSelectionModel().addListSelectionListener(new SelectionSynchronizer());
+        SelectionSynchronizer synchronizer = new SelectionSynchronizer();
+        memberTable.getSelectionModel().addListSelectionListener(synchronizer);
+        DataSet.selListeners.add(synchronizer);
         memberTable.addMouseListener(new MemberTableDblClickAdapter());
         memberTableModel.addMemberModelListener(memberTable);
@@ -1451 +1454 @@
      * Updates the selection in the current data set with the selected referers in
      * in the member table.
-     *
      */
-    class SelectionSynchronizer implements ListSelectionListener {
+    class SelectionSynchronizer implements ListSelectionListener, SelectionChangedListener{
         public void valueChanged(ListSelectionEvent e) {
             if (e.getValueIsAdjusting())
@@ -1464 +1466 @@
             if (!memberTableModel.selectionsAreInSync()) {
                 getLayer().data.setSelected(memberTableModel.getSelectedReferers());
+            }
+        }
+
+        public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+            // ignore selection change events if they happen for a dataset in another
+            // layer
+            if (!memberTableModel.isActiveLayer()) return;
+            if (!memberTableModel.selectionsAreInSync()) {
+                memberTableModel.selectMembersReferringTo(newSelection);
             }
         }
@@ -1550 +1561 @@
         }
     }
-
-
 }

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

@@ -27 +27 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
-public class MemberTableModel extends AbstractTableModel implements SelectionChangedListener{
+public class MemberTableModel extends AbstractTableModel {
 
     private ArrayList<RelationMember> members;
@@ -514 +514 @@
         if (Main.map == null || Main.map.mapView == null) return false;
         return Main.map.mapView.getActiveLayer() == layer;
-    }
-
-
-    /* ------------------------------------------------------------------------- */
-    /* Interface SelectionChangedListener                                        */
-    /* ------------------------------------------------------------------------- */
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-        // ignore selection change events if they happen for a dataset in another
-        // layer
-        if (!isActiveLayer()) return;
-        selectMembersReferringTo(newSelection);
     }