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

8335267: [XWayland] move screencast tokens from .awt to .java folder #20234

Closed

Conversation

azvegint
Copy link
Member

@azvegint azvegint commented Jul 18, 2024

Trivial fix to move the screencast token storage file from ~/.awt/robot/screencast-tokens.properties to ~/.java/robot/screencast-tokens.properties, where it should be.
Old location is still valid and will only be used if there is a file in the old location and the new location does not have it.

Along with the fix @SuppressWarnings("removal") is moved to individual items as it was done in JFX.


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-8335267: [XWayland] move screencast tokens from .awt to .java folder (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20234

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 18, 2024

👋 Welcome back azvegint! 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 Jul 18, 2024

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

8335267: [XWayland] move screencast tokens from .awt to .java folder

Reviewed-by: prr, avu

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

  • c4e6255: 8332738: Debug agent can deadlock on callbackLock when using StackFrame.PopFrames
  • c23d37e: 8337300: java/lang/Process/WaitForDuration.java leaves child process behind
  • ee365d7: 8336342: Fix known X11 library locations in sysroot
  • cd52ad8: 8337267: [REDO] G1: Refactor G1RebuildRSAndScrubTask
  • 9124a94: 8337165: Test jdk/jfr/event/gc/stacktrace/TestG1YoungAllocationPendingStackTrace.java failed: IndexOutOfBoundsException: Index 64 out of bounds for length 64
  • db168d9: 8336966: Alpine Linux x86_64 compilation error: sendfile64
  • dab2a0b: 8337222: gc/TestDisableExplicitGC.java fails due to unexpected CodeCache GC
  • 657c0bd: 8336999: Verification for resource area allocated data structures in C2
  • 90641a6: 8336095: Use-after-free in Superword leads to memory corruption
  • 2fbdbac: 8337245: Fix wrong comment of StringConcatHelper
  • ... and 113 more: https://git.openjdk.org/jdk/compare/6df7acbc74922d297852044596045a8b32636423...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 rfr Pull request is ready for review label Jul 18, 2024
@openjdk
Copy link

openjdk bot commented Jul 18, 2024

@azvegint 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.

@mlbridge
Copy link

mlbridge bot commented Jul 18, 2024

Webrevs

Path primaryPath = Path.of(userHome, REL_NAME);
Path secondaryPath = Path.of(userHome, REL_NAME_SECONDARY);

Path path = Files.isWritable(secondaryPath) && !Files.isWritable(primaryPath)
Copy link
Contributor

Choose a reason for hiding this comment

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

isWritable() returns false for both paths if it's the very first run with a particular home directory.

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure, then it chooses the primary path and creates the missing directories as expected.

The idea is to use the secondary path for compatibility reasons only if it exists and the primary path doesn't.

Copy link
Contributor

Choose a reason for hiding this comment

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

What I don't see here, which I think I expected to see, is that if only the secondary path exists, we copy what's there to the primary path, so that next time we go straight to the primary path.

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure, updated.

Copy link
Contributor

@avu avu left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@prrace prrace left a comment

Choose a reason for hiding this comment

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

I've tested various combinations on Ubuntu 24.04

  • .awt present, no .java : gets copied correctly and works
  • .java present, .awt : works
  • .java present, no .awt : works
  • no .java, no .awt : gets created in .java

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 29, 2024
@azvegint
Copy link
Member Author

azvegint commented Aug 8, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Aug 8, 2024

Going to push as commit 088871c.
Since your change was applied there have been 227 commits pushed to the master branch:

  • 3bc4a1a: 8233068: HIDPI: Linux: AWT Checkbox check mark is unscaled
  • a9460a6: 8337982: Remove dead undef assrt0n
  • fa18359: 8335981: ProblemList runtime/Thread/TestAlwaysPreTouchStacks.java for MacOS
  • 1846a65: 8337205: Typo in Stack vs Deque Method table in Deque specification
  • 16df9c3: 8337971: Problem list several jvmci tests on linux-riscv64 until JDK-8331704 is fixed
  • 9b11bd7: 8337826: Improve logging in OCSPTimeout and SimpleOCSPResponder to help diagnose JDK-8309754
  • 5e021cb: 8337410: The makefiles should set problemlist and adjust timeout basing on the given VM flags
  • a5c2d7b: 8335172: Add manual steps to run security/auth/callback/TextCallbackHandler/Password.java test
  • 36d08c2: 8336846: assert(state->get_thread() == jt) failed: handshake unsafe conditions
  • d19ba81: 8337603: Change in behavior with -Djava.locale.useOldISOCodes=true
  • ... and 217 more: https://git.openjdk.org/jdk/compare/6df7acbc74922d297852044596045a8b32636423...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 8, 2024

@azvegint Pushed as commit 088871c.

💡 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 [email protected] integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants