stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8237909: Remove zipped index files feature

Browse Source 
Reviewed-by: hannesw, jjg
This commit is contained in:
Pavel Rappo 2020-02-11 15:23:28 +00:00
parent fff1a59cfa
commit 56a7631555
14 changed files with 30 additions and 11858 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractIndexWriter.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -26,12 +26,9 @@
package jdk.javadoc.internal.doclets.formats.html; package jdk.javadoc.internal.doclets.formats.html;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer; import java.io.Writer;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import javax.lang.model.element.Element; import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.ExecutableElement;
@ -426,8 +423,9 @@ public class AbstractIndexWriter extends HtmlDocletWriter {
*/ */
protected void createSearchIndexFiles() throws DocFileIOException { protected void createSearchIndexFiles() throws DocFileIOException {
if (configuration.showModules) { if (configuration.showModules) {
createSearchIndexFile(DocPaths.MODULE_SEARCH_INDEX_JSON, DocPaths.MODULE_SEARCH_INDEX_ZIP, createSearchIndexFile(DocPaths.MODULE_SEARCH_INDEX_JS,
DocPaths.MODULE_SEARCH_INDEX_JS, configuration.moduleSearchIndex, "moduleSearchIndex"); configuration.moduleSearchIndex,
"moduleSearchIndex");
} }
if (!configuration.packages.isEmpty()) { if (!configuration.packages.isEmpty()) {
SearchIndexItem si = new SearchIndexItem(); SearchIndexItem si = new SearchIndexItem();
@ -436,33 +434,38 @@ public class AbstractIndexWriter extends HtmlDocletWriter {
si.setUrl(DocPaths.ALLPACKAGES_INDEX.getPath()); si.setUrl(DocPaths.ALLPACKAGES_INDEX.getPath());
configuration.packageSearchIndex.add(si); configuration.packageSearchIndex.add(si);
} }
createSearchIndexFile(DocPaths.PACKAGE_SEARCH_INDEX_JSON, DocPaths.PACKAGE_SEARCH_INDEX_ZIP, createSearchIndexFile(DocPaths.PACKAGE_SEARCH_INDEX_JS,
DocPaths.PACKAGE_SEARCH_INDEX_JS, configuration.packageSearchIndex, "packageSearchIndex"); configuration.packageSearchIndex,
"packageSearchIndex");
SearchIndexItem si = new SearchIndexItem(); SearchIndexItem si = new SearchIndexItem();
si.setCategory(SearchIndexItem.Category.TYPES); si.setCategory(SearchIndexItem.Category.TYPES);
si.setLabel(resources.getText("doclet.All_Classes")); si.setLabel(resources.getText("doclet.All_Classes"));
si.setUrl(DocPaths.ALLCLASSES_INDEX.getPath()); si.setUrl(DocPaths.ALLCLASSES_INDEX.getPath());
configuration.typeSearchIndex.add(si); configuration.typeSearchIndex.add(si);
createSearchIndexFile(DocPaths.TYPE_SEARCH_INDEX_JSON, DocPaths.TYPE_SEARCH_INDEX_ZIP, createSearchIndexFile(DocPaths.TYPE_SEARCH_INDEX_JS,
DocPaths.TYPE_SEARCH_INDEX_JS, configuration.typeSearchIndex, "typeSearchIndex"); configuration.typeSearchIndex,
createSearchIndexFile(DocPaths.MEMBER_SEARCH_INDEX_JSON, DocPaths.MEMBER_SEARCH_INDEX_ZIP, "typeSearchIndex");
DocPaths.MEMBER_SEARCH_INDEX_JS, configuration.memberSearchIndex, "memberSearchIndex"); createSearchIndexFile(DocPaths.MEMBER_SEARCH_INDEX_JS,
createSearchIndexFile(DocPaths.TAG_SEARCH_INDEX_JSON, DocPaths.TAG_SEARCH_INDEX_ZIP, configuration.memberSearchIndex,
DocPaths.TAG_SEARCH_INDEX_JS, configuration.tagSearchIndex, "tagSearchIndex"); "memberSearchIndex");
createSearchIndexFile(DocPaths.TAG_SEARCH_INDEX_JS,
configuration.tagSearchIndex,
"tagSearchIndex");
} }
/** /**
* Creates a search index file. * Creates a search index file.
* *
* @param searchIndexFile the file to be generated
* @param searchIndexZip the zip file to be generated
* @param searchIndexJS the file for the JavaScript to be generated * @param searchIndexJS the file for the JavaScript to be generated
* @param searchIndex the search index items * @param searchIndex the search index items
* @param varName the variable name to write in the JavaScript file * @param varName the variable name to write in the JavaScript file
* @throws DocFileIOException if there is a problem creating the search index file * @throws DocFileIOException if there is a problem creating the search index file
*/ */
protected void createSearchIndexFile(DocPath searchIndexFile, DocPath searchIndexZip, protected void createSearchIndexFile(DocPath searchIndexJS,
DocPath searchIndexJS, Collection<SearchIndexItem> searchIndex, String varName) throws DocFileIOException { Collection<SearchIndexItem> searchIndex,
String varName)
throws DocFileIOException
{
if (!searchIndex.isEmpty()) { if (!searchIndex.isEmpty()) {
StringBuilder searchVar = new StringBuilder("["); StringBuilder searchVar = new StringBuilder("[");
boolean first = true; boolean first = true;
@ -483,20 +486,6 @@ public class AbstractIndexWriter extends HtmlDocletWriter {
} catch (IOException ie) { } catch (IOException ie) {
throw new DocFileIOException(jsFile, DocFileIOException.Mode.WRITE, ie); throw new DocFileIOException(jsFile, DocFileIOException.Mode.WRITE, ie);
} }
DocFile zipFile = DocFile.createFileForOutput(configuration, searchIndexZip);
try (OutputStream fos = zipFile.openOutputStream();
ZipOutputStream zos = new ZipOutputStream(fos)) {
try {
ZipEntry ze = new ZipEntry(searchIndexFile.getPath());
zos.putNextEntry(ze);
zos.write(searchVar.toString().getBytes());
} finally {
zos.closeEntry();
}
} catch (IOException ie) {
throw new DocFileIOException(zipFile, DocFileIOException.Mode.WRITE, ie);
}
} }
} }
} }

6
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
View File

@ -223,12 +223,6 @@ public class HtmlDoclet extends AbstractDoclet {
"jquery-ui.min.css", "jquery-ui.min.css",
"jquery-ui.structure.min.css", "jquery-ui.structure.min.css",
"jquery-ui.structure.css", "jquery-ui.structure.css",
"jszip/dist/jszip.js",
"jszip/dist/jszip.min.js",
"jszip-utils/dist/jszip-utils.js",
"jszip-utils/dist/jszip-utils.min.js",
"jszip-utils/dist/jszip-utils-ie.js",
"jszip-utils/dist/jszip-utils-ie.min.js",
"images/ui-bg_glass_65_dadada_1x400.png", "images/ui-bg_glass_65_dadada_1x400.png",
"images/ui-icons_454545_256x240.png", "images/ui-icons_454545_256x240.png",
"images/ui-bg_glass_95_fef1ec_1x400.png", "images/ui-bg_glass_95_fef1ec_1x400.png",

5
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
View File

@ -313,11 +313,6 @@ public class Head {
.append(";\n") .append(";\n")
.append("loadScripts(document, 'script');"); .append("loadScripts(document, 'script');");
} }
addJQueryFile(tree, DocPaths.JSZIP_MIN);
addJQueryFile(tree, DocPaths.JSZIPUTILS_MIN);
tree.add(new RawHtml("<!--[if IE]>"));
addJQueryFile(tree, DocPaths.JSZIPUTILS_IE_MIN);
tree.add(new RawHtml("<![endif]-->"));
addJQueryFile(tree, DocPaths.JQUERY_JS_3_4); addJQueryFile(tree, DocPaths.JQUERY_JS_3_4);
addJQueryFile(tree, DocPaths.JQUERY_JS); addJQueryFile(tree, DocPaths.JQUERY_JS);
} }

56
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils-ie.js vendored
View File

@ -1,56 +0,0 @@
/*!
JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
<http://stuk.github.io/jszip-utils>
(c) 2014 Stuart Knightley, David Duponchel
Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip-utils/master/LICENSE.markdown.
*/
;(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
var global=typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {};/* jshint evil: true, newcap: false */
/* global IEBinaryToArray_ByteStr, IEBinaryToArray_ByteStr_Last */
"use strict";
// Adapted from http://stackoverflow.com/questions/1095102/how-do-i-load-binary-image-data-using-javascript-and-xmlhttprequest
var IEBinaryToArray_ByteStr_Script =
"<!-- IEBinaryToArray_ByteStr -->\r\n"+
"<script type='text/vbscript'>\r\n"+
"Function IEBinaryToArray_ByteStr(Binary)\r\n"+
" IEBinaryToArray_ByteStr = CStr(Binary)\r\n"+
"End Function\r\n"+
"Function IEBinaryToArray_ByteStr_Last(Binary)\r\n"+
" Dim lastIndex\r\n"+
" lastIndex = LenB(Binary)\r\n"+
" if lastIndex mod 2 Then\r\n"+
" IEBinaryToArray_ByteStr_Last = Chr( AscB( MidB( Binary, lastIndex, 1 ) ) )\r\n"+
" Else\r\n"+
" IEBinaryToArray_ByteStr_Last = "+'""'+"\r\n"+
" End If\r\n"+
"End Function\r\n"+
"</script>\r\n";
// inject VBScript
document.write(IEBinaryToArray_ByteStr_Script);
global.JSZipUtils._getBinaryFromXHR = function (xhr) {
var binary = xhr.responseBody;
var byteMapping = {};
for ( var i = 0; i < 256; i++ ) {
for ( var j = 0; j < 256; j++ ) {
byteMapping[ String.fromCharCode( i + (j << 8) ) ] =
String.fromCharCode(i) + String.fromCharCode(j);
}
}
var rawBytes = IEBinaryToArray_ByteStr(binary);
var lastChr = IEBinaryToArray_ByteStr_Last(binary);
return rawBytes.replace(/[\s\S]/g, function( match ) {
return byteMapping[match];
}) + lastChr;
};
// enforcing Stuk's coding style
// vim: set shiftwidth=4 softtabstop=4:
},{}]},{},[1])
;

