changeset 609:e4d87f3c8858

6725409: Unable to localize JInternalFrame system menu during run-time Summary: Use of the static final constants replaced by direct calls of UIManager.getString(). Reviewed-by: alexp
author mlapshin
date Thu, 24 Jul 2008 14:34:02 +0400
parents 8b59beb64ee9
children ef591cd4c463
files src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java test/javax/swing/JInternalFrame/6725409/bug6725409.java
diffstat 2 files changed, 175 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java	Mon Jul 21 19:58:43 2008 +0400
+++ b/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java	Thu Jul 24 14:34:02 2008 +0400
@@ -86,6 +86,7 @@
     protected Action moveAction;
     protected Action sizeAction;
 
+    // These constants are not used in JDK code
     protected static final String CLOSE_CMD =
         UIManager.getString("InternalFrameTitlePane.closeButtonText");
     protected static final String ICONIFY_CMD =
@@ -600,7 +601,8 @@
      */
     public class CloseAction extends AbstractAction {
         public CloseAction() {
-            super(CLOSE_CMD);
+            super(UIManager.getString(
+                    "InternalFrameTitlePane.closeButtonText"));
         }
 
         public void actionPerformed(ActionEvent e) {
@@ -616,7 +618,8 @@
      */
     public class MaximizeAction extends AbstractAction {
         public MaximizeAction() {
-            super(MAXIMIZE_CMD);
+            super(UIManager.getString(
+                    "InternalFrameTitlePane.maximizeButtonText"));
         }
 
         public void actionPerformed(ActionEvent evt) {
@@ -644,7 +647,8 @@
      */
     public class IconifyAction extends AbstractAction {
         public IconifyAction() {
-            super(ICONIFY_CMD);
+            super(UIManager.getString(
+                    "InternalFrameTitlePane.minimizeButtonText"));
         }
 
         public void actionPerformed(ActionEvent e) {
@@ -664,7 +668,8 @@
      */
     public class RestoreAction extends AbstractAction {
         public RestoreAction() {
-            super(RESTORE_CMD);
+            super(UIManager.getString(
+                    "InternalFrameTitlePane.restoreButtonText"));
         }
 
         public void actionPerformed(ActionEvent evt) {
@@ -690,7 +695,8 @@
      */
     public class MoveAction extends AbstractAction {
         public MoveAction() {
-            super(MOVE_CMD);
+            super(UIManager.getString(
+                    "InternalFrameTitlePane.moveButtonText"));
         }
 
         public void actionPerformed(ActionEvent e) {
@@ -723,7 +729,8 @@
      */
     public class SizeAction extends AbstractAction {
         public SizeAction() {
-            super(SIZE_CMD);
+            super(UIManager.getString(
+                    "InternalFrameTitlePane.sizeButtonText"));
         }
 
         public void actionPerformed(ActionEvent e) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/swing/JInternalFrame/6725409/bug6725409.java	Thu Jul 24 14:34:02 2008 +0400
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 6725409
+ * @summary Checks that JInternalFrame's system menu
+ *          can be localized during run-time
+ * @author Mikhail Lapshin
+ */
+
+import javax.swing.*;
+import java.awt.*;
+
+public class bug6725409 {
+    private JFrame frame;
+    private JInternalFrame iFrame;
+    private TestTitlePane testTitlePane;
+    private boolean passed;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            UIManager.setLookAndFeel(
+                    new com.sun.java.swing.plaf.windows.WindowsClassicLookAndFeel());
+        } catch(UnsupportedLookAndFeelException e) {
+            System.out.println("The test is for Windows LaF only");
+            System.exit(0);
+        }
+
+        final bug6725409 bug6725409 = new bug6725409();
+        try {
+            SwingUtilities.invokeAndWait(new Runnable() {
+                public void run() {
+                    bug6725409.setupUIStep1();
+                }
+            });
+            realSync();
+            SwingUtilities.invokeAndWait(new Runnable() {
+                public void run() {
+                    bug6725409.setupUIStep2();
+                }
+            });
+            realSync();
+            SwingUtilities.invokeAndWait(new Runnable() {
+                public void run() {
+                    bug6725409.test();
+                }
+            });
+            realSync();
+            bug6725409.checkResult();
+        } finally {
+            if (bug6725409.frame != null) {
+                bug6725409.frame.dispose();
+            }
+        }
+    }
+
+    private void setupUIStep1() {
+        frame = new JFrame();
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+        JDesktopPane desktop = new JDesktopPane();
+        iFrame = new JInternalFrame("Internal Frame", true, true, true, true);
+        iFrame.setSize(200, 100);
+        desktop.add(iFrame);
+        frame.add(desktop);
+        iFrame.setVisible(true);
+
+        frame.setSize(500, 300);
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+
+    private void setupUIStep2() {
+        UIManager.put("InternalFrameTitlePane.restoreButtonText",
+                "CUSTOM.restoreButtonText");
+        UIManager.put("InternalFrameTitlePane.moveButtonText",
+                "CUSTOM.moveButtonText");
+        UIManager.put("InternalFrameTitlePane.sizeButtonText",
+                "CUSTOM.sizeButtonText");
+        UIManager.put("InternalFrameTitlePane.minimizeButtonText",
+                "CUSTOM.minimizeButtonText");
+        UIManager.put("InternalFrameTitlePane.maximizeButtonText",
+                "CUSTOM.maximizeButtonText");
+        UIManager.put("InternalFrameTitlePane.closeButtonText",
+                "CUSTOM.closeButtonText");
+        SwingUtilities.updateComponentTreeUI(frame);
+    }
+
+    // The test depends on the order of the menu items in
+    // WindowsInternalFrameTitlePane.systemPopupMenu
+    private void test() {
+        testTitlePane = new TestTitlePane(iFrame);
+        passed = true;
+        checkMenuItemText(0, "CUSTOM.restoreButtonText");
+        checkMenuItemText(1, "CUSTOM.moveButtonText");
+        checkMenuItemText(2, "CUSTOM.sizeButtonText");
+        checkMenuItemText(3, "CUSTOM.minimizeButtonText");
+        checkMenuItemText(4, "CUSTOM.maximizeButtonText");
+        // Skip separator
+        checkMenuItemText(6, "CUSTOM.closeButtonText");
+    }
+
+    private void checkMenuItemText(int index, String text) {
+        JMenuItem menuItem = (JMenuItem)
+                testTitlePane.getSystemPopupMenu().getComponent(index);
+        if (!text.equals(menuItem.getText())) {
+            passed = false;
+        }
+    }
+
+    private void checkResult() {
+        if (passed) {
+            System.out.println("Test passed");
+        } else {
+            throw new RuntimeException("Unable to localize " +
+                    "JInternalFrame's system menu during run-time");
+        }
+    }
+
+    private static void realSync() {
+        ((sun.awt.SunToolkit) (Toolkit.getDefaultToolkit())).realSync();
+    }
+
+    // Extend WindowsInternalFrameTitlePane to get access to systemPopupMenu
+    private class TestTitlePane extends
+            com.sun.java.swing.plaf.windows.WindowsInternalFrameTitlePane {
+        private JPopupMenu systemPopupMenu;
+
+        public TestTitlePane(JInternalFrame f) {
+            super(f);
+        }
+
+        public JPopupMenu getSystemPopupMenu() {
+            return systemPopupMenu;
+        }
+
+        protected void addSystemMenuItems(JPopupMenu menu) {
+            super.addSystemMenuItems(menu);
+            systemPopupMenu = menu;
+        }
+    }
+}