Skip to content

8298240: Replace the usage of ImageLayoutException by the CMMException #11552

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

Closed
wants to merge 3 commits into from

Conversation

mrserb
Copy link
Member

@mrserb mrserb commented Dec 7, 2022

ImageLayoutException is used to report any issues with image layout calculation. But since we cannot throw the unspecified exception to the application, all usages of ImageLayoutException are wrapped by the CMMException. And now if such CMMException occurs we have lost at what point the initial exception was raised.

We can pass some additional data around, but it looks like we can just delete the ImageLayoutException and use CMMException instead.

Additionally:

  • The public keyword is removed in a few places if not needed.
  • The PT_XX flags are updated to make it clearly visible how they are related.

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-8298240: Replace the usage of ImageLayoutException by the CMMException

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11552

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 7, 2022

👋 Welcome back serb! 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 Dec 7, 2022

@mrserb 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 Dec 7, 2022
@mrserb mrserb changed the title 8298240: Replace the usage of LCMSImageLayout by the CMMException 8298240: Replace the usage of ImageLayoutException by the CMMException Dec 7, 2022
@mrserb mrserb marked this pull request as ready for review December 7, 2022 10:37
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 7, 2022
@mlbridge
Copy link

mlbridge bot commented Dec 7, 2022

Webrevs

Copy link
Contributor

@SWinxy SWinxy left a comment

Choose a reason for hiding this comment

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

In another PR, CMMException should have its documentation updated. It currently says This exception is thrown if the native CMM returns an error. But we are also throwing it with checks in Java.

@mrserb
Copy link
Member Author

mrserb commented Dec 7, 2022

In another PR, CMMException should have its documentation updated. It currently says This exception is thrown if the native CMM returns an error. But we are also throwing it with checks in Java.

We throw it from the "glue code" of the native library, it could be considered to be part of the native CMM engine.

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.

Seems reasonable to me.

@openjdk
Copy link

openjdk bot commented Jan 5, 2023

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

8298240: Replace the usage of ImageLayoutException by the CMMException

Reviewed-by: prr

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

  • 3e2314d: 8299254: Support dealing with standard assert macro
  • a49ccb9: 8299292: Missing elements in aliased String array
  • b908388: 8298449: Unnecessary Vector usage in MetaData.ProxyPersistenceDelegate
  • be64bf8: 8299329: Assertion failure with fastdebug build when trying to use CDS without classpath
  • 8723847: 8298848: C2: clone all of (CmpP (LoadKlass (AddP down at split if
  • 1ca31d3: 8299657: sun/tools/jhsdb/SAGetoptTest.java fails after 8299470
  • e7361cb: 8299430: Cleanup: delete unnecessary semicolons in java.desktop module
  • c929d8b: 8299475: Enhance SocketException by cause where it is missing in net and nio area
  • 2ccdefc: 8299470: sun/jvm/hotspot/SALauncher.java handling of negative rmiport args
  • 578c287: 8081507: Open or Save button in JFileChooser has OK title in GTK LaF
  • ... and 50 more: https://git.openjdk.org/jdk/compare/04591595374e84cfbfe38d92bff4409105b28009...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 Jan 5, 2023
@mrserb
Copy link
Member Author

mrserb commented Jan 6, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jan 6, 2023

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

  • 99be740: 8299306: Test "javax/swing/JFileChooser/FileSystemView/CustomFSVLinkTest.java" fails on Windows 10 x64 because there are some buttons did not display button name
  • 775da84: 8299412: JNI call of getAccessibleActionCount on a wrong thread
  • 7845b0d: 8296934: Write a test to verify whether Undecorated Frame can be iconified or not
  • 4b6809b: 8299693: Change to Xcode12.4+1.1 devkit for building on macOS at Oracle
  • dfdbd0f: 8299343: Windows: Invalid thread_native_entry declaration
  • 3e2314d: 8299254: Support dealing with standard assert macro
  • a49ccb9: 8299292: Missing elements in aliased String array
  • b908388: 8298449: Unnecessary Vector usage in MetaData.ProxyPersistenceDelegate
  • be64bf8: 8299329: Assertion failure with fastdebug build when trying to use CDS without classpath
  • 8723847: 8298848: C2: clone all of (CmpP (LoadKlass (AddP down at split if
  • ... and 55 more: https://git.openjdk.org/jdk/compare/04591595374e84cfbfe38d92bff4409105b28009...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 6, 2023

@mrserb Pushed as commit b5b7948.

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

@mrserb mrserb deleted the delete_imagelayout branch January 6, 2023 08:05
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