modules/javafx.web/src/main/java/com/sun/javafx/webkit/theme/RenderThemeImpl.java

*** 42,68 ****
  import javafx.scene.layout.Region;
  import java.lang.ref.WeakReference;
  import java.nio.ByteBuffer;
  import java.nio.ByteOrder;
  import java.util.ArrayList;
- import java.util.Collections;
  import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
- import java.util.logging.Level;
- import java.util.logging.Logger;
  import java.util.LinkedHashMap;
  import com.sun.javafx.webkit.Accessor;
  import com.sun.webkit.LoadListenerClient;
  import com.sun.webkit.graphics.Ref;
  import com.sun.webkit.graphics.RenderTheme;
  import com.sun.webkit.graphics.WCGraphicsContext;
  import com.sun.webkit.graphics.WCSize;
  import javafx.application.Application;
  
  public final class RenderThemeImpl extends RenderTheme {
!     private final static Logger log = Logger.getLogger(RenderThemeImpl.class.getName());
  
      enum WidgetType {
          TEXTFIELD      (0),
          BUTTON         (1),
          CHECKBOX       (2),
--- 42,67 ----
  import javafx.scene.layout.Region;
  import java.lang.ref.WeakReference;
  import java.nio.ByteBuffer;
  import java.nio.ByteOrder;
  import java.util.ArrayList;
  import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
  import java.util.LinkedHashMap;
+ import com.sun.javafx.logging.PlatformLogger;
+ import com.sun.javafx.logging.PlatformLogger.Level;
  import com.sun.javafx.webkit.Accessor;
  import com.sun.webkit.LoadListenerClient;
  import com.sun.webkit.graphics.Ref;
  import com.sun.webkit.graphics.RenderTheme;
  import com.sun.webkit.graphics.WCGraphicsContext;
  import com.sun.webkit.graphics.WCSize;
  import javafx.application.Application;
  
  public final class RenderThemeImpl extends RenderTheme {
!     private final static PlatformLogger log = PlatformLogger.getLogger(RenderThemeImpl.class.getName());
  
      enum WidgetType {
          TEXTFIELD      (0),
          BUTTON         (1),
          CHECKBOX       (2),
*** 126,136 ****
              this.type = type.getSimpleName();
          }
  
          T get(long id) {
              if (log.isLoggable(Level.FINE)) {
!                 log.log(Level.FINE, "type: {0}, size: {1}, id: 0x{2}",
                          new Object[] {type, pool.size(), Long.toHexString(id)});
              }
              assert ids.size() == pool.size();
  
              WeakReference<T> controlRef = pool.get(id);
--- 125,135 ----
              this.type = type.getSimpleName();
          }
  
          T get(long id) {
              if (log.isLoggable(Level.FINE)) {
!                 log.fine("type: {0}, size: {1}, id: 0x{2}",
                          new Object[] {type, pool.size(), Long.toHexString(id)});
              }
              assert ids.size() == pool.size();
  
              WeakReference<T> controlRef = pool.get(id);
*** 150,160 ****
              return control;
          }
  
          void put(long id, T control, int updateContentCycleID) {
              if (log.isLoggable(Level.FINEST)) {
!                 log.log(Level.FINEST, "size: {0}, id: 0x{1}, control: {2}",
                          new Object[] {pool.size(), Long.toHexString(id), control.getType()});
              }
              if (ids.size() >= capacity) {
                  // Pull a control from the bottom of the map, least used.
                  Long _id = ids.keySet().iterator().next();
--- 149,159 ----
              return control;
          }
  
          void put(long id, T control, int updateContentCycleID) {
              if (log.isLoggable(Level.FINEST)) {
!                 log.finest("size: {0}, id: 0x{1}, control: {2}",
                          new Object[] {pool.size(), Long.toHexString(id), control.getType()});
              }
              if (ids.size() >= capacity) {
                  // Pull a control from the bottom of the map, least used.
                  Long _id = ids.keySet().iterator().next();
*** 296,306 ****
                      break;
                  case METER:
                      fc = new FormProgressBar(WidgetType.METER);
                      break;
                  default:
!                     log.log(Level.ALL, "unknown widget index: {0}", widgetIndex);
                      return null;
              }
              fc.asControl().setFocusTraversable(false);
              pool.put(id, fc, accessor.getPage().getUpdateContentCycleID()); // put or replace the entry
              accessor.addChild(fc.asControl());
--- 295,305 ----
                      break;
                  case METER:
                      fc = new FormProgressBar(WidgetType.METER);
                      break;
                  default:
!                     log.severe("unknown widget index: {0}", widgetIndex);
                      return null;
              }
              fc.asControl().setFocusTraversable(false);
              pool.put(id, fc, accessor.getPage().getUpdateContentCycleID()); // put or replace the entry
              accessor.addChild(fc.asControl());