Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8259687: JTabbedPane.setComponentAt doesn't hide previously visible tab component #9681

Closed
wants to merge 3 commits into from

Conversation

honkar-jdk
Copy link
Contributor

@honkar-jdk honkar-jdk commented Jul 28, 2022

A simple change listener is used in JTabbedPane to lazily fill with components - this is done by adding the components to JTabbedPane using the setComponentAt in the change listener.

Previously, if the change listener was placed before calling addTab() , the previous visible component was overlapping with the current visible component. To fix it, the visibility of previous component is set to false before the current component's visibility is set to true in setComponentAt.

Following are the before and after fix screenshots-

image


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8259687: JTabbedPane.setComponentAt doesn't hide previously visible tab component

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/9681/head:pull/9681
$ git checkout pull/9681

Update a local copy of the PR:
$ git checkout pull/9681
$ git pull https://git.openjdk.org/jdk pull/9681/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9681

View PR using the GUI difftool:
$ git pr show -t 9681

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9681.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 28, 2022

👋 Welcome back honkar! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 28, 2022
@openjdk
Copy link

openjdk bot commented Jul 28, 2022

@honkar-jdk The following label will be automatically applied to this pull request:

  • client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the client client-libs-dev@openjdk.org label Jul 28, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 28, 2022

Webrevs

@honkar-jdk honkar-jdk changed the title 8259687: JTabbedPane.setComponentAt doesn't hide the previous visible tab component 8259687: JTabbedPane.setComponentAt doesn't hide previously visible tab component Jul 28, 2022
@@ -1598,6 +1598,11 @@ public void setComponentAt(int index, Component component) {
boolean selectedPage = (getSelectedIndex() == index);

if (selectedPage) {
if (this.visComp != null &&
!this.visComp.equals(component)) {
// previous component visibility is set to false
Copy link
Contributor

Choose a reason for hiding this comment

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

It seems isVisible is checked before changing the visibility..Should we do it here too?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I thought it might be redundant since the setVisible() checks for visibility of component within show() and hide(). But to add clarity I have add isVisible check.

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

I agree. The isVisible check is used for similar purposes so it's for the best to follow convention here and use it.


/*
* @test
* @bug 8265586
Copy link
Contributor

Choose a reason for hiding this comment

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

bugid wrong

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated

@openjdk
Copy link

openjdk bot commented Aug 2, 2022

@honkar-jdk This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8259687: JTabbedPane.setComponentAt doesn't hide previously visible tab component

Reviewed-by: psadhukhan, dnguyen

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 118 new commits pushed to the master branch:

  • 477f471: Merge
  • 4b3dfe1: 8283276: java/io/ObjectStreamClass/ObjectStreamClassCaching.java fails with various GCs
  • 6b2184e: 8290248: Implement MaxINode::Ideal transformation
  • 27c8826: 8291840: Avoid JavaCalls for setting up _java_system_loader and _java_platform_loader
  • 6e6c64c: 8291941: ProblemList java/lang/ProcessBuilder/PipelineLeaksFD.java on linux-all
  • 617a196: 8290812: Add a test for ResourceHashtable
  • 1edc245: 8291899: Zero VM is broken on MacOS after JDK-8290840 due to os::setup_fpu() is missing
  • 6ad6b1c: 8272998: ImageIO.read() throws incorrect exception type
  • 90257f9: 8169187: [macosx] Aqua: java/awt/image/multiresolution/MultiresolutionIconTest.java
  • c48cd88: 8291926: ProblemList multiple tests in -Xcomp mode due to JDK-8291649
  • ... and 108 more: https://git.openjdk.org/jdk/compare/7c3cfd13e3d67c185d15abb1c935853c856e8a42...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@prsadhuk) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 2, 2022
Copy link
Contributor

@DamonGuy DamonGuy left a comment

Choose a reason for hiding this comment

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

Applied the change and ran your test. The test clearly shows the difference, and it looks good to me.

@@ -1598,6 +1598,11 @@ public void setComponentAt(int index, Component component) {
boolean selectedPage = (getSelectedIndex() == index);

if (selectedPage) {
if (this.visComp != null &&
!this.visComp.equals(component)) {
// previous component visibility is set to false
Copy link
Contributor

Choose a reason for hiding this comment

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

I agree. The isVisible check is used for similar purposes so it's for the best to follow convention here and use it.

@honkar-jdk
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 5, 2022
@openjdk
Copy link

openjdk bot commented Aug 5, 2022

@honkar-jdk
Your change (at version ef823ee) is now ready to be sponsored by a Committer.

@prsadhuk
Copy link
Contributor

prsadhuk commented Aug 8, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 8, 2022

Going to push as commit 891df21.
Since your change was applied there have been 136 commits pushed to the master branch:

  • d4fb91b: 8291956: Simplify the loop condition in sun.net.httpserver.Request constructor
  • 20123ea: 8291901: IGV: Preference menu disappears after JDK-8288750
  • 8e2c006: 8291957: Redundant import statements in sun.security.ec
  • ae52053: 8291954: Use Optional.isEmpty instead of !Optional.isPresent in java.base
  • 87cda21: Merge
  • 5963300: 8290562: ThreadMXBean.getThread{Cpu,User}Time fails with -XX:-VMContinuations
  • 0657acf: 8289249: Add methods to Elements for record constructors
  • b66a0d1: 8291992: [REDO2] ProblemList multiple tests in -Xcomp mode due to JDK-8291649
  • 9bff3b7: 8291990: [REDO] ProblemList multiple tests in -Xcomp mode due to JDK-8291649
  • f9bb367: 8291653: G1 refinement incorrectly expects always-valid HeapRegion out of the Hot Card Cache
  • ... and 126 more: https://git.openjdk.org/jdk/compare/7c3cfd13e3d67c185d15abb1c935853c856e8a42...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 8, 2022
@openjdk openjdk bot closed this Aug 8, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Aug 8, 2022
@openjdk
Copy link

openjdk bot commented Aug 8, 2022

@prsadhuk @honkar-jdk Pushed as commit 891df21.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client client-libs-dev@openjdk.org integrated Pull request has been integrated
3 participants