Skip to content
This repository has been archived by the owner before Nov 9, 2022. It is now read-only.

8269984: [macos] JTabbedPane title looks like disabled #269

Closed
wants to merge 2 commits into from
Closed

8269984: [macos] JTabbedPane title looks like disabled #269

wants to merge 2 commits into from

Conversation

azuev-java
Copy link
Member

@azuev-java azuev-java commented Jul 22, 2021

Fixed the version string parsing to work correctly on macOS 11.x and beyond


Progress

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

Issue

  • JDK-8269984: [macos] JTabbedPane title looks like disabled

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 269

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

Using diff file

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

Fixed the version string parsing to work correctly on macOS 11.x and beyond
@bridgekeeper
Copy link

bridgekeeper bot commented Jul 22, 2021

👋 Welcome back kizune! 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 22, 2021
@openjdk
Copy link

openjdk bot commented Jul 22, 2021

@azuev-java The following label will be automatically applied to this pull request:

  • awt

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 awt client-libs-dev@openjdk.java.net label Jul 22, 2021
@mlbridge
Copy link

mlbridge bot commented Jul 22, 2021

Webrevs

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Looks good. I also tested it on macOS 11.5 and verified that the test case fails (is rendered incorrectly) without your fix and passes with your fix.

@kevinrushforth
Copy link
Member

kevinrushforth commented Jul 22, 2021

@prsadhuk Can you review this?

Copy link
Contributor

@prsadhuk prsadhuk left a comment

Since existing currentMacOSXVersionMatchesGivenVersionRange() is changed, did you test in osx 10.15 or below to see current functionality is ok?
ALso, please add noreg-demo to JBS since I guess SwingSet2 is used to test.

@@ -39,40 +39,55 @@
static boolean isBigSurOrAbove = isMacOSXBigSurOrAbove();
Copy link
Contributor

@prsadhuk prsadhuk Jul 23, 2021

Choose a reason for hiding this comment

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

This is not required..Need to be removed.

Copy link
Member Author

@azuev-java azuev-java Jul 23, 2021

Choose a reason for hiding this comment

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

This is not required..Need to be removed.

Done.

@azuev-java
Copy link
Member Author

azuev-java commented Jul 23, 2021

Since existing currentMacOSXVersionMatchesGivenVersionRange() is changed, did you test in osx 10.15 or below to see current functionality is ok?

I have tested the public methods of this class with simulated version strings for previous macOS releases - they return correct assumptions about them. I haven't tested the code that acquires the version string but i haven't changed that.

ALso, please add noreg-demo to JBS since I guess SwingSet2 is used to test.

Done.

@openjdk
Copy link

openjdk bot commented Jul 23, 2021

@azuev-java 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:

8269984: [macos] JTabbedPane title looks like  disabled

Reviewed-by: kcr, psadhukhan

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

  • e3800e6: 8271162: runtime/StackTrace/LargeClassTest.java can be run in driver mode
  • ee93cef: 8271158: runtime/handshake/HandshakeTimeoutTest.java test doesn't check exit code
  • 84be910: 8271169: runtime/Safepoint/TestAbortVMOnSafepointTimeout.java can be run in driver mode
  • 2d165a2: 8271160: runtime/jni/checked/TestCheckedJniExceptionCheck.java doesn't set -Djava.library.path
  • 7165b3f: 8271155: Wrong path separator in env variable
  • ecc37b0: 8270916: Update java.lang.annotation.Target for changes in JLS 9.6.4.1
  • 4812e53: 8271094: runtime/duplAttributes/DuplAttributesTest.java doesn't check exit code
  • 6a9ab6a: 8271093: remove deadcode from runtime/Thread/TestThreadDumpSMRInfo.java test
  • e7f9009: 8270085: Suspend during block transition may deadlock if lock held
  • 39b486d: 8271126: ProblemList runtime/InvocationTests/invokevirtualTests.java
  • ... and 20 more: https://git.openjdk.java.net/jdk17/compare/61359c46a74b03b94738744d309334a5af162f08...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 Jul 23, 2021
Copy link
Member

@kevinrushforth kevinrushforth left a comment

Updated fix looks good.

ALso, please add noreg-demo to JBS since I guess SwingSet2 is used to test.

Done.

That's not what noreg-demo means (that label means that the change itself is limited to a demo).

@azuev-java
Copy link
Member Author

azuev-java commented Jul 23, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Jul 23, 2021

Going to push as commit 8adf008.
Since your change was applied there have been 32 commits pushed to the master branch:

  • e90ed6c: 8271173: serviceability/jvmti/GetObjectSizeClass.java doesn't check exit code
  • b4c6229: 8271189: runtime/handshake/HandshakeTimeoutTest.java can be run in driver mode
  • e3800e6: 8271162: runtime/StackTrace/LargeClassTest.java can be run in driver mode
  • ee93cef: 8271158: runtime/handshake/HandshakeTimeoutTest.java test doesn't check exit code
  • 84be910: 8271169: runtime/Safepoint/TestAbortVMOnSafepointTimeout.java can be run in driver mode
  • 2d165a2: 8271160: runtime/jni/checked/TestCheckedJniExceptionCheck.java doesn't set -Djava.library.path
  • 7165b3f: 8271155: Wrong path separator in env variable
  • ecc37b0: 8270916: Update java.lang.annotation.Target for changes in JLS 9.6.4.1
  • 4812e53: 8271094: runtime/duplAttributes/DuplAttributesTest.java doesn't check exit code
  • 6a9ab6a: 8271093: remove deadcode from runtime/Thread/TestThreadDumpSMRInfo.java test
  • ... and 22 more: https://git.openjdk.java.net/jdk17/compare/61359c46a74b03b94738744d309334a5af162f08...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jul 23, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 23, 2021
@openjdk
Copy link

openjdk bot commented Jul 23, 2021

@azuev-java Pushed as commit 8adf008.

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

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