-
Notifications
You must be signed in to change notification settings - Fork 5.8k
JDK-8261263: Simplify javadoc link code #2437
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
Conversation
👋 Welcome back hannesw! A progress list of the required criteria for merging this PR into |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A couple of places where there are remnants of isStrong
; are they still required?
@@ -79,16 +74,6 @@ | |||
*/ | |||
public boolean isStrong = false; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is pervasively disappearing elsewhere. Is it still needed here?
@@ -157,14 +145,10 @@ public String toString() { | |||
", executableElement=" + executableElement + | |||
", type=" + type + | |||
", isVarArg=" + isVarArg + | |||
", isTypeBound=" + isTypeBound + | |||
", label=" + label + | |||
", isStrong=" + isStrong + |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
isStrong again
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see that isStrong
is still used, but eventually maps into a style of typeNameLink
down in the Links
class, line 188. I believe the name strong
refers back to using the HTML <strong>
element, which no longer exists.
Can we now or soon change the name or at least the doc comments for this parameter into something more meaningful?
@hns 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:
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 33 new commits pushed to the
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 |
Updated review to Approved, but I hope we can do something now or soon to clean up the remaining use of |
/integrate |
@hns Since your change was applied there have been 34 commits pushed to the
Your commit was automatically rebased without conflicts. Pushed as commit b0e7e5a. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
This is a cleanup of the javadoc link generating code.
There is a simple "horizontal" component to this change that removes the
strong
parameters from mostHtmlDocletWriter#getDocLink
methods which where the value used was alwaysfalse
, and related changes in all the code using these methods.The slightly more complex part of this change are changes in
LinkInfo[Impl]
andLinkFactory[Impl]
. Here the target was to reduce the number of booean fields inLinkInfo
and their interaction with the code, which was quite hard to grasp. I managed to replace several fields controlling generation of type parameter links with a singleincludeTypeParameterLinks()
method. The use of this method and the remaining boolean fields in the code is quite straightforward.I also removed some bits of dead code and simplified the control flow a bit by trying to do things only in one place and one way when possible.
The code passes all javadoc tests and generates documentation identical to the old code.
Progress
Issue
Reviewers
Download
$ git fetch https://git.openjdk.java.net/jdk pull/2437/head:pull/2437
$ git checkout pull/2437