jdk/src/solaris/classes/sun/awt/X11/XIconWindow.java
changeset 4191 ca8d3ef845c8
parent 439 3488710b02f8
child 4214 0fa32d38146b
equal deleted inserted replaced
4190:227655c2ff8c 4191:ca8d3ef845c8
    73             long sizes_ptr = Native.getLong(XlibWrapper.larg1); // XIconSize*
    73             long sizes_ptr = Native.getLong(XlibWrapper.larg1); // XIconSize*
    74             log.log(Level.FINEST, "count = {1}, sizes_ptr = {0}", new Object[] {Long.valueOf(sizes_ptr), Integer.valueOf(count)});
    74             log.log(Level.FINEST, "count = {1}, sizes_ptr = {0}", new Object[] {Long.valueOf(sizes_ptr), Integer.valueOf(count)});
    75             XIconSize[] res = new XIconSize[count];
    75             XIconSize[] res = new XIconSize[count];
    76             for (int i = 0; i < count; i++, sizes_ptr += XIconSize.getSize()) {
    76             for (int i = 0; i < count; i++, sizes_ptr += XIconSize.getSize()) {
    77                 res[i] = new XIconSize(sizes_ptr);
    77                 res[i] = new XIconSize(sizes_ptr);
    78                 log.log(Level.FINEST, "sizes_ptr[{1}] = {0}", new Object[] {res[i], Integer.valueOf(i)});
    78                 log.log(Level.FINEST, "sizes_ptr[{1}] = {0}", new Object[] {String.valueOf(res[i]), Integer.valueOf(i)});
    79             }
    79             }
    80             return res;
    80             return res;
    81         } finally {
    81         } finally {
    82             XToolkit.awtUnlock();
    82             XToolkit.awtUnlock();
    83         }
    83         }
    90             log.log(Level.FINEST, "Returning ICE_WM icon size: 16x16");
    90             log.log(Level.FINEST, "Returning ICE_WM icon size: 16x16");
    91             return new Dimension(16, 16);
    91             return new Dimension(16, 16);
    92         }
    92         }
    93 
    93 
    94         XIconSize[] sizeList = getIconSizes();
    94         XIconSize[] sizeList = getIconSizes();
    95         log.log(Level.FINEST, "Icon sizes: {0}", new Object[] {sizeList});
    95 
       
    96         if (log.isLoggable(Level.FINEST)) {
       
    97             log.log(Level.FINEST, "Icon sizes: {0}", new Object[] {String.valueOf(sizeList)});
       
    98         }
    96         if (sizeList == null) {
    99         if (sizeList == null) {
    97             // No icon sizes so we simply fall back to 16x16
   100             // No icon sizes so we simply fall back to 16x16
    98             return new Dimension(16, 16);
   101             return new Dimension(16, 16);
    99         }
   102         }
   100         boolean found = false;
   103         boolean found = false;
   442                 width = img.getWidth(null);
   445                 width = img.getWidth(null);
   443                 height = img.getHeight(null);
   446                 height = img.getHeight(null);
   444             }
   447             }
   445             Dimension iconSize = getIconSize(width, height);
   448             Dimension iconSize = getIconSize(width, height);
   446             if (iconSize != null) {
   449             if (iconSize != null) {
   447                 log.log(Level.FINEST, "Icon size: {0}", iconSize);
   450                 if (log.isLoggable(Level.FINEST)) {
       
   451                     log.log(Level.FINEST, "Icon size: {0}", String.valueOf(iconSize));
       
   452                 }
   448                 iconWidth = iconSize.width;
   453                 iconWidth = iconSize.width;
   449                 iconHeight = iconSize.height;
   454                 iconHeight = iconSize.height;
   450             } else {
   455             } else {
   451                 log.finest("Error calculating image size");
   456                 log.finest("Error calculating image size");
   452                 iconWidth = 0;
   457                 iconWidth = 0;