Using ImageUtilities.
authorJesse Glick <jglick@netbeans.org>
Fri, 15 May 2009 01:10:17 -0400
changeset 7830d7ab5cab025
parent 782 f7dc165aeb24
child 784 01e4c5ea3418
child 785 5f61d3551c0c
child 787 5413749e32c1
child 914 fd7c7b916fa7
Using ImageUtilities.
openide.util/src/org/openide/util/Utilities.java
     1.1 --- a/openide.util/src/org/openide/util/Utilities.java	Tue May 12 13:30:24 2009 +0200
     1.2 +++ b/openide.util/src/org/openide/util/Utilities.java	Fri May 15 01:10:17 2009 -0400
     1.3 @@ -2927,13 +2927,13 @@
     1.4  
     1.5          // First check for Mac because its part of the Unix_Mask
     1.6          if (isMac()) {
     1.7 -            image = loadImage("org/openide/util/progress-cursor-mac.gif"); //NOI18N
     1.8 +            image = ImageUtilities.loadImage("org/openide/util/progress-cursor-mac.gif"); //NOI18N
     1.9          } else if (isUnix()) {
    1.10 -            image = loadImage("org/openide/util/progress-cursor-motif.gif"); //NOI18N
    1.11 +            image = ImageUtilities.loadImage("org/openide/util/progress-cursor-motif.gif"); //NOI18N
    1.12          }
    1.13          // All other OS, including Windows, use Windows cursor
    1.14          else {
    1.15 -            image = loadImage("org/openide/util/progress-cursor-win.gif"); //NOI18N
    1.16 +            image = ImageUtilities.loadImage("org/openide/util/progress-cursor-win.gif"); //NOI18N
    1.17          }
    1.18  
    1.19          return createCustomCursor(component, image, "PROGRESS_CURSOR"); //NOI18N
    1.20 @@ -2953,7 +2953,7 @@
    1.21  
    1.22              // need to resize the icon
    1.23              Image empty = ImageUtilities.createBufferedImage(d.width, d.height);
    1.24 -            i = Utilities.mergeImages(icon, empty, 0, 0);
    1.25 +            i = ImageUtilities.mergeImages(icon, empty, 0, 0);
    1.26          }
    1.27  
    1.28          return t.createCustomCursor(i, new Point(1, 1), name);