src/solaris/classes/sun/awt/X11/XIconWindow.java

rev 1571 : 8010297: Missing isLoggable() checks in logging code
Summary: Add isLoggable() checks
Reviewed-by: anthony, mchung, serb
Contributed-by: Laurent Bourges <bourges.laurent@gmail.com>

*** 59,79 ****
          try {
              AwtGraphicsConfigData adata = parent.getGraphicsConfigurationData();
              final long screen = adata.get_awt_visInfo().get_screen();
              final long display = XToolkit.getDisplay();
  
!             if (log.isLoggable(Level.FINEST)) log.finest(adata.toString());
  
              long status =
                  XlibWrapper.XGetIconSizes(display, XToolkit.getDefaultRootWindow(),
                                            XlibWrapper.larg1, XlibWrapper.iarg1);
              if (status == 0) {
                  return null;
              }
              int count = Native.getInt(XlibWrapper.iarg1);
              long sizes_ptr = Native.getLong(XlibWrapper.larg1); // XIconSize*
!             log.log(Level.FINEST, "count = {1}, sizes_ptr = {0}", new Object[] {Long.valueOf(sizes_ptr), Integer.valueOf(count)});
              XIconSize[] res = new XIconSize[count];
              for (int i = 0; i < count; i++, sizes_ptr += XIconSize.getSize()) {
                  res[i] = new XIconSize(sizes_ptr);
                  if (log.isLoggable(Level.FINEST)) {
                      log.log(Level.FINEST, "sizes_ptr[{1}] = {0}",
--- 59,84 ----
          try {
              AwtGraphicsConfigData adata = parent.getGraphicsConfigurationData();
              final long screen = adata.get_awt_visInfo().get_screen();
              final long display = XToolkit.getDisplay();
  
!             if (log.isLoggable(Level.FINEST)) {
!                 log.finest(adata.toString());
!             }
  
              long status =
                  XlibWrapper.XGetIconSizes(display, XToolkit.getDefaultRootWindow(),
                                            XlibWrapper.larg1, XlibWrapper.iarg1);
              if (status == 0) {
                  return null;
              }
              int count = Native.getInt(XlibWrapper.iarg1);
              long sizes_ptr = Native.getLong(XlibWrapper.larg1); // XIconSize*
!             if (log.isLoggable(Level.FINEST)) {
!                 log.log(Level.FINEST, "count = {1}, sizes_ptr = {0}",
!                         new Object[] { Long.valueOf(sizes_ptr), Integer.valueOf(count) });
!             }
              XIconSize[] res = new XIconSize[count];
              for (int i = 0; i < count; i++, sizes_ptr += XIconSize.getSize()) {
                  res[i] = new XIconSize(sizes_ptr);
                  if (log.isLoggable(Level.FINEST)) {
                      log.log(Level.FINEST, "sizes_ptr[{1}] = {0}",
*** 421,431 ****
--- 426,438 ----
                      min = image;
                  }
              }
          }
          if (min != null) {
+             if (log.isLoggable(Level.FINER)) {
                  log.log(Level.FINER, "Icon: {0}x{1}", new Object[] { min.getWidth(null), min.getHeight(null)});
+             }
              setIconImage(min);
          }
      }
  
      void setIconImage(Image img) {