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

JDK-8267574: Dead code in HtmlStyle/HtmlDocletWriter #4154

Conversation

@jonathan-gibbons
Copy link
Contributor

@jonathan-gibbons jonathan-gibbons commented May 22, 2021

Please review a simple noreg-cleanup change to remove some dead code.


Progress

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

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4154

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 22, 2021

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

@openjdk openjdk bot commented May 22, 2021

@jonathan-gibbons The following label will be automatically applied to this pull request:

  • javadoc

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.

Loading

@openjdk openjdk bot added the javadoc label May 22, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented May 22, 2021

Webrevs

Loading

hns
hns approved these changes May 25, 2021
Copy link
Member

@hns hns left a comment

Looks good, but I found another potential cleanup target close by (see inline comment).

Loading

@@ -577,8 +577,7 @@ h1.hidden {
margin-right:10px;
display:inline-block;
}
div.block div.deprecation-comment, div.block div.block span.emphasized-phrase,
div.block div.block span.interface-name {
div.block div.deprecation-comment, div.block div.block span.emphasized-phrase {
Copy link
Member

@hns hns May 25, 2021

Choose a reason for hiding this comment

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

A quick search through the code and generated docs suggests that emphasized-phrase is unused as well. Should this also be removed?

Loading

Copy link
Contributor Author

@jonathan-gibbons jonathan-gibbons May 25, 2021

Choose a reason for hiding this comment

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

Let me investigate a test program to compare the class names in the style sheet and the members of HtmlStyle, and then decide whether to merge that here or do a separate commit/PR.

Loading

Copy link
Contributor Author

@jonathan-gibbons jonathan-gibbons May 25, 2021

Choose a reason for hiding this comment

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

Test program reveals differences that need to be investigated.
See https://bugs.openjdk.java.net/browse/JDK-8267709

For now, I've just removed emphasized-phrase

Loading

@openjdk
Copy link

@openjdk openjdk bot commented May 25, 2021

@jonathan-gibbons 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:

8267574: Dead code in HtmlStyle/HtmlDocletWriter

Reviewed-by: hannesw

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 1 new commit pushed to the master branch:

  • 2ef2450: 8263445: Duplicate key compiler.err.expected.module in compiler.properties

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 May 25, 2021
@jonathan-gibbons
Copy link
Contributor Author

@jonathan-gibbons jonathan-gibbons commented May 25, 2021

/integrate

Loading

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

@openjdk openjdk bot commented May 25, 2021

@jonathan-gibbons Since your change was applied there has been 1 commit pushed to the master branch:

  • 2ef2450: 8263445: Duplicate key compiler.err.expected.module in compiler.properties

Your commit was automatically rebased without conflicts.

Pushed as commit 594d454.

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

Loading

@jonathan-gibbons jonathan-gibbons deleted the HtmlStyle-interfaceName branch Oct 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants