Changeset 2490 in josm for trunk/src

Timestamp:

2009-11-21T14:03:11+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3994: unerwarteter Fehler (im Zusammenhang mit Relation)
fixed #3990: "Bearbeiten" button without function (fixed issues related to relation memberships)

Location:

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

Files:

• PropertiesDialog.java (modified) (2 diffs)
• RelationListDialog.java (modified) (1 diff)

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

@@ -570 +570 @@
         EditAction editAction = new EditAction();
         propertyTable.getSelectionModel().addListSelectionListener(editAction);
+        membershipTable.getSelectionModel().addListSelectionListener(editAction);
         this.btnEdit = new SideButton(editAction);
         buttonPanel.add(this.btnEdit);
@@ -901 +902 @@
             if (!isEnabled())
                 return;
-            int row = propertyTable.getSelectedRow();
-            propertyEdit(row >= 0 ? row : 0);
+            if (propertyTable.getSelectedRowCount() == 1) {
+                int row = propertyTable.getSelectedRow();
+                propertyEdit(row);
+            } else if (membershipTable.getSelectedRowCount() == 1) {
+                int row = membershipTable.getSelectedRow();
+                membershipEdit(row);
+            }
         }
 
         protected void updateEnabledState() {
-            setEnabled(propertyTable.getSelectedRowCount() == 1);
+            setEnabled(
+                    propertyTable.getSelectedRowCount() == 1
+                    ^ membershipTable.getSelectedRowCount() == 1
+            );
         }
 

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

@@ -620 +620 @@
         }
 
-        public int getIndexOfRelation(Relation relation) {
-            if (relation == null) return -1;
-            return relations.indexOf(relation);
-        }
-
         /**
          * Replies the list of selected, non-new relations. Empty list,