Skip to content

Commit

Permalink
8253266: JList and JTable constructors should clear OPAQUE_SET before…
Browse files Browse the repository at this point in the history
… calling updateUI

Reviewed-by: psadhukhan, serb
  • Loading branch information
trebari committed Apr 5, 2021
1 parent a8005ef commit 39719da
Show file tree
Hide file tree
Showing 7 changed files with 156 additions and 5 deletions.
1 change: 0 additions & 1 deletion src/java.desktop/share/classes/javax/swing/JList.java
Expand Up @@ -463,7 +463,6 @@ public JList(ListModel<E> dataModel)
this.dataModel = dataModel;
selectionModel = createSelectionModel();
setAutoscrolls(true);
setOpaque(true);
updateUI();
}

Expand Down
1 change: 0 additions & 1 deletion src/java.desktop/share/classes/javax/swing/JTable.java
Expand Up @@ -5592,7 +5592,6 @@ public BooleanEditor() {
*/
protected void initializeLocalVars() {
updateSelectionOnSort = true;
setOpaque(true);
createDefaultRenderers();
createDefaultEditors();

Expand Down
1 change: 0 additions & 1 deletion src/java.desktop/share/classes/javax/swing/JToolTip.java
Expand Up @@ -83,7 +83,6 @@ public class JToolTip extends JComponent implements Accessible {

/** Creates a tool tip. */
public JToolTip() {
setOpaque(true);
updateUI();
}

Expand Down
1 change: 0 additions & 1 deletion src/java.desktop/share/classes/javax/swing/JTree.java
Expand Up @@ -726,7 +726,6 @@ public JTree(TreeModel newModel) {
selectionModel = new DefaultTreeSelectionModel();
cellRenderer = null;
scrollsOnExpand = true;
setOpaque(true);
expandsSelectedPaths = true;
updateUI();
setModel(newModel);
Expand Down
1 change: 0 additions & 1 deletion src/java.desktop/share/classes/javax/swing/JViewport.java
Expand Up @@ -287,7 +287,6 @@ public class JViewport extends JComponent implements Accessible
public JViewport() {
super();
setLayout(createLayoutManager());
setOpaque(true);
updateUI();
setInheritsPopupMenu(true);
}
Expand Down
Expand Up @@ -70,6 +70,7 @@ public static ComponentUI createUI(JComponent c) {
@Override
protected void installDefaults(JComponent c) {
updateStyle(c);
LookAndFeel.installProperty(c, "opaque", Boolean.TRUE);
}

private void updateStyle(JComponent c) {
Expand Down
155 changes: 155 additions & 0 deletions test/jdk/javax/swing/JList/TestOpaqueListTable.java
@@ -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");
}
}
}
}

1 comment on commit 39719da

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.