Skip to content

Commit 1fd4687

Browse files
author
Lana Steuck
committed
Merge
2 parents 048d171 + 9ffac2c commit 1fd4687

File tree

92 files changed

+1878
-276
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1878
-276
lines changed

‎langtools/src/share/classes/com/sun/source/tree/MethodTree.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,15 @@ public interface MethodTree extends Tree {
5353
Tree getReturnType();
5454
List<? extends TypeParameterTree> getTypeParameters();
5555
List<? extends VariableTree> getParameters();
56+
57+
/**
58+
* Return an explicit receiver parameter ("this" parameter).
59+
*
60+
* @return an explicit receiver parameter ("this" parameter)
61+
* @since 1.8
62+
*/
5663
VariableTree getReceiverParameter();
64+
5765
List<? extends ExpressionTree> getThrows();
5866
BlockTree getBody();
5967
Tree getDefaultValue(); // for annotation types

‎langtools/src/share/classes/com/sun/source/tree/TypeParameterTree.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
* <em>name</em>
3737
*
3838
* <em>name</em> extends <em>bounds</em>
39+
*
40+
* <em>annotations</em> <em>name</em>
3941
* </pre>
4042
*
4143
* @jls section 4.4
@@ -48,5 +50,17 @@
4850
public interface TypeParameterTree extends Tree {
4951
Name getName();
5052
List<? extends Tree> getBounds();
53+
54+
/**
55+
* Return annotations on the type parameter declaration.
56+
*
57+
* Annotations need Target meta-annotations of
58+
* {@link java.lang.annotation.ElementType#TYPE_PARAMETER} or
59+
* {@link java.lang.annotation.ElementType#TYPE_USE}
60+
* to appear in this position.
61+
*
62+
* @return annotations on the type parameter declaration
63+
* @since 1.8
64+
*/
5165
List<? extends AnnotationTree> getAnnotations();
5266
}

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public static void generate(ConfigurationImpl configuration,
102102
configuration.standardmessage.
103103
error("doclet.exception_encountered",
104104
exc.toString(), filename);
105-
throw new DocletAbortException();
105+
throw new DocletAbortException(exc);
106106
}
107107
}
108108

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ protected void addSummaryDetailLinks(Content subDiv) {
304304
subDiv.addContent(div);
305305
} catch (Exception e) {
306306
e.printStackTrace();
307-
throw new DocletAbortException();
307+
throw new DocletAbortException(e);
308308
}
309309
}
310310

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public static void generate(ConfigurationImpl configuration,
218218
configuration.standardmessage.
219219
error("doclet.exception_encountered",
220220
exc.toString(), path.getPath());
221-
throw new DocletAbortException();
221+
throw new DocletAbortException(exc);
222222
}
223223
}
224224

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ protected void addSummaryDetailLinks(Content subDiv) {
610610
subDiv.addContent(div);
611611
} catch (Exception e) {
612612
e.printStackTrace();
613-
throw new DocletAbortException();
613+
throw new DocletAbortException(e);
614614
}
615615
}
616616

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -127,7 +127,7 @@ public static void generate(ConfigurationImpl configuration) {
127127
configuration.standardmessage.error(
128128
"doclet.exception_encountered",
129129
exc.toString(), filename);
130-
throw new DocletAbortException();
130+
throw new DocletAbortException(exc);
131131
}
132132
}
133133

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public static void generate(ConfigurationImpl configuration) {
8787
configuration.standardmessage.error(
8888
"doclet.exception_encountered",
8989
exc.toString(), filename);
90-
throw new DocletAbortException();
90+
throw new DocletAbortException(exc);
9191
}
9292
}
9393

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public static void generate(ConfigurationImpl configuration) {
7272
configuration.standardmessage.error(
7373
"doclet.exception_encountered",
7474
exc.toString(), filename);
75-
throw new DocletAbortException();
75+
throw new DocletAbortException(exc);
7676
}
7777
}
7878

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ protected void generateClassFiles(ClassDoc[] arr, ClassTree classtree) {
196196
}
197197
} catch (Exception e) {
198198
e.printStackTrace();
199-
throw new DocletAbortException();
199+
throw new DocletAbortException(e);
200200
}
201201
}
202202
}
@@ -332,7 +332,7 @@ private void performCopy(String filename) {
332332
configuration.message.error((SourcePosition) null,
333333
"doclet.perform_copy_exception_encountered",
334334
exc.toString());
335-
throw new DocletAbortException();
335+
throw new DocletAbortException(exc);
336336
}
337337
}
338338
}

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ public void printHtmlDocument(String[] metakeywords, boolean includeScript,
411411
head.addContent(headComment);
412412
}
413413
if (configuration.charset.length() > 0) {
414-
Content meta = HtmlTree.META("Content-Type", "text/html",
414+
Content meta = HtmlTree.META("Content-Type", CONTENT_TYPE,
415415
configuration.charset);
416416
head.addContent(meta);
417417
}

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public static void generate(ConfigurationImpl configuration,
109109
configuration.standardmessage.error(
110110
"doclet.exception_encountered",
111111
exc.toString(), DocPaths.PACKAGE_FRAME.getPath());
112-
throw new DocletAbortException();
112+
throw new DocletAbortException(exc);
113113
}
114114
}
115115

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public static void generate(ConfigurationImpl configuration) {
7171
configuration.standardmessage.error(
7272
"doclet.exception_encountered",
7373
exc.toString(), filename);
74-
throw new DocletAbortException();
74+
throw new DocletAbortException(exc);
7575
}
7676
}
7777

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public static void generate(ConfigurationImpl configuration) {
9898
configuration.standardmessage.error(
9999
"doclet.exception_encountered",
100100
exc.toString(), filename);
101-
throw new DocletAbortException();
101+
throw new DocletAbortException(exc);
102102
}
103103
}
104104

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public static void generate(ConfigurationImpl configuration,
105105
configuration.standardmessage.error(
106106
"doclet.exception_encountered",
107107
exc.toString(), path.getPath());
108-
throw new DocletAbortException();
108+
throw new DocletAbortException(exc);
109109
}
110110
}
111111

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public static void generate(ConfigurationImpl configuration,
106106
configuration.standardmessage.error(
107107
"doclet.exception_encountered",
108108
exc.toString(), filename);
109-
throw new DocletAbortException();
109+
throw new DocletAbortException(exc);
110110
}
111111
}
112112

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfileIndexFrameWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public static void generate(ConfigurationImpl configuration) {
7474
configuration.standardmessage.error(
7575
"doclet.exception_encountered",
7676
exc.toString(), filename);
77-
throw new DocletAbortException();
77+
throw new DocletAbortException(exc);
7878
}
7979
}
8080

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public static void generate(ConfigurationImpl configuration,
115115
configuration.standardmessage.error(
116116
"doclet.exception_encountered",
117117
exc.toString(), DocPaths.PACKAGE_FRAME.getPath());
118-
throw new DocletAbortException();
118+
throw new DocletAbortException(exc);
119119
}
120120
}
121121

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageIndexFrameWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public static void generate(ConfigurationImpl configuration, String profileName)
7575
configuration.standardmessage.error(
7676
"doclet.exception_encountered",
7777
exc.toString(), filename);
78-
throw new DocletAbortException();
78+
throw new DocletAbortException(exc);
7979
}
8080
}
8181

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -79,7 +79,7 @@ public static void generate(ConfigurationImpl configuration,
7979
configuration.standardmessage.error(
8080
"doclet.exception_encountered",
8181
exc.toString(), filename);
82-
throw new DocletAbortException();
82+
throw new DocletAbortException(exc);
8383
}
8484
}
8585

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -102,7 +102,7 @@ public static void generate(ConfigurationImpl configuration,
102102
configuration.standardmessage.error(
103103
"doclet.exception_encountered",
104104
exc.toString(), filename.getPath());
105-
throw new DocletAbortException();
105+
throw new DocletAbortException(exc);
106106
}
107107
}
108108

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -93,7 +93,7 @@ public static void generate(ConfigurationImpl configuration,
9393
configuration.standardmessage.error(
9494
"doclet.exception_encountered",
9595
exc.toString(), filename);
96-
throw new DocletAbortException();
96+
throw new DocletAbortException(exc);
9797
}
9898
}
9999

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,7 @@ public Comment(String comment) {
6363
* is not supported.
6464
*/
6565
public void addContent(Content content) {
66-
throw new DocletAbortException();
66+
throw new DocletAbortException("not supported");
6767
}
6868

6969
/**
@@ -75,7 +75,7 @@ public void addContent(Content content) {
7575
* is not supported.
7676
*/
7777
public void addContent(String stringContent) {
78-
throw new DocletAbortException();
78+
throw new DocletAbortException("not supported");
7979
}
8080

8181
/**

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -70,7 +70,7 @@ private DocType(String type, String dtd) {
7070
* is not supported.
7171
*/
7272
public void addContent(Content content) {
73-
throw new DocletAbortException();
73+
throw new DocletAbortException("not supported");
7474
}
7575

7676
/**
@@ -82,7 +82,7 @@ public void addContent(Content content) {
8282
* is not supported.
8383
*/
8484
public void addContent(String stringContent) {
85-
throw new DocletAbortException();
85+
throw new DocletAbortException("not supported");
8686
}
8787

8888
/**

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public enum HtmlAttr {
4040
BORDER,
4141
CELLPADDING,
4242
CELLSPACING,
43-
CHARSET,
4443
CLASS,
4544
CLEAR,
4645
COLS,

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
*/
5454
public abstract class HtmlDocWriter extends HtmlWriter {
5555

56+
public static final String CONTENT_TYPE = "text/html";
57+
5658
/**
5759
* Constructor. Initializes the destination file name through the super
5860
* class HtmlWriter.
@@ -194,7 +196,7 @@ public void printFramesetDocument(String title, boolean noTimeStamp,
194196
head.addContent(headComment);
195197
}
196198
if (configuration.charset.length() > 0) {
197-
Content meta = HtmlTree.META("Content-Type", "text/html",
199+
Content meta = HtmlTree.META("Content-Type", CONTENT_TYPE,
198200
configuration.charset);
199201
head.addContent(meta);
200202
}

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -91,7 +91,7 @@ public final void addContent(Content htmlContent) {
9191
* is not supported.
9292
*/
9393
public void addContent(String stringContent) {
94-
throw new DocletAbortException();
94+
throw new DocletAbortException("not supported");
9595
}
9696

9797
/**

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,9 +456,9 @@ public static HtmlTree LINK(String rel, String type, String href, String title)
456456
*/
457457
public static HtmlTree META(String httpEquiv, String content, String charSet) {
458458
HtmlTree htmltree = new HtmlTree(HtmlTag.META);
459+
String contentCharset = content + "; charset=" + charSet;
459460
htmltree.addAttr(HtmlAttr.HTTP_EQUIV, nullCheck(httpEquiv));
460-
htmltree.addAttr(HtmlAttr.CONTENT, nullCheck(content));
461-
htmltree.addAttr(HtmlAttr.CHARSET, nullCheck(charSet));
461+
htmltree.addAttr(HtmlAttr.CONTENT, contentCharset);
462462
return htmltree;
463463
}
464464

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public RawHtml(String rawHtml) {
6565
* is not supported.
6666
*/
6767
public void addContent(Content content) {
68-
throw new DocletAbortException();
68+
throw new DocletAbortException("not supported");
6969
}
7070

7171
/**
@@ -77,7 +77,7 @@ public void addContent(Content content) {
7777
* is not supported.
7878
*/
7979
public void addContent(String stringContent) {
80-
throw new DocletAbortException();
80+
throw new DocletAbortException("not supported");
8181
}
8282

8383
/**

‎langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public StringContent(String initialContent) {
7272
*/
7373
@Override
7474
public void addContent(Content content) {
75-
throw new DocletAbortException();
75+
throw new DocletAbortException("not supported");
7676
}
7777

7878
/**

‎langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ public void setOptions() throws Fault {
539539
initProfiles();
540540
initProfilePackages();
541541
} catch (Exception e) {
542-
throw new DocletAbortException();
542+
throw new DocletAbortException(e);
543543
}
544544
}
545545
setSpecificDocletOptions(root.options());

0 commit comments

Comments
 (0)