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

Javadoc html5 changes #1337

Merged

Conversation

astrelsky
Copy link
Contributor

@astrelsky astrelsky commented Dec 13, 2019

The following were the changes which were needed to be made to build the documentation in html5 (enforced on jdk 13.0.1). I will be attaching a prebuild archive of the javadocs in html5 along with a custom summary to allow easier visual comparison of the changes between the formats.

The only files which have been changed were ones where an error was reported while generating the documentation in html5.

Converted to CSS:

  • <font>
  • <align>
  • <center>

Replaced with other tags/attributes:

  • anchor name to id
  • <strike> to <del>
  • <tt> to <code>

Table summary or caption is now required. However summary has been removed so an empty caption has been placed where needed and one summary was placed within the caption with its visibility set to hidden and font size set to zero to mirror the previous behavior (which did nothing).

api-html5.tar.gz
Extract the contents of the above archive into the docs folder of the ghidra installation or more likely into any directory with previously generated docs in an 'api' subfolder. Basically the structure needs to be:

root
root/api <- old javadocs
root/html5 <- new javadocs
root/CHANGED_FILES.html <- summary file for easy comparison of the changes

I would also like to suggest setting failOnError true in the createJavadocs task, but I haven't done so in this request.

closes #1284

* <strike>{@link #setText(String)}</strike> and <strike>{@link #getText()}</strike>.
* If this field is used directly, then the user should use <ins>{@link #setSelectedValue(Object)}</ins> and
* <ins>{@link #getSelectedValue()}</ins> to get and set data on this field, rather than calling
* <del>{@link #setText(String)}</del> and <del>{@link #getText()}</del>.
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think the s tag is more correct? ins and del seem to be designed more for tracking changes.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was initially going to use <s> but thought the use of <ins> and <del> was more appropriate here as it is implying to use this rather than this

* builder.setThreadPoolName("Thread Pool Name");
* }<font color="blue"><b>builder.setListener(itemListener);</b></font>{@code
* }<span style="color:blue"><b>builder.setListener(itemListener);</b></span>{@code
Copy link
Collaborator

Choose a reason for hiding this comment

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

These new spans need line breaks.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I noticed that the {@literal } tags and the curly braces from the code were conflicting. This caused one of them to be interpreted literally. Was this the reason for the line breaks? With the soon incoming correction it appears identical to the docs released with 9.1.

@@ -520,20 +520,20 @@ public static String formatNumber(long number, int radix) {
* <table><caption></caption>
* <tr><th>Number</th><th>Radix</th><th>DEFAULT Mode Alias</th><th><i>UNSIGNED</i> Mode Value</th><th><i>SIGNED</i> Mode Value</th></tr>
* <tr><td>&nbsp;</td><td></td><td><i></i></td><td></td><td></td></tr>
* <tr align=right><td>100</td><td>2</td><td><i>UNSIGNED</i></td><td>1100100b</td><td>1100100b</td></tr>
Copy link
Collaborator

@ryanmkurtz ryanmkurtz Dec 16, 2019

Choose a reason for hiding this comment

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

This table is not rendering correctly for me in my Eclipse hover feature. The headings don't line up with the columns.

Copy link
Contributor Author

@astrelsky astrelsky Dec 16, 2019

Choose a reason for hiding this comment

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

It appears there was a mistake here as it doesn't line up in the browser either. I'm looking into it now.

Was supposed to use text-align and not float

The Unsigned Mode Value header seems out of place. I'm going to see if it looks better with that cell header aligned differently.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've changed a few more things about the table such as aligning the above header and setting all the rows to monospace font so the numbers don't appear funny.

Copy link
Collaborator

@ryanmkurtz ryanmkurtz left a comment

Choose a reason for hiding this comment

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

I'm still seeing a couple of line break issues in ConcurrentQ, but I'll just fix them in a new commit and accept this PR.

@ryanmkurtz ryanmkurtz added this to the 9.2 milestone Dec 17, 2019
@ryanmkurtz ryanmkurtz merged commit 3bdf049 into NationalSecurityAgency:master Dec 17, 2019
@astrelsky
Copy link
Contributor Author

I'm still seeing a couple of line break issues in ConcurrentQ, but I'll just fix them in a new commit and accept this PR.

Ok no problem. Its just strange that it appears ok in the web browser.

Also, I believe I've obtained the most important pr number for the rest of the history of this repository.

@ryanmkurtz
Copy link
Collaborator

Haha yes, I was gonna comment on the leetness of it!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Javadoc JDK 13 Compatibility (HTML5)
2 participants