8347916: Simplify javax.swing.text.html.CSS.LengthUnit.getValue

[turbanoff]

Static and non-static CSS.LengthUnit.getValue methods essentially do the same thing.

jdk/src/java.desktop/share/classes/javax/swing/text/html/CSS.java

Lines 3085 to 3096 in 751a914

	float getValue(boolean w3cLengthUnits) {
	Hashtable<String, Float> mapping = (w3cLengthUnits) ? w3cLengthMapping : lengthMapping;
	float scale = 1;
	if (units != null) {
	Float scaleFloat = mapping.get(units);
	if (scaleFloat != null) {
	scale = scaleFloat.floatValue();
	}
	}
	return this.value * scale;
	}

jdk/src/java.desktop/share/classes/javax/swing/text/html/CSS.java

Lines 3098 to 3108 in 751a914

	static float getValue(float value, String units, Boolean w3cLengthUnits) {
	Hashtable<String, Float> mapping = (w3cLengthUnits) ? w3cLengthMapping : lengthMapping;
	float scale = 1;
	if (units != null) {
	Float scaleFloat = mapping.get(units);
	if (scaleFloat != null) {
	scale = scaleFloat.floatValue();
	}
	}
	return value * scale;
	}

1. delegate one to another to reduce code duplication.
2. use primitive boolean type as parameter to avoid boxing
3. take advantage of Map.getOrDefault() to simplify code futher

---

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-8347916: Simplify javax.swing.text.html.CSS.LengthUnit.getValue (Enhancement - P5)

Reviewers

• Alexander Zvegintsev (@azvegint - Reviewer)
• Alexey Ivanov (@aivanov-jdk - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 21833

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

Using diff file

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

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back aturbanov! 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]

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

8347916: Simplify javax.swing.text.html.CSS.LengthUnit.getValue

Reviewed-by: azvegint, 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 1131 new commits pushed to the master branch:

• baca7da: 8347733: Replace SIZE_FORMAT in runtime code
• 2ca1b4d: 8347840: Fix testlibrary compilation warnings
• 2c41f5a: 8347959: ThreadDumper leaks memory
• 15e06b6: 8345618: javax/swing/text/Caret/8163124/CaretFloatingPointAPITest.java leaves Caret is not complete
• 3ab521e: 8347924: Replace SIZE_FORMAT in memory and metaspace
• 8460072: 8342881: RISC-V: secondary_super_cache does not scale well: C1 and interpreter
• f5573f5: 8330851: C2: More efficient TypeFunc creation
• a3eef6c: 8346875: Test jdk/jdk/jfr/event/os/TestCPULoad.java fails on macOS
• 398a580: 8347911: Limit the length of inflated text chunks
• aa21de5: 8347481: C2: Remove the control input of some nodes
• ... and 1121 more: https://git.openjdk.org/jdk/compare/751a914b0a377d4e1dd30d2501f0ab4e327dea34...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]

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

[bridgekeeper]

@turbanoff This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

[bridgekeeper]

@turbanoff This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the /open pull request command.

[turbanoff]

/open

[openjdk]

@turbanoff This pull request is now open

[mlbridge]

Webrevs

• 00: Full (1af72083)

[aivanov-jdk]

Looks good.

I'm running tests.

[aivanov-jdk]

The tests are green, too.

[turbanoff]

Thank you for review!
/integrate

[openjdk]

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

• 3c92392: 8348089: Serial: Remove virtual specifier in SerialHeap
• 8a83dc2: 8347018: C2: Insertion of Assertion Predicates ignores the effects of PhaseIdealLoop::clone_up_backedge_goo()
• 85fdd2c: 8347434: Richer VM operations events logging
• c207cc7: 8347923: Parallel: Simplify compute_survivor_space_size_and_threshold
• 4b4b1e9: 8347922: Remove runtime/cds/appcds/customLoader/HelloCustom_JFR.java from ProblemList.txt
• e7a1c86: 8217914: java/net/httpclient/ConnectTimeoutHandshakeSync.java failed on connection refused while doing POST
• 644d154: 8347474: Options singleton is used before options are parsed
• 3804082: 8346123: [REDO] NMT should not use ThreadCritical
• 1f0efc0: 8347343: RISC-V: Unchecked zicntr csr reads
• ca8ba5c: 8347366: RISC-V: Add extension asserts for CMO instructions
• ... and 1136 more: https://git.openjdk.org/jdk/compare/751a914b0a377d4e1dd30d2501f0ab4e327dea34...master

Your commit was automatically rebased without conflicts.

[openjdk]

@turbanoff Pushed as commit 9346984.

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