mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-27 23:04:50 +02:00
8253266: JList and JTable constructors should clear OPAQUE_SET before calling updateUI
Reviewed-by: psadhukhan, serb
This commit is contained in:
parent
a8005efde3
commit
39719da9d1
7 changed files with 156 additions and 5 deletions
|
@ -463,7 +463,6 @@ public class JList<E> extends JComponent implements Scrollable, Accessible
|
||||||
this.dataModel = dataModel;
|
this.dataModel = dataModel;
|
||||||
selectionModel = createSelectionModel();
|
selectionModel = createSelectionModel();
|
||||||
setAutoscrolls(true);
|
setAutoscrolls(true);
|
||||||
setOpaque(true);
|
|
||||||
updateUI();
|
updateUI();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5592,7 +5592,6 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
|
||||||
*/
|
*/
|
||||||
protected void initializeLocalVars() {
|
protected void initializeLocalVars() {
|
||||||
updateSelectionOnSort = true;
|
updateSelectionOnSort = true;
|
||||||
setOpaque(true);
|
|
||||||
createDefaultRenderers();
|
createDefaultRenderers();
|
||||||
createDefaultEditors();
|
createDefaultEditors();
|
||||||
|
|
||||||
|
|
|
@ -83,7 +83,6 @@ public class JToolTip extends JComponent implements Accessible {
|
||||||
|
|
||||||
/** Creates a tool tip. */
|
/** Creates a tool tip. */
|
||||||
public JToolTip() {
|
public JToolTip() {
|
||||||
setOpaque(true);
|
|
||||||
updateUI();
|
updateUI();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -726,7 +726,6 @@ public class JTree extends JComponent implements Scrollable, Accessible
|
||||||
selectionModel = new DefaultTreeSelectionModel();
|
selectionModel = new DefaultTreeSelectionModel();
|
||||||
cellRenderer = null;
|
cellRenderer = null;
|
||||||
scrollsOnExpand = true;
|
scrollsOnExpand = true;
|
||||||
setOpaque(true);
|
|
||||||
expandsSelectedPaths = true;
|
expandsSelectedPaths = true;
|
||||||
updateUI();
|
updateUI();
|
||||||
setModel(newModel);
|
setModel(newModel);
|
||||||
|
|
|
@ -287,7 +287,6 @@ public class JViewport extends JComponent implements Accessible
|
||||||
public JViewport() {
|
public JViewport() {
|
||||||
super();
|
super();
|
||||||
setLayout(createLayoutManager());
|
setLayout(createLayoutManager());
|
||||||
setOpaque(true);
|
|
||||||
updateUI();
|
updateUI();
|
||||||
setInheritsPopupMenu(true);
|
setInheritsPopupMenu(true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -70,6 +70,7 @@ public class SynthToolTipUI extends BasicToolTipUI
|
||||||
@Override
|
@Override
|
||||||
protected void installDefaults(JComponent c) {
|
protected void installDefaults(JComponent c) {
|
||||||
updateStyle(c);
|
updateStyle(c);
|
||||||
|
LookAndFeel.installProperty(c, "opaque", Boolean.TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateStyle(JComponent c) {
|
private void updateStyle(JComponent c) {
|
||||||
|
|
155
test/jdk/javax/swing/JList/TestOpaqueListTable.java
Normal file
155
test/jdk/javax/swing/JList/TestOpaqueListTable.java
Normal file
|
@ -0,0 +1,155 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2021, 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.JList;
|
||||||
|
import javax.swing.JTable;
|
||||||
|
import javax.swing.JToolTip;
|
||||||
|
import javax.swing.JTree;
|
||||||
|
import javax.swing.JViewport;
|
||||||
|
import javax.swing.LookAndFeel;
|
||||||
|
import javax.swing.SwingUtilities;
|
||||||
|
import javax.swing.UIManager;
|
||||||
|
import javax.swing.UnsupportedLookAndFeelException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
* @bug 8253266
|
||||||
|
* @summary setUIProperty should work when opaque property is not set by
|
||||||
|
* client
|
||||||
|
* @key headful
|
||||||
|
* @run main TestOpaqueListTable
|
||||||
|
*/
|
||||||
|
|
||||||
|
public class TestOpaqueListTable {
|
||||||
|
|
||||||
|
public static void main(String[] args) throws Exception {
|
||||||
|
UIManager.LookAndFeelInfo[] installedLookAndFeels;
|
||||||
|
installedLookAndFeels = UIManager.getInstalledLookAndFeels();
|
||||||
|
for (UIManager.LookAndFeelInfo LF : installedLookAndFeels) {
|
||||||
|
try {
|
||||||
|
UIManager.setLookAndFeel(LF.getClassName());
|
||||||
|
SwingUtilities.invokeAndWait(() -> {
|
||||||
|
JList list = new JList();
|
||||||
|
JTable table = new JTable();
|
||||||
|
JTree tree = new JTree();
|
||||||
|
JToolTip toolTip = new JToolTip();
|
||||||
|
JViewport viewport = new JViewport();
|
||||||
|
String opaqueValue = new String(" ");
|
||||||
|
|
||||||
|
if (!list.isOpaque()) {
|
||||||
|
opaqueValue += "JList, ";
|
||||||
|
}
|
||||||
|
if (!table.isOpaque()) {
|
||||||
|
opaqueValue += "JTable, ";
|
||||||
|
}
|
||||||
|
if (!tree.isOpaque()) {
|
||||||
|
opaqueValue += "JTree, ";
|
||||||
|
}
|
||||||
|
if (!toolTip.isOpaque()) {
|
||||||
|
opaqueValue += "JToolTip, ";
|
||||||
|
|
||||||
|
}
|
||||||
|
if (!viewport.isOpaque()) {
|
||||||
|
opaqueValue += "JViewport, ";
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!opaqueValue.equals(" ")) {
|
||||||
|
throw new RuntimeException("Default value of " +
|
||||||
|
"\"opaque\" property for " + opaqueValue
|
||||||
|
+ " is changed ");
|
||||||
|
}
|
||||||
|
|
||||||
|
LookAndFeel.installProperty(list, "opaque", false);
|
||||||
|
LookAndFeel.installProperty(table, "opaque", false);
|
||||||
|
LookAndFeel.installProperty(tree, "opaque", false);
|
||||||
|
LookAndFeel.installProperty(toolTip,"opaque",false);
|
||||||
|
LookAndFeel.installProperty(viewport,"opaque",false);
|
||||||
|
|
||||||
|
opaqueValue = " ";
|
||||||
|
if (list.isOpaque()) {
|
||||||
|
opaqueValue += "JList, ";
|
||||||
|
}
|
||||||
|
if (table.isOpaque()) {
|
||||||
|
opaqueValue += "JTable, ";
|
||||||
|
}
|
||||||
|
if (tree.isOpaque()) {
|
||||||
|
opaqueValue += "JTree, ";
|
||||||
|
}
|
||||||
|
if (toolTip.isOpaque()) {
|
||||||
|
opaqueValue += "JToolTip, ";
|
||||||
|
}
|
||||||
|
if (viewport.isOpaque()) {
|
||||||
|
opaqueValue += "JViewport, ";
|
||||||
|
}
|
||||||
|
if (!opaqueValue.equals(" ")) {
|
||||||
|
throw new RuntimeException(
|
||||||
|
"setUIProperty failed to clear " +
|
||||||
|
opaqueValue +" opaque" +
|
||||||
|
" when opaque is not set by client");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
list.setOpaque(true);
|
||||||
|
table.setOpaque(true);
|
||||||
|
tree.setOpaque(true);
|
||||||
|
toolTip.setOpaque(true);
|
||||||
|
viewport.setOpaque(true);
|
||||||
|
|
||||||
|
LookAndFeel.installProperty(list,"opaque",false);
|
||||||
|
LookAndFeel.installProperty(table, "opaque", false);
|
||||||
|
LookAndFeel.installProperty(tree, "opaque", false);
|
||||||
|
LookAndFeel.installProperty(toolTip, "opaque", false);
|
||||||
|
LookAndFeel.installProperty(viewport, "opaque", false);
|
||||||
|
|
||||||
|
opaqueValue = " ";
|
||||||
|
|
||||||
|
if (!list.isOpaque()) {
|
||||||
|
opaqueValue += "JList";
|
||||||
|
}
|
||||||
|
if (!table.isOpaque()) {
|
||||||
|
opaqueValue += "JTable";
|
||||||
|
}
|
||||||
|
if (!tree.isOpaque()) {
|
||||||
|
opaqueValue += "JTree";
|
||||||
|
}
|
||||||
|
if (!toolTip.isOpaque()) {
|
||||||
|
opaqueValue += "JToolTip";
|
||||||
|
}
|
||||||
|
if (!viewport.isOpaque()) {
|
||||||
|
opaqueValue += "JViewport";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!opaqueValue.equals(" ")) {
|
||||||
|
throw new RuntimeException("" +
|
||||||
|
"setUIProperty cleared the " +opaqueValue +
|
||||||
|
" Opaque when opaque is set by client");
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
} catch (UnsupportedLookAndFeelException e) {
|
||||||
|
System.out.println("Note: LookAndFeel " + LF.getClassName()
|
||||||
|
+ " is not supported on this configuration");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue