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

*** 53,88 ****
          initXSettings();
  
      }
  
      void initXSettings() {
!         if (log.isLoggable(PlatformLogger.FINE)) log.fine("Initializing XAWT XSettings");
          settings = new XMSelection("_XSETTINGS");
          settings.addSelectionListener(this);
          initPerScreenXSettings();
      }
  
      void dispose() {
          settings.removeSelectionListener(this);
      }
  
      public void ownerDeath(int screen, XMSelection sel, long deadOwner) {
!         if (log.isLoggable(PlatformLogger.FINE)) log.fine("Owner " + deadOwner + " died for selection " + sel + " screen "+ screen);
      }
  
  
      public void ownerChanged(int screen, XMSelection sel, long newOwner, long data, long timestamp) {
!         if (log.isLoggable(PlatformLogger.FINE)) log.fine("New Owner "+ newOwner + " for selection = " + sel + " screen " +screen );
      }
  
      public void selectionChanged(int screen, XMSelection sel, long owner , XPropertyEvent event) {
          log.fine("Selection changed on sel " + sel + " screen = " + screen + " owner = " + owner + " event = " + event);
          updateXSettings(screen,owner);
      }
  
      void initPerScreenXSettings() {
!         if (log.isLoggable(PlatformLogger.FINE)) log.fine("Updating Per XSettings changes");
  
          /*
           * As toolkit cannot yet cope with per-screen desktop properties,
           * only report XSETTINGS changes on the default screen.  This
           * should be "good enough" for most cases.
--- 53,98 ----
          initXSettings();
  
      }
  
      void initXSettings() {
!         if (log.isLoggable(PlatformLogger.FINE)) {
!             log.fine("Initializing XAWT XSettings");
!         }
          settings = new XMSelection("_XSETTINGS");
          settings.addSelectionListener(this);
          initPerScreenXSettings();
      }
  
      void dispose() {
          settings.removeSelectionListener(this);
      }
  
      public void ownerDeath(int screen, XMSelection sel, long deadOwner) {
!         if (log.isLoggable(PlatformLogger.FINE)) {
!             log.fine("Owner " + deadOwner + " died for selection " + sel + " screen "+ screen);
!         }
      }
  
  
      public void ownerChanged(int screen, XMSelection sel, long newOwner, long data, long timestamp) {
!         if (log.isLoggable(PlatformLogger.FINE)) {
!             log.fine("New Owner "+ newOwner + " for selection = " + sel + " screen " +screen );
!         }
      }
  
      public void selectionChanged(int screen, XMSelection sel, long owner , XPropertyEvent event) {
+         if (log.isLoggable(PlatformLogger.FINE)) {
              log.fine("Selection changed on sel " + sel + " screen = " + screen + " owner = " + owner + " event = " + event);
+         }
          updateXSettings(screen,owner);
      }
  
      void initPerScreenXSettings() {
!         if (log.isLoggable(PlatformLogger.FINE)) {
!             log.fine("Updating Per XSettings changes");
!         }
  
          /*
           * As toolkit cannot yet cope with per-screen desktop properties,
           * only report XSETTINGS changes on the default screen.  This
           * should be "good enough" for most cases.
*** 112,122 ****
              }
          });
      }
  
      private Map getUpdatedSettings(final long owner) {
!         if (log.isLoggable(PlatformLogger.FINE)) log.fine("owner =" + owner);
          if (0 == owner) {
              return null;
          }
  
          Map settings = null;
--- 122,134 ----
              }
          });
      }
  
      private Map getUpdatedSettings(final long owner) {
!         if (log.isLoggable(PlatformLogger.FINE)) {
!             log.fine("owner =" + owner);
!         }
          if (0 == owner) {
              return null;
          }
  
          Map settings = null;
*** 126,142 ****
                          false, xSettingsPropertyAtom.getAtom() );
              try {
                  int status = getter.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance());
  
                  if (status != XConstants.Success || getter.getData() == 0) {
!                     if (log.isLoggable(PlatformLogger.FINE)) log.fine("OH OH : getter failed  status = " + status );
                      settings = null;
                  }
  
                  long ptr = getter.getData();
  
!                 if (log.isLoggable(PlatformLogger.FINE)) log.fine("noItems = " + getter.getNumberOfItems());
                  byte array[] = Native.toBytes(ptr,getter.getNumberOfItems());
                  if (array != null) {
                      settings = update(array);
                  }
              } finally {
--- 138,158 ----
                          false, xSettingsPropertyAtom.getAtom() );
              try {
                  int status = getter.execute(XErrorHandler.IgnoreBadWindowHandler.getInstance());
  
                  if (status != XConstants.Success || getter.getData() == 0) {
!                     if (log.isLoggable(PlatformLogger.FINE)) {
!                         log.fine("OH OH : getter failed  status = " + status );
!                     }
                      settings = null;
                  }
  
                  long ptr = getter.getData();
  
!                 if (log.isLoggable(PlatformLogger.FINE)) {
!                     log.fine("noItems = " + getter.getNumberOfItems());
!                 }
                  byte array[] = Native.toBytes(ptr,getter.getNumberOfItems());
                  if (array != null) {
                      settings = update(array);
                  }
              } finally {