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

8269637: javax/swing/JFileChooser/FileSystemView/SystemIconTest.java fails on windows #4777

Closed
wants to merge 1 commit into from

Conversation

@azuev-java
Copy link
Member

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

Make fallback code for inaccessible file to return multiresolution icon
Remove test from ProblemList


Progress

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

Issue

  • JDK-8269637: javax/swing/JFileChooser/FileSystemView/SystemIconTest.java fails on windows

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4777

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

Using diff file

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

…fails on windows

Make fallback code for inaccessible file to return multiresolution icon
Remove test from ProblemList
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jul 14, 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.

Loading

@openjdk openjdk bot added the rfr label Jul 14, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 14, 2021

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

  • 2d
  • awt

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

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jul 14, 2021

Webrevs

Loading

@aivanov-jdk
Copy link
Member

@aivanov-jdk aivanov-jdk commented Jul 14, 2021

So, essentially all the icons returned are MultiResolutionIcon even if there's only one icon, right?

Loading

@azuev-java
Copy link
Member Author

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

So, essentially all the icons returned are MultiResolutionIcon even if there's only one icon, right?

It was a multiresolution icon even with one icon inside but only when the native and requested icon resolutions do not match. Now it will always be MRI even if file is inaccessible and there is a default icon in System32.dll that matches the requested resolution.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Jul 14, 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:

8269637: javax/swing/JFileChooser/FileSystemView/SystemIconTest.java fails on windows

Reviewed-by: aivanov

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

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.

Loading

@openjdk openjdk bot added the ready label Jul 14, 2021
@azuev-java
Copy link
Member Author

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

/integrate

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Jul 14, 2021

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

Your commit was automatically rebased without conflicts.

Loading

@openjdk openjdk bot closed this Jul 14, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jul 14, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 14, 2021

@azuev-java Pushed as commit a033866.

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

Loading

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants