Mercurial > hg > openjdk > jigsaw > langtools
changeset 1492:c75be5bc5283
8000663: clean up langtools imports
Reviewed-by: darcy
line wrap: on
line diff
--- a/src/share/classes/com/sun/source/tree/CompilationUnitTree.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/source/tree/CompilationUnitTree.java Tue Oct 09 19:10:00 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 @@ -27,7 +27,6 @@ import java.util.List; import javax.tools.JavaFileObject; -import com.sun.source.tree.LineMap; /** * Represents the abstract syntax tree for compilation units (source
--- a/src/share/classes/com/sun/source/tree/Scope.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/source/tree/Scope.java Tue Oct 09 19:10:00 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,11 +25,9 @@ package com.sun.source.tree; -import com.sun.source.tree.Tree; import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; -import javax.lang.model.type.DeclaredType; /** * Interface for determining locally available program elements, such as
--- a/src/share/classes/com/sun/source/util/TaskEvent.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/source/util/TaskEvent.java Tue Oct 09 19:10:00 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,11 @@ package com.sun.source.util; -import com.sun.source.tree.CompilationUnitTree; import javax.lang.model.element.TypeElement; import javax.tools.JavaFileObject; +import com.sun.source.tree.CompilationUnitTree; + /** * Provides details about work that has been done by the JDK Java Compiler, javac. *
--- a/src/share/classes/com/sun/source/util/TreePath.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/source/util/TreePath.java Tue Oct 09 19:10:00 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,9 @@ package com.sun.source.util; +import java.util.Iterator; + import com.sun.source.tree.*; -import java.util.Iterator; /** * A path of tree nodes, typically used to represent the sequence of ancestor
--- a/src/share/classes/com/sun/tools/classfile/ClassTranslator.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/classfile/ClassTranslator.java Tue Oct 09 19:10:00 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 @@ -25,6 +25,8 @@ package com.sun.tools.classfile; +import java.util.Map; + import com.sun.tools.classfile.ConstantPool.CONSTANT_Class_info; import com.sun.tools.classfile.ConstantPool.CONSTANT_Double_info; import com.sun.tools.classfile.ConstantPool.CONSTANT_Fieldref_info; @@ -40,7 +42,6 @@ import com.sun.tools.classfile.ConstantPool.CONSTANT_String_info; import com.sun.tools.classfile.ConstantPool.CONSTANT_Utf8_info; import com.sun.tools.classfile.ConstantPool.CPInfo; -import java.util.Map; /** * Rewrites a class file using a map of translations.
--- a/src/share/classes/com/sun/tools/classfile/Dependencies.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/classfile/Dependencies.java Tue Oct 09 19:10:00 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 @@ -33,8 +33,8 @@ import java.util.Set; import java.util.regex.Pattern; +import com.sun.tools.classfile.Dependency.Filter; import com.sun.tools.classfile.Dependency.Finder; -import com.sun.tools.classfile.Dependency.Filter; import com.sun.tools.classfile.Dependency.Location; import com.sun.tools.classfile.Type.ArrayType; import com.sun.tools.classfile.Type.ClassSigType; @@ -43,7 +43,6 @@ import com.sun.tools.classfile.Type.SimpleType; import com.sun.tools.classfile.Type.TypeParamType; import com.sun.tools.classfile.Type.WildcardType; - import static com.sun.tools.classfile.ConstantPool.*; /**
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Tue Oct 09 19:10:00 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 @@ -29,9 +29,9 @@ import java.util.*; import com.sun.javadoc.*; -import com.sun.tools.doclets.internal.toolkit.util.*; import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.util.*; /** * Generate Index for all the Member Names with Indexing in
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Tue Oct 09 19:10:00 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, 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,13 +25,14 @@ package com.sun.tools.doclets.formats.html; +import java.lang.reflect.Modifier; import java.util.*; -import java.lang.reflect.Modifier; + import com.sun.javadoc.*; import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.taglets.*; import com.sun.tools.doclets.internal.toolkit.util.*; -import com.sun.tools.doclets.internal.toolkit.taglets.*; /** * The base class for member writers.
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java Tue Oct 09 19:10:00 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 @@ -27,10 +27,11 @@ import java.io.*; import java.util.*; -import com.sun.tools.doclets.internal.toolkit.util.*; + +import com.sun.javadoc.*; +import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; -import com.sun.tools.doclets.formats.html.markup.*; -import com.sun.javadoc.*; +import com.sun.tools.doclets.internal.toolkit.util.*; /** * Abstract class to print the class hierarchy page for all the Classes. This
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java Tue Oct 09 19:10:00 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 @@ -29,9 +29,9 @@ import java.util.*; import com.sun.javadoc.*; +import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; import com.sun.tools.doclets.internal.toolkit.util.*; -import com.sun.tools.doclets.formats.html.markup.*; /** * Generate the file with list of all the classes in this run. This page will be
--- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Tue Oct 09 19:10:00 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 @@ -26,10 +26,10 @@ package com.sun.tools.doclets.formats.html; import com.sun.javadoc.*; +import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.builders.*; import com.sun.tools.doclets.internal.toolkit.util.*; -import com.sun.tools.doclets.internal.toolkit.builders.*; -import com.sun.tools.doclets.formats.html.markup.*; /** * Generate the Class Information Page.
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Tue Oct 09 19:10:00 2012 -0700 @@ -27,10 +27,11 @@ import java.io.*; import java.util.*; + import com.sun.javadoc.*; -import com.sun.tools.doclets.internal.toolkit.util.*; import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.util.*; /** * Generate class usage information.
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Tue Oct 09 19:10:00 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 @@ -28,11 +28,11 @@ import java.util.*; import com.sun.javadoc.*; +import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; -import com.sun.tools.doclets.internal.toolkit.util.*; import com.sun.tools.doclets.internal.toolkit.builders.*; import com.sun.tools.doclets.internal.toolkit.taglets.*; -import com.sun.tools.doclets.formats.html.markup.*; +import com.sun.tools.doclets.internal.toolkit.util.*; /** * Generate the Class Information Page.
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Tue Oct 09 19:10:00 2012 -0700 @@ -25,13 +25,13 @@ package com.sun.tools.doclets.formats.html; -import com.sun.tools.doclets.internal.toolkit.*; -import com.sun.tools.doclets.internal.toolkit.util.*; +import java.io.*; +import java.net.*; +import java.util.*; import com.sun.javadoc.*; -import java.util.*; -import java.io.*; -import java.net.*; +import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.util.*; /** * Configure the output based on the command line options.
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java Tue Oct 09 19:10:00 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2010, 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,10 +27,11 @@ import java.io.*; import java.util.*; + import com.sun.javadoc.*; +import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; import com.sun.tools.doclets.internal.toolkit.util.*; -import com.sun.tools.doclets.formats.html.markup.*; /** * Write the Constants Summary Page in HTML format.
--- a/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Tue Oct 09 19:10:00 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,10 +26,10 @@ package com.sun.tools.doclets.formats.html; import java.io.*; + +import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; -import com.sun.tools.doclets.internal.toolkit.util.DeprecatedAPIListBuilder; import com.sun.tools.doclets.internal.toolkit.util.*; -import com.sun.tools.doclets.formats.html.markup.*; /** * Generate File to list all the deprecated classes and class members with the
--- a/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java Tue Oct 09 19:10:00 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, 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,9 +26,10 @@ package com.sun.tools.doclets.formats.html; import java.io.*; -import com.sun.tools.doclets.internal.toolkit.util.*; + +import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; -import com.sun.tools.doclets.formats.html.markup.*; +import com.sun.tools.doclets.internal.toolkit.util.*; /** * Generate the documentation in the Html "frame" format in the browser. The
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java Tue Oct 09 19:10:00 2012 -0700 @@ -26,9 +26,10 @@ package com.sun.tools.doclets.formats.html; import java.io.*; -import com.sun.tools.doclets.internal.toolkit.util.*; + +import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; -import com.sun.tools.doclets.formats.html.markup.*; +import com.sun.tools.doclets.internal.toolkit.util.*; /** * Generate the Help File for the generated API documentation. The help file
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java Tue Oct 09 19:10:00 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 @@ -24,14 +24,14 @@ */ package com.sun.tools.doclets.formats.html; +import java.io.*; +import java.util.*; + +import com.sun.javadoc.*; import com.sun.tools.doclets.internal.toolkit.*; 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.*; - /** * The class with "start" method, calls individual Writers. *
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Tue Oct 09 19:10:00 2012 -0700 @@ -32,8 +32,8 @@ import com.sun.javadoc.*; import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.taglets.*; import com.sun.tools.doclets.internal.toolkit.util.*; -import com.sun.tools.doclets.internal.toolkit.taglets.*; /** * Class for the Html Format Code Generation specific to JavaDoc.
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java Tue Oct 09 19:10:00 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 @@ -28,9 +28,9 @@ import java.util.*; import com.sun.javadoc.*; +import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; import com.sun.tools.doclets.internal.toolkit.taglets.*; -import com.sun.tools.doclets.formats.html.markup.*; /** * Generate serialized form for serializable fields.
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java Tue Oct 09 19:10:00 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 @@ -26,9 +26,9 @@ package com.sun.tools.doclets.formats.html; import com.sun.javadoc.*; +import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; import com.sun.tools.doclets.internal.toolkit.taglets.*; -import com.sun.tools.doclets.formats.html.markup.*; /** * Generate serialized form for Serializable/Externalizable methods.
--- a/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java Tue Oct 09 19:10:00 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,10 +25,10 @@ package com.sun.tools.doclets.formats.html; -import com.sun.tools.doclets.internal.toolkit.util.links.*; 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.util.links.*; /** * A factory that returns a link given the information about it.
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Tue Oct 09 19:10:00 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 @@ -27,10 +27,11 @@ import java.io.*; import java.util.*; + import com.sun.javadoc.*; +import com.sun.tools.doclets.formats.html.markup.*; +import com.sun.tools.doclets.internal.toolkit.*; import com.sun.tools.doclets.internal.toolkit.util.*; -import com.sun.tools.doclets.internal.toolkit.*; -import com.sun.tools.doclets.formats.html.markup.*; /** * Class to generate file for each package contents in the left-hand bottom
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Tue Oct 09 19:10:00 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 @@ -26,10 +26,11 @@ package com.sun.tools.doclets.formats.html; import java.io.*; + import com.sun.javadoc.*; +import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; import com.sun.tools.doclets.internal.toolkit.util.*; -import com.sun.tools.doclets.formats.html.markup.*; /** * Generate the package index for the left-hand frame in the generated output.
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Tue Oct 09 19:10:00 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 @@ -27,10 +27,11 @@ import java.io.*; import java.util.*; + import com.sun.javadoc.*; +import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; import com.sun.tools.doclets.internal.toolkit.util.*; -import com.sun.tools.doclets.formats.html.markup.*; /** * Generate the package index page "overview-summary.html" for the right-hand
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java Tue Oct 09 19:10:00 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 @@ -28,9 +28,9 @@ import java.io.*; import com.sun.javadoc.*; -import com.sun.tools.doclets.internal.toolkit.util.*; import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.util.*; /** * Class to generate Tree page for a package. The name of the file generated is
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Tue Oct 09 19:10:00 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 @@ -27,10 +27,11 @@ import java.io.*; import java.util.*; + import com.sun.javadoc.*; -import com.sun.tools.doclets.internal.toolkit.util.*; import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.util.*; /** * Generate package usage information.
--- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Tue Oct 09 19:10:00 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 @@ -27,10 +27,11 @@ import java.io.*; import java.util.*; + import com.sun.javadoc.*; +import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; import com.sun.tools.doclets.internal.toolkit.util.*; -import com.sun.tools.doclets.formats.html.markup.*; /** * Class to generate file for each package contents in the right-hand
--- a/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java Tue Oct 09 19:10:00 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 @@ -26,9 +26,10 @@ package com.sun.tools.doclets.formats.html; import java.io.*; -import com.sun.tools.doclets.internal.toolkit.util.*; + import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.util.*; /** * Generate only one index file for all the Member Names with Indexing in
--- a/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java Tue Oct 09 19:10:00 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 @@ -26,9 +26,10 @@ package com.sun.tools.doclets.formats.html; import java.io.*; -import com.sun.tools.doclets.internal.toolkit.util.*; + import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.util.*; /** * Generate Separate Index Files for all the member names with Indexing in
--- a/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java Tue Oct 09 19:10:00 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, 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,10 +26,11 @@ package com.sun.tools.doclets.formats.html; import java.io.*; + import com.sun.javadoc.*; +import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; import com.sun.tools.doclets.internal.toolkit.util.*; -import com.sun.tools.doclets.formats.html.markup.*; /** * This abstract class exists to provide functionality needed in the
--- a/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Tue Oct 09 19:10:00 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 @@ -28,9 +28,9 @@ import java.io.*; import com.sun.javadoc.*; -import com.sun.tools.doclets.internal.toolkit.util.*; import com.sun.tools.doclets.formats.html.markup.*; import com.sun.tools.doclets.internal.toolkit.*; +import com.sun.tools.doclets.internal.toolkit.util.*; /** * Generate Class Hierarchy page for all the Classes in this run. Use
--- a/src/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java Tue Oct 09 19:10:00 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,9 +25,9 @@ package com.sun.tools.doclets.formats.html; +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 that returns HTML writers.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java Tue Oct 09 19:10:00 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,11 +25,11 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java Tue Oct 09 19:10:00 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,8 +25,9 @@ package com.sun.tools.doclets.internal.toolkit; +import java.io.*; import java.util.*; -import java.io.*; + import com.sun.javadoc.*; /**
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java Tue Oct 09 19:10:00 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,8 +25,9 @@ package com.sun.tools.doclets.internal.toolkit; +import java.io.*; + import com.sun.javadoc.*; -import java.io.*; /** * The interface for writing package summary output.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java Tue Oct 09 19:10:00 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,8 +25,8 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java Tue Oct 09 19:10:00 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,7 +27,6 @@ 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
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java Tue Oct 09 19:10:00 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,9 +27,10 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java Tue Oct 09 19:10:00 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,9 +26,10 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java Tue Oct 09 19:10:00 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,9 +26,10 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java Tue Oct 09 19:10:00 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,9 +25,9 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java Tue Oct 09 19:10:00 2012 -0700 @@ -27,9 +27,10 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java Tue Oct 09 19:10:00 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,9 +27,10 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java Tue Oct 09 19:10:00 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,9 +26,10 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java Tue Oct 09 19:10:00 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,9 +26,10 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java Tue Oct 09 19:10:00 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,9 +26,10 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Tue Oct 09 19:10:00 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,13 +24,16 @@ */ 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
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java Tue Oct 09 19:10:00 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,9 +26,10 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java Tue Oct 09 19:10:00 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,9 +26,10 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java Tue Oct 09 19:10:00 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,9 +26,10 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java Tue Oct 09 19:10:00 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,9 +27,10 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java Tue Oct 09 19:10:00 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,7 +25,6 @@ package com.sun.tools.doclets.internal.toolkit.taglets; -import com.sun.tools.doclets.internal.toolkit.util.*; import com.sun.javadoc.*; /**
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java Tue Oct 09 19:10:00 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,9 +25,10 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java Tue Oct 09 19:10:00 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,8 +25,8 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java Tue Oct 09 19:10:00 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,8 +25,8 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java Tue Oct 09 19:10:00 2012 -0700 @@ -25,14 +25,14 @@ 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 the<code>Taglet</code>s used by doclets. *
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java Tue Oct 09 19:10:00 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,9 +25,9 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java Tue Oct 09 19:10:00 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,9 +25,10 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java Tue Oct 09 19:10:00 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 Class Hierarchy for all the Classes. This class builds the Class
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java Tue Oct 09 19:10:00 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,8 +25,9 @@ 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.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java Tue Oct 09 19:10:00 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,8 +25,9 @@ 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; /**
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java Tue Oct 09 19:10:00 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,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.taglets.*; -import java.util.*; /** * Search for the requested documentation. Inherit documentation if necessary.
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java Tue Oct 09 19:10:00 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.Configuration; -import java.util.*; /** * For a given class method, build an array of interface methods which it
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java Tue Oct 09 19:10:00 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,10 +24,11 @@ */ 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; /**
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java Tue Oct 09 19:10:00 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,11 +25,12 @@ 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. *
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/com/sun/tools/javac/api/BasicJavacTask.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/api/BasicJavacTask.java Tue Oct 09 19:10:00 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.
--- a/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/com/sun/tools/javac/code/Annotations.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/code/Annotations.java Tue Oct 09 19:10:00 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.
--- a/src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java Tue Oct 09 19:10:00 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; /** *
--- a/src/share/classes/com/sun/tools/javac/code/Flags.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/code/Flags.java Tue Oct 09 19:10:00 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.
--- a/src/share/classes/com/sun/tools/javac/code/Kinds.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/code/Kinds.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/com/sun/tools/javac/code/Printer.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/code/Printer.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/com/sun/tools/javac/code/Scope.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/code/Scope.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/com/sun/tools/javac/code/Source.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/code/Source.java Tue Oct 09 19:10:00 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.
--- a/src/share/classes/com/sun/tools/javac/code/Symbol.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/code/Symbol.java Tue Oct 09 19:10:00 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.*;
--- a/src/share/classes/com/sun/tools/javac/code/Symtab.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/code/Symtab.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/com/sun/tools/javac/code/TargetType.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/code/TargetType.java Tue Oct 09 19:10:00 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.
--- a/src/share/classes/com/sun/tools/javac/code/Type.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/code/Type.java Tue Oct 09 19:10:00 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.*;
--- a/src/share/classes/com/sun/tools/javac/code/Types.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java Tue Oct 09 19:10:00 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; /**
--- a/src/share/classes/com/sun/tools/javac/comp/Attr.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java Tue Oct 09 19:10:00 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.
--- a/src/share/classes/com/sun/tools/javac/comp/Infer.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java Tue Oct 09 19:10:00 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.*;
--- a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Tue Oct 09 19:10:00 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.*;
--- a/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java Tue Oct 09 19:10:00 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.*; /**
--- a/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/com/sun/tools/javac/tree/Pretty.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/tree/Pretty.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java Tue Oct 09 19:10:00 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.*;
--- a/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java Tue Oct 09 19:10:00 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.*;
--- a/src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java Tue Oct 09 19:10:00 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,12 +27,8 @@ 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; /**
--- a/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java Tue Oct 09 19:10:00 2012 -0700 @@ -25,7 +25,6 @@ package com.sun.tools.javadoc; - import com.sun.javadoc.*; import com.sun.tools.javac.code.Attribute;
--- a/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/com/sun/tools/javadoc/DocImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/DocImpl.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/com/sun/tools/javadoc/DocLocale.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/DocLocale.java Tue Oct 09 19:10:00 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,10 +25,9 @@ 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.
--- a/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java Tue Oct 09 19:10:00 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,19 +25,17 @@ 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.
--- a/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/com/sun/tools/javadoc/JavadocEnter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/JavadocEnter.java Tue Oct 09 19:10:00 2012 -0700 @@ -25,7 +25,6 @@ package com.sun.tools.javadoc; - import javax.tools.JavaFileObject; import com.sun.tools.javac.code.Kinds;
--- a/src/share/classes/com/sun/tools/javadoc/Messager.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/Messager.java Tue Oct 09 19:10:00 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.
--- a/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java Tue Oct 09 19:10:00 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,8 +35,6 @@ 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. *
--- a/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/com/sun/tools/javadoc/ParameterImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/ParameterImpl.java Tue Oct 09 19:10:00 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,7 +29,6 @@ import com.sun.tools.javac.code.Attribute; import com.sun.tools.javac.code.Symbol.VarSymbol; -import com.sun.tools.javac.code.Type; /** * ParameterImpl information.
--- a/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java Tue Oct 09 19:10:00 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,6 @@ 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; - class PrimitiveType implements com.sun.javadoc.Type { private final String name;
--- a/src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java Tue Oct 09 19:10:00 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,20 +25,16 @@ 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.
--- a/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java Tue Oct 09 19:10:00 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,10 +25,9 @@ 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.
--- a/src/share/classes/com/sun/tools/javadoc/SerializedForm.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/SerializedForm.java Tue Oct 09 19:10:00 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; /**
--- a/src/share/classes/com/sun/tools/javadoc/Start.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/Start.java Tue Oct 09 19:10:00 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,22 +25,19 @@ 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.*; /**
--- a/src/share/classes/com/sun/tools/javadoc/TypeMaker.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/TypeMaker.java Tue Oct 09 19:10:00 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,15 +26,13 @@ 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.*;
--- a/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/javax/annotation/processing/Completions.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/annotation/processing/Completions.java Tue Oct 09 19:10:00 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. *
--- a/src/share/classes/javax/annotation/processing/FilerException.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/annotation/processing/FilerException.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/javax/annotation/processing/ProcessingEnvironment.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/annotation/processing/ProcessingEnvironment.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/javax/lang/model/element/AnnotationValue.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/element/AnnotationValue.java Tue Oct 09 19:10:00 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:
--- a/src/share/classes/javax/lang/model/element/Element.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/element/Element.java Tue Oct 09 19:10:00 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.*;
--- a/src/share/classes/javax/lang/model/element/ExecutableElement.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/element/ExecutableElement.java Tue Oct 09 19:10:00 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.*; /**
--- a/src/share/classes/javax/lang/model/element/VariableElement.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/element/VariableElement.java Tue Oct 09 19:10:00 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; /**
--- a/src/share/classes/javax/lang/model/type/MirroredTypeException.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/type/MirroredTypeException.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/javax/lang/model/type/MirroredTypesException.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/type/MirroredTypesException.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java Tue Oct 09 19:10:00 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; /**
--- a/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java Tue Oct 09 19:10:00 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; /**
--- a/src/share/classes/javax/lang/model/util/AbstractElementVisitor8.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/AbstractElementVisitor8.java Tue Oct 09 19:10:00 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; /**
--- a/src/share/classes/javax/lang/model/util/ElementFilter.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/ElementFilter.java Tue Oct 09 19:10:00 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.*; /**
--- a/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/javax/lang/model/util/ElementScanner6.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/ElementScanner6.java Tue Oct 09 19:10:00 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.*;
--- a/src/share/classes/javax/lang/model/util/ElementScanner7.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/ElementScanner7.java Tue Oct 09 19:10:00 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.*;
--- a/src/share/classes/javax/lang/model/util/ElementScanner8.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/ElementScanner8.java Tue Oct 09 19:10:00 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.*;
--- a/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java Tue Oct 09 19:10:00 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.*;
--- a/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java Tue Oct 09 19:10:00 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.*;
--- a/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java Tue Oct 09 19:10:00 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.*;
--- a/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java Tue Oct 09 19:10:00 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.*;
--- a/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/javax/lang/model/util/TypeKindVisitor8.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/lang/model/util/TypeKindVisitor8.java Tue Oct 09 19:10:00 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
--- a/src/share/classes/javax/tools/ForwardingJavaFileManager.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/tools/ForwardingJavaFileManager.java Tue Oct 09 19:10:00 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;
--- a/src/share/classes/javax/tools/JavaFileObject.java Sat Oct 06 10:35:38 2012 +0100 +++ b/src/share/classes/javax/tools/JavaFileObject.java Tue Oct 09 19:10:00 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;