Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/make/build.properties	Fri Jul 24 14:47:01 2009 -0700
     1.2 +++ b/make/build.properties	Sun Jul 26 21:27:11 2009 -0700
     1.3 @@ -68,7 +68,7 @@
     1.4  # set the following to -version to verify the versions of javac being used
     1.5  javac.version.opt = 
     1.6  # in time, there should be no exceptions to -Xlint:all
     1.7 -javac.lint.opts = -Xlint:all -Werror
     1.8 +javac.lint.opts = -Xlint:all,-deprecation -Werror
     1.9  
    1.10  # options for the <javadoc> task for javac
    1.11  javadoc.jls3.url=http://java.sun.com/docs/books/jls/

     2.1 --- a/src/share/classes/com/sun/mirror/apt/AnnotationProcessor.java	Fri Jul 24 14:47:01 2009 -0700
     2.2 +++ b/src/share/classes/com/sun/mirror/apt/AnnotationProcessor.java	Sun Jul 26 21:27:11 2009 -0700
     2.3 @@ -50,11 +50,17 @@
     2.4   * annotations of those types.  It may freely examine any other program
     2.5   * elements in the course of its processing.
     2.6   *
     2.7 + * @deprecated All components of this API have been superseded by the
     2.8 + * standardized annotation processing API.  The replacement for the
     2.9 + * functionality of this interface is {@link
    2.10 + * javax.annotation.processing.Processor}.
    2.11 + *
    2.12   * @author Joseph D. Darcy
    2.13   * @author Scott Seligman
    2.14   * @since 1.5
    2.15   */
    2.16 -
    2.17 +@Deprecated
    2.18 +@SuppressWarnings("deprecation")
    2.19  public interface AnnotationProcessor {
    2.20  
    2.21      /**

     3.1 --- a/src/share/classes/com/sun/mirror/apt/AnnotationProcessorEnvironment.java	Fri Jul 24 14:47:01 2009 -0700
     3.2 +++ b/src/share/classes/com/sun/mirror/apt/AnnotationProcessorEnvironment.java	Sun Jul 26 21:27:11 2009 -0700
     3.3 @@ -48,11 +48,17 @@
     3.4   * provides a simple way to select just the items of interest
     3.5   * when a method returns a collection of declarations.
     3.6   *
     3.7 + * @deprecated All components of this API have been superseded by the
     3.8 + * standardized annotation processing API.  The replacement for the
     3.9 + * functionality of this interface is {@link
    3.10 + * javax.annotation.processing.ProcessingEnvironment}.
    3.11 + *
    3.12   * @author Joseph D. Darcy
    3.13   * @author Scott Seligman
    3.14   * @since 1.5
    3.15   */
    3.16 -
    3.17 +@Deprecated
    3.18 +@SuppressWarnings("deprecation")
    3.19  public interface AnnotationProcessorEnvironment {
    3.20  
    3.21      /**
    3.22 @@ -87,7 +93,6 @@
    3.23      Filer getFiler();
    3.24  
    3.25  
    3.26 -
    3.27      /**
    3.28       * Returns the declarations of the types specified when the
    3.29       * annotation processing tool was invoked.

     4.1 --- a/src/share/classes/com/sun/mirror/apt/AnnotationProcessorFactory.java	Fri Jul 24 14:47:01 2009 -0700
     4.2 +++ b/src/share/classes/com/sun/mirror/apt/AnnotationProcessorFactory.java	Sun Jul 26 21:27:11 2009 -0700
     4.3 @@ -42,11 +42,17 @@
     4.4   * must provide a public no-argument constructor to be used by tools to
     4.5   * instantiate the factory.
     4.6   *
     4.7 + * @deprecated All components of this API have been superseded by the
     4.8 + * standardized annotation processing API.  The replacement for the
     4.9 + * functionality of this interface is {@link
    4.10 + * javax.annotation.processing.Processor}.
    4.11 + *
    4.12   * @author Joseph D. Darcy
    4.13   * @author Scott Seligman
    4.14   * @since 1.5
    4.15   */
    4.16 -
    4.17 +@Deprecated
    4.18 +@SuppressWarnings("deprecation")
    4.19  public interface AnnotationProcessorFactory {
    4.20  
    4.21      /**

     5.1 --- a/src/share/classes/com/sun/mirror/apt/AnnotationProcessorListener.java	Fri Jul 24 14:47:01 2009 -0700
     5.2 +++ b/src/share/classes/com/sun/mirror/apt/AnnotationProcessorListener.java	Sun Jul 26 21:27:11 2009 -0700
     5.3 @@ -28,8 +28,15 @@
     5.4  /**
     5.5   * Superinterface for all annotation processor event listeners.
     5.6   *
     5.7 + * @deprecated All components of this API have been superseded by the
     5.8 + * standardized annotation processing API.  This interface has no
     5.9 + * direct analog in the standardized API because the different round
    5.10 + * model renders it unnecessary.
    5.11 + *
    5.12   * @author Joseph D. Darcy
    5.13   * @author Scott Seligman
    5.14   * @since 1.5
    5.15   */
    5.16 +@Deprecated
    5.17 +@SuppressWarnings("deprecation")
    5.18  public interface AnnotationProcessorListener extends java.util.EventListener {}

     6.1 --- a/src/share/classes/com/sun/mirror/apt/AnnotationProcessors.java	Fri Jul 24 14:47:01 2009 -0700
     6.2 +++ b/src/share/classes/com/sun/mirror/apt/AnnotationProcessors.java	Sun Jul 26 21:27:11 2009 -0700
     6.3 @@ -31,10 +31,16 @@
     6.4  /**
     6.5   * Utilities to create specialized annotation processors.
     6.6   *
     6.7 + * @deprecated All components of this API have been superseded by the
     6.8 + * standardized annotation processing API.  There is no direct analog
     6.9 + * of the functionality of this class in the standardized API.
    6.10 + *
    6.11   * @since 1.5
    6.12   * @author Joseph D. Darcy
    6.13   * @author Scott Seligman
    6.14   */
    6.15 +@Deprecated
    6.16 +@SuppressWarnings("deprecation")
    6.17  public class AnnotationProcessors {
    6.18      static class NoOpAP implements AnnotationProcessor {
    6.19          NoOpAP() {}

     7.1 --- a/src/share/classes/com/sun/mirror/apt/Filer.java	Fri Jul 24 14:47:01 2009 -0700
     7.2 +++ b/src/share/classes/com/sun/mirror/apt/Filer.java	Sun Jul 26 21:27:11 2009 -0700
     7.3 @@ -51,11 +51,17 @@
     7.4   * be deleted.  Any subsequent attempt to create the same file during
     7.5   * a run will fail.
     7.6   *
     7.7 + * @deprecated All components of this API have been superseded by the
     7.8 + * standardized annotation processing API.  The replacement for the
     7.9 + * functionality of this interface is {@link
    7.10 + * javax.annotation.processing.Filer}.
    7.11 + *
    7.12   * @author Joseph D. Darcy
    7.13   * @author Scott Seligman
    7.14   * @since 1.5
    7.15   */
    7.16 -
    7.17 +@Deprecated
    7.18 +@SuppressWarnings("deprecation")
    7.19  public interface Filer {
    7.20  
    7.21      /**
    7.22 @@ -140,7 +146,13 @@
    7.23  
    7.24      /**
    7.25       * Locations (subtrees within the file system) where new files are created.
    7.26 +     *
    7.27 +     * @deprecated All components of this API have been superseded by
    7.28 +     * the standardized annotation processing API.  The replacement
    7.29 +     * for the functionality of this enum is {@link
    7.30 +     * javax.tools.StandardLocation}.
    7.31       */
    7.32 +    @Deprecated
    7.33      enum Location {
    7.34          /** The location of new source files. */
    7.35          SOURCE_TREE,

     8.1 --- a/src/share/classes/com/sun/mirror/apt/Messager.java	Fri Jul 24 14:47:01 2009 -0700
     8.2 +++ b/src/share/classes/com/sun/mirror/apt/Messager.java	Sun Jul 26 21:27:11 2009 -0700
     8.3 @@ -25,20 +25,24 @@
     8.4  
     8.5  package com.sun.mirror.apt;
     8.6  
     8.7 -
     8.8  import com.sun.mirror.util.SourcePosition;
     8.9  
    8.10 -
    8.11  /**
    8.12   * A <tt>Messager</tt> provides the way for
    8.13   * an annotation processor to report error messages, warnings, and
    8.14   * other notices.
    8.15   *
    8.16 + * @deprecated All components of this API have been superseded by the
    8.17 + * standardized annotation processing API.  The replacement for the
    8.18 + * functionality of this interface is {@link
    8.19 + * javax.annotation.processing.Messager}.
    8.20 + *
    8.21   * @author Joseph D. Darcy
    8.22   * @author Scott Seligman
    8.23   * @since 1.5
    8.24   */
    8.25 -
    8.26 +@Deprecated
    8.27 +@SuppressWarnings("deprecation")
    8.28  public interface Messager {
    8.29  
    8.30      /**

     9.1 --- a/src/share/classes/com/sun/mirror/apt/RoundCompleteEvent.java	Fri Jul 24 14:47:01 2009 -0700
     9.2 +++ b/src/share/classes/com/sun/mirror/apt/RoundCompleteEvent.java	Sun Jul 26 21:27:11 2009 -0700
     9.3 @@ -32,10 +32,17 @@
     9.4   * cannot meaningfully be serialized because all of the annotation
     9.5   * processing tool's internal state would potentially be needed.
     9.6   *
     9.7 + * @deprecated All components of this API have been superseded by the
     9.8 + * standardized annotation processing API.  This class has no direct
     9.9 + * analog in the standardized API because the different round model
    9.10 + * renders it unnecessary.
    9.11 + *
    9.12   * @author Joseph D. Darcy
    9.13   * @author Scott Seligman
    9.14   * @since 1.5
    9.15   */
    9.16 +@Deprecated
    9.17 +@SuppressWarnings("deprecation")
    9.18  public abstract class RoundCompleteEvent extends java.util.EventObject {
    9.19      private RoundState rs;
    9.20  

    10.1 --- a/src/share/classes/com/sun/mirror/apt/RoundCompleteListener.java	Fri Jul 24 14:47:01 2009 -0700
    10.2 +++ b/src/share/classes/com/sun/mirror/apt/RoundCompleteListener.java	Sun Jul 26 21:27:11 2009 -0700
    10.3 @@ -28,10 +28,17 @@
    10.4  /**
    10.5   * Listener for the completion of a round of annotation processing.
    10.6   *
    10.7 + * @deprecated All components of this API have been superseded by the
    10.8 + * standardized annotation processing API.  This interface has no
    10.9 + * direct analog in the standardized API because the different round
   10.10 + * model renders it unnecessary.
   10.11 + *
   10.12   * @author Joseph D. Darcy
   10.13   * @author Scott Seligman
   10.14   * @since 1.5
   10.15   */
   10.16 +@Deprecated
   10.17 +@SuppressWarnings("deprecation")
   10.18  public interface RoundCompleteListener extends AnnotationProcessorListener {
   10.19      /**
   10.20       * Invoked after all processors for a round have run to completion.

    11.1 --- a/src/share/classes/com/sun/mirror/apt/RoundState.java	Fri Jul 24 14:47:01 2009 -0700
    11.2 +++ b/src/share/classes/com/sun/mirror/apt/RoundState.java	Sun Jul 26 21:27:11 2009 -0700
    11.3 @@ -28,10 +28,17 @@
    11.4  /**
    11.5   * Represents the status of a completed round of annotation processing.
    11.6   *
    11.7 + * @deprecated All components of this API have been superseded by the
    11.8 + * standardized annotation processing API.  The replacement for the
    11.9 + * functionality of this interface is {@link
   11.10 + * javax.annotation.processing.RoundEnvironment}.
   11.11 + *
   11.12   * @author Joseph D. Darcy
   11.13   * @author Scott Seligman
   11.14   * @since 1.5
   11.15   */
   11.16 +@Deprecated
   11.17 +@SuppressWarnings("deprecation")
   11.18  public interface RoundState {
   11.19      /**
   11.20       * Returns <tt>true</tt> if this was the last round of annotation

    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/src/share/classes/com/sun/mirror/apt/package-info.java	Sun Jul 26 21:27:11 2009 -0700
    12.3 @@ -0,0 +1,38 @@
    12.4 +/*
    12.5 + * Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
    12.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    12.7 + *
    12.8 + * This code is free software; you can redistribute it and/or modify it
    12.9 + * under the terms of the GNU General Public License version 2 only, as
   12.10 + * published by the Free Software Foundation.  Sun designates this
   12.11 + * particular file as subject to the "Classpath" exception as provided
   12.12 + * by Sun in the LICENSE file that accompanied this code.
   12.13 + *
   12.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   12.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   12.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   12.17 + * version 2 for more details (a copy is included in the LICENSE file that
   12.18 + * accompanied this code).
   12.19 + *
   12.20 + * You should have received a copy of the GNU General Public License version
   12.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   12.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   12.23 + *
   12.24 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   12.25 + * CA 95054 USA or visit www.sun.com if you need additional information or
   12.26 + * have any questions.
   12.27 + */
   12.28 +
   12.29 +/**
   12.30 + * Classes used to communicate information between {@linkplain
   12.31 + * com.sun.mirror.apt.AnnotationProcessor annotation processors} and
   12.32 + * an annotation processing tool.
   12.33 + *
   12.34 + * <p>The {@code apt} tool and its associated API have been superseded
   12.35 + * by the standardized annotation processing API.  The replacement for
   12.36 + * the functionality in this package is {@link
   12.37 + * javax.annotation.processing}.
   12.38 + *
   12.39 + * @since 1.5
   12.40 + */
   12.41 +package com.sun.mirror.apt;

    13.1 --- a/src/share/classes/com/sun/mirror/apt/package.html	Fri Jul 24 14:47:01 2009 -0700
    13.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.3 @@ -1,42 +0,0 @@
    13.4 -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
    13.5 -<html>
    13.6 -<head>
    13.7 -<!--
    13.8 -
    13.9 -Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
   13.10 -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   13.11 -
   13.12 -This code is free software; you can redistribute it and/or modify it
   13.13 -under the terms of the GNU General Public License version 2 only, as
   13.14 -published by the Free Software Foundation.  Sun designates this
   13.15 -particular file as subject to the "Classpath" exception as provided
   13.16 -by Sun in the LICENSE file that accompanied this code.
   13.17 -
   13.18 -This code is distributed in the hope that it will be useful, but WITHOUT
   13.19 -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   13.20 -FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   13.21 -version 2 for more details (a copy is included in the LICENSE file that
   13.22 -accompanied this code).
   13.23 -
   13.24 -You should have received a copy of the GNU General Public License version
   13.25 -2 along with this work; if not, write to the Free Software Foundation,
   13.26 -Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   13.27 -
   13.28 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   13.29 -CA 95054 USA or visit www.sun.com if you need additional information or
   13.30 -have any questions.
   13.31 --->
   13.32 -
   13.33 -</head>
   13.34 -<body bgcolor="white">
   13.35 -
   13.36 -Classes used to communicate information between
   13.37 -{@linkplain com.sun.mirror.apt.AnnotationProcessor annotation processors}
   13.38 -and an annotation processing tool.
   13.39 -
   13.40 -<p>Note that the <code>apt</code> tool and its associated APIs may be
   13.41 -changed or superseded in future j2se releases.
   13.42 -
   13.43 -@since 1.5
   13.44 -</body>
   13.45 -</html>

    14.1 --- a/src/share/classes/com/sun/mirror/declaration/AnnotationMirror.java	Fri Jul 24 14:47:01 2009 -0700
    14.2 +++ b/src/share/classes/com/sun/mirror/declaration/AnnotationMirror.java	Sun Jul 26 21:27:11 2009 -0700
    14.3 @@ -38,11 +38,17 @@
    14.4   * ("<tt>==</tt>").  There is no guarantee that any particular
    14.5   * annotation will always be represented by the same object.
    14.6   *
    14.7 + * @deprecated All components of this API have been superseded by the
    14.8 + * standardized annotation processing API.  The replacement for the
    14.9 + * functionality of this interface is {@link
   14.10 + * javax.lang.model.element.AnnotationMirror}.
   14.11 + *
   14.12   * @author Joseph D. Darcy
   14.13   * @author Scott Seligman
   14.14   * @since 1.5
   14.15   */
   14.16 -
   14.17 +@Deprecated
   14.18 +@SuppressWarnings("deprecation")
   14.19  public interface AnnotationMirror {
   14.20  
   14.21      /**

    15.1 --- a/src/share/classes/com/sun/mirror/declaration/AnnotationTypeDeclaration.java	Fri Jul 24 14:47:01 2009 -0700
    15.2 +++ b/src/share/classes/com/sun/mirror/declaration/AnnotationTypeDeclaration.java	Sun Jul 26 21:27:11 2009 -0700
    15.3 @@ -32,11 +32,17 @@
    15.4  /**
    15.5   * Represents the declaration of an annotation type.
    15.6   *
    15.7 + * @deprecated All components of this API have been superseded by the
    15.8 + * standardized annotation processing API.  The replacement for the
    15.9 + * functionality of this interface is included in {@link
   15.10 + * javax.lang.model.element.TypeElement}.
   15.11 + *
   15.12   * @author Joseph D. Darcy
   15.13   * @author Scott Seligman
   15.14   * @since 1.5
   15.15   */
   15.16 -
   15.17 +@Deprecated
   15.18 +@SuppressWarnings("deprecation")
   15.19  public interface AnnotationTypeDeclaration extends InterfaceDeclaration {
   15.20  
   15.21      /**

    16.1 --- a/src/share/classes/com/sun/mirror/declaration/AnnotationTypeElementDeclaration.java	Fri Jul 24 14:47:01 2009 -0700
    16.2 +++ b/src/share/classes/com/sun/mirror/declaration/AnnotationTypeElementDeclaration.java	Sun Jul 26 21:27:11 2009 -0700
    16.3 @@ -29,11 +29,17 @@
    16.4  /**
    16.5   * Represents an element of an annotation type.
    16.6   *
    16.7 + * @deprecated All components of this API have been superseded by the
    16.8 + * standardized annotation processing API.  The replacement for the
    16.9 + * functionality of this interface is included in {@link
   16.10 + * javax.lang.model.element.ExecutableElement}.
   16.11 + *
   16.12   * @author Joe Darcy
   16.13   * @author Scott Seligman
   16.14   * @since 1.5
   16.15   */
   16.16 -
   16.17 +@Deprecated
   16.18 +@SuppressWarnings("deprecation")
   16.19  public interface AnnotationTypeElementDeclaration extends MethodDeclaration {
   16.20  
   16.21      /**

    17.1 --- a/src/share/classes/com/sun/mirror/declaration/AnnotationValue.java	Fri Jul 24 14:47:01 2009 -0700
    17.2 +++ b/src/share/classes/com/sun/mirror/declaration/AnnotationValue.java	Sun Jul 26 21:27:11 2009 -0700
    17.3 @@ -30,11 +30,17 @@
    17.4  /**
    17.5   * Represents a value of an annotation type element.
    17.6   *
    17.7 + * @deprecated All components of this API have been superseded by the
    17.8 + * standardized annotation processing API.  The replacement for the
    17.9 + * functionality of this interface is {@link
   17.10 + * javax.lang.model.element.AnnotationValue}.
   17.11 + *
   17.12   * @author Joseph D. Darcy
   17.13   * @author Scott Seligman
   17.14   * @since 1.5
   17.15   */
   17.16 -
   17.17 +@Deprecated
   17.18 +@SuppressWarnings("deprecation")
   17.19  public interface AnnotationValue {
   17.20  
   17.21      /**

    18.1 --- a/src/share/classes/com/sun/mirror/declaration/ClassDeclaration.java	Fri Jul 24 14:47:01 2009 -0700
    18.2 +++ b/src/share/classes/com/sun/mirror/declaration/ClassDeclaration.java	Sun Jul 26 21:27:11 2009 -0700
    18.3 @@ -46,13 +46,19 @@
    18.4   * provides a simple way to select just the items of interest
    18.5   * when a method returns a collection of declarations.
    18.6   *
    18.7 + * @deprecated All components of this API have been superseded by the
    18.8 + * standardized annotation processing API.  The replacement for the
    18.9 + * functionality of this interface is included in {@link
   18.10 + * javax.lang.model.element.TypeElement}.
   18.11 + *
   18.12   * @author Joseph D. Darcy
   18.13   * @author Scott Seligman
   18.14   *
   18.15   * @see ClassType
   18.16   * @since 1.5
   18.17   */
   18.18 -
   18.19 +@Deprecated
   18.20 +@SuppressWarnings("deprecation")
   18.21  public interface ClassDeclaration extends TypeDeclaration {
   18.22  
   18.23      /**

    19.1 --- a/src/share/classes/com/sun/mirror/declaration/ConstructorDeclaration.java	Fri Jul 24 14:47:01 2009 -0700
    19.2 +++ b/src/share/classes/com/sun/mirror/declaration/ConstructorDeclaration.java	Sun Jul 26 21:27:11 2009 -0700
    19.3 @@ -29,10 +29,16 @@
    19.4  /**
    19.5   * Represents a constructor of a class or interface.
    19.6   *
    19.7 + * @deprecated All components of this API have been superseded by the
    19.8 + * standardized annotation processing API.  The replacement for the
    19.9 + * functionality of this interface is included in {@link
   19.10 + * javax.lang.model.element.ExecutableElement}.
   19.11 + *
   19.12   * @author Joe Darcy
   19.13   * @author Scott Seligman
   19.14   * @since 1.5
   19.15   */
   19.16 -
   19.17 +@Deprecated
   19.18 +@SuppressWarnings("deprecation")
   19.19  public interface ConstructorDeclaration extends ExecutableDeclaration {
   19.20  }

    20.1 --- a/src/share/classes/com/sun/mirror/declaration/Declaration.java	Fri Jul 24 14:47:01 2009 -0700
    20.2 +++ b/src/share/classes/com/sun/mirror/declaration/Declaration.java	Sun Jul 26 21:27:11 2009 -0700
    20.3 @@ -44,6 +44,11 @@
    20.4   * method.  There is no guarantee that any particular declaration will
    20.5   * always be represented by the same object.
    20.6   *
    20.7 + * @deprecated All components of this API have been superseded by the
    20.8 + * standardized annotation processing API.  The replacement for the
    20.9 + * functionality of this interface is {@link
   20.10 + * javax.lang.model.element.Element}.
   20.11 + *
   20.12   * @author Joseph D. Darcy
   20.13   * @author Scott Seligman
   20.14   *
   20.15 @@ -51,7 +56,8 @@
   20.16   * @see TypeMirror
   20.17   * @since 1.5
   20.18   */
   20.19 -
   20.20 +@Deprecated
   20.21 +@SuppressWarnings("deprecation")
   20.22  public interface Declaration {
   20.23  
   20.24      /**

    21.1 --- a/src/share/classes/com/sun/mirror/declaration/EnumConstantDeclaration.java	Fri Jul 24 14:47:01 2009 -0700
    21.2 +++ b/src/share/classes/com/sun/mirror/declaration/EnumConstantDeclaration.java	Sun Jul 26 21:27:11 2009 -0700
    21.3 @@ -29,11 +29,17 @@
    21.4  /**
    21.5   * Represents an enum constant declaration.
    21.6   *
    21.7 + * @deprecated All components of this API have been superseded by the
    21.8 + * standardized annotation processing API.  The replacement for the
    21.9 + * functionality of this interface is included in {@link
   21.10 + * javax.lang.model.element.VariableElement}.
   21.11 + *
   21.12   * @author Joseph D. Darcy
   21.13   * @author Scott Seligman
   21.14   * @since 1.5
   21.15   */
   21.16 -
   21.17 +@Deprecated
   21.18 +@SuppressWarnings("deprecation")
   21.19  public interface EnumConstantDeclaration extends FieldDeclaration {
   21.20      /**
   21.21       * {@inheritDoc}

    22.1 --- a/src/share/classes/com/sun/mirror/declaration/EnumDeclaration.java	Fri Jul 24 14:47:01 2009 -0700
    22.2 +++ b/src/share/classes/com/sun/mirror/declaration/EnumDeclaration.java	Sun Jul 26 21:27:11 2009 -0700
    22.3 @@ -32,11 +32,17 @@
    22.4  /**
    22.5   * Represents the declaration of an enum type.
    22.6   *
    22.7 + * @deprecated All components of this API have been superseded by the
    22.8 + * standardized annotation processing API.  The replacement for the
    22.9 + * functionality of this interface is included in {@link
   22.10 + * javax.lang.model.element.TypeElement}.
   22.11 + *
   22.12   * @author Joseph D. Darcy
   22.13   * @author Scott Seligman
   22.14   * @since 1.5
   22.15   */
   22.16 -
   22.17 +@Deprecated
   22.18 +@SuppressWarnings("deprecation")
   22.19  public interface EnumDeclaration extends ClassDeclaration {
   22.20  
   22.21      /**

    23.1 --- a/src/share/classes/com/sun/mirror/declaration/ExecutableDeclaration.java	Fri Jul 24 14:47:01 2009 -0700
    23.2 +++ b/src/share/classes/com/sun/mirror/declaration/ExecutableDeclaration.java	Sun Jul 26 21:27:11 2009 -0700
    23.3 @@ -34,11 +34,17 @@
    23.4  /**
    23.5   * Represents a method or constructor of a class or interface.
    23.6   *
    23.7 + * @deprecated All components of this API have been superseded by the
    23.8 + * standardized annotation processing API.  The replacement for the
    23.9 + * functionality of this interface is {@link
   23.10 + * javax.lang.model.element.ExecutableElement}.
   23.11 + *
   23.12   * @author Joseph D. Darcy
   23.13   * @author Scott Seligman
   23.14   * @since 1.5
   23.15   */
   23.16 -
   23.17 +@Deprecated
   23.18 +@SuppressWarnings("deprecation")
   23.19  public interface ExecutableDeclaration extends MemberDeclaration {
   23.20  
   23.21      /**

    24.1 --- a/src/share/classes/com/sun/mirror/declaration/FieldDeclaration.java	Fri Jul 24 14:47:01 2009 -0700
    24.2 +++ b/src/share/classes/com/sun/mirror/declaration/FieldDeclaration.java	Sun Jul 26 21:27:11 2009 -0700
    24.3 @@ -32,11 +32,17 @@
    24.4  /**
    24.5   * Represents a field of a type declaration.
    24.6   *
    24.7 + * @deprecated All components of this API have been superseded by the
    24.8 + * standardized annotation processing API.  The replacement for the
    24.9 + * functionality of this interface is included in {@link
   24.10 + * javax.lang.model.element.VariableElement}.
   24.11 + *
   24.12   * @author Joseph D. Darcy
   24.13   * @author Scott Seligman
   24.14   * @since 1.5
   24.15   */
   24.16 -
   24.17 +@Deprecated
   24.18 +@SuppressWarnings("deprecation")
   24.19  public interface FieldDeclaration extends MemberDeclaration {
   24.20  
   24.21      /**

    25.1 --- a/src/share/classes/com/sun/mirror/declaration/InterfaceDeclaration.java	Fri Jul 24 14:47:01 2009 -0700
    25.2 +++ b/src/share/classes/com/sun/mirror/declaration/InterfaceDeclaration.java	Sun Jul 26 21:27:11 2009 -0700
    25.3 @@ -40,12 +40,18 @@
    25.4   * represents an interface <i>type</i>.
    25.5   * See {@link TypeDeclaration} for more on this distinction.
    25.6   *
    25.7 + * @deprecated All components of this API have been superseded by the
    25.8 + * standardized annotation processing API.  The replacement for the
    25.9 + * functionality of this interface is included in {@link
   25.10 + * javax.lang.model.element.TypeElement}.
   25.11 + *
   25.12   * @author Joseph D. Darcy
   25.13   * @author Scott Seligman
   25.14   *
   25.15   * @see InterfaceType
   25.16   * @since 1.5
   25.17   */
   25.18 -
   25.19 +@Deprecated
   25.20 +@SuppressWarnings("deprecation")
   25.21  public interface InterfaceDeclaration extends TypeDeclaration {
   25.22  }

    26.1 --- a/src/share/classes/com/sun/mirror/declaration/MemberDeclaration.java	Fri Jul 24 14:47:01 2009 -0700
    26.2 +++ b/src/share/classes/com/sun/mirror/declaration/MemberDeclaration.java	Sun Jul 26 21:27:11 2009 -0700
    26.3 @@ -31,11 +31,17 @@
    26.4   * type.  This includes fields, constructors, methods, and (since they
    26.5   * may be nested) declared types themselves.
    26.6   *
    26.7 + * @deprecated All components of this API have been superseded by the
    26.8 + * standardized annotation processing API.  The replacement for the
    26.9 + * functionality of this interface is {@link
   26.10 + * javax.lang.model.element.Element}.
   26.11 + *
   26.12   * @author Joseph D. Darcy
   26.13   * @author Scott Seligman
   26.14   * @since 1.5
   26.15   */
   26.16 -
   26.17 +@Deprecated
   26.18 +@SuppressWarnings("deprecation")
   26.19  public interface MemberDeclaration extends Declaration {
   26.20  
   26.21      /**

    27.1 --- a/src/share/classes/com/sun/mirror/declaration/MethodDeclaration.java	Fri Jul 24 14:47:01 2009 -0700
    27.2 +++ b/src/share/classes/com/sun/mirror/declaration/MethodDeclaration.java	Sun Jul 26 21:27:11 2009 -0700
    27.3 @@ -36,11 +36,17 @@
    27.4   * {@linkplain AnnotationTypeElementDeclaration annotation type element}
    27.5   * is a kind of method.
    27.6   *
    27.7 + * @deprecated All components of this API have been superseded by the
    27.8 + * standardized annotation processing API.  The replacement for the
    27.9 + * functionality of this interface is included in {@link
   27.10 + * javax.lang.model.element.ExecutableElement}.
   27.11 + *
   27.12   * @author Joseph D. Darcy
   27.13   * @author Scott Seligman
   27.14   * @since 1.5
   27.15   */
   27.16 -
   27.17 +@Deprecated
   27.18 +@SuppressWarnings("deprecation")
   27.19  public interface MethodDeclaration extends ExecutableDeclaration {
   27.20  
   27.21      /**

    28.1 --- a/src/share/classes/com/sun/mirror/declaration/Modifier.java	Fri Jul 24 14:47:01 2009 -0700
    28.2 +++ b/src/share/classes/com/sun/mirror/declaration/Modifier.java	Sun Jul 26 21:27:11 2009 -0700
    28.3 @@ -35,11 +35,16 @@
    28.4   * then it is customary, though not required, that they appear in the same
    28.5   * order as the constants listed in the detail section below.
    28.6   *
    28.7 + * @deprecated All components of this API have been superseded by the
    28.8 + * standardized annotation processing API.  The replacement for the
    28.9 + * functionality of this enum is {@link javax.lang.model.element.Modifier}.
   28.10 + *
   28.11   * @author Joseph D. Darcy
   28.12   * @author Scott Seligman
   28.13   * @since 1.5
   28.14   */
   28.15 -
   28.16 +@Deprecated
   28.17 +@SuppressWarnings("deprecation")
   28.18  public enum Modifier {
   28.19  
   28.20      // See JLS2 sections 8.1.1, 8.3.1, 8.4.3, 8.8.3, and 9.1.1.

    29.1 --- a/src/share/classes/com/sun/mirror/declaration/PackageDeclaration.java	Fri Jul 24 14:47:01 2009 -0700
    29.2 +++ b/src/share/classes/com/sun/mirror/declaration/PackageDeclaration.java	Sun Jul 26 21:27:11 2009 -0700
    29.3 @@ -37,11 +37,17 @@
    29.4   * provides a simple way to select just the items of interest
    29.5   * when a method returns a collection of declarations.
    29.6   *
    29.7 + * @deprecated All components of this API have been superseded by the
    29.8 + * standardized annotation processing API.  The replacement for the
    29.9 + * functionality of this interface is {@link
   29.10 + * javax.lang.model.element.PackageElement}.
   29.11 + *
   29.12   * @author Joseph D. Darcy
   29.13   * @author Scott Seligman
   29.14   * @since 1.5
   29.15   */
   29.16 -
   29.17 +@Deprecated
   29.18 +@SuppressWarnings("deprecation")
   29.19  public interface PackageDeclaration extends Declaration {
   29.20  
   29.21      /**

    30.1 --- a/src/share/classes/com/sun/mirror/declaration/ParameterDeclaration.java	Fri Jul 24 14:47:01 2009 -0700
    30.2 +++ b/src/share/classes/com/sun/mirror/declaration/ParameterDeclaration.java	Sun Jul 26 21:27:11 2009 -0700
    30.3 @@ -32,11 +32,17 @@
    30.4  /**
    30.5   * Represents a formal parameter of a method or constructor.
    30.6   *
    30.7 + * @deprecated All components of this API have been superseded by the
    30.8 + * standardized annotation processing API.  The replacement for the
    30.9 + * functionality of this interface is included in {@link
   30.10 + * javax.lang.model.element.VariableElement}.
   30.11 + *
   30.12   * @author Joseph D. Darcy
   30.13   * @author Scott Seligman
   30.14   * @since 1.5
   30.15   */
   30.16 -
   30.17 +@Deprecated
   30.18 +@SuppressWarnings("deprecation")
   30.19  public interface ParameterDeclaration extends Declaration {
   30.20  
   30.21      /**

    31.1 --- a/src/share/classes/com/sun/mirror/declaration/TypeDeclaration.java	Fri Jul 24 14:47:01 2009 -0700
    31.2 +++ b/src/share/classes/com/sun/mirror/declaration/TypeDeclaration.java	Sun Jul 26 21:27:11 2009 -0700
    31.3 @@ -54,13 +54,19 @@
    31.4   * provides a simple way to select just the items of interest
    31.5   * when a method returns a collection of declarations.
    31.6   *
    31.7 + * @deprecated All components of this API have been superseded by the
    31.8 + * standardized annotation processing API.  The replacement for the
    31.9 + * functionality of this interface is included in {@link
   31.10 + * javax.lang.model.element.TypeElement}.
   31.11 + *
   31.12   * @author Joseph D. Darcy
   31.13   * @author Scott Seligman
   31.14   *
   31.15   * @see DeclaredType
   31.16   * @since 1.5
   31.17   */
   31.18 -
   31.19 +@Deprecated
   31.20 +@SuppressWarnings("deprecation")
   31.21  public interface TypeDeclaration extends MemberDeclaration {
   31.22  
   31.23      /**

    32.1 --- a/src/share/classes/com/sun/mirror/declaration/TypeParameterDeclaration.java	Fri Jul 24 14:47:01 2009 -0700
    32.2 +++ b/src/share/classes/com/sun/mirror/declaration/TypeParameterDeclaration.java	Sun Jul 26 21:27:11 2009 -0700
    32.3 @@ -36,11 +36,17 @@
    32.4   * or constructor declaration.
    32.5   * A type parameter declares a {@link TypeVariable}.
    32.6   *
    32.7 + * @deprecated All components of this API have been superseded by the
    32.8 + * standardized annotation processing API.  The replacement for the
    32.9 + * functionality of this interface is {@link
   32.10 + * javax.lang.model.element.TypeParameterElement}.
   32.11 + *
   32.12   * @author Joseph D. Darcy
   32.13   * @author Scott Seligman
   32.14   * @since 1.5
   32.15   */
   32.16 -
   32.17 +@Deprecated
   32.18 +@SuppressWarnings("deprecation")
   32.19  public interface TypeParameterDeclaration extends Declaration {
   32.20  
   32.21      /**

    33.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    33.2 +++ b/src/share/classes/com/sun/mirror/declaration/package-info.java	Sun Jul 26 21:27:11 2009 -0700
    33.3 @@ -0,0 +1,40 @@
    33.4 +/*
    33.5 + * Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
    33.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33.7 + *
    33.8 + * This code is free software; you can redistribute it and/or modify it
    33.9 + * under the terms of the GNU General Public License version 2 only, as
   33.10 + * published by the Free Software Foundation.  Sun designates this
   33.11 + * particular file as subject to the "Classpath" exception as provided
   33.12 + * by Sun in the LICENSE file that accompanied this code.
   33.13 + *
   33.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   33.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   33.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   33.17 + * version 2 for more details (a copy is included in the LICENSE file that
   33.18 + * accompanied this code).
   33.19 + *
   33.20 + * You should have received a copy of the GNU General Public License version
   33.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   33.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   33.23 + *
   33.24 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   33.25 + * CA 95054 USA or visit www.sun.com if you need additional information or
   33.26 + * have any questions.
   33.27 + */
   33.28 +
   33.29 +/**
   33.30 + * Interfaces used to model program element declarations.  A
   33.31 + * declaration is represented by the appropriate subinterface of
   33.32 + * {@link com.sun.mirror.declaration.Declaration}, and an annotation
   33.33 + * is represented as an {@link
   33.34 + * com.sun.mirror.declaration.AnnotationMirror}.
   33.35 + *
   33.36 + * <p>The {@code apt} tool and its associated API have been superseded
   33.37 + * by the standardized annotation processing API.  The replacement for
   33.38 + * the functionality in this package is {@link
   33.39 + * javax.lang.model.element}.
   33.40 + *
   33.41 + * @since 1.5
   33.42 + */
   33.43 +package com.sun.mirror.declaration;

    34.1 --- a/src/share/classes/com/sun/mirror/declaration/package.html	Fri Jul 24 14:47:01 2009 -0700
    34.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    34.3 @@ -1,44 +0,0 @@
    34.4 -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
    34.5 -<html>
    34.6 -<head>
    34.7 -<!--
    34.8 -
    34.9 -Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
   34.10 -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   34.11 -
   34.12 -This code is free software; you can redistribute it and/or modify it
   34.13 -under the terms of the GNU General Public License version 2 only, as
   34.14 -published by the Free Software Foundation.  Sun designates this
   34.15 -particular file as subject to the "Classpath" exception as provided
   34.16 -by Sun in the LICENSE file that accompanied this code.
   34.17 -
   34.18 -This code is distributed in the hope that it will be useful, but WITHOUT
   34.19 -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   34.20 -FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   34.21 -version 2 for more details (a copy is included in the LICENSE file that
   34.22 -accompanied this code).
   34.23 -
   34.24 -You should have received a copy of the GNU General Public License version
   34.25 -2 along with this work; if not, write to the Free Software Foundation,
   34.26 -Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   34.27 -
   34.28 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   34.29 -CA 95054 USA or visit www.sun.com if you need additional information or
   34.30 -have any questions.
   34.31 --->
   34.32 -
   34.33 -</head>
   34.34 -<body bgcolor="white">
   34.35 -
   34.36 -Interfaces used to model program element declarations.
   34.37 -A declaration is represented by the appropriate subinterface of
   34.38 -{@link com.sun.mirror.declaration.Declaration},
   34.39 -and an annotation is represented as an
   34.40 -{@link com.sun.mirror.declaration.AnnotationMirror}.
   34.41 -
   34.42 -<p>Note that the <code>apt</code> tool and its associated APIs may be
   34.43 -changed or superseded in future j2se releases.
   34.44 -
   34.45 -@since 1.5
   34.46 -</body>
   34.47 -</html>

    35.1 --- a/src/share/classes/com/sun/mirror/type/AnnotationType.java	Fri Jul 24 14:47:01 2009 -0700
    35.2 +++ b/src/share/classes/com/sun/mirror/type/AnnotationType.java	Sun Jul 26 21:27:11 2009 -0700
    35.3 @@ -32,11 +32,17 @@
    35.4  /**
    35.5   * Represents an annotation type.
    35.6   *
    35.7 + * @deprecated All components of this API have been superseded by the
    35.8 + * standardized annotation processing API.  The replacement for the
    35.9 + * functionality of this interface is included in {@link
   35.10 + * javax.lang.model.type.DeclaredType}.
   35.11 + *
   35.12   * @author Joseph D. Darcy
   35.13   * @author Scott Seligman
   35.14   * @since 1.5
   35.15   */
   35.16 -
   35.17 +@Deprecated
   35.18 +@SuppressWarnings("deprecation")
   35.19  public interface AnnotationType extends InterfaceType {
   35.20  
   35.21      /**

    36.1 --- a/src/share/classes/com/sun/mirror/type/ArrayType.java	Fri Jul 24 14:47:01 2009 -0700
    36.2 +++ b/src/share/classes/com/sun/mirror/type/ArrayType.java	Sun Jul 26 21:27:11 2009 -0700
    36.3 @@ -31,11 +31,17 @@
    36.4   * A multidimensional array type is represented as an array type
    36.5   * whose component type is also an array type.
    36.6   *
    36.7 + * @deprecated All components of this API have been superseded by the
    36.8 + * standardized annotation processing API.  The replacement for the
    36.9 + * functionality of this interface is {@link
   36.10 + * javax.lang.model.type.ArrayType}.
   36.11 + *
   36.12   * @author Joseph D. Darcy
   36.13   * @author Scott Seligman
   36.14   * @since 1.5
   36.15   */
   36.16 -
   36.17 +@Deprecated
   36.18 +@SuppressWarnings("deprecation")
   36.19  public interface ArrayType extends ReferenceType {
   36.20  
   36.21      /**

    37.1 --- a/src/share/classes/com/sun/mirror/type/ClassType.java	Fri Jul 24 14:47:01 2009 -0700
    37.2 +++ b/src/share/classes/com/sun/mirror/type/ClassType.java	Sun Jul 26 21:27:11 2009 -0700
    37.3 @@ -38,11 +38,17 @@
    37.4   * of a class, a <tt>ClassType</tt> represents a class <i>type</i>.
    37.5   * See {@link TypeDeclaration} for more on this distinction.
    37.6   *
    37.7 + * @deprecated All components of this API have been superseded by the
    37.8 + * standardized annotation processing API.  The replacement for the
    37.9 + * functionality of this interface is included in {@link
   37.10 + * javax.lang.model.type.DeclaredType}.
   37.11 + *
   37.12   * @author Joseph D. Darcy
   37.13   * @author Scott Seligman
   37.14   * @since 1.5
   37.15   */
   37.16 -
   37.17 +@Deprecated
   37.18 +@SuppressWarnings("deprecation")
   37.19  public interface ClassType extends DeclaredType {
   37.20  
   37.21      /**

    38.1 --- a/src/share/classes/com/sun/mirror/type/DeclaredType.java	Fri Jul 24 14:47:01 2009 -0700
    38.2 +++ b/src/share/classes/com/sun/mirror/type/DeclaredType.java	Sun Jul 26 21:27:11 2009 -0700
    38.3 @@ -48,11 +48,17 @@
    38.4   * Other method invocations on such an unknown type will not, in general,
    38.5   * return meaningful results.
    38.6   *
    38.7 + * @deprecated All components of this API have been superseded by the
    38.8 + * standardized annotation processing API.  The replacement for the
    38.9 + * functionality of this interface is included in {@link
   38.10 + * javax.lang.model.type.DeclaredType}.
   38.11 + *
   38.12   * @author Joseph D. Darcy
   38.13   * @author Scott Seligman
   38.14   * @since 1.5
   38.15   */
   38.16 -
   38.17 +@Deprecated
   38.18 +@SuppressWarnings("deprecation")
   38.19  public interface DeclaredType extends ReferenceType {
   38.20  
   38.21      /**

    39.1 --- a/src/share/classes/com/sun/mirror/type/EnumType.java	Fri Jul 24 14:47:01 2009 -0700
    39.2 +++ b/src/share/classes/com/sun/mirror/type/EnumType.java	Sun Jul 26 21:27:11 2009 -0700
    39.3 @@ -32,11 +32,17 @@
    39.4  /**
    39.5   * Represents an enum type.
    39.6   *
    39.7 + * @deprecated All components of this API have been superseded by the
    39.8 + * standardized annotation processing API.  The replacement for the
    39.9 + * functionality of this interface is included in {@link
   39.10 + * javax.lang.model.type.DeclaredType}.
   39.11 + *
   39.12   * @author Joseph D. Darcy
   39.13   * @author Scott Seligman
   39.14   * @since 1.5
   39.15   */
   39.16 -
   39.17 +@Deprecated
   39.18 +@SuppressWarnings("deprecation")
   39.19  public interface EnumType extends ClassType {
   39.20  
   39.21      /**

    40.1 --- a/src/share/classes/com/sun/mirror/type/InterfaceType.java	Fri Jul 24 14:47:01 2009 -0700
    40.2 +++ b/src/share/classes/com/sun/mirror/type/InterfaceType.java	Sun Jul 26 21:27:11 2009 -0700
    40.3 @@ -39,11 +39,17 @@
    40.4   * represents an interface <i>type</i>.
    40.5   * See {@link TypeDeclaration} for more on this distinction.
    40.6   *
    40.7 + * @deprecated All components of this API have been superseded by the
    40.8 + * standardized annotation processing API.  The replacement for the
    40.9 + * functionality of this interface is included in {@link
   40.10 + * javax.lang.model.type.DeclaredType}.
   40.11 + *
   40.12   * @author Joseph D. Darcy
   40.13   * @author Scott Seligman
   40.14   * @since 1.5
   40.15   */
   40.16 -
   40.17 +@Deprecated
   40.18 +@SuppressWarnings("deprecation")
   40.19  public interface InterfaceType extends DeclaredType {
   40.20  
   40.21      /**

    41.1 --- a/src/share/classes/com/sun/mirror/type/MirroredTypeException.java	Fri Jul 24 14:47:01 2009 -0700
    41.2 +++ b/src/share/classes/com/sun/mirror/type/MirroredTypeException.java	Sun Jul 26 21:27:11 2009 -0700
    41.3 @@ -35,9 +35,16 @@
    41.4   * Thrown when an application attempts to access the {@link Class} object
    41.5   * corresponding to a {@link TypeMirror}.
    41.6   *
    41.7 + * @deprecated All components of this API have been superseded by the
    41.8 + * standardized annotation processing API.  The replacement for the
    41.9 + * functionality of this exception is {@link
   41.10 + * javax.lang.model.type.MirroredTypeException}.
   41.11 + *
   41.12   * @see MirroredTypesException
   41.13   * @see Declaration#getAnnotation(Class)
   41.14   */
   41.15 +@Deprecated
   41.16 +@SuppressWarnings("deprecation")
   41.17  public class MirroredTypeException extends RuntimeException {
   41.18  
   41.19      private static final long serialVersionUID = 1;

    42.1 --- a/src/share/classes/com/sun/mirror/type/MirroredTypesException.java	Fri Jul 24 14:47:01 2009 -0700
    42.2 +++ b/src/share/classes/com/sun/mirror/type/MirroredTypesException.java	Sun Jul 26 21:27:11 2009 -0700
    42.3 @@ -38,9 +38,16 @@
    42.4   * Thrown when an application attempts to access a sequence of {@link Class}
    42.5   * objects each corresponding to a {@link TypeMirror}.
    42.6   *
    42.7 + * @deprecated All components of this API have been superseded by the
    42.8 + * standardized annotation processing API.  The replacement for the
    42.9 + * functionality of this exception is {@link
   42.10 + * javax.lang.model.type.MirroredTypesException}.
   42.11 + *
   42.12   * @see MirroredTypeException
   42.13   * @see Declaration#getAnnotation(Class)
   42.14   */
   42.15 +@Deprecated
   42.16 +@SuppressWarnings("deprecation")
   42.17  public class MirroredTypesException extends RuntimeException {
   42.18  
   42.19      private static final long serialVersionUID = 1;

    43.1 --- a/src/share/classes/com/sun/mirror/type/PrimitiveType.java	Fri Jul 24 14:47:01 2009 -0700
    43.2 +++ b/src/share/classes/com/sun/mirror/type/PrimitiveType.java	Sun Jul 26 21:27:11 2009 -0700
    43.3 @@ -31,11 +31,17 @@
    43.4   * <tt>boolean</tt>, <tt>byte</tt>, <tt>short</tt>, <tt>int</tt>,
    43.5   * <tt>long</tt>, <tt>char</tt>, <tt>float</tt>, and <tt>double</tt>.
    43.6   *
    43.7 + * @deprecated All components of this API have been superseded by the
    43.8 + * standardized annotation processing API.  The replacement for the
    43.9 + * functionality of this interface is {@link
   43.10 + * javax.lang.model.type.PrimitiveType}.
   43.11 + *
   43.12   * @author Joseph D. Darcy
   43.13   * @author Scott Seligman
   43.14   * @since 1.5
   43.15   */
   43.16 -
   43.17 +@Deprecated
   43.18 +@SuppressWarnings("deprecation")
   43.19  public interface PrimitiveType extends TypeMirror {
   43.20  
   43.21      /**
   43.22 @@ -47,7 +53,13 @@
   43.23  
   43.24      /**
   43.25       * An enumeration of the different kinds of primitive types.
   43.26 +     *
   43.27 +     * @deprecated All components of this API have been superseded by
   43.28 +     * the standardized annotation processing API.  The replacement
   43.29 +     * for the functionality of this enum is {@link
   43.30 +     * javax.lang.model.type.TypeKind}.
   43.31       */
   43.32 +    @Deprecated
   43.33      enum Kind {
   43.34          /** The primitive type <tt>boolean</tt> */      BOOLEAN,
   43.35          /** The primitive type <tt>byte</tt> */         BYTE,

    44.1 --- a/src/share/classes/com/sun/mirror/type/ReferenceType.java	Fri Jul 24 14:47:01 2009 -0700
    44.2 +++ b/src/share/classes/com/sun/mirror/type/ReferenceType.java	Sun Jul 26 21:27:11 2009 -0700
    44.3 @@ -30,10 +30,16 @@
    44.4   * Represents a reference type.
    44.5   * These include class and interface types, array types, and type variables.
    44.6   *
    44.7 + * @deprecated All components of this API have been superseded by the
    44.8 + * standardized annotation processing API.  The replacement for the
    44.9 + * functionality of this interface is {@link
   44.10 + * javax.lang.model.type.ReferenceType}.
   44.11 + *
   44.12   * @author Joseph D. Darcy
   44.13   * @author Scott Seligman
   44.14   * @since 1.5
   44.15   */
   44.16 -
   44.17 +@Deprecated
   44.18 +@SuppressWarnings("deprecation")
   44.19  public interface ReferenceType extends TypeMirror {
   44.20  }

    45.1 --- a/src/share/classes/com/sun/mirror/type/TypeMirror.java	Fri Jul 24 14:47:01 2009 -0700
    45.2 +++ b/src/share/classes/com/sun/mirror/type/TypeMirror.java	Sun Jul 26 21:27:11 2009 -0700
    45.3 @@ -43,6 +43,11 @@
    45.4   * There is no guarantee that any particular type will
    45.5   * always be represented by the same object.
    45.6   *
    45.7 + * @deprecated All components of this API have been superseded by the
    45.8 + * standardized annotation processing API.  The replacement for the
    45.9 + * functionality of this interface is {@link
   45.10 + * javax.lang.model.type.TypeMirror}.
   45.11 + *
   45.12   * @author Joseph D. Darcy
   45.13   * @author Scott Seligman
   45.14   *
   45.15 @@ -50,7 +55,8 @@
   45.16   * @see Types
   45.17   * @since 1.5
   45.18   */
   45.19 -
   45.20 +@Deprecated
   45.21 +@SuppressWarnings("deprecation")
   45.22  public interface TypeMirror {
   45.23  
   45.24      /**

    46.1 --- a/src/share/classes/com/sun/mirror/type/TypeVariable.java	Fri Jul 24 14:47:01 2009 -0700
    46.2 +++ b/src/share/classes/com/sun/mirror/type/TypeVariable.java	Sun Jul 26 21:27:11 2009 -0700
    46.3 @@ -35,11 +35,17 @@
    46.4   * {@linkplain TypeParameterDeclaration type parameter} of a
    46.5   * type, method, or constructor.
    46.6   *
    46.7 + * @deprecated All components of this API have been superseded by the
    46.8 + * standardized annotation processing API.  The replacement for the
    46.9 + * functionality of this interface is {@link
   46.10 + * javax.lang.model.type.TypeVariable}.
   46.11 + *
   46.12   * @author Joe Darcy
   46.13   * @author Scott Seligman
   46.14   * @since 1.5
   46.15   */
   46.16 -
   46.17 +@Deprecated
   46.18 +@SuppressWarnings("deprecation")
   46.19  public interface TypeVariable extends ReferenceType {
   46.20  
   46.21      /**

    47.1 --- a/src/share/classes/com/sun/mirror/type/VoidType.java	Fri Jul 24 14:47:01 2009 -0700
    47.2 +++ b/src/share/classes/com/sun/mirror/type/VoidType.java	Sun Jul 26 21:27:11 2009 -0700
    47.3 @@ -35,9 +35,15 @@
    47.4   * @author Joseph D. Darcy
    47.5   * @author Scott Seligman
    47.6   *
    47.7 + * @deprecated All components of this API have been superseded by the
    47.8 + * standardized annotation processing API.  The replacement for the
    47.9 + * functionality of this interface is included in {@link
   47.10 + * javax.lang.model.type.NoType}.
   47.11 + *
   47.12   * @see MethodDeclaration#getReturnType()
   47.13   * @since 1.5
   47.14   */
   47.15 -
   47.16 +@Deprecated
   47.17 +@SuppressWarnings("deprecation")
   47.18  public interface VoidType extends TypeMirror {
   47.19  }

    48.1 --- a/src/share/classes/com/sun/mirror/type/WildcardType.java	Fri Jul 24 14:47:01 2009 -0700
    48.2 +++ b/src/share/classes/com/sun/mirror/type/WildcardType.java	Sun Jul 26 21:27:11 2009 -0700
    48.3 @@ -41,11 +41,17 @@
    48.4   * <tt>extends</tt> clause, its lower bound explicitly set by a
    48.5   * <tt>super</tt> clause, or neither (but not both).
    48.6   *
    48.7 + * @deprecated All components of this API have been superseded by the
    48.8 + * standardized annotation processing API.  The replacement for the
    48.9 + * functionality of this interface is {@link
   48.10 + * javax.lang.model.type.WildcardType}.
   48.11 + *
   48.12   * @author Joseph D. Darcy
   48.13   * @author Scott Seligman
   48.14   * @since 1.5
   48.15   */
   48.16 -
   48.17 +@Deprecated
   48.18 +@SuppressWarnings("deprecation")
   48.19  public interface WildcardType extends TypeMirror {
   48.20  
   48.21      /**

    49.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    49.2 +++ b/src/share/classes/com/sun/mirror/type/package-info.java	Sun Jul 26 21:27:11 2009 -0700
    49.3 @@ -0,0 +1,37 @@
    49.4 +/*
    49.5 + * Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
    49.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    49.7 + *
    49.8 + * This code is free software; you can redistribute it and/or modify it
    49.9 + * under the terms of the GNU General Public License version 2 only, as
   49.10 + * published by the Free Software Foundation.  Sun designates this
   49.11 + * particular file as subject to the "Classpath" exception as provided
   49.12 + * by Sun in the LICENSE file that accompanied this code.
   49.13 + *
   49.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   49.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   49.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   49.17 + * version 2 for more details (a copy is included in the LICENSE file that
   49.18 + * accompanied this code).
   49.19 + *
   49.20 + * You should have received a copy of the GNU General Public License version
   49.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   49.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   49.23 + *
   49.24 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   49.25 + * CA 95054 USA or visit www.sun.com if you need additional information or
   49.26 + * have any questions.
   49.27 + */
   49.28 +
   49.29 +/**
   49.30 + * Interfaces used to model types.  A type is represented by the
   49.31 + * appropriate subinterface of {@link com.sun.mirror.type.TypeMirror}.
   49.32 + *
   49.33 + * <p>The {@code apt} tool and its associated API have been
   49.34 + * superseded by the standardized annotation processing API.  The
   49.35 + * replacement for the functionality in this package is {@link
   49.36 + * javax.lang.model.type}.
   49.37 + *
   49.38 + * @since 1.5
   49.39 + */
   49.40 +package com.sun.mirror.type;

    50.1 --- a/src/share/classes/com/sun/mirror/type/package.html	Fri Jul 24 14:47:01 2009 -0700
    50.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    50.3 @@ -1,42 +0,0 @@
    50.4 -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
    50.5 -<html>
    50.6 -<head>
    50.7 -<!--
    50.8 -
    50.9 -Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
   50.10 -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   50.11 -
   50.12 -This code is free software; you can redistribute it and/or modify it
   50.13 -under the terms of the GNU General Public License version 2 only, as
   50.14 -published by the Free Software Foundation.  Sun designates this
   50.15 -particular file as subject to the "Classpath" exception as provided
   50.16 -by Sun in the LICENSE file that accompanied this code.
   50.17 -
   50.18 -This code is distributed in the hope that it will be useful, but WITHOUT
   50.19 -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   50.20 -FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   50.21 -version 2 for more details (a copy is included in the LICENSE file that
   50.22 -accompanied this code).
   50.23 -
   50.24 -You should have received a copy of the GNU General Public License version
   50.25 -2 along with this work; if not, write to the Free Software Foundation,
   50.26 -Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   50.27 -
   50.28 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   50.29 -CA 95054 USA or visit www.sun.com if you need additional information or
   50.30 -have any questions.
   50.31 --->
   50.32 -
   50.33 -</head>
   50.34 -<body bgcolor="white">
   50.35 -
   50.36 -Interfaces used to model types.
   50.37 -A type is represented by the appropriate subinterface of
   50.38 -{@link com.sun.mirror.type.TypeMirror}.
   50.39 -
   50.40 -<p>Note that the <code>apt</code> tool and its associated APIs may be
   50.41 -changed or superseded in future j2se releases.
   50.42 -
   50.43 -@since 1.5
   50.44 -</body>
   50.45 -</html>

    51.1 --- a/src/share/classes/com/sun/mirror/util/DeclarationFilter.java	Fri Jul 24 14:47:01 2009 -0700
    51.2 +++ b/src/share/classes/com/sun/mirror/util/DeclarationFilter.java	Sun Jul 26 21:27:11 2009 -0700
    51.3 @@ -69,11 +69,17 @@
    51.4   *                  };
    51.5   *     result = nameFilter.filter(decls);               </pre></blockquote>
    51.6   *
    51.7 + * @deprecated All components of this API have been superseded by the
    51.8 + * standardized annotation processing API.  The replacement for the
    51.9 + * functionality of this class is {@link
   51.10 + * javax.lang.model.util.ElementFilter}.
   51.11 + *
   51.12   * @author Joseph D. Darcy
   51.13   * @author Scott Seligman
   51.14   * @since 1.5
   51.15   */
   51.16 -
   51.17 +@Deprecated
   51.18 +@SuppressWarnings("deprecation")
   51.19  public class DeclarationFilter {
   51.20  
   51.21      // Predefined filters for convenience.

    52.1 --- a/src/share/classes/com/sun/mirror/util/DeclarationScanner.java	Fri Jul 24 14:47:01 2009 -0700
    52.2 +++ b/src/share/classes/com/sun/mirror/util/DeclarationScanner.java	Sun Jul 26 21:27:11 2009 -0700
    52.3 @@ -39,11 +39,17 @@
    52.4   * are scanned; the postprocessing visitor is called after the
    52.5   * contained declarations are scanned.
    52.6   *
    52.7 + * @deprecated All components of this API have been superseded by the
    52.8 + * standardized annotation processing API.  The replacement for the
    52.9 + * functionality of this class is {@link
   52.10 + * javax.lang.model.util.ElementScanner6}.
   52.11 + *
   52.12   * @author Joseph D. Darcy
   52.13   * @author Scott Seligman
   52.14   * @since 1.5
   52.15   */
   52.16 -
   52.17 +@Deprecated
   52.18 +@SuppressWarnings("deprecation")
   52.19  class DeclarationScanner implements DeclarationVisitor {
   52.20      protected DeclarationVisitor pre;
   52.21      protected DeclarationVisitor post;

    53.1 --- a/src/share/classes/com/sun/mirror/util/DeclarationVisitor.java	Fri Jul 24 14:47:01 2009 -0700
    53.2 +++ b/src/share/classes/com/sun/mirror/util/DeclarationVisitor.java	Sun Jul 26 21:27:11 2009 -0700
    53.3 @@ -37,11 +37,17 @@
    53.4   * <tt>visit<i>Xxx</i></tt> method applicable to that declaration is
    53.5   * invoked.
    53.6   *
    53.7 + * @deprecated All components of this API have been superseded by the
    53.8 + * standardized annotation processing API.  The replacement for the
    53.9 + * functionality of this interface is {@link
   53.10 + * javax.lang.model.element.ElementVisitor}.
   53.11 + *
   53.12   * @author Joseph D. Darcy
   53.13   * @author Scott Seligman
   53.14   * @since 1.5
   53.15   */
   53.16 -
   53.17 +@Deprecated
   53.18 +@SuppressWarnings("deprecation")
   53.19  public interface DeclarationVisitor {
   53.20  
   53.21      /**

    54.1 --- a/src/share/classes/com/sun/mirror/util/DeclarationVisitors.java	Fri Jul 24 14:47:01 2009 -0700
    54.2 +++ b/src/share/classes/com/sun/mirror/util/DeclarationVisitors.java	Sun Jul 26 21:27:11 2009 -0700
    54.3 @@ -28,10 +28,17 @@
    54.4  /**
    54.5   * Utilities to create specialized <tt>DeclarationVisitor</tt> instances.
    54.6   *
    54.7 + * @deprecated All components of this API have been superseded by the
    54.8 + * standardized annotation processing API.  There is no direct
    54.9 + * replacement for the functionality of this class in the standardized
   54.10 + * API due to that API's different visitor structure.
   54.11 + *
   54.12   * @author Joseph D. Darcy
   54.13   * @author Scott Seligman
   54.14   * @since 1.5
   54.15   */
   54.16 +@Deprecated
   54.17 +@SuppressWarnings("deprecation")
   54.18  public class DeclarationVisitors {
   54.19      private DeclarationVisitors(){} // do not instantiate.
   54.20  

    55.1 --- a/src/share/classes/com/sun/mirror/util/Declarations.java	Fri Jul 24 14:47:01 2009 -0700
    55.2 +++ b/src/share/classes/com/sun/mirror/util/Declarations.java	Sun Jul 26 21:27:11 2009 -0700
    55.3 @@ -32,11 +32,17 @@
    55.4  /**
    55.5   * Utility methods for operating on declarations.
    55.6   *
    55.7 + * @deprecated All components of this API have been superseded by the
    55.8 + * standardized annotation processing API.  The replacement for the
    55.9 + * functionality of this interface is {@link
   55.10 + * javax.lang.model.util.Elements}.
   55.11 + *
   55.12   * @author Joseph D. Darcy
   55.13   * @author Scott Seligman
   55.14   * @since 1.5
   55.15   */
   55.16 -
   55.17 +@Deprecated
   55.18 +@SuppressWarnings("deprecation")
   55.19  public interface Declarations {
   55.20  
   55.21      /**

    56.1 --- a/src/share/classes/com/sun/mirror/util/SimpleDeclarationVisitor.java	Fri Jul 24 14:47:01 2009 -0700
    56.2 +++ b/src/share/classes/com/sun/mirror/util/SimpleDeclarationVisitor.java	Sun Jul 26 21:27:11 2009 -0700
    56.3 @@ -37,11 +37,17 @@
    56.4   * methods that correspond to the kinds of declarations on which it
    56.5   * will operate.
    56.6   *
    56.7 + * @deprecated All components of this API have been superseded by the
    56.8 + * standardized annotation processing API.  The replacement for the
    56.9 + * functionality of this class is {@link
   56.10 + * javax.lang.model.util.SimpleElementVisitor6}.
   56.11 + *
   56.12   * @author Joseph D. Darcy
   56.13   * @author Scott Seligman
   56.14   * @since 1.5
   56.15   */
   56.16 -
   56.17 +@Deprecated
   56.18 +@SuppressWarnings("deprecation")
   56.19  public class SimpleDeclarationVisitor implements DeclarationVisitor {
   56.20  
   56.21      /**

    57.1 --- a/src/share/classes/com/sun/mirror/util/SimpleTypeVisitor.java	Fri Jul 24 14:47:01 2009 -0700
    57.2 +++ b/src/share/classes/com/sun/mirror/util/SimpleTypeVisitor.java	Sun Jul 26 21:27:11 2009 -0700
    57.3 @@ -37,11 +37,17 @@
    57.4   * methods that correspond to the kinds of types on which it will
    57.5   * operate.
    57.6   *
    57.7 + * @deprecated All components of this API have been superseded by the
    57.8 + * standardized annotation processing API.  The replacement for the
    57.9 + * functionality of this class is {@link
   57.10 + * javax.lang.model.util.SimpleTypeVisitor6}.
   57.11 + *
   57.12   * @author Joseph D. Darcy
   57.13   * @author Scott Seligman
   57.14   * @since 1.5
   57.15   */
   57.16 -
   57.17 +@Deprecated
   57.18 +@SuppressWarnings("deprecation")
   57.19  public class SimpleTypeVisitor implements TypeVisitor {
   57.20  
   57.21      /**

    58.1 --- a/src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java	Fri Jul 24 14:47:01 2009 -0700
    58.2 +++ b/src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java	Sun Jul 26 21:27:11 2009 -0700
    58.3 @@ -42,10 +42,17 @@
    58.4   * are scanned; the postprocessing visitor is called after the
    58.5   * contained declarations are scanned.
    58.6   *
    58.7 + * @deprecated All components of this API have been superseded by the
    58.8 + * standardized annotation processing API.  The replacement for the
    58.9 + * functionality of this class is {@link
   58.10 + * javax.lang.model.util.SimpleElementVisitor6}.
   58.11 + *
   58.12   * @author Joseph D. Darcy
   58.13   * @author Scott Seligman
   58.14   * @since 1.5
   58.15   */
   58.16 +@Deprecated
   58.17 +@SuppressWarnings("deprecation")
   58.18  class SourceOrderDeclScanner extends DeclarationScanner {
   58.19      static class SourceOrderComparator implements java.util.Comparator<Declaration> {
   58.20          SourceOrderComparator(){}

    59.1 --- a/src/share/classes/com/sun/mirror/util/SourcePosition.java	Fri Jul 24 14:47:01 2009 -0700
    59.2 +++ b/src/share/classes/com/sun/mirror/util/SourcePosition.java	Sun Jul 26 21:27:11 2009 -0700
    59.3 @@ -32,11 +32,20 @@
    59.4  /**
    59.5   * Represents a position in a source file.
    59.6   *
    59.7 + * @deprecated All components of this API have been superseded by the
    59.8 + * standardized annotation processing API.  There is no direct
    59.9 + * replacement for the functionality of this interface since the
   59.10 + * standardized {@link javax.annotation.processing.Messager Messager}
   59.11 + * API implicitly takes a source position argument via any element,
   59.12 + * annotation mirror, or annotation value passed along with the
   59.13 + * message.
   59.14 + *
   59.15   * @author Joseph D. Darcy
   59.16   * @author Scott Seligman
   59.17   * @since 1.5
   59.18   */
   59.19 -
   59.20 +@Deprecated
   59.21 +@SuppressWarnings("deprecation")
   59.22  public interface SourcePosition {
   59.23  
   59.24      /**

    60.1 --- a/src/share/classes/com/sun/mirror/util/TypeVisitor.java	Fri Jul 24 14:47:01 2009 -0700
    60.2 +++ b/src/share/classes/com/sun/mirror/util/TypeVisitor.java	Sun Jul 26 21:27:11 2009 -0700
    60.3 @@ -38,11 +38,17 @@
    60.4   * the most specific <tt>visit<i>Xxx</i></tt> method applicable to
    60.5   * that type is invoked.
    60.6   *
    60.7 + * @deprecated All components of this API have been superseded by the
    60.8 + * standardized annotation processing API.  The replacement for the
    60.9 + * functionality of this interface is {@link
   60.10 + * javax.lang.model.element.TypeVisitor}.
   60.11 + *
   60.12   * @author Joseph D. Darcy
   60.13   * @author Scott Seligman
   60.14   * @since 1.5
   60.15   */
   60.16 -
   60.17 +@Deprecated
   60.18 +@SuppressWarnings("deprecation")
   60.19  public interface TypeVisitor {
   60.20  
   60.21      /**

    61.1 --- a/src/share/classes/com/sun/mirror/util/Types.java	Fri Jul 24 14:47:01 2009 -0700
    61.2 +++ b/src/share/classes/com/sun/mirror/util/Types.java	Sun Jul 26 21:27:11 2009 -0700
    61.3 @@ -35,11 +35,17 @@
    61.4  /**
    61.5   * Utility methods for operating on types.
    61.6   *
    61.7 + * @deprecated All components of this API have been superseded by the
    61.8 + * standardized annotation processing API.  The replacement for the
    61.9 + * functionality of this interface is {@link
   61.10 + * javax.lang.model.util.Types}.
   61.11 + *
   61.12   * @author Joseph D. Darcy
   61.13   * @author Scott Seligman
   61.14   * @since 1.5
   61.15   */
   61.16 -
   61.17 +@Deprecated
   61.18 +@SuppressWarnings("deprecation")
   61.19  public interface Types {
   61.20  
   61.21      /**

    62.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    62.2 +++ b/src/share/classes/com/sun/mirror/util/package-info.java	Sun Jul 26 21:27:11 2009 -0700
    62.3 @@ -0,0 +1,37 @@
    62.4 +/*
    62.5 + * Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
    62.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    62.7 + *
    62.8 + * This code is free software; you can redistribute it and/or modify it
    62.9 + * under the terms of the GNU General Public License version 2 only, as
   62.10 + * published by the Free Software Foundation.  Sun designates this
   62.11 + * particular file as subject to the "Classpath" exception as provided
   62.12 + * by Sun in the LICENSE file that accompanied this code.
   62.13 + *
   62.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   62.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   62.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   62.17 + * version 2 for more details (a copy is included in the LICENSE file that
   62.18 + * accompanied this code).
   62.19 + *
   62.20 + * You should have received a copy of the GNU General Public License version
   62.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   62.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   62.23 + *
   62.24 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   62.25 + * CA 95054 USA or visit www.sun.com if you need additional information or
   62.26 + * have any questions.
   62.27 + */
   62.28 +
   62.29 +/**
   62.30 + * Utilities to assist in the processing of {@linkplain
   62.31 + * com.sun.mirror.declaration declarations} and {@linkplain
   62.32 + * com.sun.mirror.type types}.
   62.33 + *
   62.34 + * <p>The {@code apt} tool and its associated API have been superseded
   62.35 + * by the standardized annotation processing API.  The replacement for
   62.36 + * the functionality in this package is {@link javax.lang.model.util}.
   62.37 + *
   62.38 + * @since 1.5
   62.39 + */
   62.40 +package com.sun.mirror.util;

    63.1 --- a/src/share/classes/com/sun/mirror/util/package.html	Fri Jul 24 14:47:01 2009 -0700
    63.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    63.3 @@ -1,42 +0,0 @@
    63.4 -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
    63.5 -<html>
    63.6 -<head>
    63.7 -<!--
    63.8 -
    63.9 -Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
   63.10 -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   63.11 -
   63.12 -This code is free software; you can redistribute it and/or modify it
   63.13 -under the terms of the GNU General Public License version 2 only, as
   63.14 -published by the Free Software Foundation.  Sun designates this
   63.15 -particular file as subject to the "Classpath" exception as provided
   63.16 -by Sun in the LICENSE file that accompanied this code.
   63.17 -
   63.18 -This code is distributed in the hope that it will be useful, but WITHOUT
   63.19 -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   63.20 -FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   63.21 -version 2 for more details (a copy is included in the LICENSE file that
   63.22 -accompanied this code).
   63.23 -
   63.24 -You should have received a copy of the GNU General Public License version
   63.25 -2 along with this work; if not, write to the Free Software Foundation,
   63.26 -Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   63.27 -
   63.28 -Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   63.29 -CA 95054 USA or visit www.sun.com if you need additional information or
   63.30 -have any questions.
   63.31 --->
   63.32 -
   63.33 -</head>
   63.34 -<body bgcolor="white">
   63.35 -
   63.36 -Utilities to assist in the processing of {@linkplain
   63.37 -com.sun.mirror.declaration declarations} and {@linkplain
   63.38 -com.sun.mirror.type types}.
   63.39 -
   63.40 -<p>Note that the <code>apt</code> tool and its associated APIs may be
   63.41 -changed or superseded in future j2se releases.
   63.42 -
   63.43 -@since 1.5
   63.44 -</body>
   63.45 -</html>

    64.1 --- a/src/share/classes/com/sun/tools/apt/comp/Apt.java	Fri Jul 24 14:47:01 2009 -0700
    64.2 +++ b/src/share/classes/com/sun/tools/apt/comp/Apt.java	Sun Jul 26 21:27:11 2009 -0700
    64.3 @@ -65,6 +65,7 @@
    64.4   *  risk.  This code and its internal interfaces are subject to change
    64.5   *  or deletion without notice.</b>
    64.6   */
    64.7 +@SuppressWarnings("deprecation")
    64.8  public class Apt extends ListBuffer<Env<AttrContext>> {
    64.9      java.util.Set<String> genSourceFileNames = new java.util.LinkedHashSet<String>();
   64.10      public java.util.Set<String> getSourceFileNames() {

    65.1 --- a/src/share/classes/com/sun/tools/apt/comp/BootstrapAPF.java	Fri Jul 24 14:47:01 2009 -0700
    65.2 +++ b/src/share/classes/com/sun/tools/apt/comp/BootstrapAPF.java	Sun Jul 26 21:27:11 2009 -0700
    65.3 @@ -29,6 +29,7 @@
    65.4  import com.sun.mirror.apt.*;
    65.5  import com.sun.mirror.declaration.AnnotationTypeDeclaration;
    65.6  
    65.7 +@SuppressWarnings("deprecation")
    65.8  public class BootstrapAPF implements AnnotationProcessorFactory {
    65.9  
   65.10      static final Collection<String> supportedOptions =

    66.1 --- a/src/share/classes/com/sun/tools/apt/comp/PrintAP.java	Fri Jul 24 14:47:01 2009 -0700
    66.2 +++ b/src/share/classes/com/sun/tools/apt/comp/PrintAP.java	Sun Jul 26 21:27:11 2009 -0700
    66.3 @@ -36,6 +36,7 @@
    66.4  /**
    66.5   * Class used to implement "-print" option.
    66.6   */
    66.7 +@SuppressWarnings("deprecation")
    66.8  public class PrintAP implements AnnotationProcessor {
    66.9  
   66.10  

    67.1 --- a/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java	Fri Jul 24 14:47:01 2009 -0700
    67.2 +++ b/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java	Sun Jul 26 21:27:11 2009 -0700
    67.3 @@ -50,6 +50,7 @@
    67.4   *  risk.  This code and its internal interfaces are subject to change
    67.5   *  or deletion without notice.</b>
    67.6   */
    67.7 +@SuppressWarnings("deprecation")
    67.8  public class JavaCompiler extends com.sun.tools.javac.main.JavaCompiler {
    67.9      /** The context key for the compiler. */
   67.10      protected static final Context.Key<JavaCompiler> compilerKey =

    68.1 --- a/src/share/classes/com/sun/tools/apt/main/Main.java	Fri Jul 24 14:47:01 2009 -0700
    68.2 +++ b/src/share/classes/com/sun/tools/apt/main/Main.java	Sun Jul 26 21:27:11 2009 -0700
    68.3 @@ -64,6 +64,7 @@
    68.4   *  risk.  This code and its internal interfaces are subject to change
    68.5   *  or deletion without notice.</b>
    68.6   */
    68.7 +@SuppressWarnings("deprecation")
    68.8  public class Main {
    68.9  
   68.10      /** For testing: enter any options you want to be set implicitly
   68.11 @@ -780,7 +781,6 @@
   68.12          // prefixed to command line arguments.
   68.13          processArgs(forcedOpts);
   68.14  
   68.15 -
   68.16          /*
   68.17           * A run of apt only gets passed the most recently generated
   68.18           * files; the initial run of apt gets passed the files from
   68.19 @@ -792,6 +792,11 @@
   68.20              // assign args the result of parse to capture results of
   68.21              // '@file' expansion
   68.22              origFilenames = processArgs((args=CommandLine.parse(args)));
   68.23 +
   68.24 +            if (options.get("suppress-tool-api-removal-message") == null) {
   68.25 +                Bark.printLines(out, getLocalizedString("misc.Deprecation"));
   68.26 +            }
   68.27 +
   68.28              if (origFilenames == null) {
   68.29                  return EXIT_CMDERR;
   68.30              } else if (origFilenames.size() == 0) {

    69.1 --- a/src/share/classes/com/sun/tools/apt/mirror/AptEnv.java	Fri Jul 24 14:47:01 2009 -0700
    69.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/AptEnv.java	Sun Jul 26 21:27:11 2009 -0700
    69.3 @@ -39,7 +39,7 @@
    69.4  /**
    69.5   * The environment for a run of apt.
    69.6   */
    69.7 -
    69.8 +@SuppressWarnings("deprecation")
    69.9  public class AptEnv {
   69.10  
   69.11      public Names names;                 // javac's name table

    70.1 --- a/src/share/classes/com/sun/tools/apt/mirror/apt/AnnotationProcessorEnvironmentImpl.java	Fri Jul 24 14:47:01 2009 -0700
    70.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/apt/AnnotationProcessorEnvironmentImpl.java	Sun Jul 26 21:27:11 2009 -0700
    70.3 @@ -47,6 +47,7 @@
    70.4  /*
    70.5   * Annotation Processor Environment implementation.
    70.6   */
    70.7 +@SuppressWarnings("deprecation")
    70.8  public class AnnotationProcessorEnvironmentImpl implements AnnotationProcessorEnvironment {
    70.9  
   70.10      Collection<TypeDeclaration> spectypedecls;

    71.1 --- a/src/share/classes/com/sun/tools/apt/mirror/apt/FilerImpl.java	Fri Jul 24 14:47:01 2009 -0700
    71.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/apt/FilerImpl.java	Sun Jul 26 21:27:11 2009 -0700
    71.3 @@ -45,7 +45,7 @@
    71.4  /**
    71.5   * Implementation of Filer.
    71.6   */
    71.7 -
    71.8 +@SuppressWarnings("deprecation")
    71.9  public class FilerImpl implements Filer {
   71.10      /*
   71.11       * The Filer class must maintain a number of constraints.  First,

    72.1 --- a/src/share/classes/com/sun/tools/apt/mirror/apt/MessagerImpl.java	Fri Jul 24 14:47:01 2009 -0700
    72.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/apt/MessagerImpl.java	Sun Jul 26 21:27:11 2009 -0700
    72.3 @@ -38,7 +38,7 @@
    72.4  /**
    72.5   * Implementation of Messager.
    72.6   */
    72.7 -
    72.8 +@SuppressWarnings("deprecation")
    72.9  public class MessagerImpl implements Messager {
   72.10      private final Bark bark;
   72.11  

    73.1 --- a/src/share/classes/com/sun/tools/apt/mirror/apt/RoundCompleteEventImpl.java	Fri Jul 24 14:47:01 2009 -0700
    73.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/apt/RoundCompleteEventImpl.java	Sun Jul 26 21:27:11 2009 -0700
    73.3 @@ -29,6 +29,7 @@
    73.4  import com.sun.mirror.apt.RoundCompleteEvent;
    73.5  import com.sun.mirror.apt.RoundState;
    73.6  
    73.7 +@SuppressWarnings("deprecation")
    73.8  public class RoundCompleteEventImpl extends RoundCompleteEvent {
    73.9      private static final long serialVersionUID = 7067621446720784300L;
   73.10  

    74.1 --- a/src/share/classes/com/sun/tools/apt/mirror/apt/RoundStateImpl.java	Fri Jul 24 14:47:01 2009 -0700
    74.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/apt/RoundStateImpl.java	Sun Jul 26 21:27:11 2009 -0700
    74.3 @@ -28,6 +28,7 @@
    74.4  import com.sun.mirror.apt.RoundState;
    74.5  import java.util.Map;
    74.6  
    74.7 +@SuppressWarnings("deprecation")
    74.8  public class RoundStateImpl implements RoundState {
    74.9      private final boolean finalRound;
   74.10      private final boolean errorRaised;

    75.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationMirrorImpl.java	Fri Jul 24 14:47:01 2009 -0700
    75.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationMirrorImpl.java	Sun Jul 26 21:27:11 2009 -0700
    75.3 @@ -42,7 +42,7 @@
    75.4  /**
    75.5   * Implementation of AnnotationMirror
    75.6   */
    75.7 -
    75.8 +@SuppressWarnings("deprecation")
    75.9  public class AnnotationMirrorImpl implements AnnotationMirror {
   75.10  
   75.11      protected final AptEnv env;

    76.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java	Fri Jul 24 14:47:01 2009 -0700
    76.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java	Sun Jul 26 21:27:11 2009 -0700
    76.3 @@ -49,7 +49,7 @@
    76.4   * <p> The "dynamic proxy return form" of an attribute element value is
    76.5   * the form used by sun.reflect.annotation.AnnotationInvocationHandler.
    76.6   */
    76.7 -
    76.8 +@SuppressWarnings("deprecation")
    76.9  class AnnotationProxyMaker {
   76.10  
   76.11      private final AptEnv env;

    77.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeDeclarationImpl.java	Fri Jul 24 14:47:01 2009 -0700
    77.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeDeclarationImpl.java	Sun Jul 26 21:27:11 2009 -0700
    77.3 @@ -37,7 +37,7 @@
    77.4  /**
    77.5   * Implementation of AnnotationTypeDeclaration
    77.6   */
    77.7 -
    77.8 +@SuppressWarnings("deprecation")
    77.9  public class AnnotationTypeDeclarationImpl extends InterfaceDeclarationImpl
   77.10                                             implements AnnotationTypeDeclaration
   77.11  {

    78.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeElementDeclarationImpl.java	Fri Jul 24 14:47:01 2009 -0700
    78.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeElementDeclarationImpl.java	Sun Jul 26 21:27:11 2009 -0700
    78.3 @@ -35,7 +35,7 @@
    78.4  /**
    78.5   * Implementation of AnnotationTypeElementDeclaration
    78.6   */
    78.7 -
    78.8 +@SuppressWarnings("deprecation")
    78.9  public class AnnotationTypeElementDeclarationImpl extends MethodDeclarationImpl
   78.10                                    implements AnnotationTypeElementDeclaration {
   78.11  

    79.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationValueImpl.java	Fri Jul 24 14:47:01 2009 -0700
    79.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationValueImpl.java	Sun Jul 26 21:27:11 2009 -0700
    79.3 @@ -40,7 +40,7 @@
    79.4  /**
    79.5   * Implementation of AnnotationValue
    79.6   */
    79.7 -
    79.8 +@SuppressWarnings("deprecation")
    79.9  public class AnnotationValueImpl implements AnnotationValue {
   79.10  
   79.11      protected final AptEnv env;

    80.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/ClassDeclarationImpl.java	Fri Jul 24 14:47:01 2009 -0700
    80.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/ClassDeclarationImpl.java	Sun Jul 26 21:27:11 2009 -0700
    80.3 @@ -42,7 +42,7 @@
    80.4  /**
    80.5   * Implementation of ClassDeclaration
    80.6   */
    80.7 -
    80.8 +@SuppressWarnings("deprecation")
    80.9  public class ClassDeclarationImpl extends TypeDeclarationImpl
   80.10                                    implements ClassDeclaration {
   80.11  

    81.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java	Fri Jul 24 14:47:01 2009 -0700
    81.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java	Sun Jul 26 21:27:11 2009 -0700
    81.3 @@ -39,6 +39,7 @@
    81.4  /**
    81.5   * Utility class for operating on constant expressions.
    81.6   */
    81.7 +@SuppressWarnings("deprecation")
    81.8  class Constants {
    81.9  
   81.10      /**

    82.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/ConstructorDeclarationImpl.java	Fri Jul 24 14:47:01 2009 -0700
    82.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/ConstructorDeclarationImpl.java	Sun Jul 26 21:27:11 2009 -0700
    82.3 @@ -39,7 +39,7 @@
    82.4  /**
    82.5   * Implementation of ConstructorDeclaration
    82.6   */
    82.7 -
    82.8 +@SuppressWarnings("deprecation")
    82.9  public class ConstructorDeclarationImpl extends ExecutableDeclarationImpl
   82.10                                          implements ConstructorDeclaration {
   82.11  

    83.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationImpl.java	Fri Jul 24 14:47:01 2009 -0700
    83.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationImpl.java	Sun Jul 26 21:27:11 2009 -0700
    83.3 @@ -52,7 +52,7 @@
    83.4  /**
    83.5   * Implementation of Declaration
    83.6   */
    83.7 -
    83.8 +@SuppressWarnings("deprecation")
    83.9  public abstract class DeclarationImpl implements Declaration {
   83.10  
   83.11      protected final AptEnv env;

    84.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationMaker.java	Fri Jul 24 14:47:01 2009 -0700
    84.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationMaker.java	Sun Jul 26 21:27:11 2009 -0700
    84.3 @@ -40,7 +40,7 @@
    84.4  /**
    84.5   * Utilities for constructing and caching declarations.
    84.6   */
    84.7 -
    84.8 +@SuppressWarnings("deprecation")
    84.9  public class DeclarationMaker {
   84.10  
   84.11      private AptEnv env;

    85.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumConstantDeclarationImpl.java	Fri Jul 24 14:47:01 2009 -0700
    85.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumConstantDeclarationImpl.java	Sun Jul 26 21:27:11 2009 -0700
    85.3 @@ -35,7 +35,7 @@
    85.4  /**
    85.5   * Implementation of EnumConstantDeclaration
    85.6   */
    85.7 -
    85.8 +@SuppressWarnings("deprecation")
    85.9  public class EnumConstantDeclarationImpl extends FieldDeclarationImpl
   85.10                                           implements EnumConstantDeclaration {
   85.11  

    86.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumDeclarationImpl.java	Fri Jul 24 14:47:01 2009 -0700
    86.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumDeclarationImpl.java	Sun Jul 26 21:27:11 2009 -0700
    86.3 @@ -37,7 +37,7 @@
    86.4  /**
    86.5   * Implementation of EnumDeclaration
    86.6   */
    86.7 -
    86.8 +@SuppressWarnings("deprecation")
    86.9  public class EnumDeclarationImpl extends ClassDeclarationImpl
   86.10                                   implements EnumDeclaration {
   86.11  

    87.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/ExecutableDeclarationImpl.java	Fri Jul 24 14:47:01 2009 -0700
    87.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/ExecutableDeclarationImpl.java	Sun Jul 26 21:27:11 2009 -0700
    87.3 @@ -39,7 +39,7 @@
    87.4  /**
    87.5   * Implementation of ExecutableDeclaration
    87.6   */
    87.7 -
    87.8 +@SuppressWarnings("deprecation")
    87.9  public abstract class ExecutableDeclarationImpl extends MemberDeclarationImpl
   87.10                                               implements ExecutableDeclaration {
   87.11      public MethodSymbol sym;

    88.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/FieldDeclarationImpl.java	Fri Jul 24 14:47:01 2009 -0700
    88.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/FieldDeclarationImpl.java	Sun Jul 26 21:27:11 2009 -0700
    88.3 @@ -40,7 +40,7 @@
    88.4  /**
    88.5   * Implementation of FieldDeclaration
    88.6   */
    88.7 -
    88.8 +@SuppressWarnings("deprecation")
    88.9  class FieldDeclarationImpl extends MemberDeclarationImpl
   88.10                                    implements FieldDeclaration {
   88.11  

    89.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/InterfaceDeclarationImpl.java	Fri Jul 24 14:47:01 2009 -0700
    89.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/InterfaceDeclarationImpl.java	Sun Jul 26 21:27:11 2009 -0700
    89.3 @@ -35,7 +35,7 @@
    89.4  /**
    89.5   * Implementation of InterfaceDeclaration
    89.6   */
    89.7 -
    89.8 +@SuppressWarnings("deprecation")
    89.9  public class InterfaceDeclarationImpl extends TypeDeclarationImpl
   89.10                                        implements InterfaceDeclaration {
   89.11  

    90.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/MemberDeclarationImpl.java	Fri Jul 24 14:47:01 2009 -0700
    90.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/MemberDeclarationImpl.java	Sun Jul 26 21:27:11 2009 -0700
    90.3 @@ -40,7 +40,7 @@
    90.4  /**
    90.5   * Implementation of MemberDeclaration
    90.6   */
    90.7 -
    90.8 +@SuppressWarnings("deprecation")
    90.9  public abstract class MemberDeclarationImpl extends DeclarationImpl
   90.10                                              implements MemberDeclaration {
   90.11  

    91.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/MethodDeclarationImpl.java	Fri Jul 24 14:47:01 2009 -0700
    91.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/MethodDeclarationImpl.java	Sun Jul 26 21:27:11 2009 -0700
    91.3 @@ -36,7 +36,7 @@
    91.4  /**
    91.5   * Implementation of MethodDeclaration
    91.6   */
    91.7 -
    91.8 +@SuppressWarnings("deprecation")
    91.9  public class MethodDeclarationImpl extends ExecutableDeclarationImpl
   91.10                                     implements MethodDeclaration {
   91.11  

    92.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/PackageDeclarationImpl.java	Fri Jul 24 14:47:01 2009 -0700
    92.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/PackageDeclarationImpl.java	Sun Jul 26 21:27:11 2009 -0700
    92.3 @@ -39,7 +39,7 @@
    92.4  /**
    92.5   * Implementation of PackageDeclaration.
    92.6   */
    92.7 -
    92.8 +@SuppressWarnings("deprecation")
    92.9  public class PackageDeclarationImpl extends DeclarationImpl
   92.10                                      implements PackageDeclaration {
   92.11  

    93.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/ParameterDeclarationImpl.java	Fri Jul 24 14:47:01 2009 -0700
    93.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/ParameterDeclarationImpl.java	Sun Jul 26 21:27:11 2009 -0700
    93.3 @@ -39,7 +39,7 @@
    93.4  /**
    93.5   * Implementation of ParameterDeclaration
    93.6   */
    93.7 -
    93.8 +@SuppressWarnings("deprecation")
    93.9  public class ParameterDeclarationImpl extends DeclarationImpl
   93.10                                        implements ParameterDeclaration
   93.11  {

    94.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeDeclarationImpl.java	Fri Jul 24 14:47:01 2009 -0700
    94.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeDeclarationImpl.java	Sun Jul 26 21:27:11 2009 -0700
    94.3 @@ -40,7 +40,7 @@
    94.4  /**
    94.5   * Implementation of TypeDeclaration
    94.6   */
    94.7 -
    94.8 +@SuppressWarnings("deprecation")
    94.9  public class TypeDeclarationImpl extends MemberDeclarationImpl
   94.10                                   implements TypeDeclaration {
   94.11  

    95.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeParameterDeclarationImpl.java	Fri Jul 24 14:47:01 2009 -0700
    95.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeParameterDeclarationImpl.java	Sun Jul 26 21:27:11 2009 -0700
    95.3 @@ -40,7 +40,7 @@
    95.4  /**
    95.5   * Implementation of TypeParameterDeclaration
    95.6   */
    95.7 -
    95.8 +@SuppressWarnings("deprecation")
    95.9  public class TypeParameterDeclarationImpl extends DeclarationImpl
   95.10                                            implements TypeParameterDeclaration
   95.11  {

    96.1 --- a/src/share/classes/com/sun/tools/apt/mirror/type/AnnotationTypeImpl.java	Fri Jul 24 14:47:01 2009 -0700
    96.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/type/AnnotationTypeImpl.java	Sun Jul 26 21:27:11 2009 -0700
    96.3 @@ -36,7 +36,7 @@
    96.4  /**
    96.5   * Implementation of AnnotationType
    96.6   */
    96.7 -
    96.8 +@SuppressWarnings("deprecation")
    96.9  public class AnnotationTypeImpl extends InterfaceTypeImpl
   96.10                                  implements AnnotationType {
   96.11  

    97.1 --- a/src/share/classes/com/sun/tools/apt/mirror/type/ArrayTypeImpl.java	Fri Jul 24 14:47:01 2009 -0700
    97.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/type/ArrayTypeImpl.java	Sun Jul 26 21:27:11 2009 -0700
    97.3 @@ -35,7 +35,7 @@
    97.4  /**
    97.5   * Implementation of ArrayType
    97.6   */
    97.7 -
    97.8 +@SuppressWarnings("deprecation")
    97.9  public class ArrayTypeImpl extends TypeMirrorImpl implements ArrayType {
   97.10  
   97.11      protected Type.ArrayType type;

    98.1 --- a/src/share/classes/com/sun/tools/apt/mirror/type/ClassTypeImpl.java	Fri Jul 24 14:47:01 2009 -0700
    98.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/type/ClassTypeImpl.java	Sun Jul 26 21:27:11 2009 -0700
    98.3 @@ -36,7 +36,7 @@
    98.4  /**
    98.5   * Implementation of ClassType
    98.6   */
    98.7 -
    98.8 +@SuppressWarnings("deprecation")
    98.9  public class ClassTypeImpl extends DeclaredTypeImpl implements ClassType {
   98.10  
   98.11      ClassTypeImpl(AptEnv env, Type.ClassType type) {

    99.1 --- a/src/share/classes/com/sun/tools/apt/mirror/type/DeclaredTypeImpl.java	Fri Jul 24 14:47:01 2009 -0700
    99.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/type/DeclaredTypeImpl.java	Sun Jul 26 21:27:11 2009 -0700
    99.3 @@ -38,7 +38,7 @@
    99.4  /**
    99.5   * Implementation of DeclaredType
    99.6   */
    99.7 -
    99.8 +@SuppressWarnings("deprecation")
    99.9  abstract class DeclaredTypeImpl extends TypeMirrorImpl
   99.10                                  implements DeclaredType {
   99.11  

   100.1 --- a/src/share/classes/com/sun/tools/apt/mirror/type/EnumTypeImpl.java	Fri Jul 24 14:47:01 2009 -0700
   100.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/type/EnumTypeImpl.java	Sun Jul 26 21:27:11 2009 -0700
   100.3 @@ -36,7 +36,7 @@
   100.4  /**
   100.5   * Implementation of EnumType
   100.6   */
   100.7 -
   100.8 +@SuppressWarnings("deprecation")
   100.9  public class EnumTypeImpl extends ClassTypeImpl implements EnumType {
  100.10  
  100.11      EnumTypeImpl(AptEnv env, Type.ClassType type) {

   101.1 --- a/src/share/classes/com/sun/tools/apt/mirror/type/InterfaceTypeImpl.java	Fri Jul 24 14:47:01 2009 -0700
   101.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/type/InterfaceTypeImpl.java	Sun Jul 26 21:27:11 2009 -0700
   101.3 @@ -36,7 +36,7 @@
   101.4  /**
   101.5   * Implementation of InterfaceType
   101.6   */
   101.7 -
   101.8 +@SuppressWarnings("deprecation")
   101.9  public class InterfaceTypeImpl extends DeclaredTypeImpl
  101.10                                 implements InterfaceType {
  101.11  

   102.1 --- a/src/share/classes/com/sun/tools/apt/mirror/type/PrimitiveTypeImpl.java	Fri Jul 24 14:47:01 2009 -0700
   102.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/type/PrimitiveTypeImpl.java	Sun Jul 26 21:27:11 2009 -0700
   102.3 @@ -38,7 +38,7 @@
   102.4  /**
   102.5   * Implementation of PrimitiveType.
   102.6   */
   102.7 -
   102.8 +@SuppressWarnings("deprecation")
   102.9  class PrimitiveTypeImpl extends TypeMirrorImpl implements PrimitiveType {
  102.10  
  102.11      private final Kind kind;    // the kind of primitive

   103.1 --- a/src/share/classes/com/sun/tools/apt/mirror/type/TypeMaker.java	Fri Jul 24 14:47:01 2009 -0700
   103.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/type/TypeMaker.java	Sun Jul 26 21:27:11 2009 -0700
   103.3 @@ -41,7 +41,7 @@
   103.4  /**
   103.5   * Utilities for constructing type objects.
   103.6   */
   103.7 -
   103.8 +@SuppressWarnings("deprecation")
   103.9  public class TypeMaker {
  103.10  
  103.11      private final AptEnv env;

   104.1 --- a/src/share/classes/com/sun/tools/apt/mirror/type/TypeMirrorImpl.java	Fri Jul 24 14:47:01 2009 -0700
   104.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/type/TypeMirrorImpl.java	Sun Jul 26 21:27:11 2009 -0700
   104.3 @@ -35,7 +35,7 @@
   104.4  /**
   104.5   * Implementation of TypeMirror
   104.6   */
   104.7 -
   104.8 +@SuppressWarnings("deprecation")
   104.9  public abstract class TypeMirrorImpl implements TypeMirror {
  104.10  
  104.11      protected final AptEnv env;

   105.1 --- a/src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java	Fri Jul 24 14:47:01 2009 -0700
   105.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java	Sun Jul 26 21:27:11 2009 -0700
   105.3 @@ -40,7 +40,7 @@
   105.4  /**
   105.5   * Implementation of TypeVariable
   105.6   */
   105.7 -
   105.8 +@SuppressWarnings("deprecation")
   105.9  public class TypeVariableImpl extends TypeMirrorImpl implements TypeVariable {
  105.10  
  105.11      protected Type.TypeVar type;

   106.1 --- a/src/share/classes/com/sun/tools/apt/mirror/type/VoidTypeImpl.java	Fri Jul 24 14:47:01 2009 -0700
   106.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/type/VoidTypeImpl.java	Sun Jul 26 21:27:11 2009 -0700
   106.3 @@ -34,7 +34,7 @@
   106.4  /**
   106.5   * Implementation of VoidType.
   106.6   */
   106.7 -
   106.8 +@SuppressWarnings("deprecation")
   106.9  class VoidTypeImpl extends TypeMirrorImpl implements VoidType {
  106.10  
  106.11      VoidTypeImpl(AptEnv env) {

   107.1 --- a/src/share/classes/com/sun/tools/apt/mirror/type/WildcardTypeImpl.java	Fri Jul 24 14:47:01 2009 -0700
   107.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/type/WildcardTypeImpl.java	Sun Jul 26 21:27:11 2009 -0700
   107.3 @@ -41,7 +41,7 @@
   107.4  /**
   107.5   * Implementation of WildcardType
   107.6   */
   107.7 -
   107.8 +@SuppressWarnings("deprecation")
   107.9  public class WildcardTypeImpl extends TypeMirrorImpl implements WildcardType {
  107.10  
  107.11      protected Type.WildcardType type;

   108.1 --- a/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java	Fri Jul 24 14:47:01 2009 -0700
   108.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java	Sun Jul 26 21:27:11 2009 -0700
   108.3 @@ -42,7 +42,7 @@
   108.4  /**
   108.5   * Implementation of Declarations utility methods for annotation processors
   108.6   */
   108.7 -
   108.8 +@SuppressWarnings("deprecation")
   108.9  public class DeclarationsImpl implements Declarations {
  108.10  
  108.11      private final AptEnv env;

   109.1 --- a/src/share/classes/com/sun/tools/apt/mirror/util/SourcePositionImpl.java	Fri Jul 24 14:47:01 2009 -0700
   109.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/util/SourcePositionImpl.java	Sun Jul 26 21:27:11 2009 -0700
   109.3 @@ -36,7 +36,7 @@
   109.4  /**
   109.5   * Implementation of SourcePosition
   109.6   */
   109.7 -
   109.8 +@SuppressWarnings("deprecation")
   109.9  public class SourcePositionImpl implements SourcePosition {
  109.10  
  109.11      private JavaFileObject sourcefile;

   110.1 --- a/src/share/classes/com/sun/tools/apt/mirror/util/TypesImpl.java	Fri Jul 24 14:47:01 2009 -0700
   110.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/util/TypesImpl.java	Sun Jul 26 21:27:11 2009 -0700
   110.3 @@ -44,7 +44,7 @@
   110.4  /**
   110.5   * Implementation of Types utility methods for annotation processors
   110.6   */
   110.7 -
   110.8 +@SuppressWarnings("deprecation")
   110.9  public class TypesImpl implements Types {
  110.10  
  110.11      private final AptEnv env;

   111.1 --- a/src/share/classes/com/sun/tools/apt/resources/apt.properties	Fri Jul 24 14:47:01 2009 -0700
   111.2 +++ b/src/share/classes/com/sun/tools/apt/resources/apt.properties	Sun Jul 26 21:27:11 2009 -0700
   111.3 @@ -111,6 +111,14 @@
   111.4  ## miscellaneous strings
   111.5  ##
   111.6  
   111.7 +apt.misc.Deprecation=\
   111.8 +    \nwarning:\u0020The apt tool and its associated API are planned to be\n\
   111.9 +    removed in the next major JDK release.  These features have been\n\
  111.10 +    superseded by javac and the standardized annotation processing API,\n\
  111.11 +    javax.annotation.processing and javax.lang.model.  Users are\n\
  111.12 +    recommended to migrate to the annotation processing features of\n\
  111.13 +    javac; see the javac man page for more information.\n
  111.14 +
  111.15  apt.misc.Problem=\
  111.16      Problem encountered during annotation processing; \nsee stacktrace below for more information.
  111.17  

   112.1 --- a/test/tools/apt/Basics/apt.sh	Fri Jul 24 14:47:01 2009 -0700
   112.2 +++ b/test/tools/apt/Basics/apt.sh	Sun Jul 26 21:27:11 2009 -0700
   112.3 @@ -43,7 +43,7 @@
   112.4  esac
   112.5  
   112.6  # Construct path to apt executable
   112.7 -APT="${TESTJAVA}/bin/apt ${TESTTOOLVMOPTS}"
   112.8 +APT="${TESTJAVA}/bin/apt ${TESTTOOLVMOPTS} -XDsuppress-tool-api-removal-message "
   112.9  
  112.10  printf "%s\n" "-classpath ${TESTCLASSES}"                    > options
  112.11  printf "%s\n" "-factorypath ./nullap.jar"                   >> options
  112.12 @@ -58,6 +58,7 @@
  112.13  printf "%s\n" "-XListAnnotationTypes"                       >> options1
  112.14  printf "%s\n" "-XclassesAsDecls"                            >> options1
  112.15  
  112.16 +
  112.17  # Construct path to javac executable
  112.18  JAVAC="${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} -source 1.5 -sourcepath ${TESTSRC} -classpath ${TESTJAVA}/lib/tools.jar -d . "
  112.19  JAR="${TESTJAVA}/bin/jar "

   113.1 --- a/test/tools/apt/Compile/compile.sh	Fri Jul 24 14:47:01 2009 -0700
   113.2 +++ b/test/tools/apt/Compile/compile.sh	Sun Jul 26 21:27:11 2009 -0700
   113.3 @@ -67,7 +67,7 @@
   113.4  esac
   113.5  
   113.6  
   113.7 -APT="${TESTJAVA}/bin/apt ${TESTTOOLVMOPTS} "
   113.8 +APT="${TESTJAVA}/bin/apt ${TESTTOOLVMOPTS} -XDsuppress-tool-api-removal-message "
   113.9  JAVA="${TESTJAVA}/bin/java ${TESTVMOPTS} "
  113.10  JAVAC="${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} "
  113.11