Changeset 3408 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

2010-08-03T07:52:26+02:00 (16 years ago)

Author:

jttt

Message:

Show only actions that can work on all selected layers in LayerListDialog popup menu

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -10 +10 @@
 import java.awt.AlphaComposite;
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.Composite;
 import java.awt.Graphics2D;
@@ -28 +27 @@
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.Icon;
 import javax.swing.JLabel;
-import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
 import javax.swing.JTextArea;
 
@@ -440 +438 @@
     }
 
-    @Override public Component[] getMenuEntries() {
+    @Override public Action[] getMenuEntries() {
         if (Main.applet)
-            return new Component[]{
-                new JMenuItem(LayerListDialog.getInstance().createActivateLayerAction(this)),
-                new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)),
-                new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)),
-                new JSeparator(),
-                new JMenuItem(LayerListDialog.getInstance().createMergeLayerAction(this)),
-                new JSeparator(),
-                new JMenuItem(new RenameLayerAction(getAssociatedFile(), this)),
-                new JMenuItem(new ConsistencyTestAction()),
-                new JSeparator(),
-                new JMenuItem(new LayerListPopup.InfoAction(this))};
-        return new Component[]{
-                new JMenuItem(LayerListDialog.getInstance().createActivateLayerAction(this)),
-                new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)),
-                new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)),
-                new JSeparator(),
-                new JMenuItem(LayerListDialog.getInstance().createMergeLayerAction(this)),
-                new JMenuItem(new LayerSaveAction(this)),
-                new JMenuItem(new LayerSaveAsAction(this)),
-                new JMenuItem(new LayerGpxExportAction(this)),
-                new JMenuItem(new ConvertToGpxLayerAction()),
-                new JSeparator(),
-                new JMenuItem(new RenameLayerAction(getAssociatedFile(), this)),
-                new JMenuItem(new ConsistencyTestAction()),
-                new JSeparator(),
-                new JMenuItem(new LayerListPopup.InfoAction(this))};
+            return new Action[]{
+                LayerListDialog.getInstance().createActivateLayerAction(this),
+                LayerListDialog.getInstance().createShowHideLayerAction(),
+                LayerListDialog.getInstance().createDeleteLayerAction(),
+                SeparatorLayerAction.INSTANCE,
+                LayerListDialog.getInstance().createMergeLayerAction(this),
+                SeparatorLayerAction.INSTANCE,
+                new RenameLayerAction(getAssociatedFile(), this),
+                new ConsistencyTestAction(),
+                SeparatorLayerAction.INSTANCE,
+                new LayerListPopup.InfoAction(this)};
+        return new Action[]{
+                LayerListDialog.getInstance().createActivateLayerAction(this),
+                LayerListDialog.getInstance().createShowHideLayerAction(),
+                LayerListDialog.getInstance().createDeleteLayerAction(),
+                SeparatorLayerAction.INSTANCE,
+                LayerListDialog.getInstance().createMergeLayerAction(this),
+                new LayerSaveAction(this),
+                new LayerSaveAsAction(this),
+                new LayerGpxExportAction(this),
+                new ConvertToGpxLayerAction(),
+                SeparatorLayerAction.INSTANCE,
+                new RenameLayerAction(getAssociatedFile(), this),
+                new ConsistencyTestAction(),
+                SeparatorLayerAction.INSTANCE,
+                new LayerListPopup.InfoAction(this)};
     }