Changeset 3327 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

Timestamp:

2010-06-09T22:14:06+02:00 (16 years ago)

Author:

jttt

Message:

Fix some of "Keystroke %s is already assigned to %s, will be overridden by %s" warnings

File:

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

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

@@ -294 +294 @@
      * Launches the search dialog
      */
-    class SearchAction extends AbstractAction implements EditLayerChangeListener {
+    static class SearchAction extends AbstractAction implements EditLayerChangeListener {
         public SearchAction() {
             putValue(NAME, tr("Search"));
@@ -358 +358 @@
 
         public void actionPerformed(ActionEvent e) {
-            new AutoScaleAction("selection").autoScale();
+            AutoScaleAction.autoScale("selection");
         }
 
@@ -423 +423 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             Relation relation = (Relation)model.getSelected().toArray()[0];
@@ -428 +429 @@
             Collection<OsmPrimitive> selection = model.getAllElements();
             for (RelationMember member: relation.getMembers()) {
-                if (selection.contains(member.getMember()))
+                if (selection.contains(member.getMember())) {
                     members.add(member);
+                }
             }
             Main.map.relationListDialog.selectRelation(relation);
             RelationEditor.getEditor(Main.map.mapView.getEditLayer(), relation,
-                members).setVisible(true);
+                    members).setVisible(true);
         }
     }
@@ -801 +803 @@
             {
                 text.append(": ");
-                for(OsmPrimitive o : sel)
-                   text.append(o.getDisplayName(df));
+                for(OsmPrimitive o : sel) {
+                    text.append(o.getDisplayName(df));
+                }
                 setText(text.toString());
-            }
-            else
+            } else {
                 setText(tr("Selection: {0}", text));
+            }
             addActionListener(this);
         }