1.1 --- a/openide.util/apichanges.xml	Tue Jun 24 20:25:26 2008 +0200
     1.2 +++ b/openide.util/apichanges.xml	Wed Jun 25 10:15:37 2008 +0200
     1.3 @@ -51,18 +51,19 @@
     1.4  <changes>
     1.5      <change id="Utilities.toolTips">
     1.6          <api name="util"/>
     1.7 -        <summary>Image methods were made deprecated in Utilities, replacement is 
     1.8 -        ImageUtilities class (with additional methods). </summary>
     1.9 -        <version major="7" minor="14"/>
    1.10 +        <summary>ImageUtilities class (with additional methods) was created as 
    1.11 +        replacement for "image methods" in Utilities. </summary>
    1.12 +        <version major="7" minor="15"/>
    1.13          <date day="6" month="6" year="2008"/>
    1.14          <author login="t_h"/>
    1.15          <compatibility addition="yes"/>
    1.16          <description>
    1.17              <p>
    1.18 -                Image methods were made deprecated in Utilities. Replacement is
    1.19 -                <a href="@TOP@/org/openide/util/ImageUtilities.html">ImageUtilities</a>
    1.20 -                (renamed IconManager). It contains also new 
    1.21 -                methods for image tool tips manipulation:
    1.22 +                Image methods were separated to <a href="@TOP@/org/openide/util/ImageUtilities.html">ImageUtilities</a>
    1.23 +                (renamed IconManager) as replacement for methods in Utilities. 
    1.24 +                There are some additional methods for image tool tips manipulation.
    1.25 +            </p>
    1.26 +            <p>    
    1.27                  New methods for tool tips manipulation:
    1.28                  <code>Image assignToolTipToImage(Image image, String text)</code>;
    1.29                  <code>String getImageToolTip(Image image)</code>;
    1.30 @@ -73,7 +74,7 @@
    1.31                  <code>Icon image2Icon(Image image)</code>;
    1.32              </p>
    1.33              <p>
    1.34 -                Deprecated methods in <a href="@TOP@/org/openide/util/Utilities.html">Utilities</a>:
    1.35 +                "Moved" methods from <a href="@TOP@/org/openide/util/Utilities.html">Utilities</a>:
    1.36                  <code>Image icon2Image(Icon icon)</code>;
    1.37                  <code>Image loadImage(String resourceID)</code>;
    1.38                  <code>Image loadImage(String resource, boolean localized)</code>;

     2.1 --- a/openide.util/src/org/openide/util/Utilities.java	Tue Jun 24 20:25:26 2008 +0200
     2.2 +++ b/openide.util/src/org/openide/util/Utilities.java	Wed Jun 25 10:15:37 2008 +0200
     2.3 @@ -2585,14 +2585,13 @@
     2.4       * over the first one with its top-left corner at x, y. Images need not be of the same size.
     2.5       * New image will have a size of max(second image size + top-left corner, first image size).
     2.6       * Method is used mostly when second image contains transparent pixels (e.g. for badging).
     2.7 +     * <p>Please use {@link ImageUtilities#mergeImages}.
     2.8       * @param image1 underlying image
     2.9       * @param image2 second image
    2.10       * @param x x position of top-left corner
    2.11       * @param y y position of top-left corner
    2.12       * @return new merged image
    2.13 -     * @deprecated Use {@link ImageUtilities#mergeImages}.
    2.14       */
    2.15 -    @Deprecated
    2.16      public static final Image mergeImages(Image image1, Image image2, int x, int y) {
    2.17          return ImageUtilities.mergeImages(image1, image2, x, y);
    2.18      }
    2.19 @@ -2600,23 +2599,21 @@
    2.20      /**
    2.21       * Loads an image from the specified resource ID. The image is loaded using the "system" classloader registered in
    2.22       * Lookup.
    2.23 +     * <p>Please use {@link ImageUtilities#loadImage(java.lang.String)}.
    2.24       * @param resourceID resource path of the icon (no initial slash)
    2.25       * @return icon's Image, or null, if the icon cannot be loaded.
    2.26 -     * @deprecated Use {@link ImageUtilities#loadImage(java.lang.String)}.
    2.27       */
    2.28 -    @Deprecated
    2.29      public static final Image loadImage(String resourceID) {
    2.30          return ImageUtilities.loadImage(resourceID);
    2.31      }
    2.32  
    2.33      /**
    2.34       * Converts given icon to a {@link java.awt.Image}.
    2.35 +     * <p>Please use {@link ImageUtilities#icon2Image}.
    2.36       *
    2.37       * @param icon {@link javax.swing.Icon} to be converted.
    2.38       * @since 7.3
    2.39 -     * @deprecated Use {@link ImageUtilities#icon2Image}.
    2.40       */
    2.41 -    @Deprecated
    2.42      public static final Image icon2Image(Icon icon) {
    2.43          return ImageUtilities.icon2Image(icon);
    2.44      }
    2.45 @@ -2803,11 +2800,10 @@
    2.46       * or <samp>org/netbeans/modules/foo/resources/foo_mybranding.gif</samp>.
    2.47       * 
    2.48       * <p>Caching of loaded images can be used internally to improve performance.
    2.49 +     * <p>Please use {@link ImageUtilities#loadImage(java.lang.String, boolean)}.
    2.50       * 
    2.51       * @since 3.24
    2.52 -     * @deprecated Use {@link ImageUtilities#loadImage(java.lang.String, boolean)}.
    2.53       */
    2.54 -    @Deprecated
    2.55      public static final Image loadImage(String resource, boolean localized) {
    2.56          return ImageUtilities.loadImage(resource, localized);
    2.57      }