Changeset 1419 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

Timestamp:

2009-02-17T16:52:39+01:00 (17 years ago)

Author:

stoecker

Message:

close #2192. Patch by xeen

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) (5 diffs)

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

@@ -18 +18 @@
 import javax.swing.JScrollPane;
 import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import org.openstreetmap.josm.Main;
@@ -53 +54 @@
      */
     private JList displaylist = new JList(list);
+    
+    private SideButton sbEdit = new SideButton(marktr("Edit"), "edit", "Selection", tr( "Open an editor for the selected relation"), new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+            Relation toEdit = getSelected();
+            if (toEdit == null)
+                return;
+            
+            new RelationEditor(toEdit).setVisible(true);
+        }
+    });
+    
+    private SideButton sbDel = new SideButton(marktr("Delete"), "delete", "Selection", tr("Delete the selected relation"), new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+            Relation toDelete = getSelected();
+            if (toDelete == null)
+                return;
+            
+            Main.main.undoRedo.add(
+                    new DeleteCommand(Collections.singleton(toDelete)));
+        }
+    });
 
     public RelationListDialog() {
@@ -77 +99 @@
         }), GBC.std());
 
-        buttonPanel.add(new SideButton(marktr("Edit"), "edit", "Selection", tr( "Open an editor for the selected relation"), new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                Relation toEdit = (Relation) displaylist.getSelectedValue();
-                if (toEdit != null)
-                    new RelationEditor(toEdit).setVisible(true);
-            }
-        }), GBC.std());
+        buttonPanel.add(sbEdit, GBC.std());
 
-        buttonPanel.add(new SideButton(marktr("Delete"), "delete", "Selection", tr("Delete the selected relation"), new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                Relation toDelete = (Relation) displaylist.getSelectedValue();
-                if (toDelete != null) {
-                    Main.main.undoRedo.add(
-                        new DeleteCommand(Collections.singleton(toDelete)));
-                }
-            }
-        }), GBC.eol());
+        buttonPanel.add(sbDel, GBC.eol());
         Layer.listeners.add(this);
         add(buttonPanel, BorderLayout.SOUTH);
+        
+        displaylist.addListSelectionListener(new ListSelectionListener() {
+            public void valueChanged(ListSelectionEvent e) {
+               sbEdit.setEnabled(getSelected() != null);
+               sbDel.setEnabled(getSelected() != null);
+            }
+        });
     }
 
@@ -117 +132 @@
             setTitle(tr("Relations"), false);
         }
+        
+        sbEdit.setEnabled(list.size() > 0);
+        sbDel.setEnabled(list.size() > 0);
     }
 
@@ -169 +187 @@
         displaylist.removeListSelectionListener(listener);
     }
+    
+    /**
+     * @return The selected relation in the list
+     */
+    private Relation getSelected() {
+        if(list.size() == 1)
+            displaylist.setSelectedIndex(0);
+        return (Relation) displaylist.getSelectedValue();
+    }
 }