Changeset 1886 in josm

Timestamp:

2009-08-02T20:59:26+02:00 (16 years ago)

Author:

Gubaer

Message:

fixed #3154 : readd relation member selection feature

Location:

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

Files:

• RelationListDialog.java (modified) (5 diffs)
• relation/GenericRelationEditor.java (modified) (7 diffs)
• relation/MemberTableModel.java (modified) (2 diffs)

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

@@ -9 +9 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.Collection;
+import java.util.HashSet;
 
 import javax.swing.AbstractAction;
@@ -23 +25 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
@@ -35 +38 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
+import com.sun.corba.se.spi.legacy.connection.GetEndPointInfoAgainException;
+
 /**
  * A dialog showing all known relations, with buttons to add, edit, and
@@ -245 +250 @@
             setEnabled(false);
         }
+        protected Collection<RelationMember> getMembersForCurrentSelection(Relation r) {
+            Collection<RelationMember> members = new HashSet<RelationMember>();
+            Collection<OsmPrimitive> selection = Main.map.mapView.getEditLayer().data.getSelected();
+            for (RelationMember member: r.members) {
+                if (selection.contains(member.member)) {
+                    members.add(member);
+                }
+            }
+            return members;
+        }
 
         public void run() {
@@ -251 +266 @@
             if (toEdit == null)
                 return;
-            RelationEditor.getEditor(Main.map.mapView.getEditLayer(),toEdit, null).setVisible(true);
+            RelationEditor.getEditor(Main.map.mapView.getEditLayer(),toEdit, getMembersForCurrentSelection(toEdit)).setVisible(true);
         }
 

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

@@ -24 +24 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -83 +84 @@
  * This dialog is for editing relations.
  * 
- * In the basic form, it provides two tables, one with the relation tags and one with the relation
- * members. (Relation tags can be edited through the normal properties dialog as well, if you manage
- * to get a relation selected!)
- * 
- * @author Frederik Ramm <frederik@remote.org>
- * 
  */
 public class GenericRelationEditor extends RelationEditor {
@@ -146 +141 @@
             this.memberTableModel.populate(null);
         }
-        memberTableModel.setSelectedMembers(selectedMembers);
         tagEditorModel.ensureOneTag();
 
@@ -196 +190 @@
         );
 
+        memberTableModel.setSelectedMembers(selectedMembers);
     }
 
@@ -331 +326 @@
         memberTable.getSelectionModel().addListSelectionListener(new SelectionSynchronizer());
         memberTable.addMouseListener(new MemberTableDblClickAdapter());
+        memberTableModel.addMemberModelListener(memberTable);
 
         final JScrollPane scrollPane = new JScrollPane(memberTable);
@@ -1389 +1385 @@
         }
 
+        protected Collection<RelationMember> getMembersForCurrentSelection(Relation r) {
+            Collection<RelationMember> members = new HashSet<RelationMember>();
+            Collection<OsmPrimitive> selection = getLayer().data.getSelected();
+            for (RelationMember member: r.members) {
+                if (selection.contains(member.member)) {
+                    members.add(member);
+                }
+            }
+            return members;
+        }
+
         public void run() {
             int idx = memberTable.getSelectedRow();
@@ -1399 +1406 @@
             if (r.incomplete)
                 return;
-            RelationEditor editor = RelationEditor.getEditor(getLayer(), r, null);
+
+            RelationEditor editor = RelationEditor.getEditor(getLayer(), r, getMembersForCurrentSelection(r));
             editor.setVisible(true);
         }

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

@@ -374 +374 @@
         ArrayList<Integer> selectedIndices = new ArrayList<Integer>();
         for (RelationMember member : selectedMembers) {
-            int idx = members.indexOf(member);
-            if (idx >= 0 && !selectedIndices.contains(idx)) {
-                selectedIndices.add(idx);
+            for (int idx = 0; idx < members.size(); idx ++) {
+                if (members.get(idx).equals(member)) {
+                    if (!selectedIndices.contains(idx)) {
+                        selectedIndices.add(idx);
+                    }
+                }
             }
         }
@@ -487 +490 @@
          */
 
-        if (map.isEmpty()) {
+        if (map.isEmpty())
             // empty relation or incomplete members
             return;
-        }
         segments = new Vector<LinkedList<Integer>>();