8039750: KSS: Replace MetalLazyValue with lambda
Reviewed-by: alexsch, serb
diff --git a/jdk/src/share/classes/javax/swing/JTable.java b/jdk/src/share/classes/javax/swing/JTable.java
index 3b021da..e382fbd 100644
--- a/jdk/src/share/classes/javax/swing/JTable.java
+++ b/jdk/src/share/classes/javax/swing/JTable.java
@@ -34,7 +34,6 @@
import java.beans.*;
-import java.io.Serializable;
import java.io.ObjectOutputStream;
import java.io.ObjectInputStream;
import java.io.IOException;
@@ -58,7 +57,6 @@
import sun.swing.SwingUtilities2.Section;
import static sun.swing.SwingUtilities2.Section.*;
import sun.swing.PrintingStatus;
-import sun.swing.SwingLazyValue;
/**
* The <code>JTable</code> is used to display and edit regular two-dimensional tables
@@ -5307,14 +5305,6 @@
return retValue;
}
- private void setLazyValue(Hashtable h, Class c, String s) {
- h.put(c, new SwingLazyValue(s));
- }
-
- private void setLazyRenderer(Class c, String s) {
- setLazyValue(defaultRenderersByColumnClass, c, s);
- }
-
/**
* Creates default cell renderers for objects, numbers, doubles, dates,
* booleans, and icons.
@@ -5325,24 +5315,24 @@
defaultRenderersByColumnClass = new UIDefaults(8, 0.75f);
// Objects
- setLazyRenderer(Object.class, "javax.swing.table.DefaultTableCellRenderer$UIResource");
+ defaultRenderersByColumnClass.put(Object.class, (UIDefaults.LazyValue) t -> new DefaultTableCellRenderer.UIResource());
// Numbers
- setLazyRenderer(Number.class, "javax.swing.JTable$NumberRenderer");
+ defaultRenderersByColumnClass.put(Number.class, (UIDefaults.LazyValue) t -> new NumberRenderer());
// Doubles and Floats
- setLazyRenderer(Float.class, "javax.swing.JTable$DoubleRenderer");
- setLazyRenderer(Double.class, "javax.swing.JTable$DoubleRenderer");
+ defaultRenderersByColumnClass.put(Float.class, (UIDefaults.LazyValue) t -> new DoubleRenderer());
+ defaultRenderersByColumnClass.put(Double.class, (UIDefaults.LazyValue) t -> new DoubleRenderer());
// Dates
- setLazyRenderer(Date.class, "javax.swing.JTable$DateRenderer");
+ defaultRenderersByColumnClass.put(Date.class, (UIDefaults.LazyValue) t -> new DateRenderer());
// Icons and ImageIcons
- setLazyRenderer(Icon.class, "javax.swing.JTable$IconRenderer");
- setLazyRenderer(ImageIcon.class, "javax.swing.JTable$IconRenderer");
+ defaultRenderersByColumnClass.put(Icon.class, (UIDefaults.LazyValue) t -> new IconRenderer());
+ defaultRenderersByColumnClass.put(ImageIcon.class, (UIDefaults.LazyValue) t -> new IconRenderer());
// Booleans
- setLazyRenderer(Boolean.class, "javax.swing.JTable$BooleanRenderer");
+ defaultRenderersByColumnClass.put(Boolean.class, (UIDefaults.LazyValue) t -> new BooleanRenderer());
}
/**
@@ -5420,10 +5410,6 @@
}
}
- private void setLazyEditor(Class c, String s) {
- setLazyValue(defaultEditorsByColumnClass, c, s);
- }
-
/**
* Creates default cell editors for objects, numbers, and boolean values.
* @see DefaultCellEditor
@@ -5432,13 +5418,13 @@
defaultEditorsByColumnClass = new UIDefaults(3, 0.75f);
// Objects
- setLazyEditor(Object.class, "javax.swing.JTable$GenericEditor");
+ defaultEditorsByColumnClass.put(Object.class, (UIDefaults.LazyValue) t -> new GenericEditor());
// Numbers
- setLazyEditor(Number.class, "javax.swing.JTable$NumberEditor");
+ defaultEditorsByColumnClass.put(Number.class, (UIDefaults.LazyValue) t -> new NumberEditor());
// Booleans
- setLazyEditor(Boolean.class, "javax.swing.JTable$BooleanEditor");
+ defaultEditorsByColumnClass.put(Boolean.class, (UIDefaults.LazyValue) t -> new BooleanEditor());
}
/**
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java b/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
index d6b0069..e7764c8 100644
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
@@ -32,15 +32,13 @@
import javax.swing.*;
import javax.swing.plaf.basic.*;
import javax.swing.text.DefaultEditorKit;
+import javax.swing.UIDefaults.LazyValue;
import java.awt.Color;
-import java.awt.event.KeyEvent;
-import java.lang.reflect.*;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
import java.security.AccessController;
-import java.security.PrivilegedAction;
import sun.awt.*;
import sun.security.action.GetPropertyAction;
@@ -460,11 +458,9 @@
new SwingLazyValue("javax.swing.plaf.metal.MetalBorders",
"getTextFieldBorder");
- Object dialogBorder = new MetalLazyValue(
- "javax.swing.plaf.metal.MetalBorders$DialogBorder");
+ LazyValue dialogBorder = t -> new MetalBorders.DialogBorder();
- Object questionDialogBorder = new MetalLazyValue(
- "javax.swing.plaf.metal.MetalBorders$QuestionDialogBorder");
+ LazyValue questionDialogBorder = t -> new MetalBorders.QuestionDialogBorder();
Object fieldInputMap = new UIDefaults.LazyInputMap(new Object[] {
"ctrl C", DefaultEditorKit.copyAction,
@@ -1494,12 +1490,8 @@
"ToolBar.floatingBackground", menuBackground,
"ToolBar.dockingForeground", primaryControlDarkShadow,
"ToolBar.floatingForeground", primaryControl,
- "ToolBar.rolloverBorder", new MetalLazyValue(
- "javax.swing.plaf.metal.MetalBorders",
- "getToolBarRolloverBorder"),
- "ToolBar.nonrolloverBorder", new MetalLazyValue(
- "javax.swing.plaf.metal.MetalBorders",
- "getToolBarNonrolloverBorder"),
+ "ToolBar.rolloverBorder", (LazyValue) t -> MetalBorders.getToolBarRolloverBorder(),
+ "ToolBar.nonrolloverBorder", (LazyValue) t -> MetalBorders.getToolBarNonrolloverBorder(),
"ToolBar.ancestorInputMap",
new UIDefaults.LazyInputMap(new Object[] {
"UP", "navigateUp",
@@ -1513,17 +1505,14 @@
}),
// RootPane
- "RootPane.frameBorder", new MetalLazyValue(
- "javax.swing.plaf.metal.MetalBorders$FrameBorder"),
+ "RootPane.frameBorder", (LazyValue) t -> new MetalBorders.FrameBorder(),
"RootPane.plainDialogBorder", dialogBorder,
"RootPane.informationDialogBorder", dialogBorder,
- "RootPane.errorDialogBorder", new MetalLazyValue(
- "javax.swing.plaf.metal.MetalBorders$ErrorDialogBorder"),
+ "RootPane.errorDialogBorder", (LazyValue) t -> new MetalBorders.ErrorDialogBorder(),
"RootPane.colorChooserDialogBorder", questionDialogBorder,
"RootPane.fileChooserDialogBorder", questionDialogBorder,
"RootPane.questionDialogBorder", questionDialogBorder,
- "RootPane.warningDialogBorder", new MetalLazyValue(
- "javax.swing.plaf.metal.MetalBorders$WarningDialogBorder"),
+ "RootPane.warningDialogBorder", (LazyValue) t -> new MetalBorders.WarningDialogBorder(),
// These bindings are only enabled when there is a default
// button set on the rootpane.
"RootPane.defaultButtonWindowKeyBindings", new Object[] {
@@ -2175,61 +2164,6 @@
/**
- * MetalLazyValue is a slimmed down version of <code>ProxyLaxyValue</code>.
- * The code is duplicate so that it can get at the package private
- * classes in metal.
- */
- private static class MetalLazyValue implements UIDefaults.LazyValue {
- /**
- * Name of the class to create.
- */
- private String className;
- private String methodName;
-
- MetalLazyValue(String name) {
- this.className = name;
- }
-
- MetalLazyValue(String name, String methodName) {
- this(name);
- this.methodName = methodName;
- }
-
- public Object createValue(UIDefaults table) {
- try {
- final Class c = Class.forName(className);
-
- if (methodName == null) {
- return c.newInstance();
- }
- Method method = AccessController.doPrivileged(
- new PrivilegedAction<Method>() {
- public Method run() {
- Method[] methods = c.getDeclaredMethods();
- for (int counter = methods.length - 1; counter >= 0;
- counter--) {
- if (methods[counter].getName().equals(methodName)){
- methods[counter].setAccessible(true);
- return methods[counter];
- }
- }
- return null;
- }
- });
- if (method != null) {
- return method.invoke(null, (Object[])null);
- }
- } catch (ClassNotFoundException cnfe) {
- } catch (InstantiationException ie) {
- } catch (IllegalAccessException iae) {
- } catch (InvocationTargetException ite) {
- }
- return null;
- }
- }
-
-
- /**
* FontActiveValue redirects to the appropriate metal theme method.
*/
private static class FontActiveValue implements UIDefaults.ActiveValue {
diff --git a/jdk/test/javax/swing/JTable/8031971/bug8031971.java b/jdk/test/javax/swing/JTable/8031971/bug8031971.java
new file mode 100644
index 0000000..4692ae6
--- /dev/null
+++ b/jdk/test/javax/swing/JTable/8031971/bug8031971.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import java.util.Date;
+import java.util.Hashtable;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+
+/**
+ * @test
+ * @bug 8031971 8039750
+ * @author Alexander Scherbatiy
+ * @summary Use only public methods in the SwingLazyValue
+ * @run main bug8031971
+ */
+public class bug8031971 {
+
+ static Object[][] RENDERERS = {
+ {Object.class, "javax.swing.table.DefaultTableCellRenderer$UIResource"},
+ {Number.class, "javax.swing.JTable$NumberRenderer"},
+ {Float.class, "javax.swing.JTable$DoubleRenderer"},
+ {Double.class, "javax.swing.JTable$DoubleRenderer"},
+ {Date.class, "javax.swing.JTable$DateRenderer"},
+ {Icon.class, "javax.swing.JTable$IconRenderer"},
+ {ImageIcon.class, "javax.swing.JTable$IconRenderer"},
+ {Boolean.class, "javax.swing.JTable$BooleanRenderer"}
+ };
+
+ static Object[][] EDITORS = {
+ {Object.class, "javax.swing.JTable$GenericEditor"},
+ {Number.class, "javax.swing.JTable$NumberEditor"},
+ {Boolean.class, "javax.swing.JTable$BooleanEditor"}
+ };
+
+ public static void main(String[] args) throws Exception {
+
+ SwingUtilities.invokeAndWait(() -> {
+
+ TestTable table = new TestTable();
+ test(table.getDefaultRenderersByColumnClass(), RENDERERS);
+ test(table.getDefaultEditorsByColumnClass(), EDITORS);
+ });
+ }
+
+ static void test(Hashtable table, Object[][] values) {
+ for (int i = 0; i < values.length; i++) {
+ test(table.get(values[i][0]), (String) values[i][1]);
+ }
+ }
+
+ static void test(Object obj, String className) {
+ if (!obj.getClass().getCanonicalName().equals(className.replace('$', '.'))) {
+ throw new RuntimeException("Wrong value!");
+ }
+ }
+
+ static class TestTable extends JTable {
+
+ Hashtable getDefaultRenderersByColumnClass() {
+ return defaultRenderersByColumnClass;
+ }
+
+ Hashtable getDefaultEditorsByColumnClass() {
+ return defaultEditorsByColumnClass;
+ }
+ }
+}
diff --git a/jdk/test/javax/swing/plaf/metal/MetalLookAndFeel/Test8039750.java b/jdk/test/javax/swing/plaf/metal/MetalLookAndFeel/Test8039750.java
new file mode 100644
index 0000000..89b165e
--- /dev/null
+++ b/jdk/test/javax/swing/plaf/metal/MetalLookAndFeel/Test8039750.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.swing.UIDefaults;
+import javax.swing.border.CompoundBorder;
+import javax.swing.plaf.metal.MetalLookAndFeel;
+
+/*
+ * @test
+ * @bug 8039750
+ * @summary Tests MetalLazyValue removing
+ * @author Sergey Malenkov
+ */
+public class Test8039750 {
+ public static void main(String[] args) {
+ UIDefaults table= new MetalLookAndFeel().getDefaults();
+ test(table.get("ToolBar.rolloverBorder"),
+ "javax.swing.plaf.metal.MetalBorders$ButtonBorder",
+ "javax.swing.plaf.metal.MetalBorders$RolloverMarginBorder");
+ test(table.get("ToolBar.nonrolloverBorder"),
+ "javax.swing.plaf.metal.MetalBorders$ButtonBorder",
+ "javax.swing.plaf.metal.MetalBorders$RolloverMarginBorder");
+ test(table.get("RootPane.frameBorder"),
+ "javax.swing.plaf.metal.MetalBorders$FrameBorder");
+ test(table.get("RootPane.plainDialogBorder"),
+ "javax.swing.plaf.metal.MetalBorders$DialogBorder");
+ test(table.get("RootPane.informationDialogBorder"),
+ "javax.swing.plaf.metal.MetalBorders$DialogBorder");
+ test(table.get("RootPane.errorDialogBorder"),
+ "javax.swing.plaf.metal.MetalBorders$ErrorDialogBorder");
+ test(table.get("RootPane.colorChooserDialogBorder"),
+ "javax.swing.plaf.metal.MetalBorders$QuestionDialogBorder");
+ test(table.get("RootPane.fileChooserDialogBorder"),
+ "javax.swing.plaf.metal.MetalBorders$QuestionDialogBorder");
+ test(table.get("RootPane.questionDialogBorder"),
+ "javax.swing.plaf.metal.MetalBorders$QuestionDialogBorder");
+ test(table.get("RootPane.warningDialogBorder"),
+ "javax.swing.plaf.metal.MetalBorders$WarningDialogBorder");
+ }
+
+ private static void test(Object value, String name) {
+ if (!value.getClass().getName().equals(name)) {
+ throw new Error(name);
+ }
+ }
+
+ private static void test(Object value, String one, String two) {
+ if (value instanceof CompoundBorder) {
+ CompoundBorder border = (CompoundBorder) value;
+ test(border.getOutsideBorder(), one);
+ test(border.getInsideBorder(), two);
+ } else {
+ throw new Error("CompoundBorder");
+ }
+ }
+}
