MONDRIAN: [PSW-93] Fixes the Edit->Delete menu.

[git-p4: depot-paths = "//open/mondrian/": change = 14642]
pentaho · Oct 3, 2011 · 097ea21 · 097ea21
1 parent 2da5810
commit 097ea21
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/src/main/mondrian/gui/SchemaExplorer.java b/src/main/mondrian/gui/SchemaExplorer.java
@@ -2215,6 +2215,10 @@ protected void delete(EventObject evt) {
                 JOptionPane.WARNING_MESSAGE);
             return;
         }
+        delete(tpath);
+    }
+
+    void delete(TreePath tpath) {
         Object child = tpath.getLastPathComponent(); // to be deleted
         Object nextSibling = null;
         Object prevSibling = null;
@@ -5640,7 +5644,7 @@ public void showMenu(MouseEvent e) {
     private JLabel validStatusLabel;
     private JLabel targetLabel2;
     private JLabel validStatusLabel2;
-    private JTree tree;
+    JTree tree;
     private JSplitPane jSplitPane1;
 
     private JButton addDimensionButton;

diff --git a/src/main/mondrian/gui/Workbench.java b/src/main/mondrian/gui/Workbench.java
@@ -47,6 +47,7 @@
 import java.util.Properties;
 import java.util.ResourceBundle;
 
+import javax.swing.AbstractAction;
 import javax.swing.ImageIcon;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JEditorPane;
@@ -63,6 +64,7 @@
 import javax.swing.filechooser.FileSystemView;
 import javax.swing.plaf.basic.BasicArrowButton;
 import javax.swing.text.DefaultEditorKit;
+import javax.swing.tree.TreePath;
 
 import mondrian.olap.DriverManager;
 import mondrian.olap.MondrianProperties;
@@ -395,7 +397,25 @@ private void initComponents() {
             new javax.swing.JMenuItem(new DefaultEditorKit.CopyAction());
         pasteMenuItem =
             new javax.swing.JMenuItem(new DefaultEditorKit.PasteAction());
-        deleteMenuItem = new javax.swing.JMenuItem();
+        deleteMenuItem =
+            new javax.swing.JMenuItem(
+                new AbstractAction(
+                    getResourceConverter().getString(
+                        "workbench.menu.delete", "Delete"))
+                {
+                    public void actionPerformed(ActionEvent e) {
+                        JInternalFrame jf = desktopPane.getSelectedFrame();
+                        if (jf != null && jf.getContentPane()
+                            .getComponent(0) instanceof SchemaExplorer)
+                        {
+                            SchemaExplorer se =
+                                (SchemaExplorer) jf.getContentPane()
+                                    .getComponent(0);
+                            TreePath tpath = se.tree.getSelectionPath();
+                            se.delete(tpath);
+                        }
+                    }
+                });
         aboutMenuItem = new javax.swing.JMenuItem();
         toolsMenu = new javax.swing.JMenu();
         viewMenu = new javax.swing.JMenu();
@@ -728,9 +748,6 @@ public void actionPerformed(ActionEvent evt) {
                 "workbench.menu.paste", "Paste"));
         editMenu.add(pasteMenuItem);
 
-        deleteMenuItem.setText(
-            getResourceConverter().getString(
-                "workbench.menu.delete", "Delete"));
         editMenu.add(deleteMenuItem);
 
         menuBar.add(editMenu);