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-8250768: javac should be adapted to changes in JEP 12 #703

Closed
wants to merge 59 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
0694db0
8250768: a prototype of updates for JEP 12.
lahodaj Sep 3, 2020
b9dbff5
Updates to the preview javadoc appearance.
lahodaj Sep 3, 2020
70286c0
Experimenting with UI for preview links.
lahodaj Sep 8, 2020
637b8c3
Experimenting with UI for preview links.
lahodaj Sep 9, 2020
7ffc68f
Merging master into JDK-8250768
lahodaj Sep 10, 2020
df6db2e
More experiments on Preview stuff in javadoc.
lahodaj Sep 10, 2020
d27c4dc
More updates to the javadoc Preview UI.
lahodaj Sep 15, 2020
00e2b94
Merge branch 'master' into JDK-8250768
lahodaj Sep 16, 2020
34f4355
Merge branch 'master' into JDK-8250768
lahodaj Sep 21, 2020
82f1c3a
More updateds to the preview javadoc appearance.
lahodaj Sep 23, 2020
976755d
Merging master into JDK-8250768
lahodaj Oct 2, 2020
d88fdd4
More updates to javadoc appearance
lahodaj Oct 5, 2020
26a2280
Merging master into JDK-8250768
lahodaj Oct 7, 2020
1b9a052
A post-merge fix.
lahodaj Oct 7, 2020
7cb5085
Cleaning up preview in javadoc.
lahodaj Oct 13, 2020
79b89dd
Fixing tests.
lahodaj Oct 14, 2020
1425c23
More cleanup.
lahodaj Oct 14, 2020
ca11180
Cleaning up whitespaces.
lahodaj Oct 14, 2020
6edf97a
Merge branch 'master' into JDK-8250768
lahodaj Oct 14, 2020
26dcc5b
Post-merge fix.
lahodaj Oct 14, 2020
6ba11d6
Updating build.
lahodaj Oct 14, 2020
994cc72
Adding forgotten files.
lahodaj Oct 15, 2020
ca78e89
Fixing tests.
lahodaj Oct 15, 2020
a99bfe3
Merging master into JDK-8250768
lahodaj Oct 15, 2020
42b5add
No, jdk.incubator.vector does not need jdk.internal package.
lahodaj Oct 15, 2020
2d179d6
There is not jdk.internal package anymore
lahodaj Oct 15, 2020
d23d55b
The Preview taglet is not needed anymore.
lahodaj Oct 16, 2020
c50d5ec
Various cleanup.
lahodaj Oct 16, 2020
efb37a9
Fixing tests.
lahodaj Oct 16, 2020
9ce4b0a
Reflecting review comments.
lahodaj Oct 19, 2020
30a9695
Merge branch 'master' into JDK-8250768
lahodaj Oct 20, 2020
2b625f5
Using unique sections for preview warning sections, as suggested.
lahodaj Oct 20, 2020
da4d41e
Fixing tests.
lahodaj Oct 20, 2020
49b720d
More fixing tests.
lahodaj Oct 20, 2020
be1d865
Merge branch 'JDK-8250768-dev' of https://github.com/lahodaj/jdk into…
lahodaj Oct 20, 2020
34169e0
Reflecting review comments.
lahodaj Oct 23, 2020
caa4fd3
Using a more correct way to get URLs.
lahodaj Oct 23, 2020
461e7d1
Removing unnecessary cast.
lahodaj Oct 23, 2020
deda85d
Merge branch 'master' into JDK-8250768
lahodaj Oct 26, 2020
e238784
Reflecting review comments.
lahodaj Oct 29, 2020
67e18e4
Merging master into JDK-8250768
lahodaj Oct 29, 2020
35f2a78
Finalizing removal of record preview hooks.
lahodaj Oct 29, 2020
cd4741e
Fixing tests.
lahodaj Oct 29, 2020
d76eb29
Updating tests after records are a final feature.
lahodaj Oct 29, 2020
a56fd33
Merging master into JDK-8250768.
lahodaj Nov 2, 2020
2e40390
Removing trailing whitespace.
lahodaj Nov 2, 2020
743f516
Reflecting review comments.
lahodaj Nov 4, 2020
afba66a
Merging master into JDK-8250768-dev4
lahodaj Nov 4, 2020
e4b0282
Cleanup - removing unnecessary code.
lahodaj Nov 4, 2020
b9e1739
Removing unnecessary property keys.
lahodaj Nov 5, 2020
3d55f90
Merging master into JDK-8250768
lahodaj Nov 5, 2020
370031f
Removing obsolette @PreviewFeature.
lahodaj Nov 5, 2020
097ae3c
Fixing typo.
lahodaj Nov 5, 2020
61264fe
Fixing navigator for the PREVIEW page.
lahodaj Nov 6, 2020
0c1c4d5
Merging recent master changes into JDK-8250768
lahodaj Dec 8, 2020
4ccb150
Merging master into JDK-8250768
lahodaj Jan 7, 2021
a8046dd
Fixing tests after a merge.
lahodaj Jan 7, 2021
56371c4
Updating copyright years.
lahodaj Jan 8, 2021
4f65495
Merging master into JDK-8250768
lahodaj Jan 8, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -296,7 +296,7 @@ private void addMainNavLinks(Content tree) {
}
if (documentedPage == PageMode.PREVIEW) {
addActivePageLink(tree, contents.previewLabel,
configuration.conditionalPages.contains(HtmlConfiguration.ConditionalPage.DEPRECATED));
configuration.conditionalPages.contains(HtmlConfiguration.ConditionalPage.PREVIEW));
} else {
addPreviewLink(tree);
}
Expand Down
Expand Up @@ -115,6 +115,7 @@ private String getHeaderKey(SummaryElementKind kind) {
};
}

private final PageMode pageMode;
private final String description;
private final Content headContent;
private final String titleKey;
Expand All @@ -134,6 +135,7 @@ public SummaryListWriter(HtmlConfiguration configuration, DocPath filename,
PageMode pageMode, String description,
Content headContent, String titleKey) {
super(configuration, filename);
this.pageMode = pageMode;
this.description = description;
this.headContent = headContent;
this.titleKey = titleKey;
Expand Down Expand Up @@ -209,7 +211,7 @@ public Content getContentsList(L apisummary) {
public HtmlTree getHeader() {
String title = resources.getText(titleKey);
HtmlTree bodyTree = getBody(getWindowTitle(title));
bodyContents.setHeader(getHeader(PageMode.DEPRECATED));
bodyContents.setHeader(getHeader(pageMode));
return bodyTree;
}

Expand Down