Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/source/tree/CompilationUnitTree.java	Sat Oct 06 10:35:38 2012 +0100
     1.2 +++ b/src/share/classes/com/sun/source/tree/CompilationUnitTree.java	Tue Oct 09 19:10:00 2012 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -27,7 +27,6 @@
    1.11  
    1.12  import java.util.List;
    1.13  import javax.tools.JavaFileObject;
    1.14 -import com.sun.source.tree.LineMap;
    1.15  
    1.16  /**
    1.17   * Represents the abstract syntax tree for compilation units (source

     2.1 --- a/src/share/classes/com/sun/source/tree/Scope.java	Sat Oct 06 10:35:38 2012 +0100
     2.2 +++ b/src/share/classes/com/sun/source/tree/Scope.java	Tue Oct 09 19:10:00 2012 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -25,11 +25,9 @@
    2.11  
    2.12  package com.sun.source.tree;
    2.13  
    2.14 -import com.sun.source.tree.Tree;
    2.15  import javax.lang.model.element.Element;
    2.16  import javax.lang.model.element.ExecutableElement;
    2.17  import javax.lang.model.element.TypeElement;
    2.18 -import javax.lang.model.type.DeclaredType;
    2.19  
    2.20  /**
    2.21   * Interface for determining locally available program elements, such as

     3.1 --- a/src/share/classes/com/sun/source/util/TaskEvent.java	Sat Oct 06 10:35:38 2012 +0100
     3.2 +++ b/src/share/classes/com/sun/source/util/TaskEvent.java	Tue Oct 09 19:10:00 2012 -0700
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   *
     3.9   * This code is free software; you can redistribute it and/or modify it
    3.10 @@ -25,10 +25,11 @@
    3.11  
    3.12  package com.sun.source.util;
    3.13  
    3.14 -import com.sun.source.tree.CompilationUnitTree;
    3.15  import javax.lang.model.element.TypeElement;
    3.16  import javax.tools.JavaFileObject;
    3.17  
    3.18 +import com.sun.source.tree.CompilationUnitTree;
    3.19 +
    3.20  /**
    3.21   * Provides details about work that has been done by the JDK Java Compiler, javac.
    3.22   *

     4.1 --- a/src/share/classes/com/sun/source/util/TreePath.java	Sat Oct 06 10:35:38 2012 +0100
     4.2 +++ b/src/share/classes/com/sun/source/util/TreePath.java	Tue Oct 09 19:10:00 2012 -0700
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
     4.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8   *
     4.9   * This code is free software; you can redistribute it and/or modify it
    4.10 @@ -25,8 +25,9 @@
    4.11  
    4.12  package com.sun.source.util;
    4.13  
    4.14 +import java.util.Iterator;
    4.15 +
    4.16  import com.sun.source.tree.*;
    4.17 -import java.util.Iterator;
    4.18  
    4.19  /**
    4.20   * A path of tree nodes, typically used to represent the sequence of ancestor

     5.1 --- a/src/share/classes/com/sun/tools/classfile/ClassTranslator.java	Sat Oct 06 10:35:38 2012 +0100
     5.2 +++ b/src/share/classes/com/sun/tools/classfile/ClassTranslator.java	Tue Oct 09 19:10:00 2012 -0700
     5.3 @@ -1,5 +1,5 @@
     5.4  /*
     5.5 - * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
     5.6 + * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
     5.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.8   *
     5.9   * This code is free software; you can redistribute it and/or modify it
    5.10 @@ -25,6 +25,8 @@
    5.11  
    5.12  package com.sun.tools.classfile;
    5.13  
    5.14 +import java.util.Map;
    5.15 +
    5.16  import com.sun.tools.classfile.ConstantPool.CONSTANT_Class_info;
    5.17  import com.sun.tools.classfile.ConstantPool.CONSTANT_Double_info;
    5.18  import com.sun.tools.classfile.ConstantPool.CONSTANT_Fieldref_info;
    5.19 @@ -40,7 +42,6 @@
    5.20  import com.sun.tools.classfile.ConstantPool.CONSTANT_String_info;
    5.21  import com.sun.tools.classfile.ConstantPool.CONSTANT_Utf8_info;
    5.22  import com.sun.tools.classfile.ConstantPool.CPInfo;
    5.23 -import java.util.Map;
    5.24  
    5.25  /**
    5.26   * Rewrites a class file using a map of translations.

     6.1 --- a/src/share/classes/com/sun/tools/classfile/Dependencies.java	Sat Oct 06 10:35:38 2012 +0100
     6.2 +++ b/src/share/classes/com/sun/tools/classfile/Dependencies.java	Tue Oct 09 19:10:00 2012 -0700
     6.3 @@ -1,5 +1,5 @@
     6.4  /*
     6.5 - * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
     6.6 + * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
     6.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.8   *
     6.9   * This code is free software; you can redistribute it and/or modify it
    6.10 @@ -33,8 +33,8 @@
    6.11  import java.util.Set;
    6.12  import java.util.regex.Pattern;
    6.13  
    6.14 +import com.sun.tools.classfile.Dependency.Filter;
    6.15  import com.sun.tools.classfile.Dependency.Finder;
    6.16 -import com.sun.tools.classfile.Dependency.Filter;
    6.17  import com.sun.tools.classfile.Dependency.Location;
    6.18  import com.sun.tools.classfile.Type.ArrayType;
    6.19  import com.sun.tools.classfile.Type.ClassSigType;
    6.20 @@ -43,7 +43,6 @@
    6.21  import com.sun.tools.classfile.Type.SimpleType;
    6.22  import com.sun.tools.classfile.Type.TypeParamType;
    6.23  import com.sun.tools.classfile.Type.WildcardType;
    6.24 -
    6.25  import static com.sun.tools.classfile.ConstantPool.*;
    6.26  
    6.27  /**

     7.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java	Sat Oct 06 10:35:38 2012 +0100
     7.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java	Tue Oct 09 19:10:00 2012 -0700
     7.3 @@ -1,5 +1,5 @@
     7.4  /*
     7.5 - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
     7.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
     7.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.8   *
     7.9   * This code is free software; you can redistribute it and/or modify it
    7.10 @@ -29,9 +29,9 @@
    7.11  import java.util.*;
    7.12  
    7.13  import com.sun.javadoc.*;
    7.14 -import com.sun.tools.doclets.internal.toolkit.util.*;
    7.15  import com.sun.tools.doclets.formats.html.markup.*;
    7.16  import com.sun.tools.doclets.internal.toolkit.*;
    7.17 +import com.sun.tools.doclets.internal.toolkit.util.*;
    7.18  
    7.19  /**
    7.20   * Generate Index for all the Member Names with Indexing in

     8.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java	Sat Oct 06 10:35:38 2012 +0100
     8.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java	Tue Oct 09 19:10:00 2012 -0700
     8.3 @@ -1,5 +1,5 @@
     8.4  /*
     8.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
     8.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     8.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     8.8   *
     8.9   * This code is free software; you can redistribute it and/or modify it
    8.10 @@ -25,13 +25,14 @@
    8.11  
    8.12  package com.sun.tools.doclets.formats.html;
    8.13  
    8.14 +import java.lang.reflect.Modifier;
    8.15  import java.util.*;
    8.16 -import java.lang.reflect.Modifier;
    8.17 +
    8.18  import com.sun.javadoc.*;
    8.19  import com.sun.tools.doclets.formats.html.markup.*;
    8.20  import com.sun.tools.doclets.internal.toolkit.*;
    8.21 +import com.sun.tools.doclets.internal.toolkit.taglets.*;
    8.22  import com.sun.tools.doclets.internal.toolkit.util.*;
    8.23 -import com.sun.tools.doclets.internal.toolkit.taglets.*;
    8.24  
    8.25  /**
    8.26   * The base class for member writers.

     9.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java	Sat Oct 06 10:35:38 2012 +0100
     9.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java	Tue Oct 09 19:10:00 2012 -0700
     9.3 @@ -1,5 +1,5 @@
     9.4  /*
     9.5 - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
     9.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
     9.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     9.8   *
     9.9   * This code is free software; you can redistribute it and/or modify it
    9.10 @@ -27,10 +27,11 @@
    9.11  
    9.12  import java.io.*;
    9.13  import java.util.*;
    9.14 +
    9.15 +import com.sun.javadoc.*;
    9.16 +import com.sun.tools.doclets.formats.html.markup.*;
    9.17 +import com.sun.tools.doclets.internal.toolkit.*;
    9.18  import com.sun.tools.doclets.internal.toolkit.util.*;
    9.19 -import com.sun.tools.doclets.internal.toolkit.*;
    9.20 -import com.sun.tools.doclets.formats.html.markup.*;
    9.21 -import com.sun.javadoc.*;
    9.22  
    9.23  /**
    9.24   * Abstract class to print the class hierarchy page for all the Classes. This

    10.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java	Sat Oct 06 10:35:38 2012 +0100
    10.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java	Tue Oct 09 19:10:00 2012 -0700
    10.3 @@ -1,5 +1,5 @@
    10.4  /*
    10.5 - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
    10.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    10.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    10.8   *
    10.9   * This code is free software; you can redistribute it and/or modify it
   10.10 @@ -29,9 +29,9 @@
   10.11  import java.util.*;
   10.12  
   10.13  import com.sun.javadoc.*;
   10.14 +import com.sun.tools.doclets.formats.html.markup.*;
   10.15  import com.sun.tools.doclets.internal.toolkit.*;
   10.16  import com.sun.tools.doclets.internal.toolkit.util.*;
   10.17 -import com.sun.tools.doclets.formats.html.markup.*;
   10.18  
   10.19  /**
   10.20   * Generate the file with list of all the classes in this run. This page will be

    11.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java	Sat Oct 06 10:35:38 2012 +0100
    11.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java	Tue Oct 09 19:10:00 2012 -0700
    11.3 @@ -1,5 +1,5 @@
    11.4  /*
    11.5 - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
    11.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    11.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    11.8   *
    11.9   * This code is free software; you can redistribute it and/or modify it
   11.10 @@ -26,10 +26,10 @@
   11.11  package com.sun.tools.doclets.formats.html;
   11.12  
   11.13  import com.sun.javadoc.*;
   11.14 +import com.sun.tools.doclets.formats.html.markup.*;
   11.15  import com.sun.tools.doclets.internal.toolkit.*;
   11.16 +import com.sun.tools.doclets.internal.toolkit.builders.*;
   11.17  import com.sun.tools.doclets.internal.toolkit.util.*;
   11.18 -import com.sun.tools.doclets.internal.toolkit.builders.*;
   11.19 -import com.sun.tools.doclets.formats.html.markup.*;
   11.20  
   11.21  /**
   11.22   * Generate the Class Information Page.

    12.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java	Sat Oct 06 10:35:38 2012 +0100
    12.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java	Tue Oct 09 19:10:00 2012 -0700
    12.3 @@ -27,10 +27,11 @@
    12.4  
    12.5  import java.io.*;
    12.6  import java.util.*;
    12.7 +
    12.8  import com.sun.javadoc.*;
    12.9 -import com.sun.tools.doclets.internal.toolkit.util.*;
   12.10  import com.sun.tools.doclets.formats.html.markup.*;
   12.11  import com.sun.tools.doclets.internal.toolkit.*;
   12.12 +import com.sun.tools.doclets.internal.toolkit.util.*;
   12.13  
   12.14  /**
   12.15   * Generate class usage information.

    13.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java	Sat Oct 06 10:35:38 2012 +0100
    13.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java	Tue Oct 09 19:10:00 2012 -0700
    13.3 @@ -1,5 +1,5 @@
    13.4  /*
    13.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
    13.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    13.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    13.8   *
    13.9   * This code is free software; you can redistribute it and/or modify it
   13.10 @@ -28,11 +28,11 @@
   13.11  import java.util.*;
   13.12  
   13.13  import com.sun.javadoc.*;
   13.14 +import com.sun.tools.doclets.formats.html.markup.*;
   13.15  import com.sun.tools.doclets.internal.toolkit.*;
   13.16 -import com.sun.tools.doclets.internal.toolkit.util.*;
   13.17  import com.sun.tools.doclets.internal.toolkit.builders.*;
   13.18  import com.sun.tools.doclets.internal.toolkit.taglets.*;
   13.19 -import com.sun.tools.doclets.formats.html.markup.*;
   13.20 +import com.sun.tools.doclets.internal.toolkit.util.*;
   13.21  
   13.22  /**
   13.23   * Generate the Class Information Page.

    14.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java	Sat Oct 06 10:35:38 2012 +0100
    14.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java	Tue Oct 09 19:10:00 2012 -0700
    14.3 @@ -25,14 +25,14 @@
    14.4  
    14.5  package com.sun.tools.doclets.formats.html;
    14.6  
    14.7 +import java.io.*;
    14.8 +import java.net.*;
    14.9 +import java.util.*;
   14.10 +
   14.11 +import com.sun.javadoc.*;
   14.12  import com.sun.tools.doclets.internal.toolkit.*;
   14.13  import com.sun.tools.doclets.internal.toolkit.util.*;
   14.14  
   14.15 -import com.sun.javadoc.*;
   14.16 -import java.util.*;
   14.17 -import java.io.*;
   14.18 -import java.net.*;
   14.19 -
   14.20  /**
   14.21   * Configure the output based on the command line options.
   14.22   * <p>

    15.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java	Sat Oct 06 10:35:38 2012 +0100
    15.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java	Tue Oct 09 19:10:00 2012 -0700
    15.3 @@ -1,5 +1,5 @@
    15.4  /*
    15.5 - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
    15.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    15.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    15.8   *
    15.9   * This code is free software; you can redistribute it and/or modify it
   15.10 @@ -27,10 +27,11 @@
   15.11  
   15.12  import java.io.*;
   15.13  import java.util.*;
   15.14 +
   15.15  import com.sun.javadoc.*;
   15.16 +import com.sun.tools.doclets.formats.html.markup.*;
   15.17  import com.sun.tools.doclets.internal.toolkit.*;
   15.18  import com.sun.tools.doclets.internal.toolkit.util.*;
   15.19 -import com.sun.tools.doclets.formats.html.markup.*;
   15.20  
   15.21  /**
   15.22   * Write the Constants Summary Page in HTML format.

    16.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java	Sat Oct 06 10:35:38 2012 +0100
    16.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java	Tue Oct 09 19:10:00 2012 -0700
    16.3 @@ -1,5 +1,5 @@
    16.4  /*
    16.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
    16.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    16.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    16.8   *
    16.9   * This code is free software; you can redistribute it and/or modify it
   16.10 @@ -26,10 +26,10 @@
   16.11  package com.sun.tools.doclets.formats.html;
   16.12  
   16.13  import java.io.*;
   16.14 +
   16.15 +import com.sun.tools.doclets.formats.html.markup.*;
   16.16  import com.sun.tools.doclets.internal.toolkit.*;
   16.17 -import com.sun.tools.doclets.internal.toolkit.util.DeprecatedAPIListBuilder;
   16.18  import com.sun.tools.doclets.internal.toolkit.util.*;
   16.19 -import com.sun.tools.doclets.formats.html.markup.*;
   16.20  
   16.21  /**
   16.22   * Generate File to list all the deprecated classes and class members with the

    17.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java	Sat Oct 06 10:35:38 2012 +0100
    17.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java	Tue Oct 09 19:10:00 2012 -0700
    17.3 @@ -1,5 +1,5 @@
    17.4  /*
    17.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    17.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    17.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    17.8   *
    17.9   * This code is free software; you can redistribute it and/or modify it
   17.10 @@ -26,9 +26,10 @@
   17.11  package com.sun.tools.doclets.formats.html;
   17.12  
   17.13  import java.io.*;
   17.14 +
   17.15 +import com.sun.tools.doclets.formats.html.markup.*;
   17.16 +import com.sun.tools.doclets.internal.toolkit.*;
   17.17  import com.sun.tools.doclets.internal.toolkit.util.*;
   17.18 -import com.sun.tools.doclets.internal.toolkit.*;
   17.19 -import com.sun.tools.doclets.formats.html.markup.*;
   17.20  
   17.21  /**
   17.22   * Generate the documentation in the Html "frame" format in the browser. The

    18.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java	Sat Oct 06 10:35:38 2012 +0100
    18.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java	Tue Oct 09 19:10:00 2012 -0700
    18.3 @@ -26,9 +26,10 @@
    18.4  package com.sun.tools.doclets.formats.html;
    18.5  
    18.6  import java.io.*;
    18.7 +
    18.8 +import com.sun.tools.doclets.formats.html.markup.*;
    18.9 +import com.sun.tools.doclets.internal.toolkit.*;
   18.10  import com.sun.tools.doclets.internal.toolkit.util.*;
   18.11 -import com.sun.tools.doclets.internal.toolkit.*;
   18.12 -import com.sun.tools.doclets.formats.html.markup.*;
   18.13  
   18.14  /**
   18.15   * Generate the Help File for the generated API documentation. The help file

    19.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java	Sat Oct 06 10:35:38 2012 +0100
    19.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java	Tue Oct 09 19:10:00 2012 -0700
    19.3 @@ -1,5 +1,5 @@
    19.4  /*
    19.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
    19.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    19.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    19.8   *
    19.9   * This code is free software; you can redistribute it and/or modify it
   19.10 @@ -24,14 +24,14 @@
   19.11   */
   19.12  package com.sun.tools.doclets.formats.html;
   19.13  
   19.14 +import java.io.*;
   19.15 +import java.util.*;
   19.16 +
   19.17 +import com.sun.javadoc.*;
   19.18  import com.sun.tools.doclets.internal.toolkit.*;
   19.19  import com.sun.tools.doclets.internal.toolkit.builders.*;
   19.20  import com.sun.tools.doclets.internal.toolkit.util.*;
   19.21  
   19.22 -import com.sun.javadoc.*;
   19.23 -import java.util.*;
   19.24 -import java.io.*;
   19.25 -
   19.26  /**
   19.27   * The class with "start" method, calls individual Writers.
   19.28   *

    20.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Sat Oct 06 10:35:38 2012 +0100
    20.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Tue Oct 09 19:10:00 2012 -0700
    20.3 @@ -32,8 +32,8 @@
    20.4  import com.sun.javadoc.*;
    20.5  import com.sun.tools.doclets.formats.html.markup.*;
    20.6  import com.sun.tools.doclets.internal.toolkit.*;
    20.7 +import com.sun.tools.doclets.internal.toolkit.taglets.*;
    20.8  import com.sun.tools.doclets.internal.toolkit.util.*;
    20.9 -import com.sun.tools.doclets.internal.toolkit.taglets.*;
   20.10  
   20.11  /**
   20.12   * Class for the Html Format Code Generation specific to JavaDoc.

    21.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java	Sat Oct 06 10:35:38 2012 +0100
    21.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java	Tue Oct 09 19:10:00 2012 -0700
    21.3 @@ -1,5 +1,5 @@
    21.4  /*
    21.5 - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
    21.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    21.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    21.8   *
    21.9   * This code is free software; you can redistribute it and/or modify it
   21.10 @@ -28,9 +28,9 @@
   21.11  import java.util.*;
   21.12  
   21.13  import com.sun.javadoc.*;
   21.14 +import com.sun.tools.doclets.formats.html.markup.*;
   21.15  import com.sun.tools.doclets.internal.toolkit.*;
   21.16  import com.sun.tools.doclets.internal.toolkit.taglets.*;
   21.17 -import com.sun.tools.doclets.formats.html.markup.*;
   21.18  
   21.19  /**
   21.20   * Generate serialized form for serializable fields.

    22.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java	Sat Oct 06 10:35:38 2012 +0100
    22.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java	Tue Oct 09 19:10:00 2012 -0700
    22.3 @@ -1,5 +1,5 @@
    22.4  /*
    22.5 - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
    22.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    22.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    22.8   *
    22.9   * This code is free software; you can redistribute it and/or modify it
   22.10 @@ -26,9 +26,9 @@
   22.11  package com.sun.tools.doclets.formats.html;
   22.12  
   22.13  import com.sun.javadoc.*;
   22.14 +import com.sun.tools.doclets.formats.html.markup.*;
   22.15  import com.sun.tools.doclets.internal.toolkit.*;
   22.16  import com.sun.tools.doclets.internal.toolkit.taglets.*;
   22.17 -import com.sun.tools.doclets.formats.html.markup.*;
   22.18  
   22.19  /**
   22.20   * Generate serialized form for Serializable/Externalizable methods.

    23.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java	Sat Oct 06 10:35:38 2012 +0100
    23.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java	Tue Oct 09 19:10:00 2012 -0700
    23.3 @@ -1,5 +1,5 @@
    23.4  /*
    23.5 - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
    23.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    23.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    23.8   *
    23.9   * This code is free software; you can redistribute it and/or modify it
   23.10 @@ -25,10 +25,10 @@
   23.11  
   23.12  package com.sun.tools.doclets.formats.html;
   23.13  
   23.14 -import com.sun.tools.doclets.internal.toolkit.util.links.*;
   23.15  import com.sun.javadoc.*;
   23.16  import com.sun.tools.doclets.internal.toolkit.*;
   23.17  import com.sun.tools.doclets.internal.toolkit.util.*;
   23.18 +import com.sun.tools.doclets.internal.toolkit.util.links.*;
   23.19  
   23.20  /**
   23.21   * A factory that returns a link given the information about it.

    24.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java	Sat Oct 06 10:35:38 2012 +0100
    24.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java	Tue Oct 09 19:10:00 2012 -0700
    24.3 @@ -1,5 +1,5 @@
    24.4  /*
    24.5 - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
    24.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    24.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    24.8   *
    24.9   * This code is free software; you can redistribute it and/or modify it
   24.10 @@ -27,10 +27,11 @@
   24.11  
   24.12  import java.io.*;
   24.13  import java.util.*;
   24.14 +
   24.15  import com.sun.javadoc.*;
   24.16 +import com.sun.tools.doclets.formats.html.markup.*;
   24.17 +import com.sun.tools.doclets.internal.toolkit.*;
   24.18  import com.sun.tools.doclets.internal.toolkit.util.*;
   24.19 -import com.sun.tools.doclets.internal.toolkit.*;
   24.20 -import com.sun.tools.doclets.formats.html.markup.*;
   24.21  
   24.22  /**
   24.23   * Class to generate file for each package contents in the left-hand bottom

    25.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java	Sat Oct 06 10:35:38 2012 +0100
    25.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java	Tue Oct 09 19:10:00 2012 -0700
    25.3 @@ -1,5 +1,5 @@
    25.4  /*
    25.5 - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
    25.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    25.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    25.8   *
    25.9   * This code is free software; you can redistribute it and/or modify it
   25.10 @@ -26,10 +26,11 @@
   25.11  package com.sun.tools.doclets.formats.html;
   25.12  
   25.13  import java.io.*;
   25.14 +
   25.15  import com.sun.javadoc.*;
   25.16 +import com.sun.tools.doclets.formats.html.markup.*;
   25.17  import com.sun.tools.doclets.internal.toolkit.*;
   25.18  import com.sun.tools.doclets.internal.toolkit.util.*;
   25.19 -import com.sun.tools.doclets.formats.html.markup.*;
   25.20  
   25.21  /**
   25.22   * Generate the package index for the left-hand frame in the generated output.

    26.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java	Sat Oct 06 10:35:38 2012 +0100
    26.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java	Tue Oct 09 19:10:00 2012 -0700
    26.3 @@ -1,5 +1,5 @@
    26.4  /*
    26.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
    26.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    26.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    26.8   *
    26.9   * This code is free software; you can redistribute it and/or modify it
   26.10 @@ -27,10 +27,11 @@
   26.11  
   26.12  import java.io.*;
   26.13  import java.util.*;
   26.14 +
   26.15  import com.sun.javadoc.*;
   26.16 +import com.sun.tools.doclets.formats.html.markup.*;
   26.17  import com.sun.tools.doclets.internal.toolkit.*;
   26.18  import com.sun.tools.doclets.internal.toolkit.util.*;
   26.19 -import com.sun.tools.doclets.formats.html.markup.*;
   26.20  
   26.21  /**
   26.22   * Generate the package index page "overview-summary.html" for the right-hand

    27.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java	Sat Oct 06 10:35:38 2012 +0100
    27.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java	Tue Oct 09 19:10:00 2012 -0700
    27.3 @@ -1,5 +1,5 @@
    27.4  /*
    27.5 - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
    27.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    27.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    27.8   *
    27.9   * This code is free software; you can redistribute it and/or modify it
   27.10 @@ -28,9 +28,9 @@
   27.11  import java.io.*;
   27.12  
   27.13  import com.sun.javadoc.*;
   27.14 -import com.sun.tools.doclets.internal.toolkit.util.*;
   27.15  import com.sun.tools.doclets.formats.html.markup.*;
   27.16  import com.sun.tools.doclets.internal.toolkit.*;
   27.17 +import com.sun.tools.doclets.internal.toolkit.util.*;
   27.18  
   27.19  /**
   27.20   * Class to generate Tree page for a package. The name of the file generated is

    28.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java	Sat Oct 06 10:35:38 2012 +0100
    28.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java	Tue Oct 09 19:10:00 2012 -0700
    28.3 @@ -1,5 +1,5 @@
    28.4  /*
    28.5 - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
    28.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    28.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    28.8   *
    28.9   * This code is free software; you can redistribute it and/or modify it
   28.10 @@ -27,10 +27,11 @@
   28.11  
   28.12  import java.io.*;
   28.13  import java.util.*;
   28.14 +
   28.15  import com.sun.javadoc.*;
   28.16 -import com.sun.tools.doclets.internal.toolkit.util.*;
   28.17  import com.sun.tools.doclets.formats.html.markup.*;
   28.18  import com.sun.tools.doclets.internal.toolkit.*;
   28.19 +import com.sun.tools.doclets.internal.toolkit.util.*;
   28.20  
   28.21  /**
   28.22   * Generate package usage information.

    29.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java	Sat Oct 06 10:35:38 2012 +0100
    29.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java	Tue Oct 09 19:10:00 2012 -0700
    29.3 @@ -1,5 +1,5 @@
    29.4  /*
    29.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
    29.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    29.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    29.8   *
    29.9   * This code is free software; you can redistribute it and/or modify it
   29.10 @@ -27,10 +27,11 @@
   29.11  
   29.12  import java.io.*;
   29.13  import java.util.*;
   29.14 +
   29.15  import com.sun.javadoc.*;
   29.16 +import com.sun.tools.doclets.formats.html.markup.*;
   29.17  import com.sun.tools.doclets.internal.toolkit.*;
   29.18  import com.sun.tools.doclets.internal.toolkit.util.*;
   29.19 -import com.sun.tools.doclets.formats.html.markup.*;
   29.20  
   29.21  /**
   29.22   * Class to generate file for each package contents in the right-hand

    30.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java	Sat Oct 06 10:35:38 2012 +0100
    30.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java	Tue Oct 09 19:10:00 2012 -0700
    30.3 @@ -1,5 +1,5 @@
    30.4  /*
    30.5 - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
    30.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    30.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    30.8   *
    30.9   * This code is free software; you can redistribute it and/or modify it
   30.10 @@ -26,9 +26,10 @@
   30.11  package com.sun.tools.doclets.formats.html;
   30.12  
   30.13  import java.io.*;
   30.14 -import com.sun.tools.doclets.internal.toolkit.util.*;
   30.15 +
   30.16  import com.sun.tools.doclets.formats.html.markup.*;
   30.17  import com.sun.tools.doclets.internal.toolkit.*;
   30.18 +import com.sun.tools.doclets.internal.toolkit.util.*;
   30.19  
   30.20  /**
   30.21   * Generate only one index file for all the Member Names with Indexing in

    31.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java	Sat Oct 06 10:35:38 2012 +0100
    31.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java	Tue Oct 09 19:10:00 2012 -0700
    31.3 @@ -1,5 +1,5 @@
    31.4  /*
    31.5 - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
    31.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    31.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    31.8   *
    31.9   * This code is free software; you can redistribute it and/or modify it
   31.10 @@ -26,9 +26,10 @@
   31.11  package com.sun.tools.doclets.formats.html;
   31.12  
   31.13  import java.io.*;
   31.14 -import com.sun.tools.doclets.internal.toolkit.util.*;
   31.15 +
   31.16  import com.sun.tools.doclets.formats.html.markup.*;
   31.17  import com.sun.tools.doclets.internal.toolkit.*;
   31.18 +import com.sun.tools.doclets.internal.toolkit.util.*;
   31.19  
   31.20  /**
   31.21   * Generate Separate Index Files for all the member names with Indexing in

    32.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java	Sat Oct 06 10:35:38 2012 +0100
    32.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java	Tue Oct 09 19:10:00 2012 -0700
    32.3 @@ -1,5 +1,5 @@
    32.4  /*
    32.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    32.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    32.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    32.8   *
    32.9   * This code is free software; you can redistribute it and/or modify it
   32.10 @@ -26,10 +26,11 @@
   32.11  package com.sun.tools.doclets.formats.html;
   32.12  
   32.13  import java.io.*;
   32.14 +
   32.15  import com.sun.javadoc.*;
   32.16 +import com.sun.tools.doclets.formats.html.markup.*;
   32.17  import com.sun.tools.doclets.internal.toolkit.*;
   32.18  import com.sun.tools.doclets.internal.toolkit.util.*;
   32.19 -import com.sun.tools.doclets.formats.html.markup.*;
   32.20  
   32.21  /**
   32.22   * This abstract class exists to provide functionality needed in the

    33.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java	Sat Oct 06 10:35:38 2012 +0100
    33.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java	Tue Oct 09 19:10:00 2012 -0700
    33.3 @@ -1,5 +1,5 @@
    33.4  /*
    33.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
    33.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    33.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33.8   *
    33.9   * This code is free software; you can redistribute it and/or modify it
   33.10 @@ -28,9 +28,9 @@
   33.11  import java.io.*;
   33.12  
   33.13  import com.sun.javadoc.*;
   33.14 -import com.sun.tools.doclets.internal.toolkit.util.*;
   33.15  import com.sun.tools.doclets.formats.html.markup.*;
   33.16  import com.sun.tools.doclets.internal.toolkit.*;
   33.17 +import com.sun.tools.doclets.internal.toolkit.util.*;
   33.18  
   33.19  /**
   33.20   * Generate Class Hierarchy page for all the Classes in this run.  Use

    34.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java	Sat Oct 06 10:35:38 2012 +0100
    34.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java	Tue Oct 09 19:10:00 2012 -0700
    34.3 @@ -1,5 +1,5 @@
    34.4  /*
    34.5 - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
    34.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    34.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    34.8   *
    34.9   * This code is free software; you can redistribute it and/or modify it
   34.10 @@ -25,9 +25,9 @@
   34.11  
   34.12  package com.sun.tools.doclets.formats.html;
   34.13  
   34.14 +import com.sun.javadoc.*;
   34.15  import com.sun.tools.doclets.internal.toolkit.*;
   34.16  import com.sun.tools.doclets.internal.toolkit.util.*;
   34.17 -import com.sun.javadoc.*;
   34.18  
   34.19  /**
   34.20   * The factory that returns HTML writers.

    35.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java	Sat Oct 06 10:35:38 2012 +0100
    35.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java	Tue Oct 09 19:10:00 2012 -0700
    35.3 @@ -1,5 +1,5 @@
    35.4  /*
    35.5 - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
    35.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    35.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    35.8   *
    35.9   * This code is free software; you can redistribute it and/or modify it
   35.10 @@ -25,11 +25,11 @@
   35.11  
   35.12  package com.sun.tools.doclets.internal.toolkit;
   35.13  
   35.14 +import com.sun.javadoc.*;
   35.15  import com.sun.tools.doclets.internal.toolkit.builders.*;
   35.16  import com.sun.tools.doclets.internal.toolkit.util.*;
   35.17 -import com.sun.javadoc.*;
   35.18 -import java.util.*;
   35.19 -import java.io.*;
   35.20 +import java.io.File;
   35.21 +import java.util.StringTokenizer;
   35.22  
   35.23  /**
   35.24   * An abstract implementation of a Doclet.

    36.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java	Sat Oct 06 10:35:38 2012 +0100
    36.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java	Tue Oct 09 19:10:00 2012 -0700
    36.3 @@ -25,12 +25,13 @@
    36.4  
    36.5  package com.sun.tools.doclets.internal.toolkit;
    36.6  
    36.7 +import java.io.*;
    36.8 +import java.util.*;
    36.9 +
   36.10 +import com.sun.javadoc.*;
   36.11 +import com.sun.tools.doclets.internal.toolkit.builders.BuilderFactory;
   36.12  import com.sun.tools.doclets.internal.toolkit.taglets.*;
   36.13  import com.sun.tools.doclets.internal.toolkit.util.*;
   36.14 -import com.sun.tools.doclets.internal.toolkit.builders.BuilderFactory;
   36.15 -import com.sun.javadoc.*;
   36.16 -import java.util.*;
   36.17 -import java.io.*;
   36.18  
   36.19  /**
   36.20   * Configure the output based on the options. Doclets should sub-class

    37.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java	Sat Oct 06 10:35:38 2012 +0100
    37.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java	Tue Oct 09 19:10:00 2012 -0700
    37.3 @@ -1,5 +1,5 @@
    37.4  /*
    37.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    37.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    37.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    37.8   *
    37.9   * This code is free software; you can redistribute it and/or modify it
   37.10 @@ -25,8 +25,9 @@
   37.11  
   37.12  package com.sun.tools.doclets.internal.toolkit;
   37.13  
   37.14 +import java.io.*;
   37.15  import java.util.*;
   37.16 -import java.io.*;
   37.17 +
   37.18  import com.sun.javadoc.*;
   37.19  
   37.20  /**

    38.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java	Sat Oct 06 10:35:38 2012 +0100
    38.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java	Tue Oct 09 19:10:00 2012 -0700
    38.3 @@ -1,5 +1,5 @@
    38.4  /*
    38.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    38.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    38.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    38.8   *
    38.9   * This code is free software; you can redistribute it and/or modify it
   38.10 @@ -25,8 +25,9 @@
   38.11  
   38.12  package com.sun.tools.doclets.internal.toolkit;
   38.13  
   38.14 +import java.io.*;
   38.15 +
   38.16  import com.sun.javadoc.*;
   38.17 -import java.io.*;
   38.18  
   38.19  /**
   38.20   * The interface for writing package summary output.

    39.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java	Sat Oct 06 10:35:38 2012 +0100
    39.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java	Tue Oct 09 19:10:00 2012 -0700
    39.3 @@ -1,5 +1,5 @@
    39.4  /*
    39.5 - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
    39.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    39.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    39.8   *
    39.9   * This code is free software; you can redistribute it and/or modify it
   39.10 @@ -25,8 +25,8 @@
   39.11  
   39.12  package com.sun.tools.doclets.internal.toolkit;
   39.13  
   39.14 +import com.sun.javadoc.*;
   39.15  import com.sun.tools.doclets.internal.toolkit.util.*;
   39.16 -import com.sun.javadoc.*;
   39.17  
   39.18  /**
   39.19   * The interface for a factory creates writers.

    40.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java	Sat Oct 06 10:35:38 2012 +0100
    40.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    40.3 @@ -1,5 +1,5 @@
    40.4  /*
    40.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    40.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    40.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    40.8   *
    40.9   * This code is free software; you can redistribute it and/or modify it
   40.10 @@ -25,12 +25,13 @@
   40.11  
   40.12  package com.sun.tools.doclets.internal.toolkit.builders;
   40.13  
   40.14 -import com.sun.tools.doclets.internal.toolkit.*;
   40.15 -import com.sun.tools.doclets.internal.toolkit.util.*;
   40.16  import java.io.*;
   40.17  import java.lang.reflect.*;
   40.18  import java.util.*;
   40.19  
   40.20 +import com.sun.tools.doclets.internal.toolkit.*;
   40.21 +import com.sun.tools.doclets.internal.toolkit.util.*;
   40.22 +
   40.23  /**
   40.24   * The superclass for all builders.  A builder is a class that provides
   40.25   * the structure and content of API documentation.  A builder is completely

    41.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java	Sat Oct 06 10:35:38 2012 +0100
    41.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    41.3 @@ -1,5 +1,5 @@
    41.4  /*
    41.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    41.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    41.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    41.8   *
    41.9   * This code is free software; you can redistribute it and/or modify it
   41.10 @@ -27,7 +27,6 @@
   41.11  
   41.12  import com.sun.tools.doclets.internal.toolkit.*;
   41.13  import com.sun.tools.doclets.internal.toolkit.util.*;
   41.14 -import java.util.*;
   41.15  
   41.16  /**
   41.17   * The superclass for all member builders.  Member builders are only executed

    42.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java	Sat Oct 06 10:35:38 2012 +0100
    42.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    42.3 @@ -1,5 +1,5 @@
    42.4  /*
    42.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    42.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    42.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    42.8   *
    42.9   * This code is free software; you can redistribute it and/or modify it
   42.10 @@ -27,9 +27,10 @@
   42.11  
   42.12  import java.io.*;
   42.13  import java.util.*;
   42.14 +
   42.15 +import com.sun.javadoc.*;
   42.16 +import com.sun.tools.doclets.internal.toolkit.*;
   42.17  import com.sun.tools.doclets.internal.toolkit.util.*;
   42.18 -import com.sun.tools.doclets.internal.toolkit.*;
   42.19 -import com.sun.javadoc.*;
   42.20  
   42.21  /**
   42.22   * Builds the summary for a given annotation type.

    43.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java	Sat Oct 06 10:35:38 2012 +0100
    43.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    43.3 @@ -1,5 +1,5 @@
    43.4  /*
    43.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    43.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    43.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    43.8   *
    43.9   * This code is free software; you can redistribute it and/or modify it
   43.10 @@ -26,9 +26,10 @@
   43.11  package com.sun.tools.doclets.internal.toolkit.builders;
   43.12  
   43.13  import java.util.*;
   43.14 +
   43.15 +import com.sun.javadoc.*;
   43.16 +import com.sun.tools.doclets.internal.toolkit.*;
   43.17  import com.sun.tools.doclets.internal.toolkit.util.*;
   43.18 -import com.sun.tools.doclets.internal.toolkit.*;
   43.19 -import com.sun.javadoc.*;
   43.20  
   43.21  /**
   43.22   * Builds documentation for optional annotation type members.

    44.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java	Sat Oct 06 10:35:38 2012 +0100
    44.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    44.3 @@ -1,5 +1,5 @@
    44.4  /*
    44.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    44.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    44.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44.8   *
    44.9   * This code is free software; you can redistribute it and/or modify it
   44.10 @@ -26,9 +26,10 @@
   44.11  package com.sun.tools.doclets.internal.toolkit.builders;
   44.12  
   44.13  import java.util.*;
   44.14 +
   44.15 +import com.sun.javadoc.*;
   44.16 +import com.sun.tools.doclets.internal.toolkit.*;
   44.17  import com.sun.tools.doclets.internal.toolkit.util.*;
   44.18 -import com.sun.tools.doclets.internal.toolkit.*;
   44.19 -import com.sun.javadoc.*;
   44.20  
   44.21  /**
   44.22   * Builds documentation for required annotation type members.

    45.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java	Sat Oct 06 10:35:38 2012 +0100
    45.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java	Tue Oct 09 19:10:00 2012 -0700
    45.3 @@ -1,5 +1,5 @@
    45.4  /*
    45.5 - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
    45.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    45.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    45.8   *
    45.9   * This code is free software; you can redistribute it and/or modify it
   45.10 @@ -25,9 +25,9 @@
   45.11  
   45.12  package com.sun.tools.doclets.internal.toolkit.builders;
   45.13  
   45.14 +import com.sun.javadoc.*;
   45.15  import com.sun.tools.doclets.internal.toolkit.*;
   45.16  import com.sun.tools.doclets.internal.toolkit.util.*;
   45.17 -import com.sun.javadoc.*;
   45.18  
   45.19  /**
   45.20   * The factory for constructing builders.

    46.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java	Sat Oct 06 10:35:38 2012 +0100
    46.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    46.3 @@ -27,9 +27,10 @@
    46.4  
    46.5  import java.io.*;
    46.6  import java.util.*;
    46.7 +
    46.8 +import com.sun.javadoc.*;
    46.9 +import com.sun.tools.doclets.internal.toolkit.*;
   46.10  import com.sun.tools.doclets.internal.toolkit.util.*;
   46.11 -import com.sun.tools.doclets.internal.toolkit.*;
   46.12 -import com.sun.javadoc.*;
   46.13  
   46.14  /**
   46.15   * Builds the summary for a given class.

    47.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java	Sat Oct 06 10:35:38 2012 +0100
    47.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    47.3 @@ -1,5 +1,5 @@
    47.4  /*
    47.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    47.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    47.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    47.8   *
    47.9   * This code is free software; you can redistribute it and/or modify it
   47.10 @@ -27,9 +27,10 @@
   47.11  
   47.12  import java.io.*;
   47.13  import java.util.*;
   47.14 +
   47.15  import com.sun.javadoc.*;
   47.16 +import com.sun.tools.doclets.internal.toolkit.*;
   47.17  import com.sun.tools.doclets.internal.toolkit.util.*;
   47.18 -import com.sun.tools.doclets.internal.toolkit.*;
   47.19  
   47.20  /**
   47.21   * Builds the Constants Summary Page.

    48.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java	Sat Oct 06 10:35:38 2012 +0100
    48.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    48.3 @@ -1,5 +1,5 @@
    48.4  /*
    48.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    48.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    48.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    48.8   *
    48.9   * This code is free software; you can redistribute it and/or modify it
   48.10 @@ -26,9 +26,10 @@
   48.11  package com.sun.tools.doclets.internal.toolkit.builders;
   48.12  
   48.13  import java.util.*;
   48.14 +
   48.15 +import com.sun.javadoc.*;
   48.16 +import com.sun.tools.doclets.internal.toolkit.*;
   48.17  import com.sun.tools.doclets.internal.toolkit.util.*;
   48.18 -import com.sun.tools.doclets.internal.toolkit.*;
   48.19 -import com.sun.javadoc.*;
   48.20  
   48.21  /**
   48.22   * Builds documentation for a constructor.

    49.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java	Sat Oct 06 10:35:38 2012 +0100
    49.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    49.3 @@ -1,5 +1,5 @@
    49.4  /*
    49.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    49.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    49.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    49.8   *
    49.9   * This code is free software; you can redistribute it and/or modify it
   49.10 @@ -26,9 +26,10 @@
   49.11  package com.sun.tools.doclets.internal.toolkit.builders;
   49.12  
   49.13  import java.util.*;
   49.14 +
   49.15 +import com.sun.javadoc.*;
   49.16 +import com.sun.tools.doclets.internal.toolkit.*;
   49.17  import com.sun.tools.doclets.internal.toolkit.util.*;
   49.18 -import com.sun.tools.doclets.internal.toolkit.*;
   49.19 -import com.sun.javadoc.*;
   49.20  
   49.21  /**
   49.22   * Builds documentation for a enum constants.

    50.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java	Sat Oct 06 10:35:38 2012 +0100
    50.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    50.3 @@ -1,5 +1,5 @@
    50.4  /*
    50.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    50.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    50.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    50.8   *
    50.9   * This code is free software; you can redistribute it and/or modify it
   50.10 @@ -26,9 +26,10 @@
   50.11  package com.sun.tools.doclets.internal.toolkit.builders;
   50.12  
   50.13  import java.util.*;
   50.14 +
   50.15 +import com.sun.javadoc.*;
   50.16 +import com.sun.tools.doclets.internal.toolkit.*;
   50.17  import com.sun.tools.doclets.internal.toolkit.util.*;
   50.18 -import com.sun.tools.doclets.internal.toolkit.*;
   50.19 -import com.sun.javadoc.*;
   50.20  
   50.21  /**
   50.22   * Builds documentation for a field.

    51.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java	Sat Oct 06 10:35:38 2012 +0100
    51.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java	Tue Oct 09 19:10:00 2012 -0700
    51.3 @@ -1,5 +1,5 @@
    51.4  /*
    51.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    51.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    51.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    51.8   *
    51.9   * This code is free software; you can redistribute it and/or modify it
   51.10 @@ -24,13 +24,16 @@
   51.11   */
   51.12  package com.sun.tools.doclets.internal.toolkit.builders;
   51.13  
   51.14 +import java.io.*;
   51.15 +import java.util.*;
   51.16 +
   51.17 +import javax.xml.parsers.*;
   51.18 +
   51.19 +import org.xml.sax.*;
   51.20 +import org.xml.sax.helpers.DefaultHandler;
   51.21 +
   51.22  import com.sun.tools.doclets.internal.toolkit.*;
   51.23  import com.sun.tools.doclets.internal.toolkit.util.*;
   51.24 -import java.io.*;
   51.25 -import java.util.*;
   51.26 -import org.xml.sax.*;
   51.27 -import org.xml.sax.helpers.DefaultHandler;
   51.28 -import javax.xml.parsers.*;
   51.29  
   51.30  /**
   51.31   * Parse the XML that specified the order of operation for the builders.  This

    52.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java	Sat Oct 06 10:35:38 2012 +0100
    52.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    52.3 @@ -1,5 +1,5 @@
    52.4  /*
    52.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    52.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    52.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    52.8   *
    52.9   * This code is free software; you can redistribute it and/or modify it
   52.10 @@ -26,9 +26,10 @@
   52.11  package com.sun.tools.doclets.internal.toolkit.builders;
   52.12  
   52.13  import java.util.*;
   52.14 +
   52.15 +import com.sun.javadoc.*;
   52.16 +import com.sun.tools.doclets.internal.toolkit.*;
   52.17  import com.sun.tools.doclets.internal.toolkit.util.*;
   52.18 -import com.sun.tools.doclets.internal.toolkit.*;
   52.19 -import com.sun.javadoc.*;
   52.20  
   52.21  /**
   52.22   * Builds the member summary.

    53.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java	Sat Oct 06 10:35:38 2012 +0100
    53.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    53.3 @@ -1,5 +1,5 @@
    53.4  /*
    53.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    53.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    53.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    53.8   *
    53.9   * This code is free software; you can redistribute it and/or modify it
   53.10 @@ -26,9 +26,10 @@
   53.11  package com.sun.tools.doclets.internal.toolkit.builders;
   53.12  
   53.13  import java.util.*;
   53.14 +
   53.15 +import com.sun.javadoc.*;
   53.16 +import com.sun.tools.doclets.internal.toolkit.*;
   53.17  import com.sun.tools.doclets.internal.toolkit.util.*;
   53.18 -import com.sun.tools.doclets.internal.toolkit.*;
   53.19 -import com.sun.javadoc.*;
   53.20  
   53.21  /**
   53.22   * Builds documentation for a method.

    54.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java	Sat Oct 06 10:35:38 2012 +0100
    54.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    54.3 @@ -1,5 +1,5 @@
    54.4  /*
    54.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    54.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    54.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    54.8   *
    54.9   * This code is free software; you can redistribute it and/or modify it
   54.10 @@ -26,9 +26,10 @@
   54.11  package com.sun.tools.doclets.internal.toolkit.builders;
   54.12  
   54.13  import java.io.*;
   54.14 +
   54.15  import com.sun.javadoc.*;
   54.16 +import com.sun.tools.doclets.internal.toolkit.*;
   54.17  import com.sun.tools.doclets.internal.toolkit.util.*;
   54.18 -import com.sun.tools.doclets.internal.toolkit.*;
   54.19  
   54.20  /**
   54.21   * Builds the summary for a given package.

    55.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java	Sat Oct 06 10:35:38 2012 +0100
    55.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    55.3 @@ -1,5 +1,5 @@
    55.4  /*
    55.5 - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
    55.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    55.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55.8   *
    55.9   * This code is free software; you can redistribute it and/or modify it
   55.10 @@ -27,9 +27,10 @@
   55.11  
   55.12  import java.io.*;
   55.13  import java.util.*;
   55.14 +
   55.15  import com.sun.javadoc.*;
   55.16 +import com.sun.tools.doclets.internal.toolkit.*;
   55.17  import com.sun.tools.doclets.internal.toolkit.util.*;
   55.18 -import com.sun.tools.doclets.internal.toolkit.*;
   55.19  
   55.20  /**
   55.21   * Builds the serialized form.

    56.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java	Sat Oct 06 10:35:38 2012 +0100
    56.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java	Tue Oct 09 19:10:00 2012 -0700
    56.3 @@ -1,5 +1,5 @@
    56.4  /*
    56.5 - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
    56.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    56.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    56.8   *
    56.9   * This code is free software; you can redistribute it and/or modify it
   56.10 @@ -25,7 +25,6 @@
   56.11  
   56.12  package com.sun.tools.doclets.internal.toolkit.taglets;
   56.13  
   56.14 -import com.sun.tools.doclets.internal.toolkit.util.*;
   56.15  import com.sun.javadoc.*;
   56.16  
   56.17  /**

    57.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java	Sat Oct 06 10:35:38 2012 +0100
    57.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java	Tue Oct 09 19:10:00 2012 -0700
    57.3 @@ -1,5 +1,5 @@
    57.4  /*
    57.5 - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
    57.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    57.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    57.8   *
    57.9   * This code is free software; you can redistribute it and/or modify it
   57.10 @@ -25,9 +25,10 @@
   57.11  
   57.12  package com.sun.tools.doclets.internal.toolkit.taglets;
   57.13  
   57.14 +import java.util.*;
   57.15 +
   57.16  import com.sun.javadoc.*;
   57.17  import com.sun.tools.doclets.internal.toolkit.util.*;
   57.18 -import java.util.*;
   57.19  
   57.20  /**
   57.21   * A taglet that represents the @param tag.

    58.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java	Sat Oct 06 10:35:38 2012 +0100
    58.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java	Tue Oct 09 19:10:00 2012 -0700
    58.3 @@ -1,5 +1,5 @@
    58.4  /*
    58.5 - * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
    58.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    58.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    58.8   *
    58.9   * This code is free software; you can redistribute it and/or modify it
   58.10 @@ -25,8 +25,8 @@
   58.11  
   58.12  package com.sun.tools.doclets.internal.toolkit.taglets;
   58.13  
   58.14 +import com.sun.javadoc.*;
   58.15  import com.sun.tools.doclets.internal.toolkit.util.*;
   58.16 -import com.sun.javadoc.*;
   58.17  
   58.18  /**
   58.19   * A taglet that represents the @return tag.

    59.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java	Sat Oct 06 10:35:38 2012 +0100
    59.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java	Tue Oct 09 19:10:00 2012 -0700
    59.3 @@ -1,5 +1,5 @@
    59.4  /*
    59.5 - * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
    59.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    59.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    59.8   *
    59.9   * This code is free software; you can redistribute it and/or modify it
   59.10 @@ -25,8 +25,8 @@
   59.11  
   59.12  package com.sun.tools.doclets.internal.toolkit.taglets;
   59.13  
   59.14 +import com.sun.javadoc.*;
   59.15  import com.sun.tools.doclets.internal.toolkit.util.*;
   59.16 -import com.sun.javadoc.*;
   59.17  
   59.18  /**
   59.19   * A taglet that represents the @see tag.

    60.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java	Sat Oct 06 10:35:38 2012 +0100
    60.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java	Tue Oct 09 19:10:00 2012 -0700
    60.3 @@ -25,14 +25,14 @@
    60.4  
    60.5  package com.sun.tools.doclets.internal.toolkit.taglets;
    60.6  
    60.7 -import com.sun.javadoc.*;
    60.8 -import com.sun.tools.doclets.internal.toolkit.util.*;
    60.9 -
   60.10  import java.io.*;
   60.11  import java.lang.reflect.*;
   60.12  import java.net.*;
   60.13  import java.util.*;
   60.14  
   60.15 +import com.sun.javadoc.*;
   60.16 +import com.sun.tools.doclets.internal.toolkit.util.*;
   60.17 +
   60.18  /**
   60.19   * Manages the<code>Taglet</code>s used by doclets.
   60.20   *

    61.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java	Sat Oct 06 10:35:38 2012 +0100
    61.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java	Tue Oct 09 19:10:00 2012 -0700
    61.3 @@ -1,5 +1,5 @@
    61.4  /*
    61.5 - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
    61.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    61.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    61.8   *
    61.9   * This code is free software; you can redistribute it and/or modify it
   61.10 @@ -25,9 +25,9 @@
   61.11  
   61.12  package com.sun.tools.doclets.internal.toolkit.taglets;
   61.13  
   61.14 +import com.sun.javadoc.*;
   61.15  import com.sun.tools.doclets.internal.toolkit.*;
   61.16  import com.sun.tools.doclets.internal.toolkit.util.*;
   61.17 -import com.sun.javadoc.*;
   61.18  
   61.19  /**
   61.20   * The interface for the taglet writer.

    62.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java	Sat Oct 06 10:35:38 2012 +0100
    62.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java	Tue Oct 09 19:10:00 2012 -0700
    62.3 @@ -1,5 +1,5 @@
    62.4  /*
    62.5 - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
    62.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    62.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    62.8   *
    62.9   * This code is free software; you can redistribute it and/or modify it
   62.10 @@ -25,9 +25,10 @@
   62.11  
   62.12  package com.sun.tools.doclets.internal.toolkit.taglets;
   62.13  
   62.14 +import java.util.*;
   62.15 +
   62.16  import com.sun.javadoc.*;
   62.17  import com.sun.tools.doclets.internal.toolkit.util.*;
   62.18 -import java.util.*;
   62.19  
   62.20  /**
   62.21   * A taglet that represents the @throws tag.

    63.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java	Sat Oct 06 10:35:38 2012 +0100
    63.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java	Tue Oct 09 19:10:00 2012 -0700
    63.3 @@ -1,5 +1,5 @@
    63.4  /*
    63.5 - * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
    63.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
    63.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    63.8   *
    63.9   * This code is free software; you can redistribute it and/or modify it
   63.10 @@ -25,10 +25,11 @@
   63.11  
   63.12  package com.sun.tools.doclets.internal.toolkit.taglets;
   63.13  
   63.14 +import java.util.*;
   63.15 +
   63.16  import com.sun.javadoc.*;
   63.17  import com.sun.tools.doclets.internal.toolkit.Configuration;
   63.18  import com.sun.tools.doclets.internal.toolkit.util.*;
   63.19 -import java.util.*;
   63.20  
   63.21  /**
   63.22   * An inline Taglet representing the value tag. This tag should only be used with

    64.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java	Sat Oct 06 10:35:38 2012 +0100
    64.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java	Tue Oct 09 19:10:00 2012 -0700
    64.3 @@ -1,5 +1,5 @@
    64.4  /*
    64.5 - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
    64.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    64.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    64.8   *
    64.9   * This code is free software; you can redistribute it and/or modify it
   64.10 @@ -25,9 +25,10 @@
   64.11  
   64.12  package com.sun.tools.doclets.internal.toolkit.util;
   64.13  
   64.14 +import java.util.*;
   64.15 +
   64.16 +import com.sun.javadoc.*;
   64.17  import com.sun.tools.doclets.internal.toolkit.*;
   64.18 -import com.sun.javadoc.*;
   64.19 -import java.util.*;
   64.20  
   64.21  /**
   64.22   * Build Class Hierarchy for all the Classes. This class builds the Class

    65.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java	Sat Oct 06 10:35:38 2012 +0100
    65.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java	Tue Oct 09 19:10:00 2012 -0700
    65.3 @@ -1,5 +1,5 @@
    65.4  /*
    65.5 - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    65.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    65.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    65.8   *
    65.9   * This code is free software; you can redistribute it and/or modify it
   65.10 @@ -25,8 +25,9 @@
   65.11  
   65.12  package com.sun.tools.doclets.internal.toolkit.util;
   65.13  
   65.14 +import java.util.*;
   65.15 +
   65.16  import com.sun.javadoc.*;
   65.17 -import java.util.*;
   65.18  
   65.19  /**
   65.20   * Map all class uses for a given class.

    66.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java	Sat Oct 06 10:35:38 2012 +0100
    66.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    66.3 @@ -1,5 +1,5 @@
    66.4  /*
    66.5 - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
    66.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    66.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66.8   *
    66.9   * This code is free software; you can redistribute it and/or modify it
   66.10 @@ -25,8 +25,9 @@
   66.11  
   66.12  package com.sun.tools.doclets.internal.toolkit.util;
   66.13  
   66.14 +import java.util.*;
   66.15 +
   66.16  import com.sun.javadoc.*;
   66.17 -import java.util.*;
   66.18  import com.sun.tools.doclets.internal.toolkit.Configuration;
   66.19  
   66.20  /**

    67.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java	Sat Oct 06 10:35:38 2012 +0100
    67.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java	Tue Oct 09 19:10:00 2012 -0700
    67.3 @@ -1,5 +1,5 @@
    67.4  /*
    67.5 - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
    67.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    67.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    67.8   *
    67.9   * This code is free software; you can redistribute it and/or modify it
   67.10 @@ -25,9 +25,10 @@
   67.11  
   67.12  package com.sun.tools.doclets.internal.toolkit.util;
   67.13  
   67.14 +import java.util.*;
   67.15 +
   67.16  import com.sun.javadoc.*;
   67.17  import com.sun.tools.doclets.internal.toolkit.taglets.*;
   67.18 -import java.util.*;
   67.19  
   67.20  /**
   67.21   * Search for the requested documentation.  Inherit documentation if necessary.

    68.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java	Sat Oct 06 10:35:38 2012 +0100
    68.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java	Tue Oct 09 19:10:00 2012 -0700
    68.3 @@ -1,5 +1,5 @@
    68.4  /*
    68.5 - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    68.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    68.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    68.8   *
    68.9   * This code is free software; you can redistribute it and/or modify it
   68.10 @@ -25,13 +25,13 @@
   68.11  
   68.12  package com.sun.tools.doclets.internal.toolkit.util;
   68.13  
   68.14 -import com.sun.tools.doclets.internal.toolkit.*;
   68.15 +import java.io.*;
   68.16 +import java.net.*;
   68.17 +import java.util.HashMap;
   68.18 +import java.util.Map;
   68.19  
   68.20  import com.sun.javadoc.*;
   68.21 -import java.util.Map;
   68.22 -import java.util.HashMap;
   68.23 -import java.io.*;
   68.24 -import java.net.*;
   68.25 +import com.sun.tools.doclets.internal.toolkit.*;
   68.26  
   68.27  /**
   68.28   * Process and manage "-link" and "-linkoffline" to external packages. The

    69.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java	Sat Oct 06 10:35:38 2012 +0100
    69.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java	Tue Oct 09 19:10:00 2012 -0700
    69.3 @@ -1,5 +1,5 @@
    69.4  /*
    69.5 - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    69.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    69.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    69.8   *
    69.9   * This code is free software; you can redistribute it and/or modify it
   69.10 @@ -25,9 +25,10 @@
   69.11  
   69.12  package com.sun.tools.doclets.internal.toolkit.util;
   69.13  
   69.14 +import java.util.*;
   69.15 +
   69.16 +import com.sun.javadoc.*;
   69.17  import com.sun.tools.doclets.internal.toolkit.*;
   69.18 -import com.sun.javadoc.*;
   69.19 -import java.util.*;
   69.20  
   69.21  /**
   69.22   * Process and manage grouping of packages, as specified by "-group" option on

    70.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java	Sat Oct 06 10:35:38 2012 +0100
    70.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java	Tue Oct 09 19:10:00 2012 -0700
    70.3 @@ -1,5 +1,5 @@
    70.4  /*
    70.5 - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    70.6 + * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
    70.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    70.8   *
    70.9   * This code is free software; you can redistribute it and/or modify it
   70.10 @@ -25,9 +25,10 @@
   70.11  
   70.12  package com.sun.tools.doclets.internal.toolkit.util;
   70.13  
   70.14 +import java.util.*;
   70.15 +
   70.16  import com.sun.javadoc.*;
   70.17  import com.sun.tools.doclets.internal.toolkit.Configuration;
   70.18 -import java.util.*;
   70.19  
   70.20  /**
   70.21   * For a given class method, build an array of interface methods which it

    71.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java	Sat Oct 06 10:35:38 2012 +0100
    71.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java	Tue Oct 09 19:10:00 2012 -0700
    71.3 @@ -1,5 +1,5 @@
    71.4  /*
    71.5 - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
    71.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    71.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    71.8   *
    71.9   * This code is free software; you can redistribute it and/or modify it
   71.10 @@ -25,9 +25,10 @@
   71.11  
   71.12  package com.sun.tools.doclets.internal.toolkit.util;
   71.13  
   71.14 +import java.util.*;
   71.15 +
   71.16 +import com.sun.javadoc.*;
   71.17  import com.sun.tools.doclets.internal.toolkit.*;
   71.18 -import com.sun.javadoc.*;
   71.19 -import java.util.*;
   71.20  
   71.21  /**
   71.22   * Build the mapping of each Unicode character with it's member lists

    72.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java	Sat Oct 06 10:35:38 2012 +0100
    72.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java	Tue Oct 09 19:10:00 2012 -0700
    72.3 @@ -1,5 +1,5 @@
    72.4  /*
    72.5 - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
    72.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    72.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    72.8   *
    72.9   * This code is free software; you can redistribute it and/or modify it
   72.10 @@ -24,10 +24,11 @@
   72.11   */
   72.12  package com.sun.tools.doclets.internal.toolkit.util;
   72.13  
   72.14 +import java.text.MessageFormat;
   72.15 +import java.util.*;
   72.16 +
   72.17  import com.sun.javadoc.*;
   72.18  import com.sun.tools.doclets.internal.toolkit.Configuration;
   72.19 -import java.util.*;
   72.20 -import java.text.MessageFormat;
   72.21  
   72.22  
   72.23  /**

    73.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java	Sat Oct 06 10:35:38 2012 +0100
    73.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java	Tue Oct 09 19:10:00 2012 -0700
    73.3 @@ -1,5 +1,5 @@
    73.4  /*
    73.5 - * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
    73.6 + * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
    73.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    73.8   *
    73.9   * This code is free software; you can redistribute it and/or modify it
   73.10 @@ -25,9 +25,10 @@
   73.11  
   73.12  package com.sun.tools.doclets.internal.toolkit.util;
   73.13  
   73.14 +import java.util.*;
   73.15 +
   73.16 +import com.sun.javadoc.*;
   73.17  import com.sun.tools.doclets.internal.toolkit.*;
   73.18 -import com.sun.javadoc.*;
   73.19 -import java.util.*;
   73.20  
   73.21  /**
   73.22   * Provides methods for creating an array of class, method and

    74.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java	Sat Oct 06 10:35:38 2012 +0100
    74.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java	Tue Oct 09 19:10:00 2012 -0700
    74.3 @@ -1,5 +1,5 @@
    74.4  /*
    74.5 - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
    74.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    74.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    74.8   *
    74.9   * This code is free software; you can redistribute it and/or modify it
   74.10 @@ -25,11 +25,12 @@
   74.11  
   74.12  package com.sun.tools.doclets.internal.toolkit.util;
   74.13  
   74.14 -import com.sun.tools.doclets.internal.toolkit.*;
   74.15 -import com.sun.javadoc.*;
   74.16  import java.io.*;
   74.17  import java.util.*;
   74.18  
   74.19 +import com.sun.javadoc.*;
   74.20 +import com.sun.tools.doclets.internal.toolkit.*;
   74.21 +
   74.22  /**
   74.23   * Write out the package index.
   74.24   *

    75.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java	Sat Oct 06 10:35:38 2012 +0100
    75.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java	Tue Oct 09 19:10:00 2012 -0700
    75.3 @@ -1,5 +1,5 @@
    75.4  /*
    75.5 - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    75.6 + * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
    75.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    75.8   *
    75.9   * This code is free software; you can redistribute it and/or modify it
   75.10 @@ -25,9 +25,10 @@
   75.11  
   75.12  package com.sun.tools.doclets.internal.toolkit.util;
   75.13  
   75.14 +import java.util.*;
   75.15 +
   75.16  import com.sun.javadoc.*;
   75.17  import com.sun.tools.doclets.internal.toolkit.*;
   75.18 -import java.util.*;
   75.19  
   75.20  /**
   75.21   * A data structure that encapsulates the visible members of a particular

    76.1 --- a/src/share/classes/com/sun/tools/javac/api/BasicJavacTask.java	Sat Oct 06 10:35:38 2012 +0100
    76.2 +++ b/src/share/classes/com/sun/tools/javac/api/BasicJavacTask.java	Tue Oct 09 19:10:00 2012 -0700
    76.3 @@ -26,6 +26,7 @@
    76.4  package com.sun.tools.javac.api;
    76.5  
    76.6  import java.io.IOException;
    76.7 +import java.util.Collection;
    76.8  import java.util.Locale;
    76.9  
   76.10  import javax.annotation.processing.Processor;
   76.11 @@ -43,7 +44,6 @@
   76.12  import com.sun.tools.javac.model.JavacTypes;
   76.13  import com.sun.tools.javac.tree.JCTree;
   76.14  import com.sun.tools.javac.util.Context;
   76.15 -import java.util.Collection;
   76.16  
   76.17  /**
   76.18   * Provides basic functionality for implementations of JavacTask.

    77.1 --- a/src/share/classes/com/sun/tools/javac/api/JavacTrees.java	Sat Oct 06 10:35:38 2012 +0100
    77.2 +++ b/src/share/classes/com/sun/tools/javac/api/JavacTrees.java	Tue Oct 09 19:10:00 2012 -0700
    77.3 @@ -60,8 +60,8 @@
    77.4  import com.sun.tools.javac.comp.MemberEnter;
    77.5  import com.sun.tools.javac.comp.Resolve;
    77.6  import com.sun.tools.javac.model.JavacElements;
    77.7 +import com.sun.tools.javac.processing.JavacProcessingEnvironment;
    77.8  import com.sun.tools.javac.tree.EndPosTable;
    77.9 -import com.sun.tools.javac.processing.JavacProcessingEnvironment;
   77.10  import com.sun.tools.javac.tree.JCTree;
   77.11  import com.sun.tools.javac.tree.JCTree.*;
   77.12  import com.sun.tools.javac.tree.TreeCopier;

    78.1 --- a/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java	Sat Oct 06 10:35:38 2012 +0100
    78.2 +++ b/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java	Tue Oct 09 19:10:00 2012 -0700
    78.3 @@ -1,5 +1,5 @@
    78.4  /*
    78.5 - * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
    78.6 + * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
    78.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    78.8   *
    78.9   * This code is free software; you can redistribute it and/or modify it
   78.10 @@ -31,8 +31,9 @@
   78.11  import java.util.Collections;
   78.12  import java.util.List;
   78.13  import java.util.Set;
   78.14 +
   78.15 +import javax.tools.*;
   78.16  import javax.tools.JavaFileObject.Kind;
   78.17 -import javax.tools.*;
   78.18  
   78.19  /**
   78.20   * Wraps all calls to a given file manager.  Subclasses of this class

    79.1 --- a/src/share/classes/com/sun/tools/javac/code/Annotations.java	Sat Oct 06 10:35:38 2012 +0100
    79.2 +++ b/src/share/classes/com/sun/tools/javac/code/Annotations.java	Tue Oct 09 19:10:00 2012 -0700
    79.3 @@ -26,18 +26,18 @@
    79.4  package com.sun.tools.javac.code;
    79.5  
    79.6  import java.util.Map;
    79.7 +
    79.8  import javax.tools.JavaFileObject;
    79.9  
   79.10  import com.sun.tools.javac.comp.Annotate;
   79.11  import com.sun.tools.javac.comp.AttrContext;
   79.12  import com.sun.tools.javac.comp.Env;
   79.13 +import com.sun.tools.javac.util.*;
   79.14  import com.sun.tools.javac.util.Assert;
   79.15  import com.sun.tools.javac.util.List;
   79.16  import com.sun.tools.javac.util.Log;
   79.17  import com.sun.tools.javac.util.Pair;
   79.18 -
   79.19  import static com.sun.tools.javac.code.Kinds.PCK;
   79.20 -import com.sun.tools.javac.util.*;
   79.21  
   79.22  /**
   79.23   * Container for all annotations (attributes in javac) on a Symbol.

    80.1 --- a/src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java	Sat Oct 06 10:35:38 2012 +0100
    80.2 +++ b/src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java	Tue Oct 09 19:10:00 2012 -0700
    80.3 @@ -1,5 +1,5 @@
    80.4  /*
    80.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
    80.6 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    80.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    80.8   *
    80.9   * This code is free software; you can redistribute it and/or modify it
   80.10 @@ -30,8 +30,8 @@
   80.11  
   80.12  import com.sun.tools.javac.util.Assert;
   80.13  import com.sun.tools.javac.util.Context;
   80.14 +import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
   80.15  import com.sun.tools.javac.util.ListBuffer;
   80.16 -import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
   80.17  
   80.18  /**
   80.19   *

    81.1 --- a/src/share/classes/com/sun/tools/javac/code/Flags.java	Sat Oct 06 10:35:38 2012 +0100
    81.2 +++ b/src/share/classes/com/sun/tools/javac/code/Flags.java	Tue Oct 09 19:10:00 2012 -0700
    81.3 @@ -25,10 +25,11 @@
    81.4  
    81.5  package com.sun.tools.javac.code;
    81.6  
    81.7 +import java.util.Collections;
    81.8  import java.util.EnumSet;
    81.9 -import java.util.Collections;
   81.10  import java.util.Map;
   81.11  import java.util.Set;
   81.12 +
   81.13  import javax.lang.model.element.Modifier;
   81.14  
   81.15  /** Access flags and other modifiers for Java classes and members.

    82.1 --- a/src/share/classes/com/sun/tools/javac/code/Kinds.java	Sat Oct 06 10:35:38 2012 +0100
    82.2 +++ b/src/share/classes/com/sun/tools/javac/code/Kinds.java	Tue Oct 09 19:10:00 2012 -0700
    82.3 @@ -1,5 +1,5 @@
    82.4  /*
    82.5 - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
    82.6 + * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
    82.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    82.8   *
    82.9   * This code is free software; you can redistribute it and/or modify it
   82.10 @@ -31,9 +31,8 @@
   82.11  import com.sun.source.tree.MemberReferenceTree;
   82.12  import com.sun.tools.javac.api.Formattable;
   82.13  import com.sun.tools.javac.api.Messages;
   82.14 -
   82.15 +import static com.sun.tools.javac.code.Flags.*;
   82.16  import static com.sun.tools.javac.code.TypeTags.*;
   82.17 -import static com.sun.tools.javac.code.Flags.*;
   82.18  
   82.19  /** Internal symbol kinds, which distinguish between elements of
   82.20   *  different subclasses of Symbol. Symbol kinds are organized so they can be

    83.1 --- a/src/share/classes/com/sun/tools/javac/code/Printer.java	Sat Oct 06 10:35:38 2012 +0100
    83.2 +++ b/src/share/classes/com/sun/tools/javac/code/Printer.java	Tue Oct 09 19:10:00 2012 -0700
    83.3 @@ -1,5 +1,5 @@
    83.4  /*
    83.5 - * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
    83.6 + * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
    83.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    83.8   *
    83.9   * This code is free software; you can redistribute it and/or modify it
   83.10 @@ -28,18 +28,13 @@
   83.11  import java.util.Locale;
   83.12  
   83.13  import com.sun.tools.javac.api.Messages;
   83.14 +import com.sun.tools.javac.code.Symbol.*;
   83.15  import com.sun.tools.javac.code.Type.*;
   83.16 -import com.sun.tools.javac.code.Symbol.*;
   83.17 -import com.sun.tools.javac.comp.DeferredAttr.DeferredType;
   83.18 -import com.sun.tools.javac.tree.JCTree;
   83.19 -import com.sun.tools.javac.tree.Pretty;
   83.20 -import com.sun.tools.javac.util.Assert;
   83.21  import com.sun.tools.javac.util.List;
   83.22  import com.sun.tools.javac.util.ListBuffer;
   83.23 -
   83.24 -import static com.sun.tools.javac.code.TypeTags.*;
   83.25  import static com.sun.tools.javac.code.BoundKind.*;
   83.26  import static com.sun.tools.javac.code.Flags.*;
   83.27 +import static com.sun.tools.javac.code.TypeTags.*;
   83.28  
   83.29  /**
   83.30   * A combined type/symbol visitor for generating non-trivial localized string

    84.1 --- a/src/share/classes/com/sun/tools/javac/code/Scope.java	Sat Oct 06 10:35:38 2012 +0100
    84.2 +++ b/src/share/classes/com/sun/tools/javac/code/Scope.java	Tue Oct 09 19:10:00 2012 -0700
    84.3 @@ -1,5 +1,5 @@
    84.4  /*
    84.5 - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
    84.6 + * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
    84.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    84.8   *
    84.9   * This code is free software; you can redistribute it and/or modify it
   84.10 @@ -25,8 +25,9 @@
   84.11  
   84.12  package com.sun.tools.javac.code;
   84.13  
   84.14 +import java.util.Iterator;
   84.15 +
   84.16  import com.sun.tools.javac.util.*;
   84.17 -import java.util.Iterator;
   84.18  
   84.19  /** A scope represents an area of visibility in a Java program. The
   84.20   *  Scope class is a container for symbols which provides

    85.1 --- a/src/share/classes/com/sun/tools/javac/code/Source.java	Sat Oct 06 10:35:38 2012 +0100
    85.2 +++ b/src/share/classes/com/sun/tools/javac/code/Source.java	Tue Oct 09 19:10:00 2012 -0700
    85.3 @@ -26,12 +26,12 @@
    85.4  package com.sun.tools.javac.code;
    85.5  
    85.6  import java.util.*;
    85.7 +
    85.8  import javax.lang.model.SourceVersion;
    85.9  import static javax.lang.model.SourceVersion.*;
   85.10  
   85.11 +import com.sun.tools.javac.jvm.Target;
   85.12  import com.sun.tools.javac.util.*;
   85.13 -import com.sun.tools.javac.jvm.Target;
   85.14 -
   85.15  import static com.sun.tools.javac.main.Option.*;
   85.16  
   85.17  /** The source language version accepted.

    86.1 --- a/src/share/classes/com/sun/tools/javac/code/Symbol.java	Sat Oct 06 10:35:38 2012 +0100
    86.2 +++ b/src/share/classes/com/sun/tools/javac/code/Symbol.java	Tue Oct 09 19:10:00 2012 -0700
    86.3 @@ -27,11 +27,10 @@
    86.4  
    86.5  import java.util.Set;
    86.6  import java.util.concurrent.Callable;
    86.7 +
    86.8  import javax.lang.model.element.*;
    86.9  import javax.tools.JavaFileObject;
   86.10  
   86.11 -import com.sun.tools.javac.util.*;
   86.12 -import com.sun.tools.javac.util.Name;
   86.13  import com.sun.tools.javac.code.Type.*;
   86.14  import com.sun.tools.javac.comp.Attr;
   86.15  import com.sun.tools.javac.comp.AttrContext;
   86.16 @@ -39,7 +38,8 @@
   86.17  import com.sun.tools.javac.jvm.*;
   86.18  import com.sun.tools.javac.model.*;
   86.19  import com.sun.tools.javac.tree.JCTree;
   86.20 -
   86.21 +import com.sun.tools.javac.util.*;
   86.22 +import com.sun.tools.javac.util.Name;
   86.23  import static com.sun.tools.javac.code.Flags.*;
   86.24  import static com.sun.tools.javac.code.Kinds.*;
   86.25  import static com.sun.tools.javac.code.TypeTags.*;

    87.1 --- a/src/share/classes/com/sun/tools/javac/code/Symtab.java	Sat Oct 06 10:35:38 2012 +0100
    87.2 +++ b/src/share/classes/com/sun/tools/javac/code/Symtab.java	Tue Oct 09 19:10:00 2012 -0700
    87.3 @@ -26,17 +26,17 @@
    87.4  package com.sun.tools.javac.code;
    87.5  
    87.6  import java.util.*;
    87.7 +
    87.8 +import javax.lang.model.element.ElementVisitor;
    87.9  import javax.lang.model.type.TypeVisitor;
   87.10 -import javax.lang.model.element.ElementVisitor;
   87.11  
   87.12 -import com.sun.tools.javac.util.*;
   87.13 -import com.sun.tools.javac.util.List;
   87.14  import com.sun.tools.javac.code.Symbol.*;
   87.15  import com.sun.tools.javac.code.Type.*;
   87.16  import com.sun.tools.javac.jvm.*;
   87.17 -
   87.18 +import com.sun.tools.javac.util.*;
   87.19 +import com.sun.tools.javac.util.List;
   87.20 +import static com.sun.tools.javac.code.Flags.*;
   87.21  import static com.sun.tools.javac.jvm.ByteCodes.*;
   87.22 -import static com.sun.tools.javac.code.Flags.*;
   87.23  
   87.24  /** A class that defines all predefined constants and operators
   87.25   *  as well as special classes such as java.lang.Object, which need

    88.1 --- a/src/share/classes/com/sun/tools/javac/code/TargetType.java	Sat Oct 06 10:35:38 2012 +0100
    88.2 +++ b/src/share/classes/com/sun/tools/javac/code/TargetType.java	Tue Oct 09 19:10:00 2012 -0700
    88.3 @@ -1,5 +1,5 @@
    88.4  /*
    88.5 - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
    88.6 + * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
    88.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    88.8   *
    88.9   * This code is free software; you can redistribute it and/or modify it
   88.10 @@ -25,11 +25,11 @@
   88.11  
   88.12  package com.sun.tools.javac.code;
   88.13  
   88.14 -import static com.sun.tools.javac.code.TargetType.TargetAttribute.*;
   88.15 -
   88.16  import java.util.EnumSet;
   88.17  import java.util.Set;
   88.18  
   88.19 +import static com.sun.tools.javac.code.TargetType.TargetAttribute.*;
   88.20 +
   88.21  /**
   88.22   * Describes the type of program element an extended annotation (or extended
   88.23   * compound attribute) targets.

    89.1 --- a/src/share/classes/com/sun/tools/javac/code/Type.java	Sat Oct 06 10:35:38 2012 +0100
    89.2 +++ b/src/share/classes/com/sun/tools/javac/code/Type.java	Tue Oct 09 19:10:00 2012 -0700
    89.3 @@ -26,10 +26,6 @@
    89.4  package com.sun.tools.javac.code;
    89.5  
    89.6  import java.util.Collections;
    89.7 -
    89.8 -import com.sun.tools.javac.code.Symbol.*;
    89.9 -import com.sun.tools.javac.util.*;
   89.10 -
   89.11  import java.util.EnumMap;
   89.12  import java.util.EnumSet;
   89.13  import java.util.Map;
   89.14 @@ -37,6 +33,8 @@
   89.15  
   89.16  import javax.lang.model.type.*;
   89.17  
   89.18 +import com.sun.tools.javac.code.Symbol.*;
   89.19 +import com.sun.tools.javac.util.*;
   89.20  import static com.sun.tools.javac.code.BoundKind.*;
   89.21  import static com.sun.tools.javac.code.Flags.*;
   89.22  import static com.sun.tools.javac.code.Kinds.*;

    90.1 --- a/src/share/classes/com/sun/tools/javac/code/Types.java	Sat Oct 06 10:35:38 2012 +0100
    90.2 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java	Tue Oct 09 19:10:00 2012 -0700
    90.3 @@ -28,21 +28,19 @@
    90.4  import java.lang.ref.SoftReference;
    90.5  import java.util.*;
    90.6  
    90.7 -import com.sun.tools.javac.util.*;
    90.8 -import com.sun.tools.javac.util.List;
    90.9 -
   90.10 -import com.sun.tools.javac.jvm.ClassReader;
   90.11  import com.sun.tools.javac.code.Attribute.RetentionPolicy;
   90.12  import com.sun.tools.javac.code.Lint.LintCategory;
   90.13  import com.sun.tools.javac.code.Type.UndetVar.InferenceBound;
   90.14  import com.sun.tools.javac.comp.Check;
   90.15 -
   90.16 +import com.sun.tools.javac.jvm.ClassReader;
   90.17 +import com.sun.tools.javac.util.*;
   90.18 +import com.sun.tools.javac.util.List;
   90.19 +import static com.sun.tools.javac.code.BoundKind.*;
   90.20 +import static com.sun.tools.javac.code.Flags.*;
   90.21  import static com.sun.tools.javac.code.Scope.*;
   90.22 +import static com.sun.tools.javac.code.Symbol.*;
   90.23  import static com.sun.tools.javac.code.Type.*;
   90.24  import static com.sun.tools.javac.code.TypeTags.*;
   90.25 -import static com.sun.tools.javac.code.Symbol.*;
   90.26 -import static com.sun.tools.javac.code.Flags.*;
   90.27 -import static com.sun.tools.javac.code.BoundKind.*;
   90.28  import static com.sun.tools.javac.util.ListBuffer.lb;
   90.29  
   90.30  /**

    91.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Sat Oct 06 10:35:38 2012 +0100
    91.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Tue Oct 09 19:10:00 2012 -0700
    91.3 @@ -25,34 +25,32 @@
    91.4  
    91.5  package com.sun.tools.javac.comp;
    91.6  
    91.7 -import com.sun.tools.javac.code.*;
    91.8 -import com.sun.tools.javac.comp.DeferredAttr.AttrMode;
    91.9 -import com.sun.tools.javac.comp.Infer.InferenceContext;
   91.10 -import com.sun.tools.javac.comp.Infer.InferenceContext.FreeTypeListener;
   91.11 -import com.sun.tools.javac.jvm.*;
   91.12 -import com.sun.tools.javac.tree.*;
   91.13 -import com.sun.tools.javac.util.*;
   91.14 -import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
   91.15 -import com.sun.tools.javac.util.List;
   91.16 -
   91.17 -import com.sun.tools.javac.jvm.Target;
   91.18 -import com.sun.tools.javac.code.Lint.LintCategory;
   91.19 -import com.sun.tools.javac.code.Symbol.*;
   91.20 -import com.sun.tools.javac.tree.JCTree.*;
   91.21 -import com.sun.tools.javac.code.Type.*;
   91.22 -import com.sun.tools.javac.comp.Check.CheckContext;
   91.23 +import java.util.*;
   91.24 +import java.util.Set;
   91.25 +
   91.26 +import javax.lang.model.element.ElementKind;
   91.27 +import javax.tools.JavaFileObject;
   91.28  
   91.29  import com.sun.source.tree.IdentifierTree;
   91.30  import com.sun.source.tree.MemberReferenceTree.ReferenceMode;
   91.31  import com.sun.source.tree.MemberSelectTree;
   91.32  import com.sun.source.tree.TreeVisitor;
   91.33  import com.sun.source.util.SimpleTreeVisitor;
   91.34 -
   91.35 -import java.util.*;
   91.36 -import java.util.Set;
   91.37 -import javax.lang.model.element.ElementKind;
   91.38 -import javax.tools.JavaFileObject;
   91.39 -
   91.40 +import com.sun.tools.javac.code.*;
   91.41 +import com.sun.tools.javac.code.Lint.LintCategory;
   91.42 +import com.sun.tools.javac.code.Symbol.*;
   91.43 +import com.sun.tools.javac.code.Type.*;
   91.44 +import com.sun.tools.javac.comp.Check.CheckContext;
   91.45 +import com.sun.tools.javac.comp.DeferredAttr.AttrMode;
   91.46 +import com.sun.tools.javac.comp.Infer.InferenceContext;
   91.47 +import com.sun.tools.javac.comp.Infer.InferenceContext.FreeTypeListener;
   91.48 +import com.sun.tools.javac.jvm.*;
   91.49 +import com.sun.tools.javac.jvm.Target;
   91.50 +import com.sun.tools.javac.tree.*;
   91.51 +import com.sun.tools.javac.tree.JCTree.*;
   91.52 +import com.sun.tools.javac.util.*;
   91.53 +import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
   91.54 +import com.sun.tools.javac.util.List;
   91.55  import static com.sun.tools.javac.code.Flags.*;
   91.56  import static com.sun.tools.javac.code.Flags.ANNOTATION;
   91.57  import static com.sun.tools.javac.code.Flags.BLOCK;

    92.1 --- a/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java	Sat Oct 06 10:35:38 2012 +0100
    92.2 +++ b/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java	Tue Oct 09 19:10:00 2012 -0700
    92.3 @@ -46,7 +46,6 @@
    92.4  
    92.5  import static com.sun.tools.javac.code.TypeTags.*;
    92.6  import static com.sun.tools.javac.tree.JCTree.Tag.*;
    92.7 -import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
    92.8  
    92.9  /**
   92.10   * This is an helper class that is used to perform deferred type-analysis.

    93.1 --- a/src/share/classes/com/sun/tools/javac/comp/Infer.java	Sat Oct 06 10:35:38 2012 +0100
    93.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java	Tue Oct 09 19:10:00 2012 -0700
    93.3 @@ -41,7 +41,6 @@
    93.4  
    93.5  import java.util.HashMap;
    93.6  import java.util.Map;
    93.7 -import java.util.Set;
    93.8  
    93.9  import static com.sun.tools.javac.code.TypeTags.*;
   93.10  

    94.1 --- a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Sat Oct 06 10:35:38 2012 +0100
    94.2 +++ b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Tue Oct 09 19:10:00 2012 -0700
    94.3 @@ -27,8 +27,6 @@
    94.4  
    94.5  import java.util.*;
    94.6  
    94.7 -import javax.lang.model.element.ElementKind;
    94.8 -
    94.9  import com.sun.tools.javac.code.*;
   94.10  import com.sun.tools.javac.code.Symbol.*;
   94.11  import com.sun.tools.javac.tree.*;

    95.1 --- a/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java	Sat Oct 06 10:35:38 2012 +0100
    95.2 +++ b/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java	Tue Oct 09 19:10:00 2012 -0700
    95.3 @@ -38,7 +38,6 @@
    95.4  import java.util.Collections;
    95.5  import java.util.LinkedHashMap;
    95.6  import java.util.HashMap;
    95.7 -import java.util.HashSet;
    95.8  import java.util.List;
    95.9  import java.util.Map;
   95.10  import java.util.Set;

    96.1 --- a/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java	Sat Oct 06 10:35:38 2012 +0100
    96.2 +++ b/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java	Tue Oct 09 19:10:00 2012 -0700
    96.3 @@ -25,9 +25,8 @@
    96.4  
    96.5  package com.sun.tools.javac.model;
    96.6  
    96.7 -import com.sun.tools.javac.util.*;
    96.8 +import java.io.IOException;
    96.9  import java.io.ObjectInputStream;
   96.10 -import java.io.IOException;
   96.11  import java.lang.annotation.*;
   96.12  import java.lang.reflect.Array;
   96.13  import java.lang.reflect.Method;
   96.14 @@ -35,12 +34,14 @@
   96.15  import java.util.Map;
   96.16  import sun.reflect.annotation.*;
   96.17  
   96.18 -import javax.lang.model.type.TypeMirror;
   96.19  import javax.lang.model.type.MirroredTypeException;
   96.20  import javax.lang.model.type.MirroredTypesException;
   96.21 +import javax.lang.model.type.TypeMirror;
   96.22 +
   96.23  import com.sun.tools.javac.code.*;
   96.24  import com.sun.tools.javac.code.Symbol.*;
   96.25  import com.sun.tools.javac.code.Type.ArrayType;
   96.26 +import com.sun.tools.javac.util.*;
   96.27  
   96.28  
   96.29  /**

    97.1 --- a/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java	Sat Oct 06 10:35:38 2012 +0100
    97.2 +++ b/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java	Tue Oct 09 19:10:00 2012 -0700
    97.3 @@ -1,5 +1,5 @@
    97.4  /*
    97.5 - * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
    97.6 + * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
    97.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    97.8   *
    97.9   * This code is free software; you can redistribute it and/or modify it
   97.10 @@ -39,7 +39,6 @@
   97.11  import java.nio.file.Files;
   97.12  import java.nio.file.LinkOption;
   97.13  import java.nio.file.Path;
   97.14 -import java.nio.file.attribute.BasicFileAttributes;
   97.15  import javax.lang.model.element.Modifier;
   97.16  import javax.lang.model.element.NestingKind;
   97.17  import javax.tools.JavaFileObject;

    98.1 --- a/src/share/classes/com/sun/tools/javac/tree/Pretty.java	Sat Oct 06 10:35:38 2012 +0100
    98.2 +++ b/src/share/classes/com/sun/tools/javac/tree/Pretty.java	Tue Oct 09 19:10:00 2012 -0700
    98.3 @@ -26,12 +26,10 @@
    98.4  package com.sun.tools.javac.tree;
    98.5  
    98.6  import java.io.*;
    98.7 -import java.util.*;
    98.8  
    98.9  import com.sun.source.tree.MemberReferenceTree.ReferenceMode;
   98.10  import com.sun.tools.javac.code.*;
   98.11  import com.sun.tools.javac.code.Symbol.*;
   98.12 -import com.sun.tools.javac.parser.Tokens.Comment;
   98.13  import com.sun.tools.javac.tree.JCTree.*;
   98.14  import com.sun.tools.javac.util.*;
   98.15  import com.sun.tools.javac.util.List;

    99.1 --- a/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java	Sat Oct 06 10:35:38 2012 +0100
    99.2 +++ b/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java	Tue Oct 09 19:10:00 2012 -0700
    99.3 @@ -28,12 +28,10 @@
    99.4  import java.io.IOException;
    99.5  import java.lang.ref.SoftReference;
    99.6  import java.nio.CharBuffer;
    99.7 -import java.util.Map;
    99.8  import javax.tools.JavaFileObject;
    99.9  
   99.10  import com.sun.tools.javac.file.JavacFileManager;
   99.11  import com.sun.tools.javac.tree.EndPosTable;
   99.12 -import com.sun.tools.javac.tree.JCTree;
   99.13  
   99.14  import static com.sun.tools.javac.util.LayoutCharacters.*;
   99.15  

   100.1 --- a/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java	Sat Oct 06 10:35:38 2012 +0100
   100.2 +++ b/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java	Tue Oct 09 19:10:00 2012 -0700
   100.3 @@ -27,7 +27,6 @@
   100.4  
   100.5  import java.util.EnumSet;
   100.6  import java.util.Locale;
   100.7 -import java.util.Map;
   100.8  import java.util.Set;
   100.9  
  100.10  import javax.tools.Diagnostic;

   101.1 --- a/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java	Sat Oct 06 10:35:38 2012 +0100
   101.2 +++ b/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java	Tue Oct 09 19:10:00 2012 -0700
   101.3 @@ -1,5 +1,5 @@
   101.4  /*
   101.5 - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
   101.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
   101.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   101.8   *
   101.9   * This code is free software; you can redistribute it and/or modify it
  101.10 @@ -25,7 +25,6 @@
  101.11  
  101.12  package com.sun.tools.javadoc;
  101.13  
  101.14 -
  101.15  import com.sun.javadoc.*;
  101.16  
  101.17  import com.sun.tools.javac.code.Type;

   102.1 --- a/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java	Sat Oct 06 10:35:38 2012 +0100
   102.2 +++ b/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java	Tue Oct 09 19:10:00 2012 -0700
   102.3 @@ -1,5 +1,5 @@
   102.4  /*
   102.5 - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
   102.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
   102.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   102.8   *
   102.9   * This code is free software; you can redistribute it and/or modify it
  102.10 @@ -25,7 +25,6 @@
  102.11  
  102.12  package com.sun.tools.javadoc;
  102.13  
  102.14 -
  102.15  import com.sun.javadoc.*;
  102.16  
  102.17  import com.sun.tools.javac.code.Attribute;

   103.1 --- a/src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java	Sat Oct 06 10:35:38 2012 +0100
   103.2 +++ b/src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java	Tue Oct 09 19:10:00 2012 -0700
   103.3 @@ -1,5 +1,5 @@
   103.4  /*
   103.5 - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
   103.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
   103.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   103.8   *
   103.9   * This code is free software; you can redistribute it and/or modify it
  103.10 @@ -27,7 +27,6 @@
  103.11  
  103.12  import com.sun.javadoc.*;
  103.13  
  103.14 -
  103.15  import com.sun.tools.javac.code.Kinds;
  103.16  import com.sun.tools.javac.code.Scope;
  103.17  import com.sun.tools.javac.code.Symbol.*;

   104.1 --- a/src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java	Sat Oct 06 10:35:38 2012 +0100
   104.2 +++ b/src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java	Tue Oct 09 19:10:00 2012 -0700
   104.3 @@ -1,5 +1,5 @@
   104.4  /*
   104.5 - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
   104.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
   104.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   104.8   *
   104.9   * This code is free software; you can redistribute it and/or modify it
  104.10 @@ -27,12 +27,8 @@
  104.11  
  104.12  import com.sun.javadoc.*;
  104.13  
  104.14 -import static com.sun.javadoc.LanguageVersion.*;
  104.15 -
  104.16  import com.sun.tools.javac.code.Symbol.*;
  104.17  import com.sun.tools.javac.tree.JCTree.*;
  104.18 -import com.sun.tools.javac.util.List;
  104.19 -import com.sun.tools.javac.util.Name;
  104.20  import com.sun.tools.javac.util.Position;
  104.21  
  104.22  /**

   105.1 --- a/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java	Sat Oct 06 10:35:38 2012 +0100
   105.2 +++ b/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java	Tue Oct 09 19:10:00 2012 -0700
   105.3 @@ -25,7 +25,6 @@
   105.4  
   105.5  package com.sun.tools.javadoc;
   105.6  
   105.7 -
   105.8  import com.sun.javadoc.*;
   105.9  
  105.10  import com.sun.tools.javac.code.Attribute;

   106.1 --- a/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java	Sat Oct 06 10:35:38 2012 +0100
   106.2 +++ b/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java	Tue Oct 09 19:10:00 2012 -0700
   106.3 @@ -1,5 +1,5 @@
   106.4  /*
   106.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
   106.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
   106.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   106.8   *
   106.9   * This code is free software; you can redistribute it and/or modify it
  106.10 @@ -38,8 +38,6 @@
  106.11  
  106.12  import com.sun.javadoc.*;
  106.13  
  106.14 -import static com.sun.javadoc.LanguageVersion.*;
  106.15 -
  106.16  import com.sun.tools.javac.code.Flags;
  106.17  import com.sun.tools.javac.code.Kinds;
  106.18  import com.sun.tools.javac.code.Scope;

   107.1 --- a/src/share/classes/com/sun/tools/javadoc/DocImpl.java	Sat Oct 06 10:35:38 2012 +0100
   107.2 +++ b/src/share/classes/com/sun/tools/javadoc/DocImpl.java	Tue Oct 09 19:10:00 2012 -0700
   107.3 @@ -26,16 +26,16 @@
   107.4  package com.sun.tools.javadoc;
   107.5  
   107.6  import java.io.DataInputStream;
   107.7 +import java.io.IOException;
   107.8  import java.io.InputStream;
   107.9 -import java.io.IOException;
  107.10  import java.text.CollationKey;
  107.11 +import java.util.regex.Matcher;
  107.12 +import java.util.regex.Pattern;
  107.13 +
  107.14  import javax.tools.FileObject;
  107.15  
  107.16  import com.sun.javadoc.*;
  107.17 -
  107.18  import com.sun.tools.javac.util.Position;
  107.19 -import java.util.regex.Matcher;
  107.20 -import java.util.regex.Pattern;
  107.21  
  107.22  /**
  107.23   * abstract base class of all Doc classes.  Doc item's are representations

   108.1 --- a/src/share/classes/com/sun/tools/javadoc/DocLocale.java	Sat Oct 06 10:35:38 2012 +0100
   108.2 +++ b/src/share/classes/com/sun/tools/javadoc/DocLocale.java	Tue Oct 09 19:10:00 2012 -0700
   108.3 @@ -1,5 +1,5 @@
   108.4  /*
   108.5 - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
   108.6 + * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
   108.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   108.8   *
   108.9   * This code is free software; you can redistribute it and/or modify it
  108.10 @@ -25,10 +25,9 @@
  108.11  
  108.12  package com.sun.tools.javadoc;
  108.13  
  108.14 +import java.text.BreakIterator;
  108.15 +import java.text.Collator;
  108.16  import java.util.Locale;
  108.17 -import java.util.HashSet;
  108.18 -import java.text.Collator;
  108.19 -import java.text.BreakIterator;
  108.20  
  108.21  /**
  108.22   * This class holds the information about locales.

   109.1 --- a/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java	Sat Oct 06 10:35:38 2012 +0100
   109.2 +++ b/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java	Tue Oct 09 19:10:00 2012 -0700
   109.3 @@ -1,5 +1,5 @@
   109.4  /*
   109.5 - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
   109.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
   109.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   109.8   *
   109.9   * This code is free software; you can redistribute it and/or modify it
  109.10 @@ -25,19 +25,17 @@
  109.11  
  109.12  package com.sun.tools.javadoc;
  109.13  
  109.14 -import com.sun.javadoc.*;
  109.15 -
  109.16 -import static com.sun.javadoc.LanguageVersion.*;
  109.17 -
  109.18 -import com.sun.tools.javac.util.List;
  109.19 -
  109.20  import java.io.File;
  109.21 +import java.lang.reflect.InvocationTargetException;
  109.22  import java.lang.reflect.Method;
  109.23  import java.lang.reflect.Modifier;
  109.24 -import java.lang.reflect.InvocationTargetException;
  109.25  import java.net.URL;
  109.26  import java.net.URLClassLoader;
  109.27  
  109.28 +import com.sun.javadoc.*;
  109.29 +import com.sun.tools.javac.util.List;
  109.30 +import static com.sun.javadoc.LanguageVersion.*;
  109.31 +
  109.32  
  109.33  /**
  109.34   * Class creates, controls and invokes doclets.

   110.1 --- a/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java	Sat Oct 06 10:35:38 2012 +0100
   110.2 +++ b/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java	Tue Oct 09 19:10:00 2012 -0700
   110.3 @@ -29,8 +29,6 @@
   110.4  
   110.5  import com.sun.javadoc.*;
   110.6  
   110.7 -import static com.sun.javadoc.LanguageVersion.*;
   110.8 -
   110.9  import com.sun.tools.javac.code.Flags;
  110.10  import com.sun.tools.javac.code.Symbol.ClassSymbol;
  110.11  import com.sun.tools.javac.code.Symbol.VarSymbol;

   111.1 --- a/src/share/classes/com/sun/tools/javadoc/JavadocEnter.java	Sat Oct 06 10:35:38 2012 +0100
   111.2 +++ b/src/share/classes/com/sun/tools/javadoc/JavadocEnter.java	Tue Oct 09 19:10:00 2012 -0700
   111.3 @@ -25,7 +25,6 @@
   111.4  
   111.5  package com.sun.tools.javadoc;
   111.6  
   111.7 -
   111.8  import javax.tools.JavaFileObject;
   111.9  
  111.10  import com.sun.tools.javac.code.Kinds;

   112.1 --- a/src/share/classes/com/sun/tools/javadoc/Messager.java	Sat Oct 06 10:35:38 2012 +0100
   112.2 +++ b/src/share/classes/com/sun/tools/javadoc/Messager.java	Tue Oct 09 19:10:00 2012 -0700
   112.3 @@ -1,5 +1,5 @@
   112.4  /*
   112.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
   112.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
   112.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   112.8   *
   112.9   * This code is free software; you can redistribute it and/or modify it
  112.10 @@ -25,16 +25,14 @@
  112.11  
  112.12  package com.sun.tools.javadoc;
  112.13  
  112.14 -import java.io.PrintWriter;
  112.15 +import java.io.PrintWriter;  // Access to 'javac' output streams
  112.16  import java.text.MessageFormat;
  112.17 +import java.util.MissingResourceException;
  112.18  import java.util.ResourceBundle;
  112.19 -import java.util.MissingResourceException;
  112.20  
  112.21  import com.sun.javadoc.*;
  112.22 -
  112.23  import com.sun.tools.javac.util.Context;
  112.24 -
  112.25 -import com.sun.tools.javac.util.Log;  // Access to 'javac' output streams
  112.26 +import com.sun.tools.javac.util.Log;
  112.27  
  112.28  /**
  112.29   * Utility for integrating with javadoc tools and for localization.

   113.1 --- a/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java	Sat Oct 06 10:35:38 2012 +0100
   113.2 +++ b/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java	Tue Oct 09 19:10:00 2012 -0700
   113.3 @@ -1,5 +1,5 @@
   113.4  /*
   113.5 - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
   113.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
   113.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   113.8   *
   113.9   * This code is free software; you can redistribute it and/or modify it
  113.10 @@ -25,8 +25,9 @@
  113.11  
  113.12  package com.sun.tools.javadoc;
  113.13  
  113.14 +import java.lang.reflect.Modifier;
  113.15 +
  113.16  import com.sun.javadoc.*;
  113.17 -
  113.18  import com.sun.tools.javac.code.*;
  113.19  import com.sun.tools.javac.code.Symbol.*;
  113.20  import com.sun.tools.javac.code.Type;
  113.21 @@ -34,8 +35,6 @@
  113.22  import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
  113.23  import com.sun.tools.javac.util.Position;
  113.24  
  113.25 -import java.lang.reflect.Modifier;
  113.26 -
  113.27  /**
  113.28   * Represents a method of a java class.
  113.29   *

   114.1 --- a/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java	Sat Oct 06 10:35:38 2012 +0100
   114.2 +++ b/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java	Tue Oct 09 19:10:00 2012 -0700
   114.3 @@ -1,5 +1,5 @@
   114.4  /*
   114.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
   114.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
   114.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   114.8   *
   114.9   * This code is free software; you can redistribute it and/or modify it
  114.10 @@ -25,12 +25,12 @@
  114.11  
  114.12  package com.sun.tools.javadoc;
  114.13  
  114.14 +import java.io.IOException;
  114.15  import java.io.InputStream;
  114.16 -import java.io.IOException;
  114.17 +
  114.18  import javax.tools.FileObject;
  114.19  
  114.20  import com.sun.javadoc.*;
  114.21 -
  114.22  import com.sun.tools.javac.code.Attribute;
  114.23  import com.sun.tools.javac.code.Scope;
  114.24  import com.sun.tools.javac.code.Symbol.ClassSymbol;

   115.1 --- a/src/share/classes/com/sun/tools/javadoc/ParameterImpl.java	Sat Oct 06 10:35:38 2012 +0100
   115.2 +++ b/src/share/classes/com/sun/tools/javadoc/ParameterImpl.java	Tue Oct 09 19:10:00 2012 -0700
   115.3 @@ -1,5 +1,5 @@
   115.4  /*
   115.5 - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
   115.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
   115.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   115.8   *
   115.9   * This code is free software; you can redistribute it and/or modify it
  115.10 @@ -29,7 +29,6 @@
  115.11  
  115.12  import com.sun.tools.javac.code.Attribute;
  115.13  import com.sun.tools.javac.code.Symbol.VarSymbol;
  115.14 -import com.sun.tools.javac.code.Type;
  115.15  
  115.16  /**
  115.17   * ParameterImpl information.

   116.1 --- a/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java	Sat Oct 06 10:35:38 2012 +0100
   116.2 +++ b/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java	Tue Oct 09 19:10:00 2012 -0700
   116.3 @@ -1,5 +1,5 @@
   116.4  /*
   116.5 - * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
   116.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
   116.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   116.8   *
   116.9   * This code is free software; you can redistribute it and/or modify it
  116.10 @@ -27,13 +27,6 @@
  116.11  
  116.12  import com.sun.javadoc.*;
  116.13  
  116.14 -import com.sun.tools.javac.code.Symbol;
  116.15 -import com.sun.tools.javac.code.Symbol.ClassSymbol;
  116.16 -
  116.17 -import com.sun.tools.javac.code.Type;
  116.18 -import com.sun.tools.javac.code.TypeTags;
  116.19 -import com.sun.tools.javac.code.Type.ClassType;
  116.20 -
  116.21  class PrimitiveType implements com.sun.javadoc.Type {
  116.22  
  116.23      private final String name;

   117.1 --- a/src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java	Sat Oct 06 10:35:38 2012 +0100
   117.2 +++ b/src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java	Tue Oct 09 19:10:00 2012 -0700
   117.3 @@ -1,5 +1,5 @@
   117.4  /*
   117.5 - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
   117.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
   117.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   117.8   *
   117.9   * This code is free software; you can redistribute it and/or modify it
  117.10 @@ -25,20 +25,16 @@
  117.11  
  117.12  package com.sun.tools.javadoc;
  117.13  
  117.14 +import java.lang.reflect.Modifier;
  117.15 +import java.text.CollationKey;
  117.16 +
  117.17  import com.sun.javadoc.*;
  117.18 -
  117.19  import com.sun.tools.javac.code.Attribute;
  117.20 -import com.sun.tools.javac.code.Flags;
  117.21  import com.sun.tools.javac.code.Symbol;
  117.22  import com.sun.tools.javac.code.Symbol.ClassSymbol;
  117.23 -
  117.24  import com.sun.tools.javac.tree.JCTree;
  117.25 -
  117.26  import com.sun.tools.javac.util.Position;
  117.27  
  117.28 -import java.lang.reflect.Modifier;
  117.29 -import java.text.CollationKey;
  117.30 -
  117.31  /**
  117.32   * Represents a java program element: class, interface, field,
  117.33   * constructor, or method.

   118.1 --- a/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java	Sat Oct 06 10:35:38 2012 +0100
   118.2 +++ b/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java	Tue Oct 09 19:10:00 2012 -0700
   118.3 @@ -1,5 +1,5 @@
   118.4  /*
   118.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
   118.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
   118.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   118.8   *
   118.9   * This code is free software; you can redistribute it and/or modify it
  118.10 @@ -25,10 +25,9 @@
  118.11  
  118.12  package com.sun.tools.javadoc;
  118.13  
  118.14 +import com.sun.javadoc.*;
  118.15  import com.sun.tools.javac.util.*;
  118.16  
  118.17 -import com.sun.javadoc.*;
  118.18 -
  118.19  /**
  118.20   * Represents a see also documentation tag.
  118.21   * The @see tag can be plain text, or reference a class or member.

   119.1 --- a/src/share/classes/com/sun/tools/javadoc/SerializedForm.java	Sat Oct 06 10:35:38 2012 +0100
   119.2 +++ b/src/share/classes/com/sun/tools/javadoc/SerializedForm.java	Tue Oct 09 19:10:00 2012 -0700
   119.3 @@ -1,5 +1,5 @@
   119.4  /*
   119.5 - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
   119.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
   119.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   119.8   *
   119.9   * This code is free software; you can redistribute it and/or modify it
  119.10 @@ -26,15 +26,14 @@
  119.11  package com.sun.tools.javadoc;
  119.12  
  119.13  import com.sun.javadoc.*;
  119.14 -
  119.15  import com.sun.tools.javac.code.Flags;
  119.16  import com.sun.tools.javac.code.Kinds;
  119.17  import com.sun.tools.javac.code.Scope;
  119.18 -import com.sun.tools.javac.code.Symbol.VarSymbol;
  119.19  import com.sun.tools.javac.code.Symbol.ClassSymbol;
  119.20  import com.sun.tools.javac.code.Symbol.MethodSymbol;
  119.21 +import com.sun.tools.javac.code.Symbol.VarSymbol;
  119.22 +import com.sun.tools.javac.util.ListBuffer;
  119.23  import com.sun.tools.javac.util.Name;
  119.24 -import com.sun.tools.javac.util.ListBuffer;
  119.25  import com.sun.tools.javac.util.Names;
  119.26  
  119.27  /**

   120.1 --- a/src/share/classes/com/sun/tools/javadoc/Start.java	Sat Oct 06 10:35:38 2012 +0100
   120.2 +++ b/src/share/classes/com/sun/tools/javadoc/Start.java	Tue Oct 09 19:10:00 2012 -0700
   120.3 @@ -1,5 +1,5 @@
   120.4  /*
   120.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
   120.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
   120.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   120.8   *
   120.9   * This code is free software; you can redistribute it and/or modify it
  120.10 @@ -25,22 +25,19 @@
  120.11  
  120.12  package com.sun.tools.javadoc;
  120.13  
  120.14 +import java.io.File;
  120.15 +import java.io.FileNotFoundException;
  120.16 +import java.io.IOException;
  120.17 +import java.io.PrintWriter;
  120.18 +import java.util.StringTokenizer;
  120.19 +
  120.20  import com.sun.javadoc.*;
  120.21 -
  120.22  import com.sun.tools.javac.main.CommandLine;
  120.23  import com.sun.tools.javac.util.Context;
  120.24  import com.sun.tools.javac.util.List;
  120.25  import com.sun.tools.javac.util.ListBuffer;
  120.26  import com.sun.tools.javac.util.Log;
  120.27  import com.sun.tools.javac.util.Options;
  120.28 -
  120.29 -import java.io.IOException;
  120.30 -import java.io.File;
  120.31 -import java.io.FileNotFoundException;
  120.32 -import java.io.PrintWriter;
  120.33 -
  120.34 -import java.util.StringTokenizer;
  120.35 -
  120.36  import static com.sun.tools.javac.code.Flags.*;
  120.37  
  120.38  /**

   121.1 --- a/src/share/classes/com/sun/tools/javadoc/TypeMaker.java	Sat Oct 06 10:35:38 2012 +0100
   121.2 +++ b/src/share/classes/com/sun/tools/javadoc/TypeMaker.java	Tue Oct 09 19:10:00 2012 -0700
   121.3 @@ -1,5 +1,5 @@
   121.4  /*
   121.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
   121.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
   121.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   121.8   *
   121.9   * This code is free software; you can redistribute it and/or modify it
  121.10 @@ -26,15 +26,13 @@
  121.11  package com.sun.tools.javadoc;
  121.12  
  121.13  import com.sun.javadoc.*;
  121.14 -
  121.15  import com.sun.tools.javac.code.Symbol;
  121.16  import com.sun.tools.javac.code.Symbol.ClassSymbol;
  121.17  import com.sun.tools.javac.code.Type;
  121.18 +import com.sun.tools.javac.code.Type.ArrayType;
  121.19  import com.sun.tools.javac.code.Type.ClassType;
  121.20  import com.sun.tools.javac.code.Type.TypeVar;
  121.21 -import com.sun.tools.javac.code.Type.ArrayType;
  121.22  import com.sun.tools.javac.util.List;
  121.23 -
  121.24  import static com.sun.tools.javac.code.TypeTags.*;
  121.25  
  121.26  

   122.1 --- a/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java	Sat Oct 06 10:35:38 2012 +0100
   122.2 +++ b/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java	Tue Oct 09 19:10:00 2012 -0700
   122.3 @@ -1,5 +1,5 @@
   122.4  /*
   122.5 - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
   122.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
   122.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   122.8   *
   122.9   * This code is free software; you can redistribute it and/or modify it
  122.10 @@ -25,7 +25,6 @@
  122.11  
  122.12  package com.sun.tools.javadoc;
  122.13  
  122.14 -
  122.15  import com.sun.javadoc.*;
  122.16  
  122.17  import com.sun.tools.javac.code.Kinds;

   123.1 --- a/src/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java	Sat Oct 06 10:35:38 2012 +0100
   123.2 +++ b/src/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java	Tue Oct 09 19:10:00 2012 -0700
   123.3 @@ -1,5 +1,5 @@
   123.4  /*
   123.5 - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
   123.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
   123.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   123.8   *
   123.9   * This code is free software; you can redistribute it and/or modify it
  123.10 @@ -25,7 +25,6 @@
  123.11  
  123.12  package com.sun.tools.javadoc;
  123.13  
  123.14 -
  123.15  import com.sun.javadoc.*;
  123.16  
  123.17  import com.sun.tools.javac.code.Symbol.ClassSymbol;

   124.1 --- a/src/share/classes/javax/annotation/processing/Completions.java	Sat Oct 06 10:35:38 2012 +0100
   124.2 +++ b/src/share/classes/javax/annotation/processing/Completions.java	Tue Oct 09 19:10:00 2012 -0700
   124.3 @@ -1,5 +1,5 @@
   124.4  /*
   124.5 - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
   124.6 + * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
   124.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   124.8   *
   124.9   * This code is free software; you can redistribute it and/or modify it
  124.10 @@ -25,8 +25,6 @@
  124.11  
  124.12  package javax.annotation.processing;
  124.13  
  124.14 -import java.util.Arrays;
  124.15 -
  124.16  /**
  124.17   * Utility class for assembling {@link Completion} objects.
  124.18   *

   125.1 --- a/src/share/classes/javax/annotation/processing/FilerException.java	Sat Oct 06 10:35:38 2012 +0100
   125.2 +++ b/src/share/classes/javax/annotation/processing/FilerException.java	Tue Oct 09 19:10:00 2012 -0700
   125.3 @@ -1,5 +1,5 @@
   125.4  /*
   125.5 - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
   125.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
   125.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   125.8   *
   125.9   * This code is free software; you can redistribute it and/or modify it
  125.10 @@ -26,7 +26,6 @@
  125.11  package javax.annotation.processing;
  125.12  
  125.13  import java.io.IOException;
  125.14 -import javax.annotation.processing.Filer;
  125.15  
  125.16  /**
  125.17   * Indicates a {@link Filer} detected an attempt to open a file that

   126.1 --- a/src/share/classes/javax/annotation/processing/ProcessingEnvironment.java	Sat Oct 06 10:35:38 2012 +0100
   126.2 +++ b/src/share/classes/javax/annotation/processing/ProcessingEnvironment.java	Tue Oct 09 19:10:00 2012 -0700
   126.3 @@ -1,5 +1,5 @@
   126.4  /*
   126.5 - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
   126.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
   126.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   126.8   *
   126.9   * This code is free software; you can redistribute it and/or modify it
  126.10 @@ -26,12 +26,10 @@
  126.11  package javax.annotation.processing;
  126.12  
  126.13  import java.util.Map;
  126.14 -import java.util.List;
  126.15  import java.util.Locale;
  126.16  import javax.lang.model.SourceVersion;
  126.17  import javax.lang.model.util.Elements;
  126.18  import javax.lang.model.util.Types;
  126.19 -import java.io.File;
  126.20  
  126.21  /**
  126.22   * An annotation processing tool framework will {@linkplain

   127.1 --- a/src/share/classes/javax/lang/model/element/AnnotationValue.java	Sat Oct 06 10:35:38 2012 +0100
   127.2 +++ b/src/share/classes/javax/lang/model/element/AnnotationValue.java	Tue Oct 09 19:10:00 2012 -0700
   127.3 @@ -1,5 +1,5 @@
   127.4  /*
   127.5 - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
   127.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
   127.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   127.8   *
   127.9   * This code is free software; you can redistribute it and/or modify it
  127.10 @@ -25,10 +25,6 @@
  127.11  
  127.12  package javax.lang.model.element;
  127.13  
  127.14 -
  127.15 -import java.util.List;
  127.16 -import javax.lang.model.type.*;
  127.17 -
  127.18  /**
  127.19   * Represents a value of an annotation type element.
  127.20   * A value is of one of the following types:

   128.1 --- a/src/share/classes/javax/lang/model/element/Element.java	Sat Oct 06 10:35:38 2012 +0100
   128.2 +++ b/src/share/classes/javax/lang/model/element/Element.java	Tue Oct 09 19:10:00 2012 -0700
   128.3 @@ -32,7 +32,6 @@
   128.4  import java.util.List;
   128.5  import java.util.Set;
   128.6  
   128.7 -import javax.lang.model.element.Modifier;
   128.8  import javax.lang.model.type.*;
   128.9  import javax.lang.model.util.*;
  128.10  

   129.1 --- a/src/share/classes/javax/lang/model/element/ExecutableElement.java	Sat Oct 06 10:35:38 2012 +0100
   129.2 +++ b/src/share/classes/javax/lang/model/element/ExecutableElement.java	Tue Oct 09 19:10:00 2012 -0700
   129.3 @@ -1,5 +1,5 @@
   129.4  /*
   129.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
   129.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
   129.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   129.8   *
   129.9   * This code is free software; you can redistribute it and/or modify it
  129.10 @@ -26,7 +26,6 @@
  129.11  package javax.lang.model.element;
  129.12  
  129.13  import java.util.List;
  129.14 -import javax.lang.model.util.Types;
  129.15  import javax.lang.model.type.*;
  129.16  
  129.17  /**

   130.1 --- a/src/share/classes/javax/lang/model/element/VariableElement.java	Sat Oct 06 10:35:38 2012 +0100
   130.2 +++ b/src/share/classes/javax/lang/model/element/VariableElement.java	Tue Oct 09 19:10:00 2012 -0700
   130.3 @@ -1,5 +1,5 @@
   130.4  /*
   130.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
   130.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
   130.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   130.8   *
   130.9   * This code is free software; you can redistribute it and/or modify it
  130.10 @@ -25,7 +25,6 @@
  130.11  
  130.12  package javax.lang.model.element;
  130.13  
  130.14 -import javax.lang.model.type.TypeMirror;
  130.15  import javax.lang.model.util.Elements;
  130.16  
  130.17  /**

   131.1 --- a/src/share/classes/javax/lang/model/type/MirroredTypeException.java	Sat Oct 06 10:35:38 2012 +0100
   131.2 +++ b/src/share/classes/javax/lang/model/type/MirroredTypeException.java	Tue Oct 09 19:10:00 2012 -0700
   131.3 @@ -1,5 +1,5 @@
   131.4  /*
   131.5 - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
   131.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
   131.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   131.8   *
   131.9   * This code is free software; you can redistribute it and/or modify it
  131.10 @@ -27,7 +27,6 @@
  131.11  
  131.12  import java.io.ObjectInputStream;
  131.13  import java.io.IOException;
  131.14 -import java.lang.annotation.Annotation;
  131.15  import javax.lang.model.element.Element;
  131.16  
  131.17  

   132.1 --- a/src/share/classes/javax/lang/model/type/MirroredTypesException.java	Sat Oct 06 10:35:38 2012 +0100
   132.2 +++ b/src/share/classes/javax/lang/model/type/MirroredTypesException.java	Tue Oct 09 19:10:00 2012 -0700
   132.3 @@ -1,5 +1,5 @@
   132.4  /*
   132.5 - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
   132.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
   132.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   132.8   *
   132.9   * This code is free software; you can redistribute it and/or modify it
  132.10 @@ -25,7 +25,6 @@
  132.11  
  132.12  package javax.lang.model.type;
  132.13  
  132.14 -import java.lang.annotation.Annotation;
  132.15  import java.util.ArrayList;
  132.16  import java.util.List;
  132.17  import java.util.Collections;

   133.1 --- a/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java	Sat Oct 06 10:35:38 2012 +0100
   133.2 +++ b/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java	Tue Oct 09 19:10:00 2012 -0700
   133.3 @@ -1,5 +1,5 @@
   133.4  /*
   133.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
   133.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
   133.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   133.8   *
   133.9   * This code is free software; you can redistribute it and/or modify it
  133.10 @@ -26,10 +26,8 @@
  133.11  package javax.lang.model.util;
  133.12  
  133.13  
  133.14 -import java.util.List;
  133.15  import javax.lang.model.element.*;
  133.16  
  133.17 -import javax.lang.model.type.TypeMirror;
  133.18  import static javax.lang.model.SourceVersion.*;
  133.19  import javax.lang.model.SourceVersion;
  133.20  import javax.annotation.processing.SupportedSourceVersion;

   134.1 --- a/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java	Sat Oct 06 10:35:38 2012 +0100
   134.2 +++ b/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java	Tue Oct 09 19:10:00 2012 -0700
   134.3 @@ -25,10 +25,6 @@
   134.4  
   134.5  package javax.lang.model.util;
   134.6  
   134.7 -import java.util.List;
   134.8 -import javax.lang.model.element.*;
   134.9 -
  134.10 -import javax.lang.model.type.TypeMirror;
  134.11  import static javax.lang.model.SourceVersion.*;
  134.12  import javax.lang.model.SourceVersion;
  134.13  import javax.annotation.processing.SupportedSourceVersion;

   135.1 --- a/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java	Sat Oct 06 10:35:38 2012 +0100
   135.2 +++ b/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java	Tue Oct 09 19:10:00 2012 -0700
   135.3 @@ -1,5 +1,5 @@
   135.4  /*
   135.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   135.6 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
   135.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   135.8   *
   135.9   * This code is free software; you can redistribute it and/or modify it
  135.10 @@ -25,10 +25,6 @@
  135.11  
  135.12  package javax.lang.model.util;
  135.13  
  135.14 -import java.util.List;
  135.15 -import javax.lang.model.element.*;
  135.16 -
  135.17 -import javax.lang.model.type.TypeMirror;
  135.18  import static javax.lang.model.SourceVersion.*;
  135.19  import javax.lang.model.SourceVersion;
  135.20  import javax.annotation.processing.SupportedSourceVersion;

   136.1 --- a/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java	Sat Oct 06 10:35:38 2012 +0100
   136.2 +++ b/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java	Tue Oct 09 19:10:00 2012 -0700
   136.3 @@ -1,5 +1,5 @@
   136.4  /*
   136.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
   136.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
   136.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   136.8   *
   136.9   * This code is free software; you can redistribute it and/or modify it
  136.10 @@ -25,13 +25,10 @@
  136.11  
  136.12  package javax.lang.model.util;
  136.13  
  136.14 -
  136.15 +import javax.annotation.processing.SupportedSourceVersion;
  136.16 +import javax.lang.model.SourceVersion;
  136.17  import javax.lang.model.element.*;
  136.18 -import javax.annotation.processing.SupportedSourceVersion;
  136.19 -import javax.lang.model.element.*;
  136.20 -import static javax.lang.model.element.ElementKind.*;
  136.21  import static javax.lang.model.SourceVersion.*;
  136.22 -import javax.lang.model.SourceVersion;
  136.23  
  136.24  
  136.25  /**

   137.1 --- a/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java	Sat Oct 06 10:35:38 2012 +0100
   137.2 +++ b/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java	Tue Oct 09 19:10:00 2012 -0700
   137.3 @@ -1,5 +1,5 @@
   137.4  /*
   137.5 - * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
   137.6 + * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
   137.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   137.8   *
   137.9   * This code is free software; you can redistribute it and/or modify it
  137.10 @@ -25,12 +25,9 @@
  137.11  
  137.12  package javax.lang.model.util;
  137.13  
  137.14 -import javax.lang.model.element.*;
  137.15  import javax.annotation.processing.SupportedSourceVersion;
  137.16 -import javax.lang.model.element.*;
  137.17 -import static javax.lang.model.element.ElementKind.*;
  137.18 +import javax.lang.model.SourceVersion;
  137.19  import static javax.lang.model.SourceVersion.*;
  137.20 -import javax.lang.model.SourceVersion;
  137.21  
  137.22  
  137.23  /**

   138.1 --- a/src/share/classes/javax/lang/model/util/AbstractElementVisitor8.java	Sat Oct 06 10:35:38 2012 +0100
   138.2 +++ b/src/share/classes/javax/lang/model/util/AbstractElementVisitor8.java	Tue Oct 09 19:10:00 2012 -0700
   138.3 @@ -1,5 +1,5 @@
   138.4  /*
   138.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   138.6 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
   138.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   138.8   *
   138.9   * This code is free software; you can redistribute it and/or modify it
  138.10 @@ -25,12 +25,9 @@
  138.11  
  138.12  package javax.lang.model.util;
  138.13  
  138.14 -import javax.lang.model.element.*;
  138.15  import javax.annotation.processing.SupportedSourceVersion;
  138.16 -import javax.lang.model.element.*;
  138.17 -import static javax.lang.model.element.ElementKind.*;
  138.18 +import javax.lang.model.SourceVersion;
  138.19  import static javax.lang.model.SourceVersion.*;
  138.20 -import javax.lang.model.SourceVersion;
  138.21  
  138.22  
  138.23  /**

   139.1 --- a/src/share/classes/javax/lang/model/util/ElementFilter.java	Sat Oct 06 10:35:38 2012 +0100
   139.2 +++ b/src/share/classes/javax/lang/model/util/ElementFilter.java	Tue Oct 09 19:10:00 2012 -0700
   139.3 @@ -1,5 +1,5 @@
   139.4  /*
   139.5 - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
   139.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
   139.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   139.8   *
   139.9   * This code is free software; you can redistribute it and/or modify it
  139.10 @@ -25,18 +25,14 @@
  139.11  
  139.12  package javax.lang.model.util;
  139.13  
  139.14 -import java.lang.Iterable;
  139.15  import java.util.Collections;
  139.16 -import java.util.Iterator;
  139.17  import java.util.List;
  139.18  import java.util.Set;
  139.19  import java.util.EnumSet;
  139.20  import java.util.ArrayList;
  139.21  import java.util.LinkedHashSet;
  139.22 -import java.util.NoSuchElementException;
  139.23  
  139.24  import javax.lang.model.element.*;
  139.25 -import javax.lang.model.type.*;
  139.26  
  139.27  
  139.28  /**

   140.1 --- a/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java	Sat Oct 06 10:35:38 2012 +0100
   140.2 +++ b/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java	Tue Oct 09 19:10:00 2012 -0700
   140.3 @@ -1,5 +1,5 @@
   140.4  /*
   140.5 - * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
   140.6 + * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
   140.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   140.8   *
   140.9   * This code is free software; you can redistribute it and/or modify it
  140.10 @@ -25,11 +25,10 @@
  140.11  
  140.12  package javax.lang.model.util;
  140.13  
  140.14 +import javax.annotation.processing.SupportedSourceVersion;
  140.15 +import javax.lang.model.SourceVersion;
  140.16  import javax.lang.model.element.*;
  140.17 -import static javax.lang.model.element.ElementKind.*;
  140.18 -import javax.annotation.processing.SupportedSourceVersion;
  140.19  import static javax.lang.model.SourceVersion.*;
  140.20 -import javax.lang.model.SourceVersion;
  140.21  
  140.22  /**
  140.23   * A visitor of program elements based on their {@linkplain

   141.1 --- a/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java	Sat Oct 06 10:35:38 2012 +0100
   141.2 +++ b/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java	Tue Oct 09 19:10:00 2012 -0700
   141.3 @@ -26,7 +26,6 @@
   141.4  package javax.lang.model.util;
   141.5  
   141.6  import javax.lang.model.element.*;
   141.7 -import static javax.lang.model.element.ElementKind.*;
   141.8  import javax.annotation.processing.SupportedSourceVersion;
   141.9  import static javax.lang.model.SourceVersion.*;
  141.10  import javax.lang.model.SourceVersion;

   142.1 --- a/src/share/classes/javax/lang/model/util/ElementScanner6.java	Sat Oct 06 10:35:38 2012 +0100
   142.2 +++ b/src/share/classes/javax/lang/model/util/ElementScanner6.java	Tue Oct 09 19:10:00 2012 -0700
   142.3 @@ -1,5 +1,5 @@
   142.4  /*
   142.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
   142.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
   142.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   142.8   *
   142.9   * This code is free software; you can redistribute it and/or modify it
  142.10 @@ -27,7 +27,6 @@
  142.11  
  142.12  import javax.lang.model.element.*;
  142.13  import javax.annotation.processing.SupportedSourceVersion;
  142.14 -import static javax.lang.model.element.ElementKind.*;
  142.15  import javax.lang.model.SourceVersion;
  142.16  import static javax.lang.model.SourceVersion.*;
  142.17  

   143.1 --- a/src/share/classes/javax/lang/model/util/ElementScanner7.java	Sat Oct 06 10:35:38 2012 +0100
   143.2 +++ b/src/share/classes/javax/lang/model/util/ElementScanner7.java	Tue Oct 09 19:10:00 2012 -0700
   143.3 @@ -1,5 +1,5 @@
   143.4  /*
   143.5 - * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
   143.6 + * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
   143.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   143.8   *
   143.9   * This code is free software; you can redistribute it and/or modify it
  143.10 @@ -27,7 +27,6 @@
  143.11  
  143.12  import javax.lang.model.element.*;
  143.13  import javax.annotation.processing.SupportedSourceVersion;
  143.14 -import static javax.lang.model.element.ElementKind.*;
  143.15  import javax.lang.model.SourceVersion;
  143.16  import static javax.lang.model.SourceVersion.*;
  143.17  

   144.1 --- a/src/share/classes/javax/lang/model/util/ElementScanner8.java	Sat Oct 06 10:35:38 2012 +0100
   144.2 +++ b/src/share/classes/javax/lang/model/util/ElementScanner8.java	Tue Oct 09 19:10:00 2012 -0700
   144.3 @@ -1,5 +1,5 @@
   144.4  /*
   144.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   144.6 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
   144.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   144.8   *
   144.9   * This code is free software; you can redistribute it and/or modify it
  144.10 @@ -27,7 +27,6 @@
  144.11  
  144.12  import javax.lang.model.element.*;
  144.13  import javax.annotation.processing.SupportedSourceVersion;
  144.14 -import static javax.lang.model.element.ElementKind.*;
  144.15  import javax.lang.model.SourceVersion;
  144.16  import static javax.lang.model.SourceVersion.*;
  144.17  

   145.1 --- a/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java	Sat Oct 06 10:35:38 2012 +0100
   145.2 +++ b/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java	Tue Oct 09 19:10:00 2012 -0700
   145.3 @@ -1,5 +1,5 @@
   145.4  /*
   145.5 - * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
   145.6 + * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
   145.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   145.8   *
   145.9   * This code is free software; you can redistribute it and/or modify it
  145.10 @@ -25,13 +25,9 @@
  145.11  
  145.12  package javax.lang.model.util;
  145.13  
  145.14 -import java.util.List;
  145.15 -import javax.lang.model.element.*;
  145.16 -
  145.17 -import javax.lang.model.type.TypeMirror;
  145.18 +import javax.annotation.processing.SupportedSourceVersion;
  145.19 +import javax.lang.model.SourceVersion;
  145.20  import static javax.lang.model.SourceVersion.*;
  145.21 -import javax.lang.model.SourceVersion;
  145.22 -import javax.annotation.processing.SupportedSourceVersion;
  145.23  
  145.24  /**
  145.25   * A simple visitor for annotation values with default behavior

   146.1 --- a/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java	Sat Oct 06 10:35:38 2012 +0100
   146.2 +++ b/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java	Tue Oct 09 19:10:00 2012 -0700
   146.3 @@ -1,5 +1,5 @@
   146.4  /*
   146.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   146.6 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
   146.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   146.8   *
   146.9   * This code is free software; you can redistribute it and/or modify it
  146.10 @@ -25,13 +25,9 @@
  146.11  
  146.12  package javax.lang.model.util;
  146.13  
  146.14 -import java.util.List;
  146.15 -import javax.lang.model.element.*;
  146.16 -
  146.17 -import javax.lang.model.type.TypeMirror;
  146.18 +import javax.annotation.processing.SupportedSourceVersion;
  146.19 +import javax.lang.model.SourceVersion;
  146.20  import static javax.lang.model.SourceVersion.*;
  146.21 -import javax.lang.model.SourceVersion;
  146.22 -import javax.annotation.processing.SupportedSourceVersion;
  146.23  
  146.24  /**
  146.25   * A simple visitor for annotation values with default behavior

   147.1 --- a/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java	Sat Oct 06 10:35:38 2012 +0100
   147.2 +++ b/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java	Tue Oct 09 19:10:00 2012 -0700
   147.3 @@ -1,5 +1,5 @@
   147.4  /*
   147.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
   147.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
   147.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   147.8   *
   147.9   * This code is free software; you can redistribute it and/or modify it
  147.10 @@ -27,7 +27,6 @@
  147.11  
  147.12  import javax.lang.model.element.*;
  147.13  import javax.annotation.processing.SupportedSourceVersion;
  147.14 -import static javax.lang.model.element.ElementKind.*;
  147.15  import javax.lang.model.SourceVersion;
  147.16  import static javax.lang.model.SourceVersion.*;
  147.17  

   148.1 --- a/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java	Sat Oct 06 10:35:38 2012 +0100
   148.2 +++ b/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java	Tue Oct 09 19:10:00 2012 -0700
   148.3 @@ -1,5 +1,5 @@
   148.4  /*
   148.5 - * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
   148.6 + * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
   148.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   148.8   *
   148.9   * This code is free software; you can redistribute it and/or modify it
  148.10 @@ -27,7 +27,6 @@
  148.11  
  148.12  import javax.lang.model.element.*;
  148.13  import javax.annotation.processing.SupportedSourceVersion;
  148.14 -import static javax.lang.model.element.ElementKind.*;
  148.15  import javax.lang.model.SourceVersion;
  148.16  import static javax.lang.model.SourceVersion.*;
  148.17  

   149.1 --- a/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java	Sat Oct 06 10:35:38 2012 +0100
   149.2 +++ b/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java	Tue Oct 09 19:10:00 2012 -0700
   149.3 @@ -1,5 +1,5 @@
   149.4  /*
   149.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   149.6 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
   149.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   149.8   *
   149.9   * This code is free software; you can redistribute it and/or modify it
  149.10 @@ -25,9 +25,7 @@
  149.11  
  149.12  package javax.lang.model.util;
  149.13  
  149.14 -import javax.lang.model.element.*;
  149.15  import javax.annotation.processing.SupportedSourceVersion;
  149.16 -import static javax.lang.model.element.ElementKind.*;
  149.17  import javax.lang.model.SourceVersion;
  149.18  import static javax.lang.model.SourceVersion.*;
  149.19  

   150.1 --- a/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java	Sat Oct 06 10:35:38 2012 +0100
   150.2 +++ b/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java	Tue Oct 09 19:10:00 2012 -0700
   150.3 @@ -1,5 +1,5 @@
   150.4  /*
   150.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
   150.6 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
   150.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   150.8   *
   150.9   * This code is free software; you can redistribute it and/or modify it
  150.10 @@ -25,7 +25,6 @@
  150.11  
  150.12  package javax.lang.model.util;
  150.13  
  150.14 -import javax.lang.model.type.*;
  150.15  import javax.annotation.processing.SupportedSourceVersion;
  150.16  import javax.lang.model.SourceVersion;
  150.17  import static javax.lang.model.SourceVersion.*;

   151.1 --- a/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java	Sat Oct 06 10:35:38 2012 +0100
   151.2 +++ b/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java	Tue Oct 09 19:10:00 2012 -0700
   151.3 @@ -1,5 +1,5 @@
   151.4  /*
   151.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
   151.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
   151.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   151.8   *
   151.9   * This code is free software; you can redistribute it and/or modify it
  151.10 @@ -25,12 +25,10 @@
  151.11  
  151.12  package javax.lang.model.util;
  151.13  
  151.14 -
  151.15 +import javax.annotation.processing.SupportedSourceVersion;
  151.16 +import javax.lang.model.SourceVersion;
  151.17  import javax.lang.model.type.*;
  151.18 -import javax.annotation.processing.SupportedSourceVersion;
  151.19 -import static javax.lang.model.element.ElementKind.*;
  151.20  import static javax.lang.model.SourceVersion.*;
  151.21 -import javax.lang.model.SourceVersion;
  151.22  
  151.23  /**
  151.24   * A visitor of types based on their {@linkplain TypeKind kind} with