Thu, 29 Aug 2013 11:41:20 -0700
8001669: javadoc internal DocletAbortException should set cause when appropriate
Reviewed-by: darcy
1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java Wed Aug 28 15:40:33 2013 -0700 1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java Thu Aug 29 11:41:20 2013 -0700 1.3 @@ -102,7 +102,7 @@ 1.4 configuration.standardmessage. 1.5 error("doclet.exception_encountered", 1.6 exc.toString(), filename); 1.7 - throw new DocletAbortException(); 1.8 + throw new DocletAbortException(exc); 1.9 } 1.10 } 1.11
2.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Wed Aug 28 15:40:33 2013 -0700 2.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Thu Aug 29 11:41:20 2013 -0700 2.3 @@ -304,7 +304,7 @@ 2.4 subDiv.addContent(div); 2.5 } catch (Exception e) { 2.6 e.printStackTrace(); 2.7 - throw new DocletAbortException(); 2.8 + throw new DocletAbortException(e); 2.9 } 2.10 } 2.11
3.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Wed Aug 28 15:40:33 2013 -0700 3.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Thu Aug 29 11:41:20 2013 -0700 3.3 @@ -218,7 +218,7 @@ 3.4 configuration.standardmessage. 3.5 error("doclet.exception_encountered", 3.6 exc.toString(), path.getPath()); 3.7 - throw new DocletAbortException(); 3.8 + throw new DocletAbortException(exc); 3.9 } 3.10 } 3.11
4.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Wed Aug 28 15:40:33 2013 -0700 4.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Thu Aug 29 11:41:20 2013 -0700 4.3 @@ -610,7 +610,7 @@ 4.4 subDiv.addContent(div); 4.5 } catch (Exception e) { 4.6 e.printStackTrace(); 4.7 - throw new DocletAbortException(); 4.8 + throw new DocletAbortException(e); 4.9 } 4.10 } 4.11
5.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Wed Aug 28 15:40:33 2013 -0700 5.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Thu Aug 29 11:41:20 2013 -0700 5.3 @@ -1,5 +1,5 @@ 5.4 /* 5.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 5.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 5.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5.8 * 5.9 * This code is free software; you can redistribute it and/or modify it 5.10 @@ -127,7 +127,7 @@ 5.11 configuration.standardmessage.error( 5.12 "doclet.exception_encountered", 5.13 exc.toString(), filename); 5.14 - throw new DocletAbortException(); 5.15 + throw new DocletAbortException(exc); 5.16 } 5.17 } 5.18
6.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java Wed Aug 28 15:40:33 2013 -0700 6.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java Thu Aug 29 11:41:20 2013 -0700 6.3 @@ -87,7 +87,7 @@ 6.4 configuration.standardmessage.error( 6.5 "doclet.exception_encountered", 6.6 exc.toString(), filename); 6.7 - throw new DocletAbortException(); 6.8 + throw new DocletAbortException(exc); 6.9 } 6.10 } 6.11
7.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java Wed Aug 28 15:40:33 2013 -0700 7.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java Thu Aug 29 11:41:20 2013 -0700 7.3 @@ -72,7 +72,7 @@ 7.4 configuration.standardmessage.error( 7.5 "doclet.exception_encountered", 7.6 exc.toString(), filename); 7.7 - throw new DocletAbortException(); 7.8 + throw new DocletAbortException(exc); 7.9 } 7.10 } 7.11
8.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Wed Aug 28 15:40:33 2013 -0700 8.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Thu Aug 29 11:41:20 2013 -0700 8.3 @@ -196,7 +196,7 @@ 8.4 } 8.5 } catch (Exception e) { 8.6 e.printStackTrace(); 8.7 - throw new DocletAbortException(); 8.8 + throw new DocletAbortException(e); 8.9 } 8.10 } 8.11 } 8.12 @@ -332,7 +332,7 @@ 8.13 configuration.message.error((SourcePosition) null, 8.14 "doclet.perform_copy_exception_encountered", 8.15 exc.toString()); 8.16 - throw new DocletAbortException(); 8.17 + throw new DocletAbortException(exc); 8.18 } 8.19 } 8.20 }
9.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Wed Aug 28 15:40:33 2013 -0700 9.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Thu Aug 29 11:41:20 2013 -0700 9.3 @@ -109,7 +109,7 @@ 9.4 configuration.standardmessage.error( 9.5 "doclet.exception_encountered", 9.6 exc.toString(), DocPaths.PACKAGE_FRAME.getPath()); 9.7 - throw new DocletAbortException(); 9.8 + throw new DocletAbortException(exc); 9.9 } 9.10 } 9.11
10.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Wed Aug 28 15:40:33 2013 -0700 10.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Thu Aug 29 11:41:20 2013 -0700 10.3 @@ -71,7 +71,7 @@ 10.4 configuration.standardmessage.error( 10.5 "doclet.exception_encountered", 10.6 exc.toString(), filename); 10.7 - throw new DocletAbortException(); 10.8 + throw new DocletAbortException(exc); 10.9 } 10.10 } 10.11
11.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Wed Aug 28 15:40:33 2013 -0700 11.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Thu Aug 29 11:41:20 2013 -0700 11.3 @@ -98,7 +98,7 @@ 11.4 configuration.standardmessage.error( 11.5 "doclet.exception_encountered", 11.6 exc.toString(), filename); 11.7 - throw new DocletAbortException(); 11.8 + throw new DocletAbortException(exc); 11.9 } 11.10 } 11.11
12.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java Wed Aug 28 15:40:33 2013 -0700 12.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java Thu Aug 29 11:41:20 2013 -0700 12.3 @@ -105,7 +105,7 @@ 12.4 configuration.standardmessage.error( 12.5 "doclet.exception_encountered", 12.6 exc.toString(), path.getPath()); 12.7 - throw new DocletAbortException(); 12.8 + throw new DocletAbortException(exc); 12.9 } 12.10 } 12.11
13.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Wed Aug 28 15:40:33 2013 -0700 13.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Thu Aug 29 11:41:20 2013 -0700 13.3 @@ -106,7 +106,7 @@ 13.4 configuration.standardmessage.error( 13.5 "doclet.exception_encountered", 13.6 exc.toString(), filename); 13.7 - throw new DocletAbortException(); 13.8 + throw new DocletAbortException(exc); 13.9 } 13.10 } 13.11
14.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ProfileIndexFrameWriter.java Wed Aug 28 15:40:33 2013 -0700 14.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfileIndexFrameWriter.java Thu Aug 29 11:41:20 2013 -0700 14.3 @@ -74,7 +74,7 @@ 14.4 configuration.standardmessage.error( 14.5 "doclet.exception_encountered", 14.6 exc.toString(), filename); 14.7 - throw new DocletAbortException(); 14.8 + throw new DocletAbortException(exc); 14.9 } 14.10 } 14.11
15.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java Wed Aug 28 15:40:33 2013 -0700 15.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java Thu Aug 29 11:41:20 2013 -0700 15.3 @@ -115,7 +115,7 @@ 15.4 configuration.standardmessage.error( 15.5 "doclet.exception_encountered", 15.6 exc.toString(), DocPaths.PACKAGE_FRAME.getPath()); 15.7 - throw new DocletAbortException(); 15.8 + throw new DocletAbortException(exc); 15.9 } 15.10 } 15.11
16.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageIndexFrameWriter.java Wed Aug 28 15:40:33 2013 -0700 16.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageIndexFrameWriter.java Thu Aug 29 11:41:20 2013 -0700 16.3 @@ -75,7 +75,7 @@ 16.4 configuration.standardmessage.error( 16.5 "doclet.exception_encountered", 16.6 exc.toString(), filename); 16.7 - throw new DocletAbortException(); 16.8 + throw new DocletAbortException(exc); 16.9 } 16.10 } 16.11
17.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java Wed Aug 28 15:40:33 2013 -0700 17.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java Thu Aug 29 11:41:20 2013 -0700 17.3 @@ -1,5 +1,5 @@ 17.4 /* 17.5 - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. 17.6 + * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 17.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 17.8 * 17.9 * This code is free software; you can redistribute it and/or modify it 17.10 @@ -79,7 +79,7 @@ 17.11 configuration.standardmessage.error( 17.12 "doclet.exception_encountered", 17.13 exc.toString(), filename); 17.14 - throw new DocletAbortException(); 17.15 + throw new DocletAbortException(exc); 17.16 } 17.17 } 17.18
18.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java Wed Aug 28 15:40:33 2013 -0700 18.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java Thu Aug 29 11:41:20 2013 -0700 18.3 @@ -1,5 +1,5 @@ 18.4 /* 18.5 - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. 18.6 + * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 18.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 18.8 * 18.9 * This code is free software; you can redistribute it and/or modify it 18.10 @@ -102,7 +102,7 @@ 18.11 configuration.standardmessage.error( 18.12 "doclet.exception_encountered", 18.13 exc.toString(), filename.getPath()); 18.14 - throw new DocletAbortException(); 18.15 + throw new DocletAbortException(exc); 18.16 } 18.17 } 18.18
19.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Wed Aug 28 15:40:33 2013 -0700 19.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Thu Aug 29 11:41:20 2013 -0700 19.3 @@ -1,5 +1,5 @@ 19.4 /* 19.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 19.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 19.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 19.8 * 19.9 * This code is free software; you can redistribute it and/or modify it 19.10 @@ -93,7 +93,7 @@ 19.11 configuration.standardmessage.error( 19.12 "doclet.exception_encountered", 19.13 exc.toString(), filename); 19.14 - throw new DocletAbortException(); 19.15 + throw new DocletAbortException(exc); 19.16 } 19.17 } 19.18
20.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java Wed Aug 28 15:40:33 2013 -0700 20.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java Thu Aug 29 11:41:20 2013 -0700 20.3 @@ -1,5 +1,5 @@ 20.4 /* 20.5 - * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. 20.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. 20.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 20.8 * 20.9 * This code is free software; you can redistribute it and/or modify it 20.10 @@ -63,7 +63,7 @@ 20.11 * is not supported. 20.12 */ 20.13 public void addContent(Content content) { 20.14 - throw new DocletAbortException(); 20.15 + throw new DocletAbortException("not supported"); 20.16 } 20.17 20.18 /** 20.19 @@ -75,7 +75,7 @@ 20.20 * is not supported. 20.21 */ 20.22 public void addContent(String stringContent) { 20.23 - throw new DocletAbortException(); 20.24 + throw new DocletAbortException("not supported"); 20.25 } 20.26 20.27 /**
21.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java Wed Aug 28 15:40:33 2013 -0700 21.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java Thu Aug 29 11:41:20 2013 -0700 21.3 @@ -1,5 +1,5 @@ 21.4 /* 21.5 - * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. 21.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. 21.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 21.8 * 21.9 * This code is free software; you can redistribute it and/or modify it 21.10 @@ -70,7 +70,7 @@ 21.11 * is not supported. 21.12 */ 21.13 public void addContent(Content content) { 21.14 - throw new DocletAbortException(); 21.15 + throw new DocletAbortException("not supported"); 21.16 } 21.17 21.18 /** 21.19 @@ -82,7 +82,7 @@ 21.20 * is not supported. 21.21 */ 21.22 public void addContent(String stringContent) { 21.23 - throw new DocletAbortException(); 21.24 + throw new DocletAbortException("not supported"); 21.25 } 21.26 21.27 /**
22.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java Wed Aug 28 15:40:33 2013 -0700 22.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java Thu Aug 29 11:41:20 2013 -0700 22.3 @@ -1,5 +1,5 @@ 22.4 /* 22.5 - * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. 22.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. 22.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 22.8 * 22.9 * This code is free software; you can redistribute it and/or modify it 22.10 @@ -91,7 +91,7 @@ 22.11 * is not supported. 22.12 */ 22.13 public void addContent(String stringContent) { 22.14 - throw new DocletAbortException(); 22.15 + throw new DocletAbortException("not supported"); 22.16 } 22.17 22.18 /**
23.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java Wed Aug 28 15:40:33 2013 -0700 23.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java Thu Aug 29 11:41:20 2013 -0700 23.3 @@ -65,7 +65,7 @@ 23.4 * is not supported. 23.5 */ 23.6 public void addContent(Content content) { 23.7 - throw new DocletAbortException(); 23.8 + throw new DocletAbortException("not supported"); 23.9 } 23.10 23.11 /** 23.12 @@ -77,7 +77,7 @@ 23.13 * is not supported. 23.14 */ 23.15 public void addContent(String stringContent) { 23.16 - throw new DocletAbortException(); 23.17 + throw new DocletAbortException("not supported"); 23.18 } 23.19 23.20 /**
24.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java Wed Aug 28 15:40:33 2013 -0700 24.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java Thu Aug 29 11:41:20 2013 -0700 24.3 @@ -72,7 +72,7 @@ 24.4 */ 24.5 @Override 24.6 public void addContent(Content content) { 24.7 - throw new DocletAbortException(); 24.8 + throw new DocletAbortException("not supported"); 24.9 } 24.10 24.11 /**
25.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Wed Aug 28 15:40:33 2013 -0700 25.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Thu Aug 29 11:41:20 2013 -0700 25.3 @@ -539,7 +539,7 @@ 25.4 initProfiles(); 25.5 initProfilePackages(); 25.6 } catch (Exception e) { 25.7 - throw new DocletAbortException(); 25.8 + throw new DocletAbortException(e); 25.9 } 25.10 } 25.11 setSpecificDocletOptions(root.options());
26.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java Wed Aug 28 15:40:33 2013 -0700 26.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java Thu Aug 29 11:41:20 2013 -0700 26.3 @@ -55,7 +55,7 @@ 26.4 write(out, true); 26.5 } catch (IOException e) { 26.6 // cannot happen from StringWriter 26.7 - throw new DocletAbortException(); 26.8 + throw new DocletAbortException(e); 26.9 } 26.10 return out.toString(); 26.11 }
27.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java Wed Aug 28 15:40:33 2013 -0700 27.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java Thu Aug 29 11:41:20 2013 -0700 27.3 @@ -1,5 +1,5 @@ 27.4 /* 27.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. 27.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. 27.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 27.8 * 27.9 * This code is free software; you can redistribute it and/or modify it 27.10 @@ -138,7 +138,7 @@ 27.11 } catch (NoSuchMethodException e) { 27.12 e.printStackTrace(); 27.13 configuration.root.printError("Unknown element: " + component); 27.14 - throw new DocletAbortException(); 27.15 + throw new DocletAbortException(e); 27.16 } catch (InvocationTargetException e) { 27.17 e.getCause().printStackTrace(); 27.18 } catch (Exception e) { 27.19 @@ -146,7 +146,7 @@ 27.20 configuration.root.printError("Exception " + 27.21 e.getClass().getName() + 27.22 " thrown while processing element: " + component); 27.23 - throw new DocletAbortException(); 27.24 + throw new DocletAbortException(e); 27.25 } 27.26 } 27.27
28.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java Wed Aug 28 15:40:33 2013 -0700 28.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java Thu Aug 29 11:41:20 2013 -0700 28.3 @@ -1,5 +1,5 @@ 28.4 /* 28.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. 28.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. 28.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 28.8 * 28.9 * This code is free software; you can redistribute it and/or modify it 28.10 @@ -62,7 +62,7 @@ 28.11 */ 28.12 public void build() throws DocletAbortException { 28.13 //You may not call the build method in a subbuilder. 28.14 - throw new DocletAbortException(); 28.15 + throw new DocletAbortException("not supported"); 28.16 } 28.17 28.18
29.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Wed Aug 28 15:40:33 2013 -0700 29.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Thu Aug 29 11:41:20 2013 -0700 29.3 @@ -1,5 +1,5 @@ 29.4 /* 29.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. 29.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. 29.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 29.8 * 29.9 * This code is free software; you can redistribute it and/or modify it 29.10 @@ -93,7 +93,7 @@ 29.11 return xmlElementsMap.get(root); 29.12 } catch (Throwable t) { 29.13 t.printStackTrace(); 29.14 - throw new DocletAbortException(); 29.15 + throw new DocletAbortException(t); 29.16 } 29.17 } 29.18
30.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java Wed Aug 28 15:40:33 2013 -0700 30.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java Thu Aug 29 11:41:20 2013 -0700 30.3 @@ -1,5 +1,5 @@ 30.4 /* 30.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. 30.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. 30.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 30.8 * 30.9 * This code is free software; you can redistribute it and/or modify it 30.10 @@ -125,7 +125,7 @@ 30.11 return; 30.12 } 30.13 } catch (Exception e) { 30.14 - throw new DocletAbortException(); 30.15 + throw new DocletAbortException(e); 30.16 } 30.17 build(layoutParser.parseXML(NAME), contentTree); 30.18 writer.close();
31.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java Wed Aug 28 15:40:33 2013 -0700 31.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java Thu Aug 29 11:41:20 2013 -0700 31.3 @@ -126,7 +126,7 @@ 31.4 return (FieldDoc) tag.holder(); 31.5 } else { 31.6 //This should never ever happen. 31.7 - throw new DocletAbortException(); 31.8 + throw new DocletAbortException("should not happen"); 31.9 } 31.10 } 31.11 StringTokenizer st = new StringTokenizer(name, "#");
32.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java Wed Aug 28 15:40:33 2013 -0700 32.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java Thu Aug 29 11:41:20 2013 -0700 32.3 @@ -1,5 +1,5 @@ 32.4 /* 32.5 - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. 32.6 + * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 32.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 32.8 * 32.9 * This code is free software; you can redistribute it and/or modify it 32.10 @@ -452,7 +452,7 @@ 32.11 } else if (doc instanceof Parameter) { 32.12 annotations = ((Parameter) doc).annotations(); 32.13 } else { 32.14 - throw new DocletAbortException(); 32.15 + throw new DocletAbortException("should not happen"); 32.16 } 32.17 for (int i = 0; i < annotations.length; i++) { 32.18 AnnotationTypeDoc annotationDoc = annotations[i].annotationType();
33.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java Wed Aug 28 15:40:33 2013 -0700 33.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java Thu Aug 29 11:41:20 2013 -0700 33.3 @@ -1,5 +1,5 @@ 33.4 /* 33.5 - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. 33.6 + * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 33.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 33.8 * 33.9 * This code is free software; you can redistribute it and/or modify it 33.10 @@ -197,7 +197,7 @@ 33.11 } 33.12 } catch (IOException e) { 33.13 e.printStackTrace(System.err); 33.14 - throw new DocletAbortException(); 33.15 + throw new DocletAbortException(e); 33.16 } 33.17 } 33.18
34.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java Wed Aug 28 15:40:33 2013 -0700 34.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java Thu Aug 29 11:41:20 2013 -0700 34.3 @@ -1,5 +1,5 @@ 34.4 /* 34.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 34.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 34.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 34.8 * 34.9 * This code is free software; you can redistribute it and/or modify it 34.10 @@ -34,6 +34,11 @@ 34.11 public class DocletAbortException extends RuntimeException { 34.12 private static final long serialVersionUID = -9131058909576418984L; 34.13 34.14 - public DocletAbortException() { 34.15 + public DocletAbortException(String message) { 34.16 + super(message); 34.17 + } 34.18 + 34.19 + public DocletAbortException(Throwable cause) { 34.20 + super(cause); 34.21 } 34.22 }
35.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java Wed Aug 28 15:40:33 2013 -0700 35.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java Thu Aug 29 11:41:20 2013 -0700 35.3 @@ -1,5 +1,5 @@ 35.4 /* 35.5 - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. 35.6 + * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 35.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 35.8 * 35.9 * This code is free software; you can redistribute it and/or modify it 35.10 @@ -71,7 +71,7 @@ 35.11 } catch (IOException exc) { 35.12 configuration.message.error("doclet.exception_encountered", 35.13 exc.toString(), DocPaths.PACKAGE_LIST); 35.14 - throw new DocletAbortException(); 35.15 + throw new DocletAbortException(exc); 35.16 } 35.17 } 35.18
36.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PathDocFileFactory.java Wed Aug 28 15:40:33 2013 -0700 36.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PathDocFileFactory.java Thu Aug 29 11:41:20 2013 -0700 36.3 @@ -1,5 +1,5 @@ 36.4 /* 36.5 - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. 36.6 + * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 36.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 36.8 * 36.9 * This code is free software; you can redistribute it and/or modify it 36.10 @@ -77,7 +77,7 @@ 36.11 Path dir = fileManager.getDefaultFileSystem().getPath(dirName); 36.12 fileManager.setLocation(DocumentationTool.Location.DOCUMENTATION_OUTPUT, Arrays.asList(dir)); 36.13 } catch (IOException e) { 36.14 - throw new DocletAbortException(); 36.15 + throw new DocletAbortException(e); 36.16 } 36.17 } 36.18
37.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SimpleDocFileFactory.java Wed Aug 28 15:40:33 2013 -0700 37.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SimpleDocFileFactory.java Thu Aug 29 11:41:20 2013 -0700 37.3 @@ -1,5 +1,5 @@ 37.4 /* 37.5 - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. 37.6 + * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 37.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 37.8 * 37.9 * This code is free software; you can redistribute it and/or modify it 37.10 @@ -269,7 +269,7 @@ 37.11 37.12 configuration.message.error( 37.13 "doclet.Unable_to_create_directory_0", dir.getPath()); 37.14 - throw new DocletAbortException(); 37.15 + throw new DocletAbortException("can't create directory"); 37.16 } 37.17 37.18 /** Return a string to identify the contents of this object,
38.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/StandardDocFileFactory.java Wed Aug 28 15:40:33 2013 -0700 38.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/StandardDocFileFactory.java Thu Aug 29 11:41:20 2013 -0700 38.3 @@ -1,5 +1,5 @@ 38.4 /* 38.5 - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. 38.6 + * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 38.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 38.8 * 38.9 * This code is free software; you can redistribute it and/or modify it 38.10 @@ -79,7 +79,7 @@ 38.11 File dir = new File(dirName); 38.12 fileManager.setLocation(DocumentationTool.Location.DOCUMENTATION_OUTPUT, Arrays.asList(dir)); 38.13 } catch (IOException e) { 38.14 - throw new DocletAbortException(); 38.15 + throw new DocletAbortException(e); 38.16 } 38.17 } 38.18
39.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Wed Aug 28 15:40:33 2013 -0700 39.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Thu Aug 29 11:41:20 2013 -0700 39.3 @@ -241,9 +241,9 @@ 39.4 first = false; 39.5 } 39.6 } catch (SecurityException exc) { 39.7 - throw new DocletAbortException(); 39.8 + throw new DocletAbortException(exc); 39.9 } catch (IOException exc) { 39.10 - throw new DocletAbortException(); 39.11 + throw new DocletAbortException(exc); 39.12 } 39.13 } 39.14