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

*** 44,54 ****
      public boolean supportsState(int state) {
          return doStateProtocol() ; // TODO - check for Frame constants
      }
  
      public void setState(XWindowPeer window, int state) {
!         if (log.isLoggable(Level.FINE)) log.fine("Setting state of " + window + " to " + state);
          if (window.isShowing()) {
              requestState(window, state);
          } else {
              setInitialState(window, state);
          }
--- 44,56 ----
      public boolean supportsState(int state) {
          return doStateProtocol() ; // TODO - check for Frame constants
      }
  
      public void setState(XWindowPeer window, int state) {
!         if (log.isLoggable(Level.FINE)) {
!             log.fine("Setting state of " + window + " to " + state);
!         }
          if (window.isShowing()) {
              requestState(window, state);
          } else {
              setInitialState(window, state);
          }
*** 105,115 ****
                    req.set_data(2, XA_NET_WM_STATE_MAXIMIZED_VERT.getAtom());
                    break;
                default:
                    return;
              }
!             if (log.isLoggable(Level.FINE)) log.fine("Requesting state on " + window + " for " + state);
              req.set_type((int)XlibWrapper.ClientMessage);
              req.set_window(window.getWindow());
              req.set_message_type(XA_NET_WM_STATE.getAtom());
              req.set_format(32);
              req.set_data(0, _NET_WM_STATE_TOGGLE);
--- 107,119 ----
                    req.set_data(2, XA_NET_WM_STATE_MAXIMIZED_VERT.getAtom());
                    break;
                default:
                    return;
              }
!             if (log.isLoggable(Level.FINE)) {
!                 log.fine("Requesting state on " + window + " for " + state);
!             }
              req.set_type((int)XlibWrapper.ClientMessage);
              req.set_window(window.getWindow());
              req.set_message_type(XA_NET_WM_STATE.getAtom());
              req.set_format(32);
              req.set_data(0, _NET_WM_STATE_TOGGLE);
*** 187,197 ****
              req.set_format(32);
              req.set_data(0, isAdd ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE);
              req.set_data(1, state.getAtom());
              // Fix for 6735584: req.data[2] must be set to 0 when only one property is changed
              req.set_data(2, 0);
!             log.log(Level.FINE, "Setting _NET_STATE atom {0} on {1} for {2}", new Object[] {state, window, Boolean.valueOf(isAdd)});
              XToolkit.awtLock();
              try {
                  XlibWrapper.XSendEvent(XToolkit.getDisplay(),
                          XlibWrapper.RootWindow(XToolkit.getDisplay(), window.getScreenNumber()),
                          false,
--- 191,204 ----
              req.set_format(32);
              req.set_data(0, isAdd ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE);
              req.set_data(1, state.getAtom());
              // Fix for 6735584: req.data[2] must be set to 0 when only one property is changed
              req.set_data(2, 0);
!             if (log.isLoggable(Level.FINE)) {
!                 log.log(Level.FINE, "Setting _NET_STATE atom {0} on {1} for {2}",
!                         new Object[] {state, window, Boolean.valueOf(isAdd)});
!             }
              XToolkit.awtLock();
              try {
                  XlibWrapper.XSendEvent(XToolkit.getDisplay(),
                          XlibWrapper.RootWindow(XToolkit.getDisplay(), window.getScreenNumber()),
                          false,
*** 212,224 ****
--- 219,233 ----
       * @param window Window which NET_WM_STATE property is being modified
       * @param state State atom to be set/reset
       * @param reset Indicates operation, 'set' if false, 'reset' if true
       */
      private void setStateHelper(XWindowPeer window, XAtom state, boolean set) {
+         if (log.isLoggable(Level.FINER)) {
              log.log(Level.FINER, "Window visibility is: withdrawn={0}, visible={1}, mapped={2} showing={3}",
                      new Object[] {Boolean.valueOf(window.isWithdrawn()), Boolean.valueOf(window.isVisible()),
                                    Boolean.valueOf(window.isMapped()), Boolean.valueOf(window.isShowing())});
+         }
          if (window.isShowing()) {
              requestState(window, state, set);
          } else {
              XAtomList net_wm_state = window.getNETWMState();
              if (log.isLoggable(Level.FINE)) {
*** 285,295 ****
              // TODO: How about detecting WM-restart or exit?
              return;
          }
          NetWindow = checkAnchor(XA_NET_SUPPORTING_WM_CHECK, XAtom.XA_WINDOW);
          supportChecked = true;
!         if (log.isLoggable(Level.FINE)) log.fine("### " + this + " is active: " + (NetWindow != 0));
      }
  
      boolean active() {
          detect();
          return NetWindow != 0;
--- 294,306 ----
              // TODO: How about detecting WM-restart or exit?
              return;
          }
          NetWindow = checkAnchor(XA_NET_SUPPORTING_WM_CHECK, XAtom.XA_WINDOW);
          supportChecked = true;
!         if (log.isLoggable(Level.FINE)) {
!             log.fine("### " + this + " is active: " + (NetWindow != 0));
!         }
      }
  
      boolean active() {
          detect();
          return NetWindow != 0;
*** 321,331 ****
          }
          String net_wm_name_string = getWMName();
          if (net_wm_name_string == null) {
              return false;
          }
!         if (log.isLoggable(Level.FINE)) log.fine("### WM_NAME = " + net_wm_name_string);
          return net_wm_name_string.startsWith(name);
      }
  
      String net_wm_name_cache;
      public String getWMName() {
--- 332,344 ----
          }
          String net_wm_name_string = getWMName();
          if (net_wm_name_string == null) {
              return false;
          }
!         if (log.isLoggable(Level.FINE)) {
!             log.fine("### WM_NAME = " + net_wm_name_string);
!         }
          return net_wm_name_string.startsWith(name);
      }
  
      String net_wm_name_cache;
      public String getWMName() {