10
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils-ie.min.js vendored
View File

@ -1,10 +0,0 @@
/*!
JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
<http://stuk.github.io/jszip-utils>
(c) 2014 Stuart Knightley, David Duponchel
Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip-utils/master/LICENSE.markdown.
*/
!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(){var a="undefined"!=typeof self?self:"undefined"!=typeof window?window:{},b="<!-- IEBinaryToArray_ByteStr -->\r\n<script type='text/vbscript'>\r\nFunction IEBinaryToArray_ByteStr(Binary)\r\n IEBinaryToArray_ByteStr = CStr(Binary)\r\nEnd Function\r\nFunction IEBinaryToArray_ByteStr_Last(Binary)\r\n Dim lastIndex\r\n lastIndex = LenB(Binary)\r\n if lastIndex mod 2 Then\r\n IEBinaryToArray_ByteStr_Last = Chr( AscB( MidB( Binary, lastIndex, 1 ) ) )\r\n Else\r\n IEBinaryToArray_ByteStr_Last = \"\"\r\n End If\r\nEnd Function\r\n</script>\r\n";document.write(b),a.JSZipUtils._getBinaryFromXHR=function(a){for(var b=a.responseBody,c={},d=0;256>d;d++)for(var e=0;256>e;e++)c[String.fromCharCode(d+(e<<8))]=String.fromCharCode(d)+String.fromCharCode(e);var f=IEBinaryToArray_ByteStr(b),g=IEBinaryToArray_ByteStr_Last(b);return f.replace(/[\s\S]/g,function(a){return c[a]})+g}},{}]},{},[1]);

118
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils.js vendored
View File

@ -1,118 +0,0 @@
/*!
JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
<http://stuk.github.io/jszip-utils>
(c) 2014 Stuart Knightley, David Duponchel
Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip-utils/master/LICENSE.markdown.
*/
!function(e){"object"==typeof exports?module.exports=e():"function"==typeof define&&define.amd?define(e):"undefined"!=typeof window?window.JSZipUtils=e():"undefined"!=typeof global?global.JSZipUtils=e():"undefined"!=typeof self&&(self.JSZipUtils=e())}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
'use strict';
var JSZipUtils = {};
// just use the responseText with xhr1, response with xhr2.
// The transformation doesn't throw away high-order byte (with responseText)
// because JSZip handles that case. If not used with JSZip, you may need to
// do it, see https://developer.mozilla.org/En/Using_XMLHttpRequest#Handling_binary_data
JSZipUtils._getBinaryFromXHR = function (xhr) {
// for xhr.responseText, the 0xFF mask is applied by JSZip
return xhr.response || xhr.responseText;
};
// taken from jQuery
function createStandardXHR() {
try {
return new window.XMLHttpRequest();
} catch( e ) {}
}
function createActiveXHR() {
try {
return new window.ActiveXObject("Microsoft.XMLHTTP");
} catch( e ) {}
}
// Create the request object
var createXHR = window.ActiveXObject ?
/* Microsoft failed to properly
* implement the XMLHttpRequest in IE7 (can't request local files),
* so we use the ActiveXObject when it is available
* Additionally XMLHttpRequest can be disabled in IE7/IE8 so
* we need a fallback.
*/
function() {
return createStandardXHR() || createActiveXHR();
} :
// For all other browsers, use the standard XMLHttpRequest object
createStandardXHR;
JSZipUtils.getBinaryContent = function(path, callback) {
/*
* Here is the tricky part : getting the data.
* In firefox/chrome/opera/... setting the mimeType to 'text/plain; charset=x-user-defined'
* is enough, the result is in the standard xhr.responseText.
* cf https://developer.mozilla.org/En/XMLHttpRequest/Using_XMLHttpRequest#Receiving_binary_data_in_older_browsers
* In IE <= 9, we must use (the IE only) attribute responseBody
* (for binary data, its content is different from responseText).
* In IE 10, the 'charset=x-user-defined' trick doesn't work, only the
* responseType will work :
* http://msdn.microsoft.com/en-us/library/ie/hh673569%28v=vs.85%29.aspx#Binary_Object_upload_and_download
*
* I'd like to use jQuery to avoid this XHR madness, but it doesn't support
* the responseType attribute : http://bugs.jquery.com/ticket/11461
*/
try {
var xhr = createXHR();
xhr.open('GET', path, true);
// recent browsers
if ("responseType" in xhr) {
xhr.responseType = "arraybuffer";
}
// older browser
if(xhr.overrideMimeType) {
xhr.overrideMimeType("text/plain; charset=x-user-defined");
}
xhr.onreadystatechange = function(evt) {
var file, err;
// use `xhr` and not `this`... thanks IE
if (xhr.readyState === 4) {
if (xhr.status === 200 || xhr.status === 0) {
file = null;
err = null;
try {
file = JSZipUtils._getBinaryFromXHR(xhr);
} catch(e) {
err = new Error(e);
}
callback(err, file);
} else {
callback(new Error("Ajax error for " + path + " : " + this.status + " " + this.statusText), null);
}
}
};
xhr.send();
} catch (e) {
callback(new Error(e), null);
}
};
// export
module.exports = JSZipUtils;
// enforcing Stuk's coding style
// vim: set shiftwidth=4 softtabstop=4:
},{}]},{},[1])
(1)
});
;

10
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils.min.js vendored
View File

@ -1,10 +0,0 @@
/*!
JSZipUtils - A collection of cross-browser utilities to go along with JSZip.
<http://stuk.github.io/jszip-utils>
(c) 2014 Stuart Knightley, David Duponchel
Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip-utils/master/LICENSE.markdown.
*/
!function(a){"object"==typeof exports?module.exports=a():"function"==typeof define&&define.amd?define(a):"undefined"!=typeof window?window.JSZipUtils=a():"undefined"!=typeof global?global.JSZipUtils=a():"undefined"!=typeof self&&(self.JSZipUtils=a())}(function(){return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b){"use strict";function c(){try{return new window.XMLHttpRequest}catch(a){}}function d(){try{return new window.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}}var e={};e._getBinaryFromXHR=function(a){return a.response||a.responseText};var f=window.ActiveXObject?function(){return c()||d()}:c;e.getBinaryContent=function(a,b){try{var c=f();c.open("GET",a,!0),"responseType"in c&&(c.responseType="arraybuffer"),c.overrideMimeType&&c.overrideMimeType("text/plain; charset=x-user-defined"),c.onreadystatechange=function(){var d,f;if(4===c.readyState)if(200===c.status||0===c.status){d=null,f=null;try{d=e._getBinaryFromXHR(c)}catch(g){f=new Error(g)}b(f,d)}else b(new Error("Ajax error for "+a+" : "+this.status+" "+this.statusText),null)},c.send()}catch(d){b(new Error(d),null)}},b.exports=e},{}]},{},[1])(1)});

11367
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip/dist/jszip.js vendored
View File

File diff suppressed because it is too large Load Diff

13
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip/dist/jszip.min.js vendored
View File

File diff suppressed because one or more lines are too long

68
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/script.js
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -29,80 +29,14 @@ var typeSearchIndex;
var memberSearchIndex; var memberSearchIndex;
var tagSearchIndex; var tagSearchIndex;
function loadScripts(doc, tag) { function loadScripts(doc, tag) {
createElem(doc, tag, 'script-dir/jszip/dist/jszip.js');
createElem(doc, tag, 'script-dir/jszip-utils/dist/jszip-utils.js');
if (window.navigator.userAgent.indexOf('MSIE ') > 0 || window.navigator.userAgent.indexOf('Trident/') > 0 ||
window.navigator.userAgent.indexOf('Edge/') > 0) {
createElem(doc, tag, 'script-dir/jszip-utils/dist/jszip-utils-ie.js');
}
createElem(doc, tag, 'search.js'); createElem(doc, tag, 'search.js');
$.get(pathtoroot + "module-search-index.zip")
.done(function() {
JSZipUtils.getBinaryContent(pathtoroot + "module-search-index.zip", function(e, data) {
JSZip.loadAsync(data).then(function(zip){
zip.file("module-search-index.json").async("text").then(function(content){
moduleSearchIndex = JSON.parse(content);
});
});
});
});
$.get(pathtoroot + "package-search-index.zip")
.done(function() {
JSZipUtils.getBinaryContent(pathtoroot + "package-search-index.zip", function(e, data) {
JSZip.loadAsync(data).then(function(zip){
zip.file("package-search-index.json").async("text").then(function(content){
packageSearchIndex = JSON.parse(content);
});
});
});
});
$.get(pathtoroot + "type-search-index.zip")
.done(function() {
JSZipUtils.getBinaryContent(pathtoroot + "type-search-index.zip", function(e, data) {
JSZip.loadAsync(data).then(function(zip){
zip.file("type-search-index.json").async("text").then(function(content){
typeSearchIndex = JSON.parse(content);
});
});
});
});
$.get(pathtoroot + "member-search-index.zip")
.done(function() {
JSZipUtils.getBinaryContent(pathtoroot + "member-search-index.zip", function(e, data) {
JSZip.loadAsync(data).then(function(zip){
zip.file("member-search-index.json").async("text").then(function(content){
memberSearchIndex = JSON.parse(content);
});
});
});
});
$.get(pathtoroot + "tag-search-index.zip")
.done(function() {
JSZipUtils.getBinaryContent(pathtoroot + "tag-search-index.zip", function(e, data) {
JSZip.loadAsync(data).then(function(zip){
zip.file("tag-search-index.json").async("text").then(function(content){
tagSearchIndex = JSON.parse(content);
});
});
});
});
if (!moduleSearchIndex) {
createElem(doc, tag, 'module-search-index.js'); createElem(doc, tag, 'module-search-index.js');
}
if (!packageSearchIndex) {
createElem(doc, tag, 'package-search-index.js'); createElem(doc, tag, 'package-search-index.js');
}
if (!typeSearchIndex) {
createElem(doc, tag, 'type-search-index.js'); createElem(doc, tag, 'type-search-index.js');
}
if (!memberSearchIndex) {
createElem(doc, tag, 'member-search-index.js'); createElem(doc, tag, 'member-search-index.js');
}
if (!tagSearchIndex) {
createElem(doc, tag, 'tag-search-index.js'); createElem(doc, tag, 'tag-search-index.js');
} }
}
function createElem(doc, tag, path) { function createElem(doc, tag, path) {
var script = doc.createElement(tag); var script = doc.createElement(tag);

50
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -109,39 +109,9 @@ public class DocPaths {
/** The name of the default jQuery javascript file. */ /** The name of the default jQuery javascript file. */
public static final DocPath JQUERY_JS = DocPath.create("jquery-ui.js"); public static final DocPath JQUERY_JS = DocPath.create("jquery-ui.js");
/** The name of the default jszip javascript file. */
public static final DocPath JSZIP = DocPath.create("jszip/dist/jszip.js");
/** The name of the default jszip javascript file. */
public static final DocPath JSZIP_MIN = DocPath.create("jszip/dist/jszip.min.js");
/** The name of the default jszip-utils javascript file. */
public static final DocPath JSZIPUTILS = DocPath.create("jszip-utils/dist/jszip-utils.js");
/** The name of the default jszip-utils javascript file. */
public static final DocPath JSZIPUTILS_MIN = DocPath.create("jszip-utils/dist/jszip-utils.min.js");
/** The name of the default jszip-utils javascript file. */
public static final DocPath JSZIPUTILS_IE = DocPath.create("jszip-utils/dist/jszip-utils-ie.js");
/** The name of the default jszip-utils javascript file. */
public static final DocPath JSZIPUTILS_IE_MIN = DocPath.create("jszip-utils/dist/jszip-utils-ie.min.js");
/** The name of the member search index file. */
public static final DocPath MEMBER_SEARCH_INDEX_JSON = DocPath.create("member-search-index.json");
/** The name of the member search index zip file. */
public static final DocPath MEMBER_SEARCH_INDEX_ZIP = DocPath.create("member-search-index.zip");
/** The name of the member search index js file. */ /** The name of the member search index js file. */
public static final DocPath MEMBER_SEARCH_INDEX_JS = DocPath.create("member-search-index.js"); public static final DocPath MEMBER_SEARCH_INDEX_JS = DocPath.create("member-search-index.js");
/** The name of the module search index file. */
public static final DocPath MODULE_SEARCH_INDEX_JSON = DocPath.create("module-search-index.json");
/** The name of the module search index zip file. */
public static final DocPath MODULE_SEARCH_INDEX_ZIP = DocPath.create("module-search-index.zip");
/** The name of the module search index js file. */ /** The name of the module search index js file. */
public static final DocPath MODULE_SEARCH_INDEX_JS = DocPath.create("module-search-index.js"); public static final DocPath MODULE_SEARCH_INDEX_JS = DocPath.create("module-search-index.js");
@ -154,12 +124,6 @@ public class DocPaths {
/** The name of the file for the package list. This is to support the legacy mode. */ /** The name of the file for the package list. This is to support the legacy mode. */
public static final DocPath PACKAGE_LIST = DocPath.create("package-list"); public static final DocPath PACKAGE_LIST = DocPath.create("package-list");
/** The name of the package search index file. */
public static final DocPath PACKAGE_SEARCH_INDEX_JSON = DocPath.create("package-search-index.json");
/** The name of the package search index zip file. */
public static final DocPath PACKAGE_SEARCH_INDEX_ZIP = DocPath.create("package-search-index.zip");
/** The name of the package search index js file. */ /** The name of the package search index js file. */
public static final DocPath PACKAGE_SEARCH_INDEX_JS = DocPath.create("package-search-index.js"); public static final DocPath PACKAGE_SEARCH_INDEX_JS = DocPath.create("package-search-index.js");
@ -319,21 +283,9 @@ public class DocPaths {
/** The name of the default stylesheet. */ /** The name of the default stylesheet. */
public static final DocPath STYLESHEET = DocPath.create("stylesheet.css"); public static final DocPath STYLESHEET = DocPath.create("stylesheet.css");
/** The name of the tag search index file. */
public static final DocPath TAG_SEARCH_INDEX_JSON = DocPath.create("tag-search-index.json");
/** The name of the tag search index zip file. */
public static final DocPath TAG_SEARCH_INDEX_ZIP = DocPath.create("tag-search-index.zip");
/** The name of the tag search index js file. */ /** The name of the tag search index js file. */
public static final DocPath TAG_SEARCH_INDEX_JS = DocPath.create("tag-search-index.js"); public static final DocPath TAG_SEARCH_INDEX_JS = DocPath.create("tag-search-index.js");
/** The name of the type search index file. */
public static final DocPath TYPE_SEARCH_INDEX_JSON = DocPath.create("type-search-index.json");
/** The name of the type search index zip file. */
public static final DocPath TYPE_SEARCH_INDEX_ZIP = DocPath.create("type-search-index.zip");
/** The name of the type search index js file. */ /** The name of the type search index js file. */
public static final DocPath TYPE_SEARCH_INDEX_JS = DocPath.create("type-search-index.js"); public static final DocPath TYPE_SEARCH_INDEX_JS = DocPath.create("type-search-index.js");

58
src/jdk.javadoc/share/legal/jszip.md
View File

@ -1,58 +0,0 @@
## JSZip v3.2.1
### MIT License
<pre>
Copyright (c) 2009-2016 Stuart Knightley, David Duponchel, Franz Buchinger, António Afonso
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
******************************************
The JSZip JavaScript Library v3.2.1 also includes pako
pako includes the following license:
(The MIT License)
Copyright (C) 2014-2017 by Vitaly Puzrin and Andrei Tuputcyn
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
******************************************
</pre>

51
test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
View File

@ -55,12 +55,8 @@ public class TestSearch extends JavadocTester {
checkJqueryAndImageFiles(true); checkJqueryAndImageFiles(true);
checkSearchJS(); checkSearchJS();
checkFiles(false, checkFiles(false,
"tag-search-index.zip",
"tag-search-index.js"); "tag-search-index.js");
checkFiles(true, checkFiles(true,
"package-search-index.zip",
"member-search-index.zip",
"type-search-index.zip",
"package-search-index.js", "package-search-index.js",
"member-search-index.js", "member-search-index.js",
"type-search-index.js"); "type-search-index.js");
@ -82,10 +78,6 @@ public class TestSearch extends JavadocTester {
checkSearchJS(); checkSearchJS();
checkAllPkgsAllClasses(); checkAllPkgsAllClasses();
checkFiles(true, checkFiles(true,
"member-search-index.zip",
"package-search-index.zip",
"tag-search-index.zip",
"type-search-index.zip",
"member-search-index.js", "member-search-index.js",
"package-search-index.js", "package-search-index.js",
"tag-search-index.js", "tag-search-index.js",
@ -107,10 +99,6 @@ public class TestSearch extends JavadocTester {
checkJqueryAndImageFiles(true); checkJqueryAndImageFiles(true);
checkSearchJS(); checkSearchJS();
checkFiles(true, checkFiles(true,
"member-search-index.zip",
"package-search-index.zip",
"tag-search-index.zip",
"type-search-index.zip",
"member-search-index.js", "member-search-index.js",
"package-search-index.js", "package-search-index.js",
"tag-search-index.js", "tag-search-index.js",
@ -129,10 +117,6 @@ public class TestSearch extends JavadocTester {
checkSearchOutput(false); checkSearchOutput(false);
checkJqueryAndImageFiles(false); checkJqueryAndImageFiles(false);
checkFiles(false, checkFiles(false,
"member-search-index.zip",
"package-search-index.zip",
"tag-search-index.zip",
"type-search-index.zip",
"member-search-index.js", "member-search-index.js",
"package-search-index.js", "package-search-index.js",
"tag-search-index.js", "tag-search-index.js",
@ -157,10 +141,6 @@ public class TestSearch extends JavadocTester {
checkJqueryAndImageFiles(true); checkJqueryAndImageFiles(true);
checkSearchJS(); checkSearchJS();
checkFiles(true, checkFiles(true,
"member-search-index.zip",
"package-search-index.zip",
"tag-search-index.zip",
"type-search-index.zip",
"member-search-index.js", "member-search-index.js",
"package-search-index.js", "package-search-index.js",
"tag-search-index.js", "tag-search-index.js",
@ -180,10 +160,6 @@ public class TestSearch extends JavadocTester {
checkSearchOutput(false); checkSearchOutput(false);
checkJqueryAndImageFiles(false); checkJqueryAndImageFiles(false);
checkFiles(false, checkFiles(false,
"member-search-index.zip",
"package-search-index.zip",
"tag-search-index.zip",
"type-search-index.zip",
"member-search-index.js", "member-search-index.js",
"package-search-index.js", "package-search-index.js",
"tag-search-index.js", "tag-search-index.js",
@ -205,10 +181,6 @@ public class TestSearch extends JavadocTester {
checkJqueryAndImageFiles(true); checkJqueryAndImageFiles(true);
checkSearchJS(); checkSearchJS();
checkFiles(true, checkFiles(true,
"member-search-index.zip",
"package-search-index.zip",
"tag-search-index.zip",
"type-search-index.zip",
"member-search-index.js", "member-search-index.js",
"package-search-index.js", "package-search-index.js",
"tag-search-index.js", "tag-search-index.js",
@ -230,10 +202,6 @@ public class TestSearch extends JavadocTester {
checkJqueryAndImageFiles(true); checkJqueryAndImageFiles(true);
checkSearchJS(); checkSearchJS();
checkFiles(true, checkFiles(true,
"member-search-index.zip",
"package-search-index.zip",
"tag-search-index.zip",
"type-search-index.zip",
"member-search-index.js", "member-search-index.js",
"package-search-index.js", "package-search-index.js",
"tag-search-index.js", "tag-search-index.js",
@ -256,10 +224,6 @@ public class TestSearch extends JavadocTester {
checkJqueryAndImageFiles(true); checkJqueryAndImageFiles(true);
checkSearchJS(); checkSearchJS();
checkFiles(true, checkFiles(true,
"member-search-index.zip",
"package-search-index.zip",
"tag-search-index.zip",
"type-search-index.zip",
"member-search-index.js", "member-search-index.js",
"package-search-index.js", "package-search-index.js",
"tag-search-index.js", "tag-search-index.js",
@ -281,12 +245,8 @@ public class TestSearch extends JavadocTester {
checkJqueryAndImageFiles(true); checkJqueryAndImageFiles(true);
checkSearchJS(); checkSearchJS();
checkFiles(false, checkFiles(false,
"tag-search-index.zip",
"tag-search-index.js"); "tag-search-index.js");
checkFiles(true, checkFiles(true,
"member-search-index.zip",
"package-search-index.zip",
"type-search-index.zip",
"member-search-index.js", "member-search-index.js",
"package-search-index.js", "package-search-index.js",
"type-search-index.js"); "type-search-index.js");
@ -421,11 +381,6 @@ public class TestSearch extends JavadocTester {
// Test for search related markup // Test for search related markup
checkOutput(fileName, expectedOutput, checkOutput(fileName, expectedOutput,
"<link rel=\"stylesheet\" type=\"text/css\" href=\"script-dir/jquery-ui.css\" title=\"Style\">\n", "<link rel=\"stylesheet\" type=\"text/css\" href=\"script-dir/jquery-ui.css\" title=\"Style\">\n",
"<script type=\"text/javascript\" src=\"script-dir/jszip/dist/jszip.min.js\"></script>\n",
"<script type=\"text/javascript\" src=\"script-dir/jszip-utils/dist/jszip-utils.min.js\"></script>\n",
"<!--[if IE]>\n",
"<script type=\"text/javascript\" src=\"script-dir/jszip-utils/dist/jszip-utils-ie.min.js\"></script>\n",
"<![endif]-->\n",
"<script type=\"text/javascript\" src=\"script-dir/jquery-3.4.1.js\"></script>\n", "<script type=\"text/javascript\" src=\"script-dir/jquery-3.4.1.js\"></script>\n",
"<script type=\"text/javascript\" src=\"script-dir/jquery-ui.js\"></script>", "<script type=\"text/javascript\" src=\"script-dir/jquery-ui.js\"></script>",
"var pathtoroot = \"./\";\n" "var pathtoroot = \"./\";\n"
@ -625,12 +580,6 @@ public class TestSearch extends JavadocTester {
"script-dir/jquery-ui.min.css", "script-dir/jquery-ui.min.css",
"script-dir/jquery-ui.structure.min.css", "script-dir/jquery-ui.structure.min.css",
"script-dir/jquery-ui.structure.css", "script-dir/jquery-ui.structure.css",
"script-dir/jszip/dist/jszip.js",
"script-dir/jszip/dist/jszip.min.js",
"script-dir/jszip-utils/dist/jszip-utils.js",
"script-dir/jszip-utils/dist/jszip-utils.min.js",
"script-dir/jszip-utils/dist/jszip-utils-ie.js",
"script-dir/jszip-utils/dist/jszip-utils-ie.min.js",
"script-dir/images/ui-bg_glass_65_dadada_1x400.png", "script-dir/images/ui-bg_glass_65_dadada_1x400.png",
"script-dir/images/ui-icons_454545_256x240.png", "script-dir/images/ui-icons_454545_256x240.png",
"script-dir/images/ui-bg_glass_95_fef1ec_1x400.png", "script-dir/images/ui-bg_glass_95_fef1ec_1x400.png",

13
test/langtools/jdk/javadoc/tool/api/basic/APITest.java
View File

@ -204,12 +204,6 @@ class APITest {
"script-dir/jquery-ui.min.css", "script-dir/jquery-ui.min.css",
"script-dir/jquery-ui.structure.min.css", "script-dir/jquery-ui.structure.min.css",
"script-dir/jquery-ui.structure.css", "script-dir/jquery-ui.structure.css",
"script-dir/jszip/dist/jszip.js",
"script-dir/jszip/dist/jszip.min.js",
"script-dir/jszip-utils/dist/jszip-utils.js",
"script-dir/jszip-utils/dist/jszip-utils.min.js",
"script-dir/jszip-utils/dist/jszip-utils-ie.js",
"script-dir/jszip-utils/dist/jszip-utils-ie.min.js",
"script-dir/images/ui-bg_glass_65_dadada_1x400.png", "script-dir/images/ui-bg_glass_65_dadada_1x400.png",
"script-dir/images/ui-icons_454545_256x240.png", "script-dir/images/ui-icons_454545_256x240.png",
"script-dir/images/ui-bg_glass_95_fef1ec_1x400.png", "script-dir/images/ui-bg_glass_95_fef1ec_1x400.png",
@ -222,11 +216,9 @@ class APITest {
"script-dir/images/ui-icons_222222_256x240.png", "script-dir/images/ui-icons_222222_256x240.png",
"script-dir/images/ui-bg_glass_75_e6e6e6_1x400.png", "script-dir/images/ui-bg_glass_75_e6e6e6_1x400.png",
"member-search-index.js", "member-search-index.js",
"member-search-index.zip",
"overview-tree.html", "overview-tree.html",
"element-list", "element-list",
"package-search-index.js", "package-search-index.js",
"package-search-index.zip",
"pkg/C.html", "pkg/C.html",
"pkg/package-summary.html", "pkg/package-summary.html",
"pkg/package-tree.html", "pkg/package-tree.html",
@ -236,12 +228,11 @@ class APITest {
"search.js", "search.js",
"stylesheet.css", "stylesheet.css",
"system-properties.html", "system-properties.html",
"type-search-index.js", "type-search-index.js"
"type-search-index.zip"
)); ));
protected static Set<String> noIndexFiles = standardExpectFiles.stream() protected static Set<String> noIndexFiles = standardExpectFiles.stream()
.filter(s -> !s.startsWith("script-dir") && !s.startsWith("resources") && !s.endsWith("zip") .filter(s -> !s.startsWith("script-dir") && !s.startsWith("resources")
&& !s.equals("index-all.html") && !s.equals("search.js") && !s.endsWith("-search-index.js") && !s.equals("index-all.html") && !s.equals("search.js") && !s.endsWith("-search-index.js")
&& !s.equals("allclasses-index.html") && !s.equals("allpackages-index.html") && !s.equals("allclasses-index.html") && !s.equals("allpackages-index.html")
&& !s.equals("system-properties.html")) && !s.equals("system-properties.html"))