Skip to content

Conversation

@prsadhuk
Copy link
Contributor

@prsadhuk prsadhuk commented Apr 14, 2022

JDK-4517214 was fixed for Metal L&F where JComboBox having TitledBorder used to have double height compared to normal JComboBox.
The issue is still observed for macos for Aqua L&F where still double height is seen.
Fix is to prevent adding border insets height to combobox size as was done for [MetalComboxUI.getMinimumSize](https://github.com/openjdk/jdk/blame/master/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java#L384)
The closed test is automated and moved to open. CI testing on all platform is ok.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-7132796: [macosx] closed/javax/swing/JComboBox/4517214/bug4517214.java fails on MacOS

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8237/head:pull/8237
$ git checkout pull/8237

Update a local copy of the PR:
$ git checkout pull/8237
$ git pull https://git.openjdk.java.net/jdk pull/8237/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8237

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8237.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 14, 2022

👋 Welcome back psadhukhan! 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
Copy link

openjdk bot commented Apr 14, 2022

@prsadhuk 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 Apr 14, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 14, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 14, 2022

Webrevs

private static JComboBox combo1, combo2;

public static void main(String[] args) throws Exception {
try {
Copy link
Member

Choose a reason for hiding this comment

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

Can we check all L&Fs?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not now..we already have open JBS for window L&F JDK-8233469 and it also fails in Nimbus which will be looked into separately..
I will like this PR to be for for default L&F only otherwise it will cause failure in CI systems..

@prsadhuk
Copy link
Contributor Author

Any more comments on this @mrserb ?

@jayathirthrao
Copy link
Member

@prsadhuk I am not seeing an internal PR to remove this test case from closed repo. I thought we usually raise closed PR first about movement and then open PR. Have things changed recently.

Also having "closed" in open PR title is confusing.

@prsadhuk
Copy link
Contributor Author

prsadhuk commented Apr 18, 2022

The above holds true for test fix in closed. Since this is a product fix w.r.t closed test and NOT a test fix, I have raised an open PR first. If and when this goes through, closed PR will be raised to remove the test and also from problemlist.

@openjdk
Copy link

openjdk bot commented Apr 22, 2022

@prsadhuk 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:

7132796: [macosx] closed/javax/swing/JComboBox/4517214/bug4517214.java fails on MacOS

Reviewed-by: serb

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 188 new commits pushed to the master branch:

  • ce8db2c: 8285394: Compiler blackholes can be eliminated due to stale ciMethod::intrinsic_id()
  • 4e252cf: 8285370: Fix typo in jdk.charsets
  • d8025c9: 8285362: unify os::pause platform coding
  • 82f0ac0: 8284995: G1: Do not mark through Closed Archive regions during concurrent mark
  • 165f516: 8277056: Combining several C2 Print* flags asserts in xmlStream::pop_tag
  • 139615b: 8285369: C2: emit reduction flag value in node and loop dumps
  • 80219a4: 8284993: Replace System.exit call in swing tests with RuntimeException
  • d84b9c5: 8285342: Zero build failure with clang due to values not handled in switch
  • 58155a7: 8285386: java/util/HashMap/WhiteBoxResizeTest.java fails in tier7 after JDK-8186958
  • f6e9ca0: 8283324: CLDRConverter run time increased by 3x
  • ... and 178 more: https://git.openjdk.java.net/jdk/compare/ec73c61d8fe5de15a42fc14aaf8ebe3ac9ffcae5...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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 22, 2022
@prsadhuk
Copy link
Contributor Author

prsadhuk commented May 5, 2022

/integrate

@openjdk
Copy link

openjdk bot commented May 5, 2022

Going to push as commit 81d7475.
Since your change was applied there have been 348 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 5, 2022

@prsadhuk Pushed as commit 81d7475.

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

@prsadhuk prsadhuk deleted the 7132796 branch May 5, 2022 08:51
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

Development

Successfully merging this pull request may close these issues.

3 participants