Changeset 1331 in josm for trunk

Timestamp:

2009-01-24T22:23:50+01:00 (16 years ago)

Author:

stoecker

Message:

close #2058, #2063

Location:

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

Files:

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

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

@@ -278 +278 @@
             }
         });
-        ListSelectionModel lsm2 = propertyTable.getSelectionModel();
-        lsm2.addListSelectionListener(new ListSelectionListener() {
-            public void valueChanged(ListSelectionEvent e) {
-                Main.ds.setSelected(RelationEditor.this.relation);
-            }
-        });
         propertyTable.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
 

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

@@ -64 +64 @@
         displaylist.addMouseListener(new MouseAdapter(){
             @Override public void mouseClicked(MouseEvent e) {
-                if (e.getClickCount() < 2)
-                    return;
-                Relation toEdit = (Relation) displaylist.getSelectedValue();
-                if (toEdit != null)
-                    new RelationEditor(toEdit).setVisible(true);
+                if (e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1)
+                    Main.ds.setSelected((Relation)displaylist.getSelectedValue());
             }
         });
-        /*displaylist.addListSelectionListener(new ListSelectionListener(){
-            public void valueChanged(ListSelectionEvent e) {
-                Relation toEdit = (Relation) displaylist.getSelectedValue();
-                if (toEdit != null) {
-                    Main.ds.setSelected(toEdit);
-                    AutoScaleAction asa = new AutoScaleAction("selection");
-                    asa.actionPerformed(null);
-                }
-            }
-        });*/
 
         add(new JScrollPane(displaylist), BorderLayout.CENTER);
@@ -90 +77 @@
                 // call relation editor with null argument to create new relation
                 new RelationEditor(null).setVisible(true);
-            }
-        }), GBC.std());
-
-        buttonPanel.add(new SideButton(marktr("Select"), "select", "Selection", tr("Select this relation"), new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                // replace selection with the relation from the list
-                Main.ds.setSelected((Relation)displaylist.getSelectedValue());
-                AutoScaleAction asa = new AutoScaleAction("selection");
-                asa.actionPerformed(null);
             }
         }), GBC.std());