Mercurial > hg > icedtea7-forest > langtools
changeset 2206:e537073e5360
8001669: javadoc internal DocletAbortException should set cause when appropriate
Reviewed-by: darcy
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java Wed Jan 18 18:23:49 2017 +0000 @@ -104,7 +104,7 @@ configuration.standardmessage. error("doclet.exception_encountered", exc.toString(), filename); - throw new DocletAbortException(); + throw new DocletAbortException(exc); } }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Wed Jan 18 18:23:49 2017 +0000 @@ -301,7 +301,7 @@ subDiv.addContent(div); } catch (Exception e) { e.printStackTrace(); - throw new DocletAbortException(); + throw new DocletAbortException(e); } }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Wed Jan 18 18:23:49 2017 +0000 @@ -210,7 +210,7 @@ configuration.standardmessage. error("doclet.exception_encountered", exc.toString(), filename); - throw new DocletAbortException(); + throw new DocletAbortException(exc); } }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Wed Jan 18 18:23:49 2017 +0000 @@ -579,7 +579,7 @@ subDiv.addContent(div); } catch (Exception e) { e.printStackTrace(); - throw new DocletAbortException(); + throw new DocletAbortException(e); } }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Wed Jan 18 18:23:49 2017 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, 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 @@ -122,7 +122,7 @@ configuration.standardmessage.error( "doclet.exception_encountered", exc.toString(), filename); - throw new DocletAbortException(); + throw new DocletAbortException(exc); } }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java Wed Jan 18 18:23:49 2017 +0000 @@ -81,7 +81,7 @@ configuration.standardmessage.error( "doclet.exception_encountered", exc.toString(), filename); - throw new DocletAbortException(); + throw new DocletAbortException(exc); } }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java Wed Jan 18 18:23:49 2017 +0000 @@ -66,7 +66,7 @@ configuration.standardmessage.error( "doclet.exception_encountered", exc.toString(), filename); - throw new DocletAbortException(); + throw new DocletAbortException(exc); } }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Wed Jan 18 18:23:49 2017 +0000 @@ -187,7 +187,7 @@ } } catch (Exception e) { e.printStackTrace(); - throw new DocletAbortException(); + throw new DocletAbortException(e); } } } @@ -278,7 +278,7 @@ error((SourcePosition) null, "doclet.perform_copy_exception_encountered", exc.toString()); - throw new DocletAbortException(); + throw new DocletAbortException(exc); } } }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Wed Jan 18 18:23:49 2017 +0000 @@ -109,7 +109,7 @@ configuration.standardmessage.error( "doclet.exception_encountered", exc.toString(), OUTPUT_FILE_NAME); - throw new DocletAbortException(); + throw new DocletAbortException(exc); } }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Wed Jan 18 18:23:49 2017 +0000 @@ -65,7 +65,7 @@ configuration.standardmessage.error( "doclet.exception_encountered", exc.toString(), filename); - throw new DocletAbortException(); + throw new DocletAbortException(exc); } }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Wed Jan 18 18:23:49 2017 +0000 @@ -91,7 +91,7 @@ configuration.standardmessage.error( "doclet.exception_encountered", exc.toString(), filename); - throw new DocletAbortException(); + throw new DocletAbortException(exc); } }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java Wed Jan 18 18:23:49 2017 +0000 @@ -102,7 +102,7 @@ configuration.standardmessage.error( "doclet.exception_encountered", exc.toString(), filename); - throw new DocletAbortException(); + throw new DocletAbortException(exc); } }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Wed Jan 18 18:23:49 2017 +0000 @@ -102,7 +102,7 @@ configuration.standardmessage.error( "doclet.exception_encountered", exc.toString(), filename); - throw new DocletAbortException(); + throw new DocletAbortException(exc); } }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java Wed Jan 18 18:23:49 2017 +0000 @@ -75,7 +75,7 @@ configuration.standardmessage.error( "doclet.exception_encountered", exc.toString(), filename); - throw new DocletAbortException(); + throw new DocletAbortException(exc); } }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java Wed Jan 18 18:23:49 2017 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2013, 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 @@ -99,7 +99,7 @@ configuration.standardmessage.error( "doclet.exception_encountered", exc.toString(), filename); - throw new DocletAbortException(); + throw new DocletAbortException(exc); } }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Wed Jan 18 18:23:49 2017 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, 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 @@ -88,7 +88,7 @@ configuration.standardmessage.error( "doclet.exception_encountered", exc.toString(), filename); - throw new DocletAbortException(); + throw new DocletAbortException(exc); } }
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java Wed Jan 18 18:23:49 2017 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2013, 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 @@ -58,7 +58,7 @@ * is not supported. */ public void addContent(Content content) { - throw new DocletAbortException(); + throw new DocletAbortException("not supported"); } /** @@ -70,7 +70,7 @@ * is not supported. */ public void addContent(String stringContent) { - throw new DocletAbortException(); + throw new DocletAbortException("not supported"); } /**
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java Wed Jan 18 18:23:49 2017 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2013, 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 @@ -85,7 +85,7 @@ * is not supported. */ public void addContent(Content content) { - throw new DocletAbortException(); + throw new DocletAbortException("not supported"); } /** @@ -97,7 +97,7 @@ * is not supported. */ public void addContent(String stringContent) { - throw new DocletAbortException(); + throw new DocletAbortException("not supported"); } /**
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java Wed Jan 18 18:23:49 2017 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2013, 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 @@ -86,7 +86,7 @@ * is not supported. */ public void addContent(String stringContent) { - throw new DocletAbortException(); + throw new DocletAbortException("not supported"); } /**
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java Wed Jan 18 18:23:49 2017 +0000 @@ -60,7 +60,7 @@ * is not supported. */ public void addContent(Content content) { - throw new DocletAbortException(); + throw new DocletAbortException("not supported"); } /** @@ -72,7 +72,7 @@ * is not supported. */ public void addContent(String stringContent) { - throw new DocletAbortException(); + throw new DocletAbortException("not supported"); } /**
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java Wed Jan 18 18:23:49 2017 +0000 @@ -66,7 +66,7 @@ * is not supported. */ public void addContent(Content content) { - throw new DocletAbortException(); + throw new DocletAbortException("not supported"); } /**
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java Wed Jan 18 18:23:49 2017 +0000 @@ -50,7 +50,7 @@ write(out, true); } catch (IOException e) { // cannot happen from StringWriter - throw new DocletAbortException(); + throw new DocletAbortException(e); } return out.toString(); }
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java Wed Jan 18 18:23:49 2017 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, 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 @@ } catch (NoSuchMethodException e) { e.printStackTrace(); configuration.root.printError("Unknown element: " + component); - throw new DocletAbortException(); + throw new DocletAbortException(e); } catch (InvocationTargetException e) { e.getCause().printStackTrace(); } catch (Exception e) { @@ -114,7 +114,7 @@ configuration.root.printError("Exception " + e.getClass().getName() + " thrown while processing element: " + component); - throw new DocletAbortException(); + throw new DocletAbortException(e); } }
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java Wed Jan 18 18:23:49 2017 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, 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 @@ -60,7 +60,7 @@ */ public void build() throws DocletAbortException { //You may not call the build method in a subbuilder. - throw new DocletAbortException(); + throw new DocletAbortException("not supported"); }
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Wed Jan 18 18:23:49 2017 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, 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 @@ -92,7 +92,7 @@ return xmlElementsMap.get(root); } catch (Throwable t) { t.printStackTrace(); - throw new DocletAbortException(); + throw new DocletAbortException(t); } }
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java Wed Jan 18 18:23:49 2017 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, 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 @@ return; } } catch (Exception e) { - throw new DocletAbortException(); + throw new DocletAbortException(e); } build(LayoutParser.getInstance(configuration).parseXML(NAME), contentTree); writer.close();
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java Wed Jan 18 18:23:49 2017 +0000 @@ -123,7 +123,7 @@ return (FieldDoc) tag.holder(); } else { //This should never ever happen. - throw new DocletAbortException(); + throw new DocletAbortException("should not happen"); } } StringTokenizer st = new StringTokenizer(name, "#");
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java Wed Jan 18 18:23:49 2017 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2013, 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 @@ -450,7 +450,7 @@ } else if (doc instanceof Parameter) { annotations = ((Parameter) doc).annotations(); } else { - throw new DocletAbortException(); + throw new DocletAbortException("should not happen"); } for (int i = 0; i < annotations.length; i++) { AnnotationTypeDoc annotationDoc = annotations[i].annotationType();
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java Wed Jan 18 18:23:49 2017 +0000 @@ -278,7 +278,7 @@ } else { configuration.message.error( "doclet.Unable_to_create_directory_0", path); - throw new DocletAbortException(); + throw new DocletAbortException("Unable to create directory"); } } }
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java Wed Jan 18 18:23:49 2017 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, 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 @@ public class DocletAbortException extends RuntimeException { private static final long serialVersionUID = -9131058909576418984L; - public DocletAbortException() { + public DocletAbortException(String message) { + super(message); + } + + public DocletAbortException(Throwable cause) { + super(cause); } }
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java Wed Jan 18 18:23:49 2017 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2013, 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 @@ -70,7 +70,7 @@ } catch (IOException exc) { configuration.message.error("doclet.exception_encountered", exc.toString(), DocletConstants.PACKAGE_LIST_FILE_NAME); - throw new DocletAbortException(); + throw new DocletAbortException(exc); } }
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Tue Jan 17 04:03:44 2017 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Wed Jan 18 18:23:49 2017 +0000 @@ -281,9 +281,9 @@ } } } catch (SecurityException exc) { - throw new DocletAbortException(); + throw new DocletAbortException(exc); } catch (IOException exc) { - throw new DocletAbortException(); + throw new DocletAbortException(exc); } } @@ -396,7 +396,7 @@ } } catch (IOException ie) { ie.printStackTrace(System.err); - throw new DocletAbortException(); + throw new DocletAbortException(ie); } }