src/solaris/classes/sun/awt/X11/XWINProtocol.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>

*** 62,72 ****
              req.set_window(window.getWindow());
              req.set_message_type(XA_WIN_STATE.getAtom());
              req.set_format(32);
              req.set_data(0, (WIN_STATE_MAXIMIZED_HORIZ | WIN_STATE_MAXIMIZED_VERT));
              req.set_data(1, win_state);
!             if (log.isLoggable(Level.FINE)) log.fine("Sending WIN_STATE to root to change the state to " + win_state);
              try {
                  XToolkit.awtLock();
                  XlibWrapper.XSendEvent(XToolkit.getDisplay(),
                          XlibWrapper.RootWindow(XToolkit.getDisplay(),
                              window.getScreenNumber()),
--- 62,74 ----
              req.set_window(window.getWindow());
              req.set_message_type(XA_WIN_STATE.getAtom());
              req.set_format(32);
              req.set_data(0, (WIN_STATE_MAXIMIZED_HORIZ | WIN_STATE_MAXIMIZED_VERT));
              req.set_data(1, win_state);
!             if (log.isLoggable(Level.FINE)) {
!                 log.fine("Sending WIN_STATE to root to change the state to " + win_state);
!             }
              try {
                  XToolkit.awtLock();
                  XlibWrapper.XSendEvent(XToolkit.getDisplay(),
                          XlibWrapper.RootWindow(XToolkit.getDisplay(),
                              window.getScreenNumber()),
*** 110,120 ****
                  win_state |= WIN_STATE_MAXIMIZED_HORIZ;
              } else {
                  win_state &= ~WIN_STATE_MAXIMIZED_HORIZ;
              }
              if ((old_win_state ^ win_state) != 0) {
!                 if (log.isLoggable(Level.FINE)) log.fine("Setting WIN_STATE on " + window + " to change the state to " + win_state);
                  XA_WIN_STATE.setCard32Property(window, win_state);
              }
          }
      }
  
--- 112,124 ----
                  win_state |= WIN_STATE_MAXIMIZED_HORIZ;
              } else {
                  win_state &= ~WIN_STATE_MAXIMIZED_HORIZ;
              }
              if ((old_win_state ^ win_state) != 0) {
!                 if (log.isLoggable(Level.FINE)) {
!                     log.fine("Setting WIN_STATE on " + window + " to change the state to " + win_state);
!                 }
                  XA_WIN_STATE.setCard32Property(window, win_state);
              }
          }
      }
  
*** 155,165 ****
              req.set_message_type(XA_WIN_LAYER.getAtom());
              req.set_format(32);
              req.set_data(0, layer == LAYER_NORMAL ? WIN_LAYER_NORMAL : WIN_LAYER_ONTOP);
              req.set_data(1, 0);
              req.set_data(2, 0);
!             if (log.isLoggable(Level.FINE)) log.fine("Setting layer " + layer + " by root message : " + req);
              XToolkit.awtLock();
              try {
                  XlibWrapper.XSendEvent(XToolkit.getDisplay(),
                          XlibWrapper.RootWindow(XToolkit.getDisplay(),
                              window.getScreenNumber()),
--- 159,171 ----
              req.set_message_type(XA_WIN_LAYER.getAtom());
              req.set_format(32);
              req.set_data(0, layer == LAYER_NORMAL ? WIN_LAYER_NORMAL : WIN_LAYER_ONTOP);
              req.set_data(1, 0);
              req.set_data(2, 0);
!             if (log.isLoggable(Level.FINE)) {
!                 log.fine("Setting layer " + layer + " by root message : " + req);
!             }
              XToolkit.awtLock();
              try {
                  XlibWrapper.XSendEvent(XToolkit.getDisplay(),
                          XlibWrapper.RootWindow(XToolkit.getDisplay(),
                              window.getScreenNumber()),
*** 170,180 ****
              finally {
                  XToolkit.awtUnlock();
              }
              req.dispose();
          } else {
!             if (log.isLoggable(Level.FINE)) log.fine("Setting layer property to " + layer);
              XA_WIN_LAYER.setCard32Property(window, layer == LAYER_NORMAL ? WIN_LAYER_NORMAL : WIN_LAYER_ONTOP);
          }
      }
  
      XAtom XA_WIN_LAYER = XAtom.get("_WIN_LAYER");
--- 176,188 ----
              finally {
                  XToolkit.awtUnlock();
              }
              req.dispose();
          } else {
!             if (log.isLoggable(Level.FINE)) {
!                 log.fine("Setting layer property to " + layer);
!             }
              XA_WIN_LAYER.setCard32Property(window, layer == LAYER_NORMAL ? WIN_LAYER_NORMAL : WIN_LAYER_ONTOP);
          }
      }
  
      XAtom XA_WIN_LAYER = XAtom.get("_WIN_LAYER");
*** 196,219 ****
          if (supportChecked) {
              return;
          }
          WinWindow = checkAnchor(XA_WIN_SUPPORTING_WM_CHECK, XAtom.XA_CARDINAL);
          supportChecked = true;
!         if (log.isLoggable(Level.FINE)) log.fine("### " + this + " is active: " + (WinWindow != 0));
      }
  
      boolean active() {
          detect();
          return WinWindow != 0;
      }
      boolean doStateProtocol() {
          boolean res = active() && checkProtocol(XA_WIN_PROTOCOLS, XA_WIN_STATE);
!         if (log.isLoggable(Level.FINE)) log.fine("### " + this + " supports state: " + res);
          return res;
      }
  
      boolean doLayerProtocol() {
          boolean res = active() && checkProtocol(XA_WIN_PROTOCOLS, XA_WIN_LAYER);
!         if (log.isLoggable(Level.FINE)) log.fine("### " + this + " supports layer: " + res);
          return res;
      }
  }
--- 204,233 ----
          if (supportChecked) {
              return;
          }
          WinWindow = checkAnchor(XA_WIN_SUPPORTING_WM_CHECK, XAtom.XA_CARDINAL);
          supportChecked = true;
!         if (log.isLoggable(Level.FINE)) {
!             log.fine("### " + this + " is active: " + (WinWindow != 0));
!         }
      }
  
      boolean active() {
          detect();
          return WinWindow != 0;
      }
      boolean doStateProtocol() {
          boolean res = active() && checkProtocol(XA_WIN_PROTOCOLS, XA_WIN_STATE);
!         if (log.isLoggable(Level.FINE)) {
!             log.fine("### " + this + " supports state: " + res);
!         }
          return res;
      }
  
      boolean doLayerProtocol() {
          boolean res = active() && checkProtocol(XA_WIN_PROTOCOLS, XA_WIN_LAYER);
!         if (log.isLoggable(Level.FINE)) {
!             log.fine("### " + this + " supports layer: " + res);
!         }
          return res;
      }
  }