tag still requires '<' and '>' characters to be escaped
+ slurpSource = slurpSource.replace("<", "<");
+ slurpSource = slurpSource.replace(">", ">");
+ results.append("").append(slurpSource).append("
");
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
- public boolean inPackage() {
- return true;
+ return results.toString();
}
- public boolean inType() {
- return true;
+ @Override
+ public Set getAllowedLocations() {
+ return EnumSet.allOf(Location.class);
}
+ @Override
public boolean isInlineTag() {
return true;
}
- public String toString(Tag tag) {
- SourcePosition position = LinkResolver.resolveLink(tag,
- new ExtraClassResolver() {
- public ClassDoc findClass(String className) {
- return GWTJavaDoclet.root.classNamed(className);
+ /**
+ * Read the content of the reader line by line until the start character is found in a line.
+ * Remove leading whitespace on each line to match the first, and stop when closing curly
+ * brackets match opening brackets.
+ *
+ * @param reader the reader to get bytes from
+ * @param startChar the first character of the file that we're interested in
+ * @return a newline-joined, html-escaped string
+ */
+ private static String slurpSource(Reader reader, long startChar) throws IOException {
+ // We want to skip until the line that contains character startChar - can't use BufferedReader
+ // for this as it won't count characters (and the newlines could be two chars etc)
+
+ // style guide says 100, actual max is around 190
+ CharBuffer line = CharBuffer.allocate(250);
+ // position starts at 0, since we incr at the same time as we read
+ int position = -1;
+ // accumulate finished lines to return
+ StringBuilder lines = new StringBuilder();
+ // indent starts at -1 meaning "we don't know the indentation level yet"
+ int indent = -1;
+
+ // braceDepth lets us tell when we finish the target element, but we have to be sure we saw at
+ // least one open/close set, or semicolon.
+ int braceDepth = 0;
+ boolean seenSemiColonOrBrace = false;
+
+ // read each character - if \r (check for a \n to follow) or \n end the line and record the
+ // position of the end of the line.
+ int ch = reader.read();
+ position++;
+ while (true) {
+ if (ch == '\n' || ch == '\r' || ch == -1) {
+ if (ch == '\r') {
+ ch = reader.read();
+ position++;
+ if (ch == '\n') {
+ ch = reader.read();
+ position++;
}
- });
-
- String slurpSource = slurpSource(position);
- // The tag still requires '<' and '>' characters to be escaped
- slurpSource = slurpSource.replace("<", "<");
- slurpSource = slurpSource.replace(">", ">");
- return "" + slurpSource + "
";
- }
-
- public String toString(Tag[] tags) {
- if (tags == null || tags.length == 0) {
- return null;
- }
- String result = "";
- for (int i = 0; i < tags.length; i++) {
- result += toString(tags[i]);
- }
- return result;
- }
-
- private static String slurpSource(SourcePosition position) {
- BufferedReader br = null;
- try {
- br = new BufferedReader(new FileReader(position.file()));
- for (int i = 0, n = position.line() - 1; i < n; ++i) {
- br.readLine();
- }
-
- StringBuffer lines = new StringBuffer();
- String line = br.readLine();
- int braceDepth = 0;
- int indent = -1;
- boolean seenSemiColonOrBrace = false;
- while (line != null) {
+ } else if (ch == '\n') {
+ ch = reader.read();
+ position++;
+ } // else EOF, nothing to do
+
+ // We've read a full line (and are ready to start the next one).
+ // If position < startChar, we haven't yet reached our content, continue
+ if (position <= startChar) {
+ line.clear();
+ continue;
+ }
+ // make the written chars available to be read
+ line.flip();
if (indent == -1) {
+ // this is our first line, read the indentation level
for (indent = 0; Character.isWhitespace(line.charAt(indent)); ++indent) {
// just accumulate
}
}
-
+ // remove the indent chars from this line, and append it
+ String lineStr;
if (line.length() >= indent) {
- line = line.substring(indent);
+ lineStr = line.subSequence(indent, line.length()).toString();
+ } else {
+ lineStr = line.toString();
}
- lines.append(line).append("\n");
+ lines.append(lineStr).append('\n');
for (int i = 0, n = line.length(); i < n; ++i) {
char c = line.charAt(i);
if (c == '{') {
@@ -137,26 +175,23 @@ private static String slurpSource(SourcePosition position) {
}
}
- if (braceDepth > 0 || !seenSemiColonOrBrace) {
- line = br.readLine();
- } else {
+ // now that we've written the line, check if it was our final line
+ if ((braceDepth <= 0 && seenSemiColonOrBrace) || ch == -1) {
break;
}
- }
- return lines.toString();
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- try {
- if (br != null) {
- br.close();
- }
- } catch (IOException e) {
- e.printStackTrace();
+ // free up the buffer to have new chars written to it
+ line.clear();
+ } else {
+ // we're in the middle of a line, record the character and continue
+ line.put((char) ch);
+
+ ch = reader.read();
+ position++;
}
}
- return "";
+
+ return lines.toString();
}
}
diff --git a/build_tools/doctool/src/com/google/doctool/custom/EztDoclet.java b/build_tools/doctool/src/com/google/doctool/custom/EztDoclet.java
deleted file mode 100644
index 37853a92338..00000000000
--- a/build_tools/doctool/src/com/google/doctool/custom/EztDoclet.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.google.doctool.custom;
-
-import com.sun.javadoc.ClassDoc;
-import com.sun.javadoc.DocErrorReporter;
-import com.sun.javadoc.ExecutableMemberDoc;
-import com.sun.javadoc.FieldDoc;
-import com.sun.javadoc.PackageDoc;
-import com.sun.javadoc.RootDoc;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Iterator;
-
-/**
- * A doclet for using producing EZT output listing the specified classes and
- * their methods and constructors.
- */
-public class EztDoclet {
-
- public static final String OPT_EZTFILE = "-eztfile";
-
- private static EztDoclet EZT_DOCLET;
-
- private static final String JAVADOC_URL = "https://docs.oracle.com/javase/8/docs/api/";
-
- public static int optionLength(String option) {
- if (option.equals(OPT_EZTFILE)) {
- return 2;
- }
- return 0;
- }
-
- public static boolean start(RootDoc root) {
- getDoclet().process(root);
- return true;
- }
-
- public static boolean validOptions(String[][] options,
- DocErrorReporter reporter) {
- return getDoclet().analyzeOptions(options, reporter);
- }
-
- private static EztDoclet getDoclet() {
- if (EZT_DOCLET == null) {
- EZT_DOCLET = new EztDoclet();
- }
- return EZT_DOCLET;
- }
-
- private String outputFile;
-
- private boolean analyzeOptions(String[][] options, DocErrorReporter reporter) {
- for (int i = 0; i < options.length; i++) {
- if (options[i][0] == OPT_EZTFILE) {
- outputFile = options[i][1];
- }
- }
-
- if (outputFile == null) {
- reporter.printError("You must specify an output filepath with "
- + OPT_EZTFILE);
- return false;
- }
-
- return true;
- }
-
- private String createFieldList(Collection fields) {
- StringBuffer buffer = new StringBuffer();
- Iterator iter = fields.iterator();
- while (iter.hasNext()) {
- FieldDoc field = iter.next();
- buffer.append(field.name());
- if (iter.hasNext()) {
- buffer.append(", ");
- }
- }
- return buffer.toString();
- }
-
- private String createMemberList(Collection members) {
- StringBuffer buffer = new StringBuffer();
- Iterator iter = members.iterator();
- while (iter.hasNext()) {
- ExecutableMemberDoc member = iter.next();
- buffer.append(member.name() + member.flatSignature());
- if (iter.hasNext()) {
- buffer.append(", ");
- }
- }
- return buffer.toString();
- }
-
- private void process(RootDoc root) {
- try {
- File outFile = new File(outputFile);
- outFile.getParentFile().mkdirs();
- FileWriter fw = new FileWriter(outFile);
- PrintWriter pw = new PrintWriter(fw, true);
-
- pw.println("");
- for (PackageDoc pack : root.specifiedPackages()) {
- pw.format(" - %s
\n",
- pack.name().replace('.', '_'), pack.name());
- }
- pw.println("
\n");
-
- for (PackageDoc pack : root.specifiedPackages()) {
- pw.format("Package %s
\n",
- pack.name().replace('.', '_'), pack.name());
- pw.println("");
-
- String packURL = JAVADOC_URL + pack.name().replace(".", "/") + "/";
-
- // Sort the classes alphabetically
- ClassDoc[] classes = pack.allClasses(true);
- Arrays.sort(classes, new Comparator() {
- public int compare(ClassDoc arg0, ClassDoc arg1) {
- return arg0.name().compareTo(arg1.name());
- }
- });
-
- Iterator iter = Arrays.asList(classes).iterator();
- while (iter.hasNext()) {
- ClassDoc cls = iter.next();
-
- // Each class links to Sun's main JavaDoc
- pw.format(" - %s
\n", packURL,
- cls.name(), cls.name());
-
- // Print out all fields
- Collection fields = new ArrayList();
- fields.addAll(Arrays.asList(cls.fields(true)));
-
- if (!fields.isEmpty()) {
- pw.format(" - %s
\n", createFieldList(fields));
- }
-
- // Print out all constructors and methods
- Collection members = new ArrayList();
- members.addAll(Arrays.asList(cls.constructors(true)));
- members.addAll(Arrays.asList(cls.methods(true)));
-
- if (!members.isEmpty()) {
- pw.format(" - %s
\n", createMemberList(members));
- }
-
- if (iter.hasNext()) {
- pw.print("\n");
- }
- }
-
- pw.println("
\n");
- }
- pw.close();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-}
diff --git a/build_tools/doctool/src/com/google/doctool/custom/FindPackages.java b/build_tools/doctool/src/com/google/doctool/custom/FindPackages.java
index ee280bd1b98..fb00872b4a5 100644
--- a/build_tools/doctool/src/com/google/doctool/custom/FindPackages.java
+++ b/build_tools/doctool/src/com/google/doctool/custom/FindPackages.java
@@ -26,7 +26,7 @@
import java.util.regex.Pattern;
/**
- * Used by trunk/doc/build.xml to generate the packages.properties file.
+ * Used by doc/build.xml to generate the packages.properties file.
*/
public class FindPackages {
@@ -55,13 +55,20 @@ public class FindPackages {
private static final String[] JAVA_PKGS = {
"java.beans",
"java.io",
- "java.lang", "java.lang.annotation", "java.lang.reflect",
+ "java.lang",
+ "java.lang.annotation",
+ "java.lang.reflect",
"java.math",
"java.nio.charset",
"java.security",
"java.sql",
"java.text",
- "java.util", "java.util.concurrent", "java.util.concurrent.atomic", "java.util.function", "java.util.logging", "java.util.stream"
+ "java.util",
+ "java.util.concurrent",
+ "java.util.concurrent.atomic",
+ "java.util.function",
+ "java.util.logging",
+ "java.util.stream"
};
/**
@@ -90,14 +97,14 @@ public class FindPackages {
"user/src/com/google/gwt/i18n/server/GwtLocaleFactoryImpl.java",
"user/src/com/google/gwt/i18n/server/GwtLocaleImpl.java"};
- private static Pattern exclusions;
+ private static final Pattern exclusions;
static {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < EXCLUSIONS.length; i++) {
String ex = EXCLUSIONS[i];
ex = ex.replace(".", "\\.");
if (i < EXCLUSIONS.length - 1) {
- sb.append(ex + "|");
+ sb.append(ex).append("|");
} else {
sb.append(ex);
}
@@ -128,14 +135,16 @@ public static void main(String[] args) {
out.println("JAVA_PKGS=\\");
for (int i = 0; i < JAVA_PKGS.length; i++) {
if (i < JAVA_PKGS.length - 1) {
- out.println(JAVA_PKGS[i] + ";\\");
+ out.println(JAVA_PKGS[i] + ",\\");
} else {
out.println(JAVA_PKGS[i]);
}
}
out.println("# The last package should not have a trailing semicolon");
- out.println("");
- out.println("# Individual classes to include when we don't want to include an entire package");
+ out.println();
+ out.println(
+ "# Individual classes to include when we don't want to include an entire package"
+ );
out.println("USER_CLASSES=\\");
// Output a package-info.java once for each package
@@ -145,15 +154,15 @@ public static void main(String[] args) {
String classPath = className.substring(0, className.lastIndexOf('/'));
if (!classPaths.contains(classPath)) {
classPaths.add(classPath);
- out.println("${gwt.root}/" + classPath + "/package-info.java" + ":\\");
+ out.println("${gwt.root}/" + classPath + "/package-info.java" + ",\\");
}
if (i < USER_CLASSES.length - 1) {
- out.println("${gwt.root}/" + className + ":\\");
+ out.println("${gwt.root}/" + className + ",\\");
} else {
out.println("${gwt.root}/" + className);
}
}
- out.println("");
+ out.println();
out.println("# Packages to include");
out.println("USER_PKGS=\\");
@@ -171,7 +180,7 @@ public static void main(String[] args) {
for (int i = 0; i < packages.size(); i++) {
if (i < packages.size() - 1) {
- out.println(packageList.get(i) + ";\\");
+ out.println(packageList.get(i) + ",\\");
} else {
out.println(packageList.get(i));
}
diff --git a/build_tools/doctool/src/com/google/doctool/custom/GWTJavaDoclet.java b/build_tools/doctool/src/com/google/doctool/custom/GWTJavaDoclet.java
deleted file mode 100644
index ad9e747b3bd..00000000000
--- a/build_tools/doctool/src/com/google/doctool/custom/GWTJavaDoclet.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2006 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.google.doctool.custom;
-
-import com.sun.javadoc.Doclet;
-import com.sun.javadoc.RootDoc;
-import com.sun.tools.doclets.standard.Standard;
-import com.sun.tools.javadoc.Main;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * A doclet for using GWT-specific tags in standard javadoc output.
- */
-public class GWTJavaDoclet extends Doclet {
-
- static RootDoc root = null;
-
- private static final String[] TAGLET_ARGS = new String[] {
- "-taglet", ExampleTaglet.class.getName(), "-taglet",
- TipTaglet.class.getName(), "-taglet", IncludeTaglet.class.getName()};
-
- public static void main(String[] args) {
- List examplePackages = new ArrayList();
- List filteredArgs = new ArrayList();
-
- // filter out and save packages args
- for (int i = 0; i < args.length; ++i) {
- if (args[i].equalsIgnoreCase("-examplepackages")) {
- String nextArg = args[++i];
- String[] split = nextArg.split(":|;");
- for (int j = 0; j < split.length; ++j) {
- examplePackages.add(split[j]);
- }
- } else if (args[i].equalsIgnoreCase("-packages")) {
- String nextArg = args[++i];
- String[] split = nextArg.split(":|;");
- for (int j = 0; j < split.length; ++j) {
- filteredArgs.add(split[j]);
- }
- } else {
- filteredArgs.add(args[i]);
- }
- }
-
- // Build a javadoc structure that includes example packages for reference
- String name = GWTJavaDoclet.class.getName();
- List myArgs = new ArrayList();
- myArgs.addAll(filteredArgs);
- myArgs.addAll(examplePackages);
- Main.execute(name, name, (String[]) myArgs.toArray(new String[] {}));
-
- // Now delegate to the real javadoc without the example packages
- filteredArgs.addAll(0, Arrays.asList(TAGLET_ARGS));
- Main.execute((String[]) filteredArgs.toArray(new String[] {}));
- }
-
- public static int optionLength(String option) {
- // delegate
- return Standard.optionLength(option);
- }
-
- public static boolean start(RootDoc root) {
- // cache the root; ExampleTag will use it for reference later.
- GWTJavaDoclet.root = root;
- return true;
- }
-
-}
diff --git a/build_tools/doctool/src/com/google/doctool/custom/IncludeTaglet.java b/build_tools/doctool/src/com/google/doctool/custom/IncludeTaglet.java
index 26e18bf9a51..80ac4443f39 100644
--- a/build_tools/doctool/src/com/google/doctool/custom/IncludeTaglet.java
+++ b/build_tools/doctool/src/com/google/doctool/custom/IncludeTaglet.java
@@ -17,65 +17,54 @@
import com.google.doctool.ResourceIncluder;
-import com.sun.javadoc.Tag;
-import com.sun.tools.doclets.Taglet;
+import com.sun.source.doctree.DocTree;
-import java.util.Map;
+import javax.lang.model.element.Element;
+import javax.tools.Diagnostic;
+import java.io.IOException;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
/**
* A taglet for slurping in the content of artbitrary files appearing on the
* classpath into javadoc.
*/
-public class IncludeTaglet implements Taglet {
-
- public static void register(Map tagletMap) {
- IncludeTaglet tag = new IncludeTaglet();
- Taglet t = (Taglet) tagletMap.get(tag.getName());
- if (t != null) {
- tagletMap.remove(tag.getName());
- }
- tagletMap.put(tag.getName(), tag);
- }
+public class IncludeTaglet extends AbstractTaglet {
+ @Override
public String getName() {
return "gwt.include";
}
- public boolean inConstructor() {
- return true;
- }
-
- public boolean inField() {
- return true;
- }
-
- public boolean inMethod() {
- return true;
- }
-
- public boolean inOverview() {
- return true;
+ @Override
+ public String toString(List list, Element element) {
+ StringBuilder results = new StringBuilder();
+ for (DocTree docTree : list) {
+ String text = getHtmlContent(docTree);
+
+ try {
+ String contents = ResourceIncluder.getResourceFromClasspathScrubbedForHTML(text);
+ results.append("").append(contents).append("
");
+ } catch (IOException e) {
+ e.printStackTrace();
+ printMessage(Diagnostic.Kind.ERROR, "Error in reading file: " + e.getMessage(), element,
+ docTree);
+ // return empty to let javadoc report this
+ return "";
+ }
+ }
+ return results.toString();
}
- public boolean inPackage() {
- return true;
- }
-
- public boolean inType() {
- return true;
+ @Override
+ public Set getAllowedLocations() {
+ return EnumSet.allOf(Location.class);
}
+ @Override
public boolean isInlineTag() {
return true;
}
- public String toString(Tag tag) {
- String contents = ResourceIncluder.getResourceFromClasspathScrubbedForHTML(tag);
- return "" + contents + "
";
- }
-
- public String toString(Tag[] tags) {
- return null;
- }
-
}
diff --git a/build_tools/doctool/src/com/google/doctool/custom/JavaEmulSummaryDoclet.java b/build_tools/doctool/src/com/google/doctool/custom/JavaEmulSummaryDoclet.java
new file mode 100644
index 00000000000..1b8a5ce21be
--- /dev/null
+++ b/build_tools/doctool/src/com/google/doctool/custom/JavaEmulSummaryDoclet.java
@@ -0,0 +1,290 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.doctool.custom;
+
+import jdk.javadoc.doclet.Doclet;
+import jdk.javadoc.doclet.DocletEnvironment;
+import jdk.javadoc.doclet.Reporter;
+
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.type.ArrayType;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+import javax.tools.Diagnostic;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * A doclet for listing the specified classes and
+ * their methods and constructors.
+ */
+public class JavaEmulSummaryDoclet implements Doclet {
+
+ public static final String OPT_OUTFILE = "-outfile";
+ private static final String JAVADOC_URL = "https://docs.oracle.com/en/java/javase/11/docs/api/";
+
+ private Reporter reporter;
+ private String outputFile;
+
+ @Override
+ public boolean run(DocletEnvironment env) {
+ try {
+
+ File outFile = new File(outputFile);
+ outFile.getParentFile().mkdirs();
+ try (FileWriter fw = new FileWriter(outFile);
+ PrintWriter pw = new PrintWriter(fw, true)) {
+
+ pw.println("");
+ getSpecifiedPackages(env)
+ .forEach(pack -> {
+ pw.format(" - %s
\n",
+ pack.getQualifiedName()
+ .toString().replace('.', '_'),
+ pack.getQualifiedName().toString());
+ });
+
+ pw.println("
\n");
+
+ getSpecifiedPackages(env).forEach(pack -> {
+ pw.format("Package %s
\n",
+ pack.getQualifiedName().toString().replace('.', '_'),
+ pack.getQualifiedName().toString());
+ pw.println("");
+
+ String packURL = JAVADOC_URL + pack.getQualifiedName().toString()
+ .replace(".", "/") + "/";
+
+ Iterator classesIterator = pack.getEnclosedElements()
+ .stream()
+ .filter(element -> env.isSelected(element) && env.isIncluded(element))
+ .filter(element -> element.getModifiers().contains(Modifier.PUBLIC))
+ .sorted(Comparator.comparing((Element o) -> o.getSimpleName()
+ .toString()))
+ .iterator();
+
+ while (classesIterator.hasNext()) {
+ Element cls = classesIterator.next();
+ // Each class links to Oracle's main JavaDoc
+ emitClassDocs(env, pw, packURL, cls);
+ if (classesIterator.hasNext()) {
+ pw.print("\n");
+ }
+ }
+
+ pw.println("
\n");
+ });
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ return true;
+ }
+
+ private void emitClassDocs(DocletEnvironment env, PrintWriter pw, String packURL, Element cls) {
+ pw.format(" %s \n", packURL,
+ qualifiedSimpleName(cls), qualifiedSimpleName(cls));
+
+ // Print out all fields
+ String fields = cls.getEnclosedElements()
+ .stream()
+ .filter(element -> element.getKind().isField())
+ .filter(field -> field.getModifiers().contains(Modifier.PUBLIC))
+ .map(field -> field.getSimpleName().toString())
+ .collect(Collectors.joining(", "));
+
+ if (!fields.isEmpty()) {
+ pw.format(" %s \n", fields);
+ }
+
+ List constructors = cls.getEnclosedElements()
+ .stream()
+ .filter(element -> ElementKind.CONSTRUCTOR == element.getKind())
+ .filter(member -> member.getModifiers().contains(Modifier.PUBLIC))
+ .map(member -> (ExecutableElement) member)
+ .map(executableElement -> flatSignature(env, cls, executableElement))
+ .collect(Collectors.toList());
+
+ List methods = cls.getEnclosedElements()
+ .stream()
+ .filter(element -> ElementKind.METHOD == element.getKind())
+ .filter(member -> member.getModifiers().contains(Modifier.PUBLIC))
+ .map(member -> (ExecutableElement) member)
+ .map(executableElement -> flatSignature(env, cls, executableElement))
+ .collect(Collectors.toList());
+
+ List members = new ArrayList<>(constructors);
+ members.addAll(methods);
+
+ // Print out all constructors and methods
+ if (!members.isEmpty()) {
+ pw.format(" %s \n", createMemberList(members));
+ }
+
+ Iterator classesIterator = cls.getEnclosedElements()
+ .stream()
+ .filter(element -> element.getKind().isClass()
+ || element.getKind().isInterface()
+ || ElementKind.ENUM == element.getKind())
+ .filter(element -> element.getModifiers().contains(Modifier.PUBLIC))
+ .sorted(Comparator.comparing((Element o) -> o.getSimpleName().toString()))
+ .iterator();
+ if (classesIterator.hasNext()) {
+ pw.print("\n");
+ }
+ while (classesIterator.hasNext()) {
+ Element innerCls = classesIterator.next();
+ // Each class links to Sun's main JavaDoc
+ emitClassDocs(env, pw, packURL, innerCls);
+ if (classesIterator.hasNext()) {
+ pw.print("\n");
+ }
+ }
+ }
+
+ private String createMemberList(Collection members) {
+ StringBuilder sb = new StringBuilder();
+ Iterator iter = members.iterator();
+ while (iter.hasNext()) {
+ String member = iter.next();
+ sb.append(member);
+ if (iter.hasNext()) {
+ sb.append(", ");
+ }
+ }
+ return sb.toString();
+ }
+
+ private String qualifiedSimpleName(Element element) {
+ String elementName = element.getSimpleName().toString();
+ if (ElementKind.PACKAGE != element.getEnclosingElement().getKind()) {
+ return qualifiedSimpleName(element.getEnclosingElement()) + "." + elementName;
+ }
+ return elementName;
+ }
+
+ private String flatSignature(DocletEnvironment env, Element parent, ExecutableElement member) {
+ return (ElementKind.CONSTRUCTOR == member.getKind()
+ ? parent.getSimpleName().toString()
+ : member.getSimpleName().toString()) +
+ "(" + member.getParameters()
+ .stream()
+ .map(Element::asType)
+ .map(t -> simpleParamName(env, t))
+ .collect(Collectors.joining(", ")) + ")";
+ }
+
+ private String simpleParamName(DocletEnvironment env, TypeMirror type) {
+ if (type.getKind().isPrimitive() || TypeKind.TYPEVAR == type.getKind()) {
+ return String.valueOf(type);
+ } else if (TypeKind.ARRAY == type.getKind()) {
+ return simpleParamName(env, ((ArrayType) type).getComponentType()) + "[]";
+ } else {
+ return qualifiedSimpleName(env.getTypeUtils().asElement(type));
+ }
+ }
+
+ @Override
+ public void init(Locale locale, Reporter reporter) {
+ this.reporter = reporter;
+ }
+
+ @Override
+ public String getName() {
+ return "JreEmulationSummaryDoclet";
+ }
+
+ @Override
+ public Set getSupportedOptions() {
+ Option[] options = {
+ new Option() {
+
+ @Override
+ public int getArgumentCount() {
+ return 1;
+ }
+
+ @Override
+ public String getDescription() {
+ return "JRE emulation summary Doc location";
+ }
+
+ @Override
+ public Kind getKind() {
+ return Kind.STANDARD;
+ }
+
+ @Override
+ public List getNames() {
+ return List.of(OPT_OUTFILE);
+ }
+
+ @Override
+ public String getParameters() {
+ return "file";
+ }
+
+ @Override
+ public boolean process(String opt, List arguments) {
+ if (arguments.isEmpty()) {
+ reporter.print(Diagnostic.Kind.ERROR,
+ "You must specify an output filepath with "
+ + OPT_OUTFILE);
+ return false;
+ }
+ reporter.print(Diagnostic.Kind.NOTE,
+ "JRE emulation summary Doclet Option : "
+ + arguments.get(0));
+ outputFile = arguments.get(0);
+ return true;
+ }
+ }
+ };
+ return new HashSet<>(Arrays.asList(options));
+ }
+
+ @Override
+ public SourceVersion getSupportedSourceVersion() {
+ return SourceVersion.latestSupported();
+ }
+
+ private Stream getSpecifiedPackages(DocletEnvironment root) {
+ return root.getSpecifiedElements()
+ .stream()
+ .filter(element -> ElementKind.PACKAGE == element.getKind())
+ .map(element -> (PackageElement) element);
+ }
+}
diff --git a/build_tools/doctool/src/com/google/doctool/custom/TipTaglet.java b/build_tools/doctool/src/com/google/doctool/custom/TipTaglet.java
index a17e0b33210..830b23cb486 100644
--- a/build_tools/doctool/src/com/google/doctool/custom/TipTaglet.java
+++ b/build_tools/doctool/src/com/google/doctool/custom/TipTaglet.java
@@ -15,80 +15,52 @@
*/
package com.google.doctool.custom;
-import com.sun.javadoc.Tag;
-import com.sun.tools.doclets.Taglet;
+import com.sun.source.doctree.DocTree;
-import java.util.Map;
+import javax.lang.model.element.Element;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
/**
* A taglet for including GWT tip tags in javadoc output.
*/
-public class TipTaglet implements Taglet {
-
- public static void register(Map tagletMap) {
- TipTaglet tag = new TipTaglet();
- Taglet t = (Taglet) tagletMap.get(tag.getName());
- if (t != null) {
- tagletMap.remove(tag.getName());
- }
- tagletMap.put(tag.getName(), tag);
- }
-
- public TipTaglet() {
- }
+public class TipTaglet extends AbstractTaglet {
+ @Override
public String getName() {
return "tip";
}
- public boolean inConstructor() {
- return true;
- }
-
- public boolean inField() {
- return true;
- }
-
- public boolean inMethod() {
- return true;
- }
-
- public boolean inOverview() {
- return true;
- }
-
- public boolean inPackage() {
- return true;
+ @Override
+ public Set getAllowedLocations() {
+ return EnumSet.allOf(Location.class);
}
- public boolean inType() {
- return true;
- }
-
- public boolean isInlineTag() {
- return false;
- }
-
- public String toString(Tag tag) {
- return null;
- }
-
- public String toString(Tag[] tags) {
- if (tags == null || tags.length == 0) {
+ @Override
+ public String toString(List list, Element element) {
+ if (list == null || list.size() == 0) {
return null;
}
- String result = "Tip: ";
- if (tags.length == 1) {
- result += tags[0].text();
+ StringBuilder result = new StringBuilder(" Tip: ");
+ if (list.size() == 1) {
+ result.append(getHtmlContent(list.get(0)));
} else {
- result += "";
- for (int i = 0; i < tags.length; i++) {
- result += "- " + tags[i].text() + "
";
+ result.append("");
+ for (int i = 0; i < list.size(); i++) {
+ result.append("- ");
+ result.append(getHtmlContent(list.get(i)));
+ result.append("
");
}
- result += "
";
+ result.append("
");
}
- result += " ";
- return result;
+ result.append("");
+ return result.toString();
+ }
+
+ @Override
+ public boolean isInlineTag() {
+ return false;
}
}
diff --git a/common.ant.xml b/common.ant.xml
index 7c5d26ea669..36a56b4882d 100755
--- a/common.ant.xml
+++ b/common.ant.xml
@@ -28,11 +28,11 @@
-
+
@@ -273,6 +272,7 @@
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/WebServer.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/WebServer.java
index d6b333a1e17..273e63cf4f2 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/WebServer.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/WebServer.java
@@ -30,7 +30,6 @@
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.servlets.GzipFilter;
import java.io.BufferedReader;
import java.io.File;
@@ -125,7 +124,7 @@ void start(final TreeLogger logger) throws UnableToCompleteException {
connector.setReuseAddress(false);
newServer.addConnector(connector);
- ServletContextHandler newHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
+ ServletContextHandler newHandler = new ServletContextHandler(ServletContextHandler.GZIP);
newHandler.setContextPath("/");
newHandler.addServlet(new ServletHolder(new HttpServlet() {
@Override
@@ -134,7 +133,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
handleRequest(request.getPathInfo(), request, response, logger);
}
}), "/*");
- newHandler.addFilter(GzipFilter.class, "/*", EnumSet.allOf(DispatcherType.class));
newServer.setHandler(newHandler);
try {
newServer.start();
diff --git a/dev/core/src/com/google/gwt/core/ext/linker/impl/installLocationIframe.js b/dev/core/src/com/google/gwt/core/ext/linker/impl/installLocationIframe.js
index 59fca5c907f..c9c39393862 100644
--- a/dev/core/src/com/google/gwt/core/ext/linker/impl/installLocationIframe.js
+++ b/dev/core/src/com/google/gwt/core/ext/linker/impl/installLocationIframe.js
@@ -46,8 +46,10 @@ function setupInstallLocation() {
// throwing away the current document.
//
// In IE, it ensures that the element is immediately available.
- frameDoc.open();
- var doctype = (document.compatMode == 'CSS1Compat') ? '' : '';
- frameDoc.write(doctype + '');
- frameDoc.close();
+ if (navigator.userAgent.indexOf("Chrome") == -1) {
+ frameDoc.open();
+ var doctype = (document.compatMode == 'CSS1Compat') ? '' : '';
+ frameDoc.write(doctype + '');
+ frameDoc.close();
+ }
}
diff --git a/dev/core/src/com/google/gwt/core/ext/linker/impl/installScriptDirect.js b/dev/core/src/com/google/gwt/core/ext/linker/impl/installScriptDirect.js
index 725505e0bf0..2df43d26150 100644
--- a/dev/core/src/com/google/gwt/core/ext/linker/impl/installScriptDirect.js
+++ b/dev/core/src/com/google/gwt/core/ext/linker/impl/installScriptDirect.js
@@ -9,7 +9,9 @@ function installScript(filename) {
var docbody = doc.body;
var script = doc.createElement('script');
script.language='javascript';
- script.crossOrigin='';
+ if (location.host) {
+ script.crossOrigin='';
+ }
script.src = code;
if (__MODULE_FUNC__.__errFn) {
script.onerror = function() {
diff --git a/dev/core/src/com/google/gwt/core/ext/linker/impl/installScriptEarlyDownload.js b/dev/core/src/com/google/gwt/core/ext/linker/impl/installScriptEarlyDownload.js
index 0e2712b130d..85bd6e62090 100644
--- a/dev/core/src/com/google/gwt/core/ext/linker/impl/installScriptEarlyDownload.js
+++ b/dev/core/src/com/google/gwt/core/ext/linker/impl/installScriptEarlyDownload.js
@@ -19,29 +19,15 @@ function installScript(filename) {
var doc = getInstallLocationDoc();
var docbody = doc.body;
var script;
- // for sourcemaps, we inject textNodes into the script element on Chrome
- if (navigator.userAgent.indexOf("Chrome") > -1 && window.JSON) {
- var scriptFrag = doc.createDocumentFragment()
- // surround code with eval until crbug #90707
- scriptFrag.appendChild(doc.createTextNode("eval(\""));
- for (var i = 0; i < code.length; i++) {
- // escape newlines, backslashes, and quotes with JSON.stringify
- // rather than create multiple script tags which mess up line numbers, we use 1 tag, multiple text nodes
- var c = window.JSON.stringify(code[i]);
- // trim beginning/end quotes
- scriptFrag.appendChild(doc.createTextNode(c.substring(1, c.length - 1)));
- }
- // close the eval
- scriptFrag.appendChild(doc.createTextNode("\");"));
+ // for sourcemaps, we inject the code as a single string for Chrome
+ if (navigator.userAgent.indexOf("Chrome") > -1) {
script = doc.createElement('script');
- script.language='javascript';
- script.appendChild(scriptFrag);
+ script.text = code.join('');
docbody.appendChild(script);
removeScript(docbody, script);
} else {
for (var i = 0; i < code.length; i++) {
script = doc.createElement('script');
- script.language='javascript';
script.text = code[i];
docbody.appendChild(script);
removeScript(docbody, script);
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorder.java b/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorder.java
index beada0d13e1..bfa7223d38b 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorder.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorder.java
@@ -169,16 +169,13 @@ private void analyzeFragment(MemberFactory memberFactory, TreeSet c
assert info != null;
// Infer dependency information
- if (!dependencyScope.isEmpty()) {
-
+ while (!dependencyScope.isEmpty() && !dependencyScope.peek().range.contains(range)) {
/*
* Pop frames until we get back to a container, using this as a chance
* to build up our list of non-overlapping Ranges to report back to the
* user.
*/
- while (!dependencyScope.peek().range.contains(range)) {
- popAndRecord(dependencyScope, fragment);
- }
+ popAndRecord(dependencyScope, fragment);
}
// Possibly create and record Members
@@ -271,7 +268,7 @@ private void emitStory(StoryImpl story, Range range) throws IOException {
builder.append("\"/>\n\n");
} else {
builder.append("\">");
- SizeMapRecorder.escapeXml(jsCode, start, end, false, builder);
+ SizeMapRecorder.escapeXml(jsCode, start, Math.min(end,jsCode.length()), false, builder);
builder.append("\n\n");
}
}
@@ -297,7 +294,7 @@ private void popAndRecord(Stack dependencyScope, int fragment) throws
* Make a new Range for the gap between the popped Range and whatever we
* last stored.
*/
- if (lastEnd < toStore.getStart()) {
+ if (lastEnd < toStore.getStart() && !dependencyScope.isEmpty()) {
Range newRange = new Range(lastEnd, toStore.getStart());
assert !dependencyScope.isEmpty();
@@ -351,7 +348,9 @@ private void recordStory(SourceInfo info, int fragment, int length, Range range)
theStory = new StoryImpl(storyCache.get(info), length);
}
- emitStory(theStory, range);
+ if (range.getStart() < js[curHighestFragment].length()) {
+ emitStory(theStory, range);
+ }
}
}
diff --git a/dev/core/src/com/google/gwt/core/linker/SingleScriptTemplate.js b/dev/core/src/com/google/gwt/core/linker/SingleScriptTemplate.js
index 53d168da3d6..30cfb179c3e 100644
--- a/dev/core/src/com/google/gwt/core/linker/SingleScriptTemplate.js
+++ b/dev/core/src/com/google/gwt/core/linker/SingleScriptTemplate.js
@@ -93,15 +93,21 @@ function __MODULE_FUNC__() {
,markerId = "__gwt_marker___MODULE_NAME__"
,markerScript;
- $doc.write('');
- markerScript = $doc.getElementById(markerId);
-
- // Our script element is assumed to be the closest previous script element
- // to the marker, so start at the marker and walk backwards until we find
- // a script.
- thisScript = markerScript && markerScript.previousSibling;
- while (thisScript && thisScript.tagName != 'SCRIPT') {
- thisScript = thisScript.previousSibling;
+ if ($doc.currentScript) {
+ // document.currentScript is not supported by IE 11.
+ thisScript = $doc.currentScript;
+ } else {
+ // may fail in extension or anywhere else with inability to use document.write
+ $doc.write('');
+ markerScript = $doc.getElementById(markerId);
+
+ // Our script element is assumed to be the closest previous script element
+ // to the marker, so start at the marker and walk backwards until we find
+ // a script.
+ thisScript = markerScript && markerScript.previousSibling;
+ while (thisScript && thisScript.tagName != 'SCRIPT') {
+ thisScript = thisScript.previousSibling;
+ }
}
// Gets the part of a url up to and including the 'path' portion.
diff --git a/dev/core/src/com/google/gwt/dev/javac/BytecodeSignatureMaker.java b/dev/core/src/com/google/gwt/dev/javac/BytecodeSignatureMaker.java
index 762c4228ed8..a70120930ba 100644
--- a/dev/core/src/com/google/gwt/dev/javac/BytecodeSignatureMaker.java
+++ b/dev/core/src/com/google/gwt/dev/javac/BytecodeSignatureMaker.java
@@ -56,7 +56,7 @@ private static class CompileDependencyVisitor extends ClassVisitor {
private Map methods = new HashMap();
public CompileDependencyVisitor() {
- super(Opcodes.ASM7);
+ super(Opcodes.ASM9);
}
public String getSignature() {
diff --git a/dev/core/src/com/google/gwt/dev/javac/CompilationUnit.java b/dev/core/src/com/google/gwt/dev/javac/CompilationUnit.java
index 6f7f003dc0d..0066c2f7628 100644
--- a/dev/core/src/com/google/gwt/dev/javac/CompilationUnit.java
+++ b/dev/core/src/com/google/gwt/dev/javac/CompilationUnit.java
@@ -66,7 +66,7 @@ private static class AnonymousClassVisitor extends EmptyVisitor {
public AnonymousClassVisitor() {
- this.mv = new org.objectweb.asm.MethodVisitor(Opcodes.ASM7, this.mv) {
+ this.mv = new org.objectweb.asm.MethodVisitor(Opcodes.ASM9, this.mv) {
@Override
public void visitCode() {
++sawCode;
diff --git a/dev/core/src/com/google/gwt/dev/javac/asm/CollectAnnotationData.java b/dev/core/src/com/google/gwt/dev/javac/asm/CollectAnnotationData.java
index 95fcc52fc0b..2d26d19d577 100644
--- a/dev/core/src/com/google/gwt/dev/javac/asm/CollectAnnotationData.java
+++ b/dev/core/src/com/google/gwt/dev/javac/asm/CollectAnnotationData.java
@@ -79,7 +79,7 @@ public static class MyAnnotationArrayVisitor extends AnnotationVisitor {
private final List
+ *
+ * The {@link EnumMap#getEnumMapKeyType(java.util.EnumMap)} method can be used to determine the key
+ * type of any {@link java.util.EnumMap}, even if it's empty.
+ */
+class EnumMap
+ *
+ * Use like this:
+ *
+ * Implementation note: If the map passed to {@link #getKeyType(java.util.EnumMap)} is not empty,
+ * the first key is obtained from the {@link EnumMap#keySet() key set} and its type is determined
+ * and returned. If the map is empty, it is serialized into an {@link ObjectOutputStream} writing to
+ * a {@link ByteArrayOutputStream} from which it is read again with a specialized
+ * {@link ObjectInputStream}where the {@code resolveClass} method is overridden. Upon reading a
+ * class descriptor for class {@link java.util.EnumMap}, instead of regularly resolving the class
+ * descriptor a package-protected class {@link com.google.gwt.user.server.rpc.EnumMap} is returned
+ * which has a serial version UID equal to that of {@link java.util.EnumMap} and the same set of
+ * fields. By having the same simple name (despite living in a different package) the
+ * {@link ObjectInputStream} considers this class to be compatible to {@link java.util.EnumMap} and
+ * de-serializes the stream contents into an instance of
+ * {@link com.google.gwt.user.server.rpc.EnumMap} which in turn offers a public getter
+ * {@link com.google.gwt.user.server.rpc.EnumMap#getKeyType()} for the key type. Through this getter
+ * the key type is then determined and returned.
+ *
+ */
+public class EnumMapUtil {
+ private static class MyObjectInputStream extends ObjectInputStream {
+ public MyObjectInputStream(InputStream in) throws IOException {
+ super(in);
+ }
+
+ @Override
+ protected Class resolveClass(ObjectStreamClass desc) throws IOException,
+ ClassNotFoundException {
+ Class result = null;
+ if (desc.getName().equals("java.util.EnumMap")) {
+ result = EnumMap.class;
+ } else {
+ try {
+ result = super.resolveClass(desc);
+ } catch (ClassNotFoundException e) {
+ result = Class.forName(desc.getName(), false, Thread.currentThread()
+ .getContextClassLoader());
+ }
+ }
+ return result;
+ }
+ }
+
+ public static
+ * private static enum MyBoolean {
+ * TRUE, FALSE
+ * };
+ * EnumMap
+ *