");
- }
-
- /**
- * Print <TH ALIGN="align"> tag.
- *
- * @param align the align attribute.
- */
- public void thAlign(String align) {
- print("| ");
- }
-
- /**
- * Print <TH CLASS="stylename" SCOPE="scope" NOWRAP> tag.
- *
- * @param stylename style to be applied.
- * @param scope the scope attribute.
- */
- public void thScopeNoWrap(String stylename, String scope) {
- print(" | ");
- }
-
/*
* Returns a header for Modifier and Type column of a table.
*/
public String getModifierTypeHeader() {
return modifierTypeHeader;
}
-
- /**
- * Print <TH align="align" COLSPAN=i> tag.
- *
- * @param align the align attribute.
- * @param i integer.
- */
- public void thAlignColspan(String align, int i) {
- print(" | ");
- }
-
- /**
- * Print <TH align="align" NOWRAP> tag.
- *
- * @param align the align attribute.
- */
- public void thAlignNowrap(String align) {
- print(" | ");
- }
-
- /**
- * Print </TH> tag. Add a newline character at the end.
- */
- public void thEnd() {
- println(" | ");
- }
-
- /**
- * Print <TD COLSPAN=i> tag.
- *
- * @param i integer.
- */
- public void tdColspan(int i) {
- print("");
- }
-
- /**
- * Print <TD BGCOLOR="color" CLASS="stylename"> tag.
- *
- * @param color String color.
- * @param stylename String stylename.
- */
- public void tdBgcolorStyle(String color, String stylename) {
- print(" | ");
- }
-
- /**
- * Print <TD COLSPAN=i BGCOLOR="color" CLASS="stylename"> tag.
- *
- * @param i integer.
- * @param color String color.
- * @param stylename String stylename.
- */
- public void tdColspanBgcolorStyle(int i, String color, String stylename) {
- print(" | ");
- }
-
- /**
- * Print <TD ALIGN="align"> tag. Adds a newline character
- * at the end.
- *
- * @param align String align.
- */
- public void tdAlign(String align) {
- print(" | ");
- }
-
- /**
- * Print <TD ALIGN="align" CLASS="stylename"> tag.
- *
- * @param align String align.
- * @param stylename String stylename.
- */
- public void tdVAlignClass(String align, String stylename) {
- print(" | ");
- }
-
- /**
- * Print <TD VALIGN="valign"> tag.
- *
- * @param valign String valign.
- */
- public void tdVAlign(String valign) {
- print(" | ");
- }
-
- /**
- * Print <TD ALIGN="align" VALIGN="valign"> tag.
- *
- * @param align String align.
- * @param valign String valign.
- */
- public void tdAlignVAlign(String align, String valign) {
- print(" | ");
- }
-
- /**
- * Print <TD ALIGN="align" ROWSPAN=rowspan> tag.
- *
- * @param align String align.
- * @param rowspan integer rowspan.
- */
- public void tdAlignRowspan(String align, int rowspan) {
- print(" | ");
- }
-
- /**
- * Print <TD ALIGN="align" VALIGN="valign" ROWSPAN=rowspan> tag.
- *
- * @param align String align.
- * @param valign String valign.
- * @param rowspan integer rowspan.
- */
- public void tdAlignVAlignRowspan(String align, String valign,
- int rowspan) {
- print(" | ");
- }
-
- /**
- * Print <BLOCKQUOTE> tag. Add a newline character at the end.
- */
- public void blockquote() {
- println("");
- }
-
- /**
- * Print </BLOCKQUOTE> tag. Add a newline character at the end.
- */
- public void blockquoteEnd() {
- println(" ");
- }
-
- /**
- * Get the "<code>" string.
- *
- * @return String Return String "<code>";
- */
- public String getCode() {
- return "";
- }
-
- /**
- * Get the "</code>" string.
- *
- * @return String Return String "</code>";
- */
- public String getCodeEnd() {
- return "";
- }
-
- /**
- * Print <NOFRAMES> tag. Add a newline character at the end.
- */
- public void noFrames() {
- println("<![CDATA[");
- }
-
- /**
- * Print </NOFRAMES> tag. Add a newline character at the end.
- */
- public void noFramesEnd() {
- println("]]>");
- }
}
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,20 @@
package com.sun.tools.doclets.formats.html.markup;
+import java.io.IOException;
+import java.io.Writer;
+
import com.sun.tools.doclets.internal.toolkit.Content;
import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Class for generating raw HTML content to be added to HTML pages of javadoc output.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Bhavesh Patel
*/
public class RawHtml extends Content{
@@ -82,7 +90,16 @@
/**
* {@inheritDoc}
*/
- public void write(StringBuilder contentBuilder) {
- contentBuilder.append(rawHtmlContent);
+ public String toString() {
+ return rawHtmlContent;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean write(Writer out, boolean atNewline) throws IOException {
+ out.write(rawHtmlContent);
+ return rawHtmlContent.endsWith(DocletConstants.NL);
}
}
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,20 @@
package com.sun.tools.doclets.formats.html.markup;
+import java.io.IOException;
+import java.io.Writer;
+
import com.sun.tools.doclets.internal.toolkit.Content;
import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Class for generating string content for HTML tags of javadoc output.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Bhavesh Patel
*/
public class StringContent extends Content{
@@ -93,7 +101,10 @@
/**
* {@inheritDoc}
*/
- public void write(StringBuilder contentBuilder) {
- contentBuilder.append(stringContent);
+ @Override
+ public boolean write(Writer out, boolean atNewline) throws IOException {
+ String s = stringContent.toString();
+ out.write(s);
+ return s.endsWith(DocletConstants.NL);
}
}
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,18 +25,19 @@
package com.sun.tools.doclets.internal.toolkit;
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.builders.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.javadoc.*;
-import java.util.*;
-import java.io.*;
+import java.io.File;
+import java.util.StringTokenizer;
/**
* An abstract implementation of a Doclet.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API.
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,10 @@
/**
* The interface for writing annotation type optional member output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,9 +31,11 @@
/**
* The interface for writing annotation type required member output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,9 +32,10 @@
/**
* The interface for writing annotation type output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API.
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -152,7 +153,7 @@
*
* @param contentTree content tree that will be printed as a document
*/
- public void printDocument(Content contentTree);
+ public void printDocument(Content contentTree) throws IOException;
/**
* Close the writer.
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,9 +32,10 @@
/**
* The interface for writing class output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -179,7 +180,7 @@
*
* @param contentTree content tree that will be printed as a document
*/
- public void printDocument(Content contentTree);
+ public void printDocument(Content contentTree) throws IOException;
/**
* Close the writer.
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Tue Oct 23 09:42:48 2012 -0700
@@ -25,12 +25,13 @@
package com.sun.tools.doclets.internal.toolkit;
+import java.io.*;
+import java.util.*;
+
+import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.builders.BuilderFactory;
import com.sun.tools.doclets.internal.toolkit.taglets.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.builders.BuilderFactory;
-import com.sun.javadoc.*;
-import java.util.*;
-import java.io.*;
/**
* Configure the output based on the options. Doclets should sub-class
@@ -38,9 +39,10 @@
* all user options which are supported by the 1.1 doclet and the standard
* doclet.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Robert Field.
* @author Atul Dambalkar.
@@ -463,7 +465,7 @@
tagletManager.addNewSimpleCustomTag(tagName, null, "");
} else {
//Create a simple tag with the heading that has the same name as the tag.
- StringBuffer heading = new StringBuffer(tagName + ":");
+ StringBuilder heading = new StringBuilder(tagName + ":");
heading.setCharAt(0, Character.toUpperCase(tagName.charAt(0)));
tagletManager.addNewSimpleCustomTag(tagName, heading.toString(), "a");
}
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,18 @@
package com.sun.tools.doclets.internal.toolkit;
+import java.io.*;
import java.util.*;
-import java.io.*;
+
import com.sun.javadoc.*;
/**
* The interface for writing constants summary output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -137,6 +139,6 @@
*
* @param contentTree content tree which should be printed
*/
- public abstract void printDocument(Content contentTree);
+ public abstract void printDocument(Content contentTree) throws IOException;
}
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,9 +31,10 @@
/**
* The interface for writing constructor output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,20 @@
package com.sun.tools.doclets.internal.toolkit;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+
import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* A class to create content for javadoc output pages.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Bhavesh Patel
*/
public abstract class Content {
@@ -39,10 +48,16 @@
*
* @return string representation of the content
*/
+ @Override
public String toString() {
- StringBuilder contentBuilder = new StringBuilder();
- write(contentBuilder);
- return contentBuilder.toString();
+ StringWriter out = new StringWriter();
+ try {
+ write(out, true);
+ } catch (IOException e) {
+ // cannot happen from StringWriter
+ throw new DocletAbortException();
+ }
+ return out.toString();
}
/**
@@ -60,10 +75,10 @@
public abstract void addContent(String stringContent);
/**
- * Writes content to a StringBuilder.
+ * Writes content to a writer.
*
*/
- public abstract void write(StringBuilder contentBuilder);
+ public abstract boolean write(Writer writer, boolean atNewline) throws IOException ;
/**
* Returns true if the content is empty.
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,9 +31,10 @@
/**
* The interface for writing enum constant output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -56,7 +57,7 @@
* Get the enum constants documentation tree header.
*
* @param enumConstant the enum constant being documented
- * @param enumConstantDetailsTree the content tree representing enum constant details
+ * @param enumConstantsDetailsTree the content tree representing enum constant details
* @return content tree for the enum constant documentation header
*/
public Content getEnumConstantsTreeHeader(FieldDoc enumConstant,
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,9 +31,10 @@
/**
* The interface for writing field output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,9 +32,10 @@
/**
* The interface for writing member summary output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,9 +31,10 @@
/**
* The interface for writing method output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,10 @@
/**
* The interface for writing class output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,17 @@
package com.sun.tools.doclets.internal.toolkit;
+import java.io.*;
+
import com.sun.javadoc.*;
-import java.io.*;
/**
* The interface for writing package summary output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -113,7 +115,7 @@
*
* @param contentTree the content tree that will be printed
*/
- public abstract void printDocument(Content contentTree);
+ public abstract void printDocument(Content contentTree) throws IOException;
/**
* Close the writer.
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,9 +32,10 @@
/**
* The interface for writing serialized form output.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.5
@@ -150,7 +151,7 @@
*
* @param serializedTree the content tree that will be printed
*/
- public abstract void printDocument(Content serializedTree);
+ public abstract void printDocument(Content serializedTree) throws IOException;
/**
* Write the serialized form for a given field.
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,16 @@
package com.sun.tools.doclets.internal.toolkit;
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.javadoc.*;
/**
* The interface for a factory creates writers.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.4
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,13 @@
package com.sun.tools.doclets.internal.toolkit.builders;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import java.io.*;
import java.lang.reflect.*;
import java.util.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
+
/**
* The superclass for all builders. A builder is a class that provides
* the structure and content of API documentation. A builder is completely
@@ -41,9 +42,10 @@
* do is implement the ConstantsSummaryWriter interface and pass it to the
* builder using a WriterFactory.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.5
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,16 +27,16 @@
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import java.util.*;
/**
* The superclass for all member builders. Member builders are only executed
* within Class Builders. They essentially build sub-components. For example,
* method documentation is a sub-component of class documentation.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.5
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,16 +27,18 @@
import java.io.*;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
+
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds the summary for a given annotation type.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -177,7 +179,7 @@
* @param annotationInfoTree the content tree to which the documentation will be added
*/
public void buildAnnotationTypeSignature(XMLNode node, Content annotationInfoTree) {
- StringBuffer modifiers = new StringBuffer(
+ StringBuilder modifiers = new StringBuilder(
annotationTypeDoc.modifiers() + " ");
writer.addAnnotationTypeSignature(Util.replaceText(
modifiers.toString(), "interface", "@interface"), annotationInfoTree);
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,16 +26,18 @@
package com.sun.tools.doclets.internal.toolkit.builders;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
+
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds documentation for optional annotation type members.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,16 +26,18 @@
package com.sun.tools.doclets.internal.toolkit.builders;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
+
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds documentation for required annotation type members.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,17 @@
package com.sun.tools.doclets.internal.toolkit.builders;
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.javadoc.*;
/**
* The factory for constructing builders.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.4
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java Tue Oct 23 09:42:48 2012 -0700
@@ -27,16 +27,18 @@
import java.io.*;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
+
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds the summary for a given class.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -280,18 +282,18 @@
* @param classInfoTree the content tree to which the documentation will be added
*/
public void buildClassSignature(XMLNode node, Content classInfoTree) {
- StringBuffer modifiers = new StringBuffer(classDoc.modifiers() + " ");
+ StringBuilder modifiers = new StringBuilder(classDoc.modifiers() + " ");
if (isEnum) {
modifiers.append("enum ");
int index;
if ((index = modifiers.indexOf("abstract")) >= 0) {
- modifiers.delete(index, index + (new String("abstract")).length());
- modifiers = new StringBuffer(
+ modifiers.delete(index, index + "abstract".length());
+ modifiers = new StringBuilder(
Util.replaceText(modifiers.toString(), " ", " "));
}
if ((index = modifiers.indexOf("final")) >= 0) {
- modifiers.delete(index, index + (new String("final")).length());
- modifiers = new StringBuffer(
+ modifiers.delete(index, index + "final".length());
+ modifiers = new StringBuilder(
Util.replaceText(modifiers.toString(), " ", " "));
}
//} else if (classDoc.isAnnotationType()) {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,16 +27,18 @@
import java.io.*;
import java.util.*;
+
import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.*;
/**
* Builds the Constants Summary Page.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -345,7 +347,6 @@
/**
* Return the list of visible constant fields for the given classdoc.
- * @param cd the classdoc to examine.
* @return the list of visible constant fields for the given classdoc.
*/
protected List members() {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,16 +26,18 @@
package com.sun.tools.doclets.internal.toolkit.builders;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
+
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds documentation for a constructor.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,16 +26,18 @@
package com.sun.tools.doclets.internal.toolkit.builders;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
+
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds documentation for a enum constants.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,16 +26,18 @@
package com.sun.tools.doclets.internal.toolkit.builders;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
+
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds documentation for a field.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,18 +24,26 @@
*/
package com.sun.tools.doclets.internal.toolkit.builders;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import java.io.*;
import java.util.*;
+
+import javax.xml.parsers.*;
+
import org.xml.sax.*;
import org.xml.sax.helpers.DefaultHandler;
-import javax.xml.parsers.*;
+
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Parse the XML that specified the order of operation for the builders. This
* Parser uses SAX parsing.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Jamie Ho
* @since 1.5
* @see SAXParser
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,16 +26,18 @@
package com.sun.tools.doclets.internal.toolkit.builders;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
+
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds the member summary.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
@@ -165,7 +167,6 @@
* This information can be used for doclet specific documentation
* generation.
*
- * @param classDoc the {@link ClassDoc} we want to check.
* @param type the type of members to return.
* @return a list of methods that will be documented.
* @see VisibleMemberMap
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,16 +26,18 @@
package com.sun.tools.doclets.internal.toolkit.builders;
import java.util.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
+
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
/**
* Builds documentation for a method.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,16 +26,18 @@
package com.sun.tools.doclets.internal.toolkit.builders;
import java.io.*;
+
import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.*;
/**
* Builds the summary for a given package.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,16 +27,18 @@
import java.io.*;
import java.util.*;
+
import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.tools.doclets.internal.toolkit.*;
/**
* Builds the serialized form.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Bhavesh Patel (Modified)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,11 @@
/**
* Simple class to represent the attribute and elements of an XML node.
+ *
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*/
public class XMLNode {
XMLNode(XMLNode parent, String qname) {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,10 @@
* An abstract class for that implements the {@link Taglet} interface
* for tags in ExecutableMembers.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API.
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.4
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,9 +28,10 @@
/**
* An abstract inline taglet that outputs HTML.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.4
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,15 @@
package com.sun.tools.doclets.internal.toolkit.taglets;
-import com.sun.tools.doclets.internal.toolkit.util.*;
import com.sun.javadoc.*;
/**
* An abstract class for that implements the {@link Taglet} interface.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.4
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,11 @@
* displays as:
* The type {@code List}
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Scott Seligman
* @since 1.5
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,10 @@
/**
* A taglet that represents the @deprecated tag.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.5
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,9 +32,10 @@
* used to get the relative path to the document's root output
* directory.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @author Doug Kramer
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,9 +33,10 @@
* be used with a method. It is used to inherit documentation from overriden
* and implemented methods.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.4
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,11 @@
* A taglet should implement this interface if it supports the inheritDoc
* tag or is automatically inherited if it is missing.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Jamie Ho
* @since 1.5
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,9 +36,10 @@
* This taglet is able to wrap most most legacy taglets because
* the standard doclet is the only known doclet to use legacy taglets.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @since 1.5
* @author Jamie Ho
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,11 @@
* displays as:
* {@literal ac}
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Scott Seligman
* @since 1.5
*/
@@ -79,7 +84,7 @@
* Replace occurrences of the following characters: < > &
*/
protected static String textToString(String text) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
for (int i = 0; i < text.length(); i++) {
char c = text.charAt(i);
switch (c) {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,18 @@
package com.sun.tools.doclets.internal.toolkit.taglets;
+import java.util.*;
+
import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import java.util.*;
/**
* A taglet that represents the @param tag.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.4
@@ -182,7 +184,7 @@
* Given an array of ParamTags,return its string representation.
* Try to inherit the param tags that are missing.
*
- * @param doc the doc that holds the param tags.
+ * @param holder the doc that holds the param tags.
* @param writer the TagletWriter that will write this tag.
* @param formalParameters The array of parmeters (from type or executable
* member) to check.
@@ -255,7 +257,7 @@
* been documented.
* @param rankMap a {@link java.util.Map} which holds ordering
* information about the parameters.
- * @param nameMap a {@link java.util.Map} which holds a mapping
+ * @param rankMap a {@link java.util.Map} which holds a mapping
* of a rank of a parameter to its name. This is
* used to ensure that the right name is used
* when parameter documentation is inherited.
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,16 @@
package com.sun.tools.doclets.internal.toolkit.taglets;
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.javadoc.*;
/**
* A taglet that represents the @return tag.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.4
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,16 @@
package com.sun.tools.doclets.internal.toolkit.taglets;
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.javadoc.*;
/**
* A taglet that represents the @see tag.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.4
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,10 @@
/**
* A simple single argument custom tag.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java Tue Oct 23 09:42:48 2012 -0700
@@ -25,20 +25,21 @@
package com.sun.tools.doclets.internal.toolkit.taglets;
-import com.sun.javadoc.*;
-import com.sun.tools.doclets.internal.toolkit.util.*;
-
import java.io.*;
import java.lang.reflect.*;
import java.net.*;
import java.util.*;
+import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
+
/**
* Manages theTaglets used by doclets.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.4
@@ -448,7 +449,7 @@
//This known tag is excluded.
return;
}
- StringBuffer combined_locations = new StringBuffer();
+ StringBuilder combined_locations = new StringBuilder();
for (int i = 0; i < locations.length; i++) {
if (i > 0) {
combined_locations.append(", ");
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletOutput.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletOutput.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletOutput.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,11 @@
* different doclets work with different formats of output. A single taglet can
* work with any doclet that provides an implementation of taglet output.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Jamie Ho
* @since 1.5
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,18 @@
package com.sun.tools.doclets.internal.toolkit.taglets;
+import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import com.sun.javadoc.*;
/**
* The interface for the taglet writer.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @since 1.5
* @author Jamie Ho
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,18 @@
package com.sun.tools.doclets.internal.toolkit.taglets;
+import java.util.*;
+
import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import java.util.*;
/**
* A taglet that represents the @throws tag.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.4
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,11 @@
package com.sun.tools.doclets.internal.toolkit.taglets;
+import java.util.*;
+
import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.Configuration;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import java.util.*;
/**
* An inline Taglet representing the value tag. This tag should only be used with
@@ -39,9 +40,10 @@
* is retrieved for the field that the inline tag appears on. The name is specifed
* in the following format: [fully qualified class name]#[constant field name].
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.4
@@ -107,7 +109,7 @@
* @param config the current configuration of the doclet.
* @param tag the value tag.
* @param name the name of the field to search for. The name should be in
- * # format. If the class name is omitted,
+ * {@code #} format. If the class name is omitted,
* it is assumed that the field is in the current class.
*
* @return the corresponding FieldDoc. If the name is null or empty string,
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,9 +36,10 @@
* those classes so that we can retrieve all of the classes from a particular
* package later.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.4
@@ -184,7 +185,7 @@
/**
* Return all of the classes specified on the command-line that
* belong to the given package.
- * @param packageDoc the package to return the classes for.
+ * @param pkgDoc the package to return the classes for.
*/
public ClassDoc[] allClasses(PackageDoc pkgDoc) {
return pkgDoc.isIncluded() ?
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,19 @@
package com.sun.tools.doclets.internal.toolkit.util;
-import com.sun.tools.doclets.internal.toolkit.*;
+import java.util.*;
+
import com.sun.javadoc.*;
-import java.util.*;
+import com.sun.tools.doclets.internal.toolkit.*;
/**
* Build Class Hierarchy for all the Classes. This class builds the Class
* Tree and the Interface Tree separately.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @see java.util.HashMap
* @see java.util.List
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,17 @@
package com.sun.tools.doclets.internal.toolkit.util;
+import java.util.*;
+
import com.sun.javadoc.*;
-import java.util.*;
/**
* Map all class uses for a given class.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @since 1.2
* @author Robert G. Field
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/CommentedMethodFinder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/CommentedMethodFinder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/CommentedMethodFinder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,10 @@
/**
* Find a commented method.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
*/
public class CommentedMethodFinder extends MethodFinder {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,19 @@
package com.sun.tools.doclets.internal.toolkit.util;
+import java.util.*;
+
import com.sun.javadoc.*;
-import java.util.*;
import com.sun.tools.doclets.internal.toolkit.Configuration;
/**
* Build list of all the deprecated packages, classes, constructors, fields and methods.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Atul M Dambalkar
*/
public class DeprecatedAPIListBuilder {
@@ -145,7 +151,7 @@
/**
* Return the list of deprecated Doc objects of a given type.
*
- * @param the constant representing the type of list being returned.
+ * @param type the constant representing the type of list being returned.
*/
public List getList(int type) {
return deprecatedLists.get(type);
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -119,7 +119,7 @@
if (packageName == null || packageName.length() == 0) {
return "";
}
- StringBuffer pathstr = new StringBuffer();
+ StringBuilder pathstr = new StringBuilder();
for (int i = 0; i < packageName.length(); i++) {
char ch = packageName.charAt(i);
if (ch == '.') {
@@ -151,7 +151,7 @@
if (name == null || name.length() == 0) {
return "";
}
- StringBuffer pathstr = new StringBuffer();
+ StringBuilder pathstr = new StringBuilder();
for (int i = 0; i < name.length(); i++) {
char ch = name.charAt(i);
if (ch == '.') {
@@ -181,7 +181,7 @@
* @see #getPath(String)
*/
public static String getRelativePath(String from, String to) {
- StringBuffer pathstr = new StringBuffer();
+ StringBuilder pathstr = new StringBuilder();
pathstr.append(getRelativePath(from));
pathstr.append(getPath(to));
pathstr.append(URL_FILE_SEPARATOR);
@@ -222,7 +222,7 @@
if (from == null || from.length() == 0) {
return "";
}
- StringBuffer pathstr = new StringBuffer();
+ StringBuilder pathstr = new StringBuilder();
for (int i = 0; i < from.length(); i++) {
char ch = from.charAt(i);
if (ch == '.') {
@@ -293,7 +293,7 @@
* @param filename File name to be appended to the path of the package.
*/
public static String getPathToPackage(PackageDoc pd, String filename) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
String pathstr = createPathString(pd);
if (pathstr.length() > 0) {
buf.append(pathstr);
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,19 @@
package com.sun.tools.doclets.internal.toolkit.util;
+import java.util.*;
+
import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.taglets.*;
-import java.util.*;
/**
* Search for the requested documentation. Inherit documentation if necessary.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Jamie Ho
* @since 1.5
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,12 @@
package com.sun.tools.doclets.internal.toolkit.util;
+/**
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
public class DocletAbortException extends RuntimeException {
private static final long serialVersionUID = -9131058909576418984L;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,10 @@
* Stores all constants for a Doclet. Extend this class if you have doclet
* specific constants to add.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.5
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,13 @@
package com.sun.tools.doclets.internal.toolkit.util;
-import com.sun.tools.doclets.internal.toolkit.*;
+import java.io.*;
+import java.net.*;
+import java.util.HashMap;
+import java.util.Map;
import com.sun.javadoc.*;
-import java.util.Map;
-import java.util.HashMap;
-import java.io.*;
-import java.net.*;
+import com.sun.tools.doclets.internal.toolkit.*;
/**
* Process and manage "-link" and "-linkoffline" to external packages. The
@@ -40,9 +40,10 @@
* documented) file in the current or the destination directory, while
* generating the documentation.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Atul M Dambalkar
* @author Robert Field
@@ -91,7 +92,7 @@
* If the same package name is found in the map, then the first mapped
* Item object or offline location will be retained.
*
- * @param packagename Package name found in the "package-list" file.
+ * @param packageName Package name found in the "package-list" file.
* @param path URL or Directory path from where the "package-list"
* file is picked.
* @param relative True if path is URL, false if directory path.
@@ -179,7 +180,7 @@
/**
* Get the Extern Item object associated with this package name.
*
- * @param pkgname Package name.
+ * @param pkgName Package name.
*/
private Item findPackageItem(String pkgName) {
if (packageToItemMap == null) {
@@ -276,7 +277,7 @@
boolean relative)
throws IOException {
BufferedReader in = new BufferedReader(new InputStreamReader(input));
- StringBuffer strbuf = new StringBuffer();
+ StringBuilder strbuf = new StringBuilder();
try {
int c;
while ((c = in.read()) >= 0) {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,10 @@
package com.sun.tools.doclets.internal.toolkit.util;
-import com.sun.tools.doclets.internal.toolkit.*;
+import java.util.*;
+
import com.sun.javadoc.*;
-import java.util.*;
+import com.sun.tools.doclets.internal.toolkit.*;
/**
* Process and manage grouping of packages, as specified by "-group" option on
@@ -48,9 +49,10 @@
* will put the package java.lang in the group "Lang" and not in group "Core".
*
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Atul M Dambalkar
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,19 @@
package com.sun.tools.doclets.internal.toolkit.util;
+import java.util.*;
+
import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.Configuration;
-import java.util.*;
/**
* For a given class method, build an array of interface methods which it
* implements.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Atul M Dambalkar
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,10 @@
package com.sun.tools.doclets.internal.toolkit.util;
-import com.sun.tools.doclets.internal.toolkit.*;
+import java.util.*;
+
import com.sun.javadoc.*;
-import java.util.*;
+import com.sun.tools.doclets.internal.toolkit.*;
/**
* Build the mapping of each Unicode character with it's member lists
@@ -35,9 +36,10 @@
* Unicode characters which start a member name. Member name is
* classkind or field or method or constructor name.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @since 1.2
* @see java.lang.Character
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,18 +24,20 @@
*/
package com.sun.tools.doclets.internal.toolkit.util;
+import java.text.MessageFormat;
+import java.util.*;
+
import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.Configuration;
-import java.util.*;
-import java.text.MessageFormat;
/**
* Retrieve and format messages stored in a resource.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @since 1.2
* @author Atul M Dambalkar
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,10 @@
package com.sun.tools.doclets.internal.toolkit.util;
-import com.sun.tools.doclets.internal.toolkit.*;
+import java.util.*;
+
import com.sun.javadoc.*;
-import java.util.*;
+import com.sun.tools.doclets.internal.toolkit.*;
/**
* Provides methods for creating an array of class, method and
@@ -35,9 +36,10 @@
* of class pages. These keywords improve search results
* on browsers that look for keywords.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Doug Kramer
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodFinder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodFinder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodFinder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,9 +33,10 @@
* superclasses and interfaces(subsequently super-interfaces also)
* recursively.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API.
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*/
public abstract class MethodFinder {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,19 @@
package com.sun.tools.doclets.internal.toolkit.util;
-import com.sun.tools.doclets.internal.toolkit.*;
-import com.sun.javadoc.*;
import java.io.*;
import java.util.*;
+import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+
/**
* Write out the package index.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @see com.sun.javadoc.PackageDoc
* @author Atul M Dambalkar
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TaggedMethodFinder.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TaggedMethodFinder.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TaggedMethodFinder.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,10 @@
/**
* Find a tagged method.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Atul M Dambalkar
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,10 @@
* A tag that holds nothing but plain text. This is useful for passing
* text to methods that only accept inline tags as a parameter.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Jamie Ho
* @since 1.5
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,9 +34,10 @@
/**
* Utilities Class for Doclets.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Atul M Dambalkar
* @author Jamie Ho
@@ -366,7 +367,13 @@
while((n = in.read(buf))>0) out.write(buf,0,n);
} else {
BufferedReader reader = new BufferedReader(new InputStreamReader(in));
- BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out));
+ BufferedWriter writer;
+ if (configuration.docencoding == null) {
+ writer = new BufferedWriter(new OutputStreamWriter(out));
+ } else {
+ writer = new BufferedWriter(new OutputStreamWriter(out,
+ configuration.docencoding));
+ }
try {
String line;
while ((line = reader.readLine()) != null) {
@@ -643,9 +650,9 @@
fos = new FileOutputStream(filename);
}
if (docencoding == null) {
- return new OutputStreamWriter(fos);
+ return new BufferedWriter(new OutputStreamWriter(fos));
} else {
- return new OutputStreamWriter(fos, docencoding);
+ return new BufferedWriter(new OutputStreamWriter(fos, docencoding));
}
}
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,10 @@
package com.sun.tools.doclets.internal.toolkit.util;
+import java.util.*;
+
import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
-import java.util.*;
/**
* A data structure that encapsulates the visible members of a particular
@@ -36,9 +37,10 @@
* or method) and the leaf of the class tree. The data structure will map
* all visible members in the leaf and classes above the leaf in the tree.
*
- * This code is not part of an API.
- * It is implementation that is subject to change.
- * Do not use it as an API
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @author Atul M Dambalkar
* @author Jamie Ho (rewrite)
@@ -125,7 +127,7 @@
* Return the package private members inherited by the class. Only return
* if parent is package private and not documented.
*
- * @param configuation the current configuration of the doclet.
+ * @param configuration the current configuration of the doclet.
* @return the package private members inherited by the class.
*/
private List getInheritedPackagePrivateMethods(Configuration configuration) {
@@ -148,7 +150,7 @@
* end of the list members that are inherited by inaccessible parents. We
* document these members in the child because the parent is not documented.
*
- * @param configuation the current configuration of the doclet.
+ * @param configuration the current configuration of the doclet.
*/
public List getLeafClassMembers(Configuration configuration) {
List result = getMembersFor(classdoc);
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,11 @@
/**
* A factory that constructs links from given link information.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Jamie Ho
* @since 1.5
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,11 @@
/**
* Encapsulates information about a link.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Jamie Ho
* @since 1.5
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,11 @@
/**
* Stores output of a link.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Jamie Ho
* @since 1.5
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/api/BasicJavacTask.java
--- a/langtools/src/share/classes/com/sun/tools/javac/api/BasicJavacTask.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/BasicJavacTask.java Tue Oct 23 09:42:48 2012 -0700
@@ -26,6 +26,7 @@
package com.sun.tools.javac.api;
import java.io.IOException;
+import java.util.Collection;
import java.util.Locale;
import javax.annotation.processing.Processor;
@@ -43,7 +44,6 @@
import com.sun.tools.javac.model.JavacTypes;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.util.Context;
-import java.util.Collection;
/**
* Provides basic functionality for implementations of JavacTask.
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java
--- a/langtools/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -138,7 +138,7 @@
/**
* Configure the set of diagnostic parts that should be displayed
* by the formatter.
- * @param options options to set
+ * @param visibleParts the parts to be set
*/
public void setVisible(Set visibleParts);
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -66,7 +66,7 @@
* Constructor used by service provider mechanism. The recommended way to
* obtain an instance of this class is by using {@link #create} or the
* service provider mechanism.
- * @see javax.tools.JavaCompilerTool
+ * @see javax.tools.JavaCompiler
* @see javax.tools.ToolProvider
* @see #create
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Tue Oct 23 09:42:48 2012 -0700
@@ -60,8 +60,8 @@
import com.sun.tools.javac.comp.MemberEnter;
import com.sun.tools.javac.comp.Resolve;
import com.sun.tools.javac.model.JavacElements;
+import com.sun.tools.javac.processing.JavacProcessingEnvironment;
import com.sun.tools.javac.tree.EndPosTable;
-import com.sun.tools.javac.processing.JavacProcessingEnvironment;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.tree.TreeCopier;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java
--- a/langtools/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,8 +31,9 @@
import java.util.Collections;
import java.util.List;
import java.util.Set;
+
+import javax.tools.*;
import javax.tools.JavaFileObject.Kind;
-import javax.tools.*;
/**
* Wraps all calls to a given file manager. Subclasses of this class
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/code/Annotations.java
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Annotations.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Annotations.java Tue Oct 23 09:42:48 2012 -0700
@@ -26,18 +26,18 @@
package com.sun.tools.javac.code;
import java.util.Map;
+
import javax.tools.JavaFileObject;
import com.sun.tools.javac.comp.Annotate;
import com.sun.tools.javac.comp.AttrContext;
import com.sun.tools.javac.comp.Env;
+import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.Assert;
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.util.Pair;
-
import static com.sun.tools.javac.code.Kinds.PCK;
-import com.sun.tools.javac.util.*;
/**
* Container for all annotations (attributes in javac) on a Symbol.
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java
--- a/langtools/src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,8 +30,8 @@
import com.sun.tools.javac.util.Assert;
import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
import com.sun.tools.javac.util.ListBuffer;
-import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
/**
*
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/code/Flags.java
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java Tue Oct 23 09:42:48 2012 -0700
@@ -25,10 +25,11 @@
package com.sun.tools.javac.code;
+import java.util.Collections;
import java.util.EnumSet;
-import java.util.Collections;
import java.util.Map;
import java.util.Set;
+
import javax.lang.model.element.Modifier;
/** Access flags and other modifiers for Java classes and members.
@@ -66,6 +67,7 @@
if ((mask&NATIVE) != 0) flags.add(Flag.NATIVE);
if ((mask&INTERFACE) != 0) flags.add(Flag.INTERFACE);
if ((mask&ABSTRACT) != 0) flags.add(Flag.ABSTRACT);
+ if ((mask&DEFAULT) != 0) flags.add(Flag.DEFAULT);
if ((mask&STRICTFP) != 0) flags.add(Flag.STRICTFP);
if ((mask&BRIDGE) != 0) flags.add(Flag.BRIDGE);
if ((mask&SYNTHETIC) != 0) flags.add(Flag.SYNTHETIC);
@@ -251,6 +253,11 @@
*/
public static final long CLASH = 1L<<42;
+ /**
+ * Flag that marks either a default method or an interface containing default methods
+ */
+ public static final long DEFAULT = 1L<<43;
+
/** Modifier masks.
*/
public static final int
@@ -266,7 +273,10 @@
MethodFlags = AccessFlags | ABSTRACT | STATIC | NATIVE |
SYNCHRONIZED | FINAL | STRICTFP;
public static final long
- LocalVarFlags = FINAL | PARAMETER;
+ ExtendedStandardFlags = (long)StandardFlags | DEFAULT,
+ InterfaceDefaultMethodMask = ABSTRACT | PUBLIC | STRICTFP | SYNCHRONIZED | DEFAULT,
+ LocalVarFlags = FINAL | PARAMETER;
+
public static Set asModifierSet(long flags) {
Set modifiers = modifierSets.get(flags);
@@ -319,6 +329,7 @@
NATIVE("native"),
INTERFACE("interface"),
ABSTRACT("abstract"),
+ DEFAULT("default"),
STRICTFP("strictfp"),
BRIDGE("bridge"),
SYNTHETIC("synthetic"),
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/code/Kinds.java
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Kinds.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Kinds.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,9 +31,8 @@
import com.sun.source.tree.MemberReferenceTree;
import com.sun.tools.javac.api.Formattable;
import com.sun.tools.javac.api.Messages;
-
+import static com.sun.tools.javac.code.Flags.*;
import static com.sun.tools.javac.code.TypeTags.*;
-import static com.sun.tools.javac.code.Flags.*;
/** Internal symbol kinds, which distinguish between elements of
* different subclasses of Symbol. Symbol kinds are organized so they can be
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/code/Printer.java
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,18 +28,13 @@
import java.util.Locale;
import com.sun.tools.javac.api.Messages;
+import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.code.Type.*;
-import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.comp.DeferredAttr.DeferredType;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.Pretty;
-import com.sun.tools.javac.util.Assert;
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.ListBuffer;
-
-import static com.sun.tools.javac.code.TypeTags.*;
import static com.sun.tools.javac.code.BoundKind.*;
import static com.sun.tools.javac.code.Flags.*;
+import static com.sun.tools.javac.code.TypeTags.*;
/**
* A combined type/symbol visitor for generating non-trivial localized string
@@ -129,7 +124,7 @@
/**
* Get a localized string represenation for a given type.
*
- * @param ts type to be displayed
+ * @param t type to be displayed
* @param locale the locale in which the string is to be rendered
* @return localized string representation
*/
@@ -140,7 +135,7 @@
/**
* Get a localized string represenation for a given symbol.
*
- * @param ts symbol to be displayed
+ * @param s symbol to be displayed
* @param locale the locale in which the string is to be rendered
* @return localized string representation
*/
@@ -187,7 +182,7 @@
@Override
public String visitClassType(ClassType t, Locale locale) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
if (t.getEnclosingType().tag == CLASS && t.tsym.owner.kind == Kinds.TYP) {
buf.append(visit(t.getEnclosingType(), locale));
buf.append(".");
@@ -215,7 +210,7 @@
@Override
public String visitWildcardType(WildcardType t, Locale locale) {
- StringBuffer s = new StringBuffer();
+ StringBuilder s = new StringBuilder();
s.append(t.kind);
if (t.kind != UNBOUND) {
s.append(visit(t.type, locale));
@@ -253,7 +248,7 @@
protected String className(ClassType t, boolean longform, Locale locale) {
Symbol sym = t.tsym;
if (sym.name.length() == 0 && (sym.flags() & COMPOUND) != 0) {
- StringBuffer s = new StringBuffer(visit(t.supertype_field, locale));
+ StringBuilder s = new StringBuilder(visit(t.supertype_field, locale));
for (List is = t.interfaces_field; is.nonEmpty(); is = is.tail) {
s.append("&");
s.append(visit(is.head, locale));
@@ -292,7 +287,7 @@
if (!varArgs) {
return visitTypes(args, locale);
} else {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
while (args.tail.nonEmpty()) {
buf.append(visit(args.head, locale));
args = args.tail;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/code/Scope.java
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,9 @@
package com.sun.tools.javac.code;
+import java.util.Iterator;
+
import com.sun.tools.javac.util.*;
-import java.util.Iterator;
/** A scope represents an area of visibility in a Java program. The
* Scope class is a container for symbols which provides
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/code/Source.java
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Source.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Source.java Tue Oct 23 09:42:48 2012 -0700
@@ -26,12 +26,12 @@
package com.sun.tools.javac.code;
import java.util.*;
+
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
+import com.sun.tools.javac.jvm.Target;
import com.sun.tools.javac.util.*;
-import com.sun.tools.javac.jvm.Target;
-
import static com.sun.tools.javac.main.Option.*;
/** The source language version accepted.
@@ -203,6 +203,9 @@
public boolean allowMethodReferences() {
return compareTo(JDK1_8) >= 0;
}
+ public boolean allowDefaultMethods() {
+ return compareTo(JDK1_8) >= 0;
+ }
public boolean allowEffectivelyFinalInInnerClasses() {
return compareTo(JDK1_8) >= 0;
}
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java Tue Oct 23 09:42:48 2012 -0700
@@ -27,11 +27,10 @@
import java.util.Set;
import java.util.concurrent.Callable;
+
import javax.lang.model.element.*;
import javax.tools.JavaFileObject;
-import com.sun.tools.javac.util.*;
-import com.sun.tools.javac.util.Name;
import com.sun.tools.javac.code.Type.*;
import com.sun.tools.javac.comp.Attr;
import com.sun.tools.javac.comp.AttrContext;
@@ -39,7 +38,8 @@
import com.sun.tools.javac.jvm.*;
import com.sun.tools.javac.model.*;
import com.sun.tools.javac.tree.JCTree;
-
+import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.util.Name;
import static com.sun.tools.javac.code.Flags.*;
import static com.sun.tools.javac.code.Kinds.*;
import static com.sun.tools.javac.code.TypeTags.*;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java Tue Oct 23 09:42:48 2012 -0700
@@ -26,17 +26,17 @@
package com.sun.tools.javac.code;
import java.util.*;
-import javax.lang.model.type.TypeVisitor;
-import javax.lang.model.element.ElementVisitor;
-import com.sun.tools.javac.util.*;
-import com.sun.tools.javac.util.List;
+import javax.lang.model.element.ElementVisitor;
+import javax.lang.model.type.TypeVisitor;
+
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.code.Type.*;
import com.sun.tools.javac.jvm.*;
-
+import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.util.List;
+import static com.sun.tools.javac.code.Flags.*;
import static com.sun.tools.javac.jvm.ByteCodes.*;
-import static com.sun.tools.javac.code.Flags.*;
/** A class that defines all predefined constants and operators
* as well as special classes such as java.lang.Object, which need
@@ -301,7 +301,7 @@
}
/** Enter a class into symbol table.
- * @param The name of the class.
+ * @param s The name of the class.
*/
private Type enterClass(String s) {
return reader.enterClass(names.fromString(s)).type;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/code/TargetType.java
--- a/langtools/src/share/classes/com/sun/tools/javac/code/TargetType.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/TargetType.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,11 @@
package com.sun.tools.javac.code;
-import static com.sun.tools.javac.code.TargetType.TargetAttribute.*;
-
import java.util.EnumSet;
import java.util.Set;
+import static com.sun.tools.javac.code.TargetType.TargetAttribute.*;
+
/**
* Describes the type of program element an extended annotation (or extended
* compound attribute) targets.
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/code/Type.java
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Type.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Type.java Tue Oct 23 09:42:48 2012 -0700
@@ -26,10 +26,6 @@
package com.sun.tools.javac.code;
import java.util.Collections;
-
-import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.util.*;
-
import java.util.EnumMap;
import java.util.EnumSet;
import java.util.Map;
@@ -37,6 +33,8 @@
import javax.lang.model.type.*;
+import com.sun.tools.javac.code.Symbol.*;
+import com.sun.tools.javac.util.*;
import static com.sun.tools.javac.code.BoundKind.*;
import static com.sun.tools.javac.code.Flags.*;
import static com.sun.tools.javac.code.Kinds.*;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/code/TypeTags.java
--- a/langtools/src/share/classes/com/sun/tools/javac/code/TypeTags.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/TypeTags.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -106,7 +106,7 @@
*/
public static final int DEFERRED = FORALL+1;
- /** The tag of the bottom type .
+ /** The tag of the bottom type {@code }.
*/
public static final int BOT = DEFERRED+1;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/code/Types.java
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Tue Oct 23 09:42:48 2012 -0700
@@ -28,21 +28,19 @@
import java.lang.ref.SoftReference;
import java.util.*;
-import com.sun.tools.javac.util.*;
-import com.sun.tools.javac.util.List;
-
-import com.sun.tools.javac.jvm.ClassReader;
import com.sun.tools.javac.code.Attribute.RetentionPolicy;
import com.sun.tools.javac.code.Lint.LintCategory;
import com.sun.tools.javac.code.Type.UndetVar.InferenceBound;
import com.sun.tools.javac.comp.Check;
-
+import com.sun.tools.javac.jvm.ClassReader;
+import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.util.List;
+import static com.sun.tools.javac.code.BoundKind.*;
+import static com.sun.tools.javac.code.Flags.*;
import static com.sun.tools.javac.code.Scope.*;
+import static com.sun.tools.javac.code.Symbol.*;
import static com.sun.tools.javac.code.Type.*;
import static com.sun.tools.javac.code.TypeTags.*;
-import static com.sun.tools.javac.code.Symbol.*;
-import static com.sun.tools.javac.code.Flags.*;
-import static com.sun.tools.javac.code.BoundKind.*;
import static com.sun.tools.javac.util.ListBuffer.lb;
/**
@@ -1429,8 +1427,8 @@
* conservative in that it is allowed to say that two types are
* not disjoint, even though they actually are.
*
- * The type C is castable to C exactly if X and Y are not
- * disjoint.
+ * The type {@code C} is castable to {@code C} exactly if
+ * {@code X} and {@code Y} are not disjoint.
*/
public boolean disjointType(Type t, Type s) {
return disjointType.visit(t, s);
@@ -1525,7 +1523,7 @@
* something of type `t' can be a subtype of `s'? This is
* different from the question "is `t' not a subtype of `s'?"
* when type variables are involved: Integer is not a subtype of T
- * where but it is not true that Integer cannot
+ * where {@code } but it is not true that Integer cannot
* possibly be a subtype of T.
*/
public boolean notSoftSubtype(Type t, Type s) {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Tue Oct 23 09:42:48 2012 -0700
@@ -25,34 +25,32 @@
package com.sun.tools.javac.comp;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.comp.DeferredAttr.AttrMode;
-import com.sun.tools.javac.comp.Infer.InferenceContext;
-import com.sun.tools.javac.comp.Infer.InferenceContext.FreeTypeListener;
-import com.sun.tools.javac.jvm.*;
-import com.sun.tools.javac.tree.*;
-import com.sun.tools.javac.util.*;
-import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
-import com.sun.tools.javac.util.List;
-
-import com.sun.tools.javac.jvm.Target;
-import com.sun.tools.javac.code.Lint.LintCategory;
-import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.tree.JCTree.*;
-import com.sun.tools.javac.code.Type.*;
-import com.sun.tools.javac.comp.Check.CheckContext;
+import java.util.*;
+import java.util.Set;
+
+import javax.lang.model.element.ElementKind;
+import javax.tools.JavaFileObject;
import com.sun.source.tree.IdentifierTree;
import com.sun.source.tree.MemberReferenceTree.ReferenceMode;
import com.sun.source.tree.MemberSelectTree;
import com.sun.source.tree.TreeVisitor;
import com.sun.source.util.SimpleTreeVisitor;
-
-import java.util.*;
-import java.util.Set;
-import javax.lang.model.element.ElementKind;
-import javax.tools.JavaFileObject;
-
+import com.sun.tools.javac.code.*;
+import com.sun.tools.javac.code.Lint.LintCategory;
+import com.sun.tools.javac.code.Symbol.*;
+import com.sun.tools.javac.code.Type.*;
+import com.sun.tools.javac.comp.Check.CheckContext;
+import com.sun.tools.javac.comp.DeferredAttr.AttrMode;
+import com.sun.tools.javac.comp.Infer.InferenceContext;
+import com.sun.tools.javac.comp.Infer.InferenceContext.FreeTypeListener;
+import com.sun.tools.javac.jvm.*;
+import com.sun.tools.javac.jvm.Target;
+import com.sun.tools.javac.tree.*;
+import com.sun.tools.javac.tree.JCTree.*;
+import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
+import com.sun.tools.javac.util.List;
import static com.sun.tools.javac.code.Flags.*;
import static com.sun.tools.javac.code.Flags.ANNOTATION;
import static com.sun.tools.javac.code.Flags.BLOCK;
@@ -742,7 +740,7 @@
* @param env The env for the const value
* @param initializer The initializer for the const value
* @param type The expected type, or null
- * @see VarSymbol#setlazyConstValue
+ * @see VarSymbol#setLazyConstValue
*/
public Object attribLazyConstantValue(Env env,
JCTree.JCExpression initializer,
@@ -875,6 +873,7 @@
public void visitMethodDef(JCMethodDecl tree) {
MethodSymbol m = tree.sym;
+ boolean isDefaultMethod = (m.flags() & DEFAULT) != 0;
Lint lint = env.info.lint.augment(m.annotations, m.flags());
Lint prevLint = chk.setLint(lint);
@@ -954,8 +953,8 @@
// Empty bodies are only allowed for
// abstract, native, or interface methods, or for methods
// in a retrofit signature class.
- if ((owner.flags() & INTERFACE) == 0 &&
- (tree.mods.flags & (ABSTRACT | NATIVE)) == 0 &&
+ if (isDefaultMethod || ((owner.flags() & INTERFACE) == 0 &&
+ (tree.mods.flags & (ABSTRACT | NATIVE)) == 0) &&
!relax)
log.error(tree.pos(), "missing.meth.body.or.decl.abstract");
if (tree.defaultValue != null) {
@@ -963,7 +962,7 @@
log.error(tree.pos(),
"default.allowed.in.intf.annotation.member");
}
- } else if ((owner.flags() & INTERFACE) != 0) {
+ } else if ((owner.flags() & INTERFACE) != 0 && !isDefaultMethod) {
log.error(tree.body.pos(), "intf.meth.cant.have.body");
} else if ((tree.mods.flags & ABSTRACT) != 0) {
log.error(tree.pos(), "abstract.meth.cant.have.body");
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Tue Oct 23 09:42:48 2012 -0700
@@ -230,7 +230,6 @@
/** Warn about unsafe vararg method decl.
* @param pos Position to be used for error reporting.
- * @param sym The deprecated symbol.
*/
void warnUnsafeVararg(DiagnosticPosition pos, String key, Object... args) {
if (lint.isEnabled(LintCategory.VARARGS) && allowSimplifiedVarargs)
@@ -397,7 +396,7 @@
**************************************************************************/
/** Return name of local class.
- * This is of the form $ n
+ * This is of the form {@code $ n }
* where
* enclClass is the flat name of the enclosing class,
* classname is the simple name of the local class
@@ -600,11 +599,10 @@
/** Check that a type is within some bounds.
*
- * Used in TypeApply to verify that, e.g., X in V is a valid
+ * Used in TypeApply to verify that, e.g., X in {@code V} is a valid
* type argument.
- * @param pos Position to be used for error reporting.
* @param a The type that should be bounded by bs.
- * @param bs The bound.
+ * @param bound The bound.
*/
private boolean checkExtends(Type a, Type bound) {
if (a.isUnbound()) {
@@ -1123,8 +1121,14 @@
mask = PRIVATE;
} else
mask = ConstructorFlags;
- } else if ((sym.owner.flags_field & INTERFACE) != 0)
- mask = implicit = InterfaceMethodFlags;
+ } else if ((sym.owner.flags_field & INTERFACE) != 0) {
+ if ((flags & DEFAULT) != 0) {
+ mask = InterfaceDefaultMethodMask;
+ implicit = PUBLIC;
+ } else {
+ mask = implicit = InterfaceMethodFlags;
+ }
+ }
else {
mask = MethodFlags;
}
@@ -1171,7 +1175,7 @@
default:
throw new AssertionError();
}
- long illegal = flags & StandardFlags & ~mask;
+ long illegal = flags & ExtendedStandardFlags & ~mask;
if (illegal != 0) {
if ((illegal & INTERFACE) != 0) {
log.error(pos, "intf.not.allowed.here");
@@ -1187,7 +1191,7 @@
// in the presence of inner classes. Should it be deleted here?
checkDisjoint(pos, flags,
ABSTRACT,
- PRIVATE | STATIC))
+ PRIVATE | STATIC | DEFAULT))
&&
checkDisjoint(pos, flags,
ABSTRACT | INTERFACE,
@@ -1211,7 +1215,7 @@
STRICTFP))) {
// skip
}
- return flags & (mask | ~StandardFlags) | implicit;
+ return flags & (mask | ~ExtendedStandardFlags) | implicit;
}
@@ -1262,8 +1266,10 @@
* their bounds. This must be done in a second phase after type attributon
* since a class might have a subclass as type parameter bound. E.g:
*
+ * {@code
* class B { ... }
* class C extends B { ... }
+ * }
*
* and we can't make sure that the bound is already attributed because
* of possible cycles.
@@ -2574,7 +2580,7 @@
* 'pos'.
*
* @param s The (annotation)type declaration annotated with a @ContainedBy
- * @param containerAnno the @ContainedBy on 's'
+ * @param containedBy the @ContainedBy on 's'
* @param pos where to report errors
*/
public void validateContainedBy(TypeSymbol s, Attribute.Compound containedBy, DiagnosticPosition pos) {
@@ -3181,7 +3187,6 @@
* @param pos Position for error reporting.
* @param sym The symbol.
* @param s The scope
- * @param staticImport Whether or not this was a static import
*/
boolean checkUniqueStaticImport(DiagnosticPosition pos, Symbol sym, Scope s) {
return checkUniqueImport(pos, sym, s, true);
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java Tue Oct 23 09:42:48 2012 -0700
@@ -46,7 +46,6 @@
import static com.sun.tools.javac.code.TypeTags.*;
import static com.sun.tools.javac.tree.JCTree.Tag.*;
-import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
/**
* This is an helper class that is used to perform deferred type-analysis.
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Tue Oct 23 09:42:48 2012 -0700
@@ -148,7 +148,7 @@
* exception to this [no pun intended] is that checked exceptions that
* are known to be caught or declared to be caught in the enclosing
* method are not recorded in the queue, but instead are recorded in a
- * global variable "Set thrown" that records the type of all
+ * global variable "{@code Set thrown}" that records the type of all
* exceptions that can be thrown.
*
* Other minor issues the treatment of members of other classes
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java Tue Oct 23 09:42:48 2012 -0700
@@ -41,7 +41,6 @@
import java.util.HashMap;
import java.util.Map;
-import java.util.Set;
import static com.sun.tools.javac.code.TypeTags.*;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Tue Oct 23 09:42:48 2012 -0700
@@ -671,7 +671,7 @@
};
/** Look up a synthetic name in a given scope.
- * @param scope The scope.
+ * @param s The scope.
* @param name The name.
*/
private Symbol lookupSynthetic(Name name, Scope s) {
@@ -747,7 +747,7 @@
* This numbering scheme is used by the backend to decide whether
* to issue an invokevirtual or invokespecial call.
*
- * @see Gen.visitSelect(Select tree)
+ * @see Gen#visitSelect(JCFieldAccess tree)
*/
private static final int
DEREFcode = 0,
@@ -1945,7 +1945,7 @@
* @param sig The signature of type T.
*/
private Name cacheName(String sig) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
if (sig.startsWith("[")) {
buf = buf.append("array");
while (sig.startsWith("[")) {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Tue Oct 23 09:42:48 2012 -0700
@@ -128,8 +128,7 @@
/** Import all classes of a class or package on demand.
* @param pos Position to be used for error reporting.
* @param tsym The class or package the members of which are imported.
- * @param toScope The (import) scope in which imported classes
- * are entered.
+ * @param env The env in which the imported classes will be entered.
*/
private void importAll(int pos,
final TypeSymbol tsym,
@@ -150,8 +149,7 @@
/** Import all static members of a class or package on demand.
* @param pos Position to be used for error reporting.
* @param tsym The class or package the members of which are imported.
- * @param toScope The (import) scope in which imported classes
- * are entered.
+ * @param env The env in which the imported classes will be entered.
*/
private void importStaticAll(int pos,
final TypeSymbol tsym,
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Tue Oct 23 09:42:48 2012 -0700
@@ -27,8 +27,6 @@
import java.util.*;
-import javax.lang.model.element.ElementKind;
-
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.tree.*;
@@ -134,17 +132,21 @@
* Then, coerce to some given target type unless target type is null.
* This operation is used in situations like the following:
*
+ * {@code
* class Cell { A value; }
* ...
* Cell cell;
* Integer x = cell.value;
+ * }
*
* Since the erasure of Cell.value is Object, but the type
* of cell.value in the assignment is Integer, we need to
* adjust the original type of cell.value to Object, and insert
* a cast to Integer. That is, the last assignment becomes:
*
+ * {@code
* Integer x = (Integer)cell.value;
+ * }
*
* @param tree The expression tree whose type might need adjustment.
* @param erasedType The expression's type after erasure.
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
--- a/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -805,8 +805,8 @@
}
/**
- * Enforces the specification of a "relative" URI as used in
- * {@linkplain #getFileForInput(Location,String,URI)
+ * Enforces the specification of a "relative" name as used in
+ * {@linkplain #getFileForInput(Location,String,String)
* getFileForInput}. This method must follow the rules defined in
* that method, do not make any changes without consulting the
* specification.
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/file/Locations.java
--- a/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java Tue Oct 23 09:42:48 2012 -0700
@@ -53,13 +53,14 @@
import com.sun.tools.javac.util.Options;
import javax.tools.JavaFileManager;
+import javax.tools.StandardJavaFileManager;
import static javax.tools.StandardLocation.*;
import static com.sun.tools.javac.main.Option.*;
/** This class converts command line arguments, environment variables
* and system properties (in File.pathSeparator-separated String form)
* into a boot class path, user class path, and source path (in
- * Collection form).
+ * {@code Collection} form).
*
* This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
@@ -342,11 +343,11 @@
}
}
- /** @see JavaFileManager#handleOption. */
+ /** @see JavaFileManager#handleOption */
abstract boolean handleOption(Option option, String value);
- /** @see JavaFileManager#getLocation. */
+ /** @see StandardJavaFileManager#getLocation */
abstract Collection getLocation();
- /** @see JavaFileManager#setLocation. */
+ /** @see StandardJavaFileManager#setLocation */
abstract void setLocation(Iterable files) throws IOException;
}
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java
--- a/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java Tue Oct 23 09:42:48 2012 -0700
@@ -38,7 +38,6 @@
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -60,7 +59,7 @@
* the command line.)
*
* Location where to look for/generate optimized zip index files can be
- * provided using "-XDcachezipindexdir=". If this flag is not
+ * provided using "{@code -XDcachezipindexdir=}". If this flag is not
* provided, the default location is the value of the "java.io.tmpdir" system
* property.
*
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java Tue Oct 23 09:42:48 2012 -0700
@@ -446,7 +446,7 @@
* Normalizing class-members.
*************************************************************************/
- /** Distribute member initializer code into constructors and
+ /** Distribute member initializer code into constructors and {@code }
* method.
* @param defs The list of class member declarations.
* @param c The enclosing class.
@@ -689,7 +689,7 @@
* should be emitted, if so, put a new entry into CRTable
* and call method to generate bytecode.
* If not, just call method to generate bytecode.
- * @see #genStat(Tree, Env)
+ * @see #genStat(JCTree, Env)
*
* @param tree The tree to be visited.
* @param env The environment to use.
@@ -756,7 +756,7 @@
* should be emitted, if so, put a new entry into CRTable
* and call method to generate bytecode.
* If not, just call method to generate bytecode.
- * @see #genCond(Tree,boolean)
+ * @see #genCond(JCTree,boolean)
*
* @param tree The tree to be visited.
* @param crtFlags The CharacterRangeTable flags
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
--- a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Tue Oct 23 09:42:48 2012 -0700
@@ -607,7 +607,7 @@
/** Parse contents of input stream.
* @param filename The name of the file from which input stream comes.
- * @param input The input stream to be parsed.
+ * @param content The characters to be parsed.
*/
protected JCCompilationUnit parse(JavaFileObject filename, CharSequence content) {
long msec = now();
@@ -755,8 +755,6 @@
/** Complete compiling a source file that has been accessed
* by the class file reader.
* @param c The class the source file of which needs to be compiled.
- * @param filename The name of the source file.
- * @param f An input stream that reads the source file.
*/
public void complete(ClassSymbol c) throws CompletionFailure {
// System.err.println("completing " + c);//DEBUG
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java
--- a/langtools/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java Tue Oct 23 09:42:48 2012 -0700
@@ -25,9 +25,8 @@
package com.sun.tools.javac.model;
-import com.sun.tools.javac.util.*;
+import java.io.IOException;
import java.io.ObjectInputStream;
-import java.io.IOException;
import java.lang.annotation.*;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
@@ -35,12 +34,14 @@
import java.util.Map;
import sun.reflect.annotation.*;
-import javax.lang.model.type.TypeMirror;
import javax.lang.model.type.MirroredTypeException;
import javax.lang.model.type.MirroredTypesException;
+import javax.lang.model.type.TypeMirror;
+
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.code.Type.ArrayType;
+import com.sun.tools.javac.util.*;
/**
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java
--- a/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,13 +27,14 @@
import java.io.IOException;
import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
import java.nio.file.Path;
import javax.tools.FileObject;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
/**
- * File manager based on {@linkplain File java.nio.file.Path}.
+ * File manager based on {@link java.nio.file.Path}.
*
* Eventually, this should be moved to javax.tools.
* Also, JavaCompiler might reasonably provide a method getPathFileManager,
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java
--- a/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,6 @@
import java.nio.file.Files;
import java.nio.file.LinkOption;
import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.NestingKind;
import javax.tools.JavaFileObject;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java Tue Oct 23 09:42:48 2012 -0700
@@ -108,8 +108,7 @@
* {@code input[input.length -1]} is a white space character.
*
* @param fac the factory which created this Scanner
- * @param input the input, might be modified
- * @param inputLength the size of the input.
+ * @param buf the input, might be modified
* Must be positive and less than or equal to input.length.
*/
protected JavaTokenizer(ScannerFactory fac, CharBuffer buf) {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Tue Oct 23 09:42:48 2012 -0700
@@ -116,6 +116,8 @@
fac.options.isSet("allowLambda"); //pre-lambda guard
this.allowMethodReferences = source.allowMethodReferences() &&
fac.options.isSet("allowMethodReferences"); //pre-lambda guard
+ this.allowDefaultMethods = source.allowDefaultMethods() &&
+ fac.options.isSet("allowDefaultMethods"); //pre-lambda guard
this.keepDocComments = keepDocComments;
docComments = newDocCommentTable(keepDocComments);
this.keepLineMap = keepLineMap;
@@ -185,6 +187,10 @@
*/
boolean allowMethodReferences;
+ /** Switch: should we allow default methods in interfaces?
+ */
+ boolean allowDefaultMethods;
+
/** Switch: should we keep docComments?
*/
boolean keepDocComments;
@@ -806,7 +812,7 @@
t = odStack[0];
if (t.hasTag(JCTree.Tag.PLUS)) {
- StringBuffer buf = foldStrings(t);
+ StringBuilder buf = foldStrings(t);
if (buf != null) {
t = toP(F.at(startPos).Literal(TypeTags.CLASS, buf.toString()));
}
@@ -833,7 +839,7 @@
/** If tree is a concatenation of string literals, replace it
* by a single literal representing the concatenated string.
*/
- protected StringBuffer foldStrings(JCTree tree) {
+ protected StringBuilder foldStrings(JCTree tree) {
if (!allowStringFolding)
return null;
List buf = List.nil();
@@ -841,8 +847,8 @@
if (tree.hasTag(LITERAL)) {
JCLiteral lit = (JCLiteral) tree;
if (lit.typetag == TypeTags.CLASS) {
- StringBuffer sbuf =
- new StringBuffer((String)lit.value);
+ StringBuilder sbuf =
+ new StringBuilder((String)lit.value);
while (buf.nonEmpty()) {
sbuf.append(buf.head);
buf = buf.tail;
@@ -2311,6 +2317,7 @@
case SYNCHRONIZED: flag = Flags.SYNCHRONIZED; break;
case STRICTFP : flag = Flags.STRICTFP; break;
case MONKEYS_AT : flag = Flags.ANNOTATION; break;
+ case DEFAULT : checkDefaultMethods(); flag = Flags.DEFAULT; break;
case ERROR : flag = 0; nextToken(); break;
default: break loop;
}
@@ -3361,6 +3368,12 @@
allowMethodReferences = true;
}
}
+ void checkDefaultMethods() {
+ if (!allowDefaultMethods) {
+ log.error(token.pos, "default.methods.not.supported.in.source", source.name);
+ allowDefaultMethods = true;
+ }
+ }
/*
* a functional source tree and end position mappings
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -66,8 +66,7 @@
* {@code input[input.length -1]} is a white space character.
*
* @param fac the factory which created this Scanner
- * @param input the input, might be modified
- * @param inputLength the size of the input.
+ * @param buf the input, might be modified
* Must be positive and less than or equal to input.length.
*/
protected Scanner(ScannerFactory fac, CharBuffer buf) {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java Tue Oct 23 09:42:48 2012 -0700
@@ -77,9 +77,8 @@
* that {@code inputLength < input.length} or
* {@code input[input.length -1]} is a white space character.
*
- * @param fac the factory which created this Scanner
- * @param input the input, might be modified
- * @param inputLength the size of the input.
+ * @param sf the factory which created this Scanner
+ * @param buffer the input, might be modified
* Must be positive and less than or equal to input.length.
*/
protected UnicodeReader(ScannerFactory sf, CharBuffer buffer) {
@@ -255,16 +254,16 @@
/**
* Returns a copy of a character array subset of the input buffer.
- * The returned array begins at the beginIndex and
- * extends to the character at index endIndex - 1.
- * Thus the length of the substring is endIndex-beginIndex.
+ * The returned array begins at the {@code beginIndex} and
+ * extends to the character at index {@code endIndex - 1}.
+ * Thus the length of the substring is {@code endIndex-beginIndex}.
* This behavior is like
- * String.substring(beginIndex, endIndex).
+ * {@code String.substring(beginIndex, endIndex)}.
* Unicode escape sequences are not translated.
*
* @param beginIndex the beginning index, inclusive.
* @param endIndex the ending index, exclusive.
- * @throws IndexOutOfBounds if either offset is outside of the
+ * @throws ArrayIndexOutOfBoundsException if either offset is outside of the
* array bounds
*/
public char[] getRawCharacters(int beginIndex, int endIndex) {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -105,7 +105,7 @@
* Only type elements included in this round of annotation
* processing, or declarations of members, parameters, or type
* parameters declared within those, are returned. Included type
- * elements are {@linkplain #getSpecifiedTypeElements specified
+ * elements are {@linkplain #getRootElements specified
* types} and any types nested within them.
*
* @param a annotation type being requested
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -72,7 +72,7 @@
* The service class for which providers are being sought;
* used to construct error detail strings
*
- * @param url
+ * @param u
* The URL naming the configuration file to be parsed
*
* @return true if the name of a service is found
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Tue Oct 23 09:42:48 2012 -0700
@@ -2174,6 +2174,11 @@
method references are not supported in -source {0}\n\
(use -source 8 or higher to enable method references)
+# 0: string
+compiler.err.default.methods.not.supported.in.source=\
+ default methods are not supported in -source {0}\n\
+ (use -source 8 or higher to enable default methods)
+
########################################
# Diagnostics for verbose resolution
# used by Resolve (debug only)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java Tue Oct 23 09:42:48 2012 -0700
@@ -464,32 +464,29 @@
}
/**
- * Everything in one source file is kept in a TopLevel structure.
- * @param pid The tree representing the package clause.
- * @param sourcefile The source file name.
- * @param defs All definitions in this file (ClassDef, Import, and Skip)
- * @param packge The package it belongs to.
- * @param namedImportScope A scope for all named imports.
- * @param starImportScope A scope for all import-on-demands.
- * @param lineMap Line starting positions, defined only
- * if option -g is set.
- * @param docComments A hashtable that stores all documentation comments
- * indexed by the tree nodes they refer to.
- * defined only if option -s is set.
- * @param endPositions An object encapsulating ending positions of source
- * ranges indexed by the tree nodes they belong to.
- * Defined only if option -Xjcov is set.
+ * Everything in one source file is kept in a {@linkplain JCCompilationUnit} structure.
*/
public static class JCCompilationUnit extends JCTree implements CompilationUnitTree {
public List packageAnnotations;
+ /** The tree representing the package clause. */
public JCExpression pid;
+ /** All definitions in this file (ClassDef, Import, and Skip) */
public List defs;
+ /* The source file name. */
public JavaFileObject sourcefile;
+ /** The package to which this compilation unit belongs. */
public PackageSymbol packge;
+ /** A scope for all named imports. */
public ImportScope namedImportScope;
+ /** A scope for all import-on-demands. */
public StarImportScope starImportScope;
+ /** Line starting positions, defined only if option -g is set. */
public Position.LineMap lineMap = null;
+ /** A table that stores all documentation comments indexed by the tree
+ * nodes they refer to. defined only if option -s is set. */
public DocCommentTable docComments = null;
+ /* An object encapsulating ending positions of source ranges indexed by
+ * the tree nodes they belong to. Defined only if option -Xjcov is set. */
public EndPosTable endPositions = null;
protected JCCompilationUnit(List packageAnnotations,
JCExpression pid,
@@ -550,10 +547,10 @@
/**
* An import clause.
- * @param qualid The imported class(es).
*/
public static class JCImport extends JCTree implements ImportTree {
public boolean staticImport;
+ /** The imported class(es). */
public JCTree qualid;
protected JCImport(JCTree qualid, boolean importStatic) {
this.qualid = qualid;
@@ -605,21 +602,21 @@
/**
* A class definition.
- * @param modifiers the modifiers
- * @param name the name of the class
- * @param typarams formal class parameters
- * @param extending the classes this class extends
- * @param implementing the interfaces implemented by this class
- * @param defs all variables and methods defined in this class
- * @param sym the symbol
*/
public static class JCClassDecl extends JCStatement implements ClassTree {
+ /** the modifiers */
public JCModifiers mods;
+ /** the name of the class */
public Name name;
+ /** formal class parameters */
public List typarams;
+ /** the classes this class extends */
public JCExpression extending;
+ /** the interfaces implemented by this class */
public List implementing;
+ /** all variables and methods defined in this class */
public List defs;
+ /** the symbol */
public ClassSymbol sym;
protected JCClassDecl(JCModifiers mods,
Name name,
@@ -676,24 +673,25 @@
/**
* A method definition.
- * @param modifiers method modifiers
- * @param name method name
- * @param restype type of method return value
- * @param typarams type parameters
- * @param params value parameters
- * @param thrown exceptions thrown by this method
- * @param stats statements in the method
- * @param sym method symbol
*/
public static class JCMethodDecl extends JCTree implements MethodTree {
+ /** method modifiers */
public JCModifiers mods;
+ /** method name */
public Name name;
+ /** type of method return value */
public JCExpression restype;
+ /** type parameters */
public List typarams;
+ /** value parameters */
public List params;
+ /** exceptions thrown by this method */
public List thrown;
+ /** statements in the method */
public JCBlock body;
- public JCExpression defaultValue; // for annotation types
+ /** default value, for annotation types */
+ public JCExpression defaultValue;
+ /** method symbol */
public MethodSymbol sym;
protected JCMethodDecl(JCModifiers mods,
Name name,
@@ -748,17 +746,17 @@
/**
* A variable definition.
- * @param modifiers variable modifiers
- * @param name variable name
- * @param vartype type of the variable
- * @param init variables initial value
- * @param sym symbol
*/
public static class JCVariableDecl extends JCStatement implements VariableTree {
+ /** variable modifiers */
public JCModifiers mods;
+ /** variable name */
public Name name;
+ /** type of the variable */
public JCExpression vartype;
+ /** variable's initial value */
public JCExpression init;
+ /** symbol */
public VarSymbol sym;
protected JCVariableDecl(JCModifiers mods,
Name name,
@@ -815,11 +813,11 @@
/**
* A statement block.
- * @param stats statements
- * @param flags flags
*/
public static class JCBlock extends JCStatement implements BlockTree {
+ /** flags */
public long flags;
+ /** statements */
public List stats;
/** Position of closing brace, optional. */
public int endpos = Position.NOPOS;
@@ -1206,9 +1204,9 @@
/**
* an expression statement
- * @param expr expression structure
*/
public static class JCExpressionStatement extends JCStatement implements ExpressionStatementTree {
+ /** expression structure */
public JCExpression expr;
protected JCExpressionStatement(JCExpression expr)
{
@@ -1776,13 +1774,13 @@
/**
* Selects through packages and classes
- * @param selected selected Tree hierarchie
- * @param selector name of field to select thru
- * @param sym symbol of the selected class
*/
public static class JCFieldAccess extends JCExpression implements MemberSelectTree {
+ /** selected Tree hierarchy */
public JCExpression selected;
+ /** name of field to select thru */
public Name name;
+ /** symbol of the selected class */
public Symbol sym;
protected JCFieldAccess(JCExpression selected, Name name, Symbol sym) {
this.selected = selected;
@@ -1885,11 +1883,11 @@
/**
* An identifier
- * @param idname the name
- * @param sym the symbol
*/
public static class JCIdent extends JCExpression implements IdentifierTree {
+ /** the name */
public Name name;
+ /** the symbol */
public Symbol sym;
protected JCIdent(Name name, Symbol sym) {
this.name = name;
@@ -1912,10 +1910,10 @@
/**
* A constant value given literally.
- * @param value value representation
*/
public static class JCLiteral extends JCExpression implements LiteralTree {
public int typetag;
+ /** value representation */
public Object value;
protected JCLiteral(int typetag, Object value) {
this.typetag = typetag;
@@ -1978,10 +1976,10 @@
/**
* Identifies a basic type.
- * @param tag the basic type id
* @see TypeTags
*/
public static class JCPrimitiveTypeTree extends JCExpression implements PrimitiveTypeTree {
+ /** the basic type id */
public int typetag;
protected JCPrimitiveTypeTree(int typetag) {
this.typetag = typetag;
@@ -2105,11 +2103,11 @@
/**
* A formal class parameter.
- * @param name name
- * @param bounds bounds
*/
public static class JCTypeParameter extends JCTree implements TypeParameterTree {
+ /** name */
public Name name;
+ /** bounds */
public List bounds;
protected JCTypeParameter(Name name, List bounds) {
this.name = name;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java Tue Oct 23 09:42:48 2012 -0700
@@ -26,12 +26,10 @@
package com.sun.tools.javac.tree;
import java.io.*;
-import java.util.*;
import com.sun.source.tree.MemberReferenceTree.ReferenceMode;
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.parser.Tokens.Comment;
import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.List;
@@ -250,7 +248,7 @@
public void printFlags(long flags) throws IOException {
if ((flags & SYNTHETIC) != 0) print("/*synthetic*/ ");
print(TreeInfo.flagNames(flags));
- if ((flags & StandardFlags) != 0) print(" ");
+ if ((flags & ExtendedStandardFlags) != 0) print(" ");
if ((flags & ANNOTATION) != 0) print("@");
}
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Tue Oct 23 09:42:48 2012 -0700
@@ -790,8 +790,8 @@
* pre: flags != 0
*/
public static long firstFlag(long flags) {
- int flag = 1;
- while ((flag & StandardFlags) != 0 && (flag & flags) == 0)
+ long flag = 1;
+ while ((flag & flags & ExtendedStandardFlags) == 0)
flag = flag << 1;
return flag;
}
@@ -799,7 +799,7 @@
/** Return flags as a string, separated by " ".
*/
public static String flagNames(long flags) {
- return Flags.toString(flags & StandardFlags).trim();
+ return Flags.toString(flags & ExtendedStandardFlags).trim();
}
/** Operator precedences values.
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
--- a/langtools/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -484,7 +484,7 @@
/**
* Tells whether the caret display is active or not.
*
- * @param caretEnabled if true the caret is enabled
+ * @return true if the caret is enabled
*/
public boolean isCaretEnabled() {
return caretEnabled;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/util/AbstractLog.java
--- a/langtools/src/share/classes/com/sun/tools/javac/util/AbstractLog.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/AbstractLog.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -132,7 +132,6 @@
/** Report a warning, unless suppressed by the -nowarn option or the
* maximum number of warnings has been reached.
- * @param pos The source position at which to report the warning.
* @param key The key for the localized warning message.
* @param args Fields of the warning message.
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java
--- a/langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -69,7 +69,7 @@
/**
* Create a basic formatter based on the supplied options.
*
- * @param opts list of command-line options
+ * @param options list of command-line options
* @param msgs JavacMessages object used for i18n
*/
public BasicDiagnosticFormatter(Options options, JavacMessages msgs) {
@@ -329,7 +329,7 @@
* Set the indentation level for various element of a given diagnostic -
* this might lead to more readable diagnostics
*
- * @param indentationKind kind of indentation to be set
+ * @param diagPart
* @param nSpaces amount of spaces for the specified diagnostic part
*/
public void setIndentation(DiagnosticPart diagPart, int nSpaces) {
@@ -384,7 +384,7 @@
/**
* Get a metachar string for a specific format
*
- * @param sourcePos a positioning value for source line
+ * @param kind the format kind for which to get the metachar string
*/
public String getFormat(BasicFormatKind kind) {
return availableFormats.get(kind);
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/util/Context.java
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Context.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Context.java Tue Oct 23 09:42:48 2012 -0700
@@ -44,7 +44,7 @@
* instance method that is overridden in extended components. A base
* phase supporting extension would look something like this:
*
- *
+ * {@code
* public class Phase {
* protected static final Context.Key phaseKey =
* new Context.Key();
@@ -62,7 +62,7 @@
* // other intitialization follows...
* }
* }
- *
+ * }
*
* In the compiler, we simply use Phase.instance(context) to get
* the reference to the phase. But in extensions of the compiler, we
@@ -70,7 +70,7 @@
* and this must be done before any reference to the phase is accessed
* using Phase.instance(). An extended phase might be declared thus:
*
- *
+ * {@code
* public class NewPhase extends Phase {
* protected NewPhase(Context context) {
* super(context);
@@ -83,7 +83,7 @@
* });
* }
* }
- *
+ * }
*
* And is registered early in the extended compiler like this
*
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/util/Convert.java
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Convert.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Convert.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -260,7 +260,7 @@
while (i < len) {
char ch = s.charAt(i);
if (ch > 255) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append(s.substring(0, i));
while (i < len) {
ch = s.charAt(i);
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java
--- a/langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java Tue Oct 23 09:42:48 2012 -0700
@@ -28,12 +28,10 @@
import java.io.IOException;
import java.lang.ref.SoftReference;
import java.nio.CharBuffer;
-import java.util.Map;
import javax.tools.JavaFileObject;
import com.sun.tools.javac.file.JavacFileManager;
import com.sun.tools.javac.tree.EndPosTable;
-import com.sun.tools.javac.tree.JCTree;
import static com.sun.tools.javac.util.LayoutCharacters.*;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
--- a/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java Tue Oct 23 09:42:48 2012 -0700
@@ -27,7 +27,6 @@
import java.util.EnumSet;
import java.util.Locale;
-import java.util.Map;
import java.util.Set;
import javax.tools.Diagnostic;
@@ -214,7 +213,6 @@
* Create a new diagnostic of the given kind, which is not mandatory and which has
* no lint category.
* @param kind The diagnostic kind
- * @param ls The lint category, if applicable, or null
* @param source The source of the compilation unit, if any, in which to report the message.
* @param pos The source position at which to report the message.
* @param key The key for the localized message.
@@ -229,7 +227,7 @@
* Create a new diagnostic of the given kind.
* @param kind The diagnostic kind
* @param lc The lint category, if applicable, or null
- * @param isMandatory is diagnostic mandatory?
+ * @param flags The set of flags for the diagnostic
* @param source The source of the compilation unit, if any, in which to report the message.
* @param pos The source position at which to report the message.
* @param key The key for the localized message.
@@ -364,7 +362,7 @@
/**
* Create a diagnostic object.
- * @param fomatter the formatter to use for the diagnostic
+ * @param formatter the formatter to use for the diagnostic
* @param dt the type of diagnostic
* @param lc the lint category for the diagnostic
* @param source the name of the source file, or null if none.
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/util/List.java
--- a/langtools/src/share/classes/com/sun/tools/javac/util/List.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/List.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -287,7 +287,7 @@
if (isEmpty()) {
return "";
} else {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append(head);
for (List l = tail; l.nonEmpty(); l = l.tail) {
buf.append(sep);
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/util/Position.java
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Position.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Position.java Tue Oct 23 09:42:48 2012 -0700
@@ -80,11 +80,11 @@
/** Encode line and column numbers in an integer as:
* {@code line-number << LINESHIFT + column-number }.
- * {@link Position.NOPOS} represents an undefined position.
+ * {@link Position#NOPOS} represents an undefined position.
*
* @param line number of line (first is 1)
* @param col number of character on line (first is 1)
- * @return an encoded position or {@link Position.NOPOS}
+ * @return an encoded position or {@link Position#NOPOS}
* if the line or column number is too big to
* represent in the encoded format
* @throws IllegalArgumentException if line or col is less than 1
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
--- a/langtools/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@
/**
* Create a formatter based on the supplied options.
- * @param msgs
+ * @param options
*/
public RawDiagnosticFormatter(Options options) {
super(null, new SimpleConfiguration(options,
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
package com.sun.tools.javadoc;
-
import com.sun.javadoc.*;
import com.sun.tools.javac.code.Type;
@@ -36,6 +35,11 @@
* defaults for the methods in Type (and a couple from
* ProgramElementDoc).
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Scott Seligman
* @since 1.5
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
package com.sun.tools.javadoc;
-
import com.sun.javadoc.*;
import com.sun.tools.javac.code.Attribute;
@@ -40,6 +39,11 @@
* Sure it ought to be called "Annotation", but that clashes with
* java.lang.annotation.Annotation.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Scott Seligman
* @since 1.5
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
import com.sun.javadoc.*;
-
import com.sun.tools.javac.code.Kinds;
import com.sun.tools.javac.code.Scope;
import com.sun.tools.javac.code.Symbol.*;
@@ -39,6 +38,11 @@
/**
* Represents an annotation type.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Scott Seligman
* @since 1.5
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,18 @@
import com.sun.javadoc.*;
-import static com.sun.javadoc.LanguageVersion.*;
-
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.tree.JCTree.*;
-import com.sun.tools.javac.util.List;
-import com.sun.tools.javac.util.Name;
import com.sun.tools.javac.util.Position;
/**
* Represents an element of an annotation type.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Scott Seligman
* @since 1.5
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -25,7 +25,6 @@
package com.sun.tools.javadoc;
-
import com.sun.javadoc.*;
import com.sun.tools.javac.code.Attribute;
@@ -36,6 +35,11 @@
/**
* Represents a value of an annotation type element.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Scott Seligman
* @since 1.5
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,8 +38,6 @@
import com.sun.javadoc.*;
-import static com.sun.javadoc.LanguageVersion.*;
-
import com.sun.tools.javac.code.Flags;
import com.sun.tools.javac.code.Kinds;
import com.sun.tools.javac.code.Scope;
@@ -76,6 +74,11 @@
* referred to using Type (which can be converted to ClassDocImpl,
* if possible).
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @see Type
*
* @since 1.2
@@ -846,7 +849,7 @@
* Note that this is not necessarily what the compiler would do!
*
* @param methodName the unqualified name to search for.
- * @param paramTypeArray the array of Strings for method parameter types.
+ * @param paramTypes the array of Strings for method parameter types.
* @return the first MethodDocImpl which matches, null if not found.
*/
public MethodDocImpl findMethod(String methodName, String[] paramTypes) {
@@ -973,7 +976,7 @@
* Find constructor in this class.
*
* @param constrName the unqualified name to search for.
- * @param paramTypeArray the array of Strings for constructor parameters.
+ * @param paramTypes the array of Strings for constructor parameters.
* @return the first ConstructorDocImpl which matches, null if not found.
*/
public ConstructorDoc findConstructor(String constrName,
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/Comment.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/Comment.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/Comment.java Tue Oct 23 09:42:48 2012 -0700
@@ -33,6 +33,11 @@
* It allows users to get first sentence of this comment, get
* comment for different tags...
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Kaiyang Liu (original)
* @author Robert Field (rewrite)
* @author Atul M Dambalkar
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,11 @@
/**
* Represents a constructor of a java class.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @since 1.2
* @author Robert Field
* @author Neal Gafter (rewrite)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,6 +46,11 @@
* run and not the compiler info that could be GC'ed
* or ported.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @since 1.4
* @author Robert Field
* @author Neal Gafter (rewrite)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -26,16 +26,16 @@
package com.sun.tools.javadoc;
import java.io.DataInputStream;
+import java.io.IOException;
import java.io.InputStream;
-import java.io.IOException;
import java.text.CollationKey;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import javax.tools.FileObject;
import com.sun.javadoc.*;
-
import com.sun.tools.javac.util.Position;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
/**
* abstract base class of all Doc classes. Doc item's are representations
@@ -43,6 +43,11 @@
* comments and have been processed by this run of javadoc. All Doc items
* are unique, that is, they are == comparable.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @since 1.2
* @author Robert Field
* @author Atul M Dambalkar
@@ -262,7 +267,7 @@
*
* Included so that Doc item are java.lang.Comparable.
*
- * @param o the Object to be compared.
+ * @param obj the {@code Object} to be compared.
* @return a negative integer, zero, or a positive integer as this Object
* is less than, equal to, or greater than the given Object.
* @exception ClassCastException the specified Object's type prevents it
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/DocLocale.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocLocale.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocLocale.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,18 @@
package com.sun.tools.javadoc;
+import java.text.BreakIterator;
+import java.text.Collator;
import java.util.Locale;
-import java.util.HashSet;
-import java.text.Collator;
-import java.text.BreakIterator;
/**
* This class holds the information about locales.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @since 1.4
* @author Robert Field
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,26 @@
package com.sun.tools.javadoc;
-import com.sun.javadoc.*;
-
-import static com.sun.javadoc.LanguageVersion.*;
-
-import com.sun.tools.javac.util.List;
-
import java.io.File;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.net.URLClassLoader;
+import com.sun.javadoc.*;
+import com.sun.tools.javac.util.List;
+import static com.sun.javadoc.LanguageVersion.*;
+
/**
* Class creates, controls and invokes doclets.
+ *
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Neal Gafter (rewrite)
*/
public class DocletInvoker {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,11 @@
/**
* Represents a method or constructor of a java class.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @since 1.2
* @author Robert Field
* @author Neal Gafter (rewrite)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -29,8 +29,6 @@
import com.sun.javadoc.*;
-import static com.sun.javadoc.LanguageVersion.*;
-
import com.sun.tools.javac.code.Flags;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
import com.sun.tools.javac.code.Symbol.VarSymbol;
@@ -43,6 +41,11 @@
/**
* Represents a field in a java class.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @see MemberDocImpl
*
* @since 1.2
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,12 @@
import com.sun.tools.javac.util.Context;
/** Javadoc uses an extended class reader that records package.html entries
+ *
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Neal Gafter
*/
public class JavadocClassReader extends ClassReader {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/JavadocEnter.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocEnter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocEnter.java Tue Oct 23 09:42:48 2012 -0700
@@ -25,7 +25,6 @@
package com.sun.tools.javadoc;
-
import javax.tools.JavaFileObject;
import com.sun.tools.javac.code.Kinds;
@@ -40,6 +39,12 @@
/**
* Javadoc's own enter phase does a few things above and beyond that
* done by javac.
+ *
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Neal Gafter
*/
public class JavadocEnter extends Enter {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java Tue Oct 23 09:42:48 2012 -0700
@@ -37,6 +37,12 @@
/**
* Javadoc's own memberEnter phase does a few things above and beyond that
* done by javac.
+ *
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Neal Gafter
*/
public class JavadocMemberEnter extends MemberEnter {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/JavadocTodo.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTodo.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTodo.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,12 @@
/**
* Javadoc's own todo queue doesn't queue its inputs, as javadoc
* doesn't perform attribution of method bodies or semantic checking.
+ *
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Neal Gafter
*/
public class JavadocTodo extends Todo {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -54,6 +54,12 @@
* component in a larger software system. It provides operations to
* construct a new javadoc processor, and to run it on a set of source
* files.
+ *
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Neal Gafter
*/
public class JavadocTool extends com.sun.tools.javac.main.JavaCompiler {
@@ -386,7 +392,7 @@
/**
* Return true if given file name is a valid class name
* (including "package-info").
- * @param clazzname the name of the class to check.
+ * @param s the name of the class to check.
* @return true if given class name is a valid class name
* and false otherwise.
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/Main.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/Main.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/Main.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,11 @@
* Provides external entry points (tool and programmatic)
* for the javadoc program.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @since 1.4
*/
public class Main {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/MemberDocImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/MemberDocImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/MemberDocImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,11 @@
* method, constructor and field members. Class members of a class
* (nested classes) are represented instead by ClassDocImpl.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @see MethodDocImpl
* @see FieldDocImpl
* @see ClassDocImpl
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/Messager.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/Messager.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/Messager.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,14 @@
package com.sun.tools.javadoc;
-import java.io.PrintWriter;
+import java.io.PrintWriter; // Access to 'javac' output streams
import java.text.MessageFormat;
+import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import java.util.MissingResourceException;
import com.sun.javadoc.*;
-
import com.sun.tools.javac.util.Context;
-
-import com.sun.tools.javac.util.Log; // Access to 'javac' output streams
+import com.sun.tools.javac.util.Log;
/**
* Utility for integrating with javadoc tools and for localization.
@@ -43,6 +41,11 @@
*
* Also provides implementation for DocErrorReporter.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @see java.util.ResourceBundle
* @see java.text.MessageFormat
* @author Neal Gafter (rewrite)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,9 @@
package com.sun.tools.javadoc;
+import java.lang.reflect.Modifier;
+
import com.sun.javadoc.*;
-
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.code.Type;
@@ -34,11 +35,14 @@
import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
import com.sun.tools.javac.util.Position;
-import java.lang.reflect.Modifier;
-
/**
* Represents a method of a java class.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @since 1.2
* @author Robert Field
* @author Neal Gafter (rewrite)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/ModifierFilter.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ModifierFilter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ModifierFilter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,13 @@
* Filtering is done by returning boolean values.
* Classes, methods and fields can be filtered, or filtering
* can be done directly on modifier bits.
- * @see com.sun.tools.javac.code.Flags;
+ *
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
+ * @see com.sun.tools.javac.code.Flags
* @author Robert Field
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,12 @@
package com.sun.tools.javadoc;
+import java.io.IOException;
import java.io.InputStream;
-import java.io.IOException;
+
import javax.tools.FileObject;
import com.sun.javadoc.*;
-
import com.sun.tools.javac.code.Attribute;
import com.sun.tools.javac.code.Scope;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
@@ -47,6 +47,11 @@
* about the package, the package's comment and tags, and the
* classes in the package.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @since 1.2
* @author Kaiyang Liu (original)
* @author Robert Field (rewrite)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/ParamTagImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ParamTagImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ParamTagImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,11 @@
* Represents an @param documentation tag.
* Parses and stores the name and comment parts of the parameter tag.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Robert Field
*
*/
@@ -101,8 +106,8 @@
* TagImpls consisting of SeeTagImpl(s) and text containing TagImpl(s).
*
* @return TagImpl[] Array of tags with inline SeeTagImpls.
- * @see TagImpl#inlineTagImpls()
- * @see ThrowsTagImpl#inlineTagImpls()
+ * @see TagImpl#inlineTags()
+ * @see ThrowsTagImpl#inlineTags()
*/
@Override
public Tag[] inlineTags() {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/ParameterImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ParameterImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ParameterImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,12 +29,16 @@
import com.sun.tools.javac.code.Attribute;
import com.sun.tools.javac.code.Symbol.VarSymbol;
-import com.sun.tools.javac.code.Type;
/**
* ParameterImpl information.
* This includes a parameter type and parameter name.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Kaiyang Liu (original)
* @author Robert Field (rewrite)
* @author Scott Seligman (generics, annotations)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,11 @@
* Implementation of ParameterizedType, which
* represents an invocation of a generic class or interface.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Scott Seligman
* @since 1.5
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,13 +27,12 @@
import com.sun.javadoc.*;
-import com.sun.tools.javac.code.Symbol;
-import com.sun.tools.javac.code.Symbol.ClassSymbol;
-
-import com.sun.tools.javac.code.Type;
-import com.sun.tools.javac.code.TypeTags;
-import com.sun.tools.javac.code.Type.ClassType;
-
+/**
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
class PrimitiveType implements com.sun.javadoc.Type {
private final String name;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,26 +25,27 @@
package com.sun.tools.javadoc;
-import com.sun.javadoc.*;
+import java.lang.reflect.Modifier;
+import java.text.CollationKey;
+import com.sun.javadoc.*;
import com.sun.tools.javac.code.Attribute;
-import com.sun.tools.javac.code.Flags;
import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
-
import com.sun.tools.javac.tree.JCTree;
-
import com.sun.tools.javac.util.Position;
-import java.lang.reflect.Modifier;
-import java.text.CollationKey;
-
/**
* Represents a java program element: class, interface, field,
* constructor, or method.
* This is an abstract class dealing with information common to
* these elements.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @see MemberDocImpl
* @see ClassDocImpl
*
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,12 @@
/**
* This class holds the information from one run of javadoc.
* Particularly the packages, classes and options specified
- * by the user..
+ * by the user.
+ *
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
*
* @since 1.2
* @author Robert Field
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,18 @@
package com.sun.tools.javadoc;
+import com.sun.javadoc.*;
import com.sun.tools.javac.util.*;
-import com.sun.javadoc.*;
-
/**
* Represents a see also documentation tag.
* The @see tag can be plain text, or reference a class or member.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Kaiyang Liu (original)
* @author Robert Field (rewrite)
* @author Atul M Dambalkar
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/SerialFieldTagImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/SerialFieldTagImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/SerialFieldTagImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,11 @@
* This tag is only allowed in the javadoc for the special member
* serialPersistentFields.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Joe Fialli
* @author Neal Gafter
*
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/SerializedForm.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/SerializedForm.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/SerializedForm.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,15 +26,14 @@
package com.sun.tools.javadoc;
import com.sun.javadoc.*;
-
import com.sun.tools.javac.code.Flags;
import com.sun.tools.javac.code.Kinds;
import com.sun.tools.javac.code.Scope;
-import com.sun.tools.javac.code.Symbol.VarSymbol;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
import com.sun.tools.javac.code.Symbol.MethodSymbol;
+import com.sun.tools.javac.code.Symbol.VarSymbol;
+import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Name;
-import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Names;
/**
@@ -59,6 +58,11 @@
* b. For Externalizable, data layout is described by 2(b).
*
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @since 1.2
* @author Joe Fialli
* @author Neal Gafter (rewrite but not too proud)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,11 @@
/**
* A source position: filename, line number, and column number.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @since J2SE1.4
* @author Neal M Gafter
* @author Michael Van De Vanter (position representation changed to char offsets)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/Start.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/Start.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/Start.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,28 +25,30 @@
package com.sun.tools.javadoc;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.StringTokenizer;
+
import com.sun.javadoc.*;
-
import com.sun.tools.javac.main.CommandLine;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.util.Options;
-
-import java.io.IOException;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-
-import java.util.StringTokenizer;
-
import static com.sun.tools.javac.code.Flags.*;
/**
* Main program of Javadoc.
* Previously named "Main".
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @since 1.2
* @author Robert Field
* @author Neal Gafter (rewrite)
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/TagImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/TagImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/TagImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,11 @@
* special processing are handled by subclasses (ParamTagImpl, SeeTagImpl,
* and ThrowsTagImpl
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Robert Field
* @author Atul M Dambalkar
* @author Neal M Gafter
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/ThrowsTagImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ThrowsTagImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ThrowsTagImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,11 @@
* The exception name my be the name of a type variable.
* Note: @exception is a backwards compatible synonymy for @throws.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Robert Field
* @author Atul M Dambalkar
* @see ExecutableMemberDocImpl#throwsTags()
@@ -108,8 +113,8 @@
* TagImpls consisting of SeeTagImpl(s) and text containing TagImpl(s).
*
* @return TagImpl[] Array of tags with inline SeeTagImpls.
- * @see TagImpl#inlineTagImpls()
- * @see ParamTagImpl#inlineTagImpls()
+ * @see TagImpl#inlineTags()
+ * @see ParamTagImpl#inlineTags()
*/
@Override
public Tag[] inlineTags() {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/TypeMaker.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/TypeMaker.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/TypeMaker.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,18 +26,21 @@
package com.sun.tools.javadoc;
import com.sun.javadoc.*;
-
import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
import com.sun.tools.javac.code.Type;
+import com.sun.tools.javac.code.Type.ArrayType;
import com.sun.tools.javac.code.Type.ClassType;
import com.sun.tools.javac.code.Type.TypeVar;
-import com.sun.tools.javac.code.Type.ArrayType;
import com.sun.tools.javac.util.List;
-
import static com.sun.tools.javac.code.TypeTags.*;
-
+/**
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ */
public class TypeMaker {
public static com.sun.javadoc.Type getType(DocEnv env, Type t) {
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
package com.sun.tools.javadoc;
-
import com.sun.javadoc.*;
import com.sun.tools.javac.code.Kinds;
@@ -42,6 +41,11 @@
* Implementation of TypeVariable, which
* represents a type variable.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Scott Seligman
* @since 1.5
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java
--- a/langtools/src/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
package com.sun.tools.javadoc;
-
import com.sun.javadoc.*;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
@@ -37,6 +36,11 @@
* Implementation of WildcardType, which
* represents a wildcard type.
*
+ * This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.
+ *
* @author Scott Seligman
* @since 1.5
*/
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javah/Gen.java
--- a/langtools/src/share/classes/com/sun/tools/javah/Gen.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javah/Gen.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -287,7 +287,7 @@
constString = value.toString();
}
if (constString != null) {
- StringBuffer s = new StringBuffer("#undef ");
+ StringBuilder s = new StringBuilder("#undef ");
s.append(cname); s.append("_"); s.append(fname); s.append(lineSep);
s.append("#define "); s.append(cname); s.append("_");
s.append(fname); s.append(" "); s.append(constString);
@@ -370,7 +370,7 @@
// c.f. MethodDoc.signature
String signature(ExecutableElement e) {
- StringBuffer sb = new StringBuffer("(");
+ StringBuilder sb = new StringBuilder("(");
String sep = "";
for (VariableElement p: e.getParameters()) {
sb.append(sep);
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javah/LLNI.java
--- a/langtools/src/share/classes/com/sun/tools/javah/LLNI.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javah/LLNI.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -647,7 +647,7 @@
%%% This may not be right, but should be called more often. */
protected final String nameToIdentifier(String name) {
int len = name.length();
- StringBuffer buf = new StringBuffer(len);
+ StringBuilder buf = new StringBuilder(len);
for (int i = 0; i < len; i++) {
char c = name.charAt(i);
if (isASCIILetterOrDigit(c))
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javah/Mangle.java
--- a/langtools/src/share/classes/com/sun/tools/javah/Mangle.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javah/Mangle.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -66,7 +66,7 @@
}
public final String mangle(CharSequence name, int mtype) {
- StringBuffer result = new StringBuffer(100);
+ StringBuilder result = new StringBuilder(100);
int length = name.length();
for (int i = 0; i < length; i++) {
@@ -115,7 +115,7 @@
public String mangleMethod(ExecutableElement method, TypeElement clazz,
int mtype) throws TypeSignature.SignatureException {
- StringBuffer result = new StringBuffer(100);
+ StringBuilder result = new StringBuilder(100);
result.append("Java_");
if (mtype == Mangle.Type.METHOD_JDK_1) {
@@ -164,7 +164,7 @@
// Warning: duplicated in Gen
private String signature(ExecutableElement e) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
String sep = "(";
for (VariableElement p: e.getParameters()) {
sb.append(sep);
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javah/NativeHeaderTool.java
--- a/langtools/src/share/classes/com/sun/tools/javah/NativeHeaderTool.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javah/NativeHeaderTool.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,11 +29,13 @@
import java.nio.charset.Charset;
import java.util.Locale;
import java.util.concurrent.Callable;
+import javax.tools.Diagnostic;
import javax.tools.DiagnosticListener;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
import javax.tools.OptionChecker;
import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
import javax.tools.Tool;
/**
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/com/sun/tools/javap/DisassemblerTool.java
--- a/langtools/src/share/classes/com/sun/tools/javap/DisassemblerTool.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javap/DisassemblerTool.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,11 +29,13 @@
import java.nio.charset.Charset;
import java.util.Locale;
import java.util.concurrent.Callable;
+import javax.tools.Diagnostic;
import javax.tools.DiagnosticListener;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
import javax.tools.OptionChecker;
import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
import javax.tools.Tool;
/**
@@ -69,9 +71,7 @@
* @param options compiler options, {@code null} means no options
* @param classes class names (for annotation processing), {@code
* null} means no class names
- * @param compilationUnits the compilation units to compile, {@code
- * null} means no compilation units
- * @return an object representing the compilation
+ * @return a task to perform the disassembly
* @throws RuntimeException if an unrecoverable error
* occurred in a user supplied component. The
* {@linkplain Throwable#getCause() cause} will be the error in
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/annotation/processing/Completions.java
--- a/langtools/src/share/classes/javax/annotation/processing/Completions.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/annotation/processing/Completions.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
package javax.annotation.processing;
-import java.util.Arrays;
-
/**
* Utility class for assembling {@link Completion} objects.
*
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/annotation/processing/FilerException.java
--- a/langtools/src/share/classes/javax/annotation/processing/FilerException.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/annotation/processing/FilerException.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
package javax.annotation.processing;
import java.io.IOException;
-import javax.annotation.processing.Filer;
/**
* Indicates a {@link Filer} detected an attempt to open a file that
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/annotation/processing/ProcessingEnvironment.java
--- a/langtools/src/share/classes/javax/annotation/processing/ProcessingEnvironment.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/annotation/processing/ProcessingEnvironment.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,10 @@
package javax.annotation.processing;
import java.util.Map;
-import java.util.List;
import java.util.Locale;
import javax.lang.model.SourceVersion;
import javax.lang.model.util.Elements;
import javax.lang.model.util.Types;
-import java.io.File;
/**
* An annotation processing tool framework will {@linkplain
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/element/AnnotationValue.java
--- a/langtools/src/share/classes/javax/lang/model/element/AnnotationValue.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/element/AnnotationValue.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,6 @@
package javax.lang.model.element;
-
-import java.util.List;
-import javax.lang.model.type.*;
-
/**
* Represents a value of an annotation type element.
* A value is of one of the following types:
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/element/Element.java
--- a/langtools/src/share/classes/javax/lang/model/element/Element.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/element/Element.java Tue Oct 23 09:42:48 2012 -0700
@@ -32,7 +32,6 @@
import java.util.List;
import java.util.Set;
-import javax.lang.model.element.Modifier;
import javax.lang.model.type.*;
import javax.lang.model.util.*;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/element/ExecutableElement.java
--- a/langtools/src/share/classes/javax/lang/model/element/ExecutableElement.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/element/ExecutableElement.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
package javax.lang.model.element;
import java.util.List;
-import javax.lang.model.util.Types;
import javax.lang.model.type.*;
/**
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/element/VariableElement.java
--- a/langtools/src/share/classes/javax/lang/model/element/VariableElement.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/element/VariableElement.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
package javax.lang.model.element;
-import javax.lang.model.type.TypeMirror;
import javax.lang.model.util.Elements;
/**
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/type/MirroredTypeException.java
--- a/langtools/src/share/classes/javax/lang/model/type/MirroredTypeException.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/type/MirroredTypeException.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
import java.io.ObjectInputStream;
import java.io.IOException;
-import java.lang.annotation.Annotation;
import javax.lang.model.element.Element;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/type/MirroredTypesException.java
--- a/langtools/src/share/classes/javax/lang/model/type/MirroredTypesException.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/type/MirroredTypesException.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
package javax.lang.model.type;
-import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.List;
import java.util.Collections;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,8 @@
package javax.lang.model.util;
-import java.util.List;
import javax.lang.model.element.*;
-import javax.lang.model.type.TypeMirror;
import static javax.lang.model.SourceVersion.*;
import javax.lang.model.SourceVersion;
import javax.annotation.processing.SupportedSourceVersion;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java Tue Oct 23 09:42:48 2012 -0700
@@ -25,10 +25,6 @@
package javax.lang.model.util;
-import java.util.List;
-import javax.lang.model.element.*;
-
-import javax.lang.model.type.TypeMirror;
import static javax.lang.model.SourceVersion.*;
import javax.lang.model.SourceVersion;
import javax.annotation.processing.SupportedSourceVersion;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,6 @@
package javax.lang.model.util;
-import java.util.List;
-import javax.lang.model.element.*;
-
-import javax.lang.model.type.TypeMirror;
import static javax.lang.model.SourceVersion.*;
import javax.lang.model.SourceVersion;
import javax.annotation.processing.SupportedSourceVersion;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,10 @@
package javax.lang.model.util;
-
-import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
import javax.lang.model.element.*;
-import static javax.lang.model.element.ElementKind.*;
import static javax.lang.model.SourceVersion.*;
-import javax.lang.model.SourceVersion;
/**
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,9 @@
package javax.lang.model.util;
-import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
-import javax.lang.model.element.*;
-import static javax.lang.model.element.ElementKind.*;
+import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
-import javax.lang.model.SourceVersion;
/**
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor8.java
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor8.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor8.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,9 @@
package javax.lang.model.util;
-import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
-import javax.lang.model.element.*;
-import static javax.lang.model.element.ElementKind.*;
+import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
-import javax.lang.model.SourceVersion;
/**
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/ElementFilter.java
--- a/langtools/src/share/classes/javax/lang/model/util/ElementFilter.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/ElementFilter.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,18 +25,14 @@
package javax.lang.model.util;
-import java.lang.Iterable;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.EnumSet;
import java.util.ArrayList;
import java.util.LinkedHashSet;
-import java.util.NoSuchElementException;
import javax.lang.model.element.*;
-import javax.lang.model.type.*;
/**
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java
--- a/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,10 @@
package javax.lang.model.util;
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
import javax.lang.model.element.*;
-import static javax.lang.model.element.ElementKind.*;
-import javax.annotation.processing.SupportedSourceVersion;
import static javax.lang.model.SourceVersion.*;
-import javax.lang.model.SourceVersion;
/**
* A visitor of program elements based on their {@linkplain
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java
--- a/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java Tue Oct 23 09:42:48 2012 -0700
@@ -26,7 +26,6 @@
package javax.lang.model.util;
import javax.lang.model.element.*;
-import static javax.lang.model.element.ElementKind.*;
import javax.annotation.processing.SupportedSourceVersion;
import static javax.lang.model.SourceVersion.*;
import javax.lang.model.SourceVersion;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/ElementScanner6.java
--- a/langtools/src/share/classes/javax/lang/model/util/ElementScanner6.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/ElementScanner6.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.element.ElementKind.*;
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/ElementScanner7.java
--- a/langtools/src/share/classes/javax/lang/model/util/ElementScanner7.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/ElementScanner7.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.element.ElementKind.*;
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/ElementScanner8.java
--- a/langtools/src/share/classes/javax/lang/model/util/ElementScanner8.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/ElementScanner8.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.element.ElementKind.*;
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,9 @@
package javax.lang.model.util;
-import java.util.List;
-import javax.lang.model.element.*;
-
-import javax.lang.model.type.TypeMirror;
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
-import javax.lang.model.SourceVersion;
-import javax.annotation.processing.SupportedSourceVersion;
/**
* A simple visitor for annotation values with default behavior
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,9 @@
package javax.lang.model.util;
-import java.util.List;
-import javax.lang.model.element.*;
-
-import javax.lang.model.type.TypeMirror;
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
-import javax.lang.model.SourceVersion;
-import javax.annotation.processing.SupportedSourceVersion;
/**
* A simple visitor for annotation values with default behavior
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.element.ElementKind.*;
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.element.ElementKind.*;
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,7 @@
package javax.lang.model.util;
-import javax.lang.model.element.*;
import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.element.ElementKind.*;
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
package javax.lang.model.util;
-import javax.lang.model.type.*;
import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
import static javax.lang.model.SourceVersion.*;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java
--- a/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,10 @@
package javax.lang.model.util;
-
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
import javax.lang.model.type.*;
-import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.element.ElementKind.*;
import static javax.lang.model.SourceVersion.*;
-import javax.lang.model.SourceVersion;
/**
* A visitor of types based on their {@linkplain TypeKind kind} with
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java
--- a/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
import javax.lang.model.type.*;
import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.element.ElementKind.*;
import static javax.lang.model.SourceVersion.*;
import javax.lang.model.SourceVersion;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor8.java
--- a/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor8.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor8.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,10 @@
package javax.lang.model.util;
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
import javax.lang.model.type.*;
-import javax.annotation.processing.SupportedSourceVersion;
-import static javax.lang.model.element.ElementKind.*;
import static javax.lang.model.SourceVersion.*;
-import javax.lang.model.SourceVersion;
/**
* A visitor of types based on their {@linkplain TypeKind kind} with
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/tools/ForwardingJavaFileManager.java
--- a/langtools/src/share/classes/javax/tools/ForwardingJavaFileManager.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/tools/ForwardingJavaFileManager.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
package javax.tools;
import java.io.IOException;
-import java.net.URI;
import java.util.Iterator;
import java.util.Set;
import javax.tools.JavaFileObject.Kind;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/src/share/classes/javax/tools/JavaFileObject.java
--- a/langtools/src/share/classes/javax/tools/JavaFileObject.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/src/share/classes/javax/tools/JavaFileObject.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,6 @@
package javax.tools;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-import java.nio.CharBuffer;
import javax.lang.model.element.NestingKind;
import javax.lang.model.element.Modifier;
diff -r 8d9d430b4244 -r 27d36231d705 langtools/test/com/sun/javadoc/VersionNumber/VersionNumber.java
--- a/langtools/test/com/sun/javadoc/VersionNumber/VersionNumber.java Wed Jul 05 18:26:51 2017 +0200
+++ b/langtools/test/com/sun/javadoc/VersionNumber/VersionNumber.java Tue Oct 23 09:42:48 2012 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -84,7 +84,7 @@
// Test the proper DOCTYPE element is present:
{
- " |