jdk-sandbox: comparison jdk/src/solaris/classes/sun/awt/X11/XListPeer.java

equal deleted inserted replaced

-:487e1aa949c4
+:ef327bd847c0
 import java.awt.event.*;
 import java.awt.peer.*;
 import java.util.Vector;
 import java.awt.geom.*;
 import java.awt.image.*;
-import java.util.logging.*;
+import sun.util.logging.PlatformLogger;
 // TODO: some input actions should do nothing if Shift or Control are down
 class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
-private static final Logger log = Logger.getLogger("sun.awt.X11.XListPeer");
+private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XListPeer");
 public final static int     MARGIN = 2;
 public final static int     SPACE = 1;
 public final static int     SCROLLBAR_AREA = 17;  // Area reserved for the
 // scrollbar
 repaint();
 }
 }
 void mousePressed(MouseEvent mouseEvent) {
-if (log.isLoggable(Level.FINER)) log.finer(mouseEvent.toString() + ", hsb " + hsbVis + ", vsb " + vsbVis);
+if (log.isLoggable(PlatformLogger.FINER)) log.finer(mouseEvent.toString() + ", hsb " + hsbVis + ", vsb " + vsbVis);
 if (isEnabled() && mouseEvent.getButton() == MouseEvent.BUTTON1) {
 if (inWindow(mouseEvent.getX(), mouseEvent.getY())) {
-if (log.isLoggable(Level.FINE)) log.fine("Mouse press in items area");
+if (log.isLoggable(PlatformLogger.FINE)) log.fine("Mouse press in items area");
 active = WINDOW;
 int i = y2index(mouseEvent.getY());
 if (i >= 0) {
 if (multipleSelections) {
 if (isSelected(i)) {
 // 6426186: reset variable to prevent action event
 // if user clicks on unoccupied area of list
 currentIndex = -1;
 }
 } else if (inVerticalScrollbar(mouseEvent.getX(), mouseEvent.getY())) {
-if (log.isLoggable(Level.FINE)) log.fine("Mouse press in vertical scrollbar");
+if (log.isLoggable(PlatformLogger.FINE)) log.fine("Mouse press in vertical scrollbar");
 active = VERSCROLLBAR;
 vsb.handleMouseEvent(mouseEvent.getID(),
 mouseEvent.getModifiers(),
 mouseEvent.getX() - (width - SCROLLBAR_WIDTH),
 mouseEvent.getY());
 } else if (inHorizontalScrollbar(mouseEvent.getX(), mouseEvent.getY())) {
-if (log.isLoggable(Level.FINE)) log.fine("Mouse press in horizontal scrollbar");
+if (log.isLoggable(PlatformLogger.FINE)) log.fine("Mouse press in horizontal scrollbar");
 active = HORSCROLLBAR;
 hsb.handleMouseEvent(mouseEvent.getID(),
 mouseEvent.getModifiers(),
 mouseEvent.getX(),
 mouseEvent.getY() - (height - SCROLLBAR_WIDTH));
 }
 }
 void keyPressed(KeyEvent e) {
 int keyCode = e.getKeyCode();
-if (log.isLoggable(Level.FINE)) log.fine(e.toString());
+if (log.isLoggable(PlatformLogger.FINE)) log.fine(e.toString());
 switch(keyCode) {
 case KeyEvent.VK_UP:
 case KeyEvent.VK_KP_UP: // TODO: I assume we also want this, too
 if (getFocusIndex() > 0) {
 setFocusIndex(getFocusIndex()-1);
 /**
 * return value from the scrollbar
 */
 public void notifyValue(XScrollbar obj, int type, int v, boolean isAdjusting) {
-if (log.isLoggable(Level.FINE)) log.fine("Notify value changed on " + obj + " to " + v);
+if (log.isLoggable(PlatformLogger.FINE)) log.fine("Notify value changed on " + obj + " to " + v);
 int value = obj.getValue();
 if (obj == vsb) {
 scrollVertical(v - value);
 // See 6243382 for more information
 if (selected[j] >= i) {
 selected[j] += 1;
 }
 }
 }
-if (log.isLoggable(Level.FINER)) log.finer("Adding item '" + item + "' to " + addedIndex);
+if (log.isLoggable(PlatformLogger.FINER)) log.finer("Adding item '" + item + "' to " + addedIndex);
 // Update maxLength
 boolean repaintItems = !isItemHidden(addedIndex);
 maxLength = Math.max(maxLength, getItemWidth(addedIndex));
 layout();
 options = (repaintItems ? (PAINT_ITEMS):0)
 | ((maxLength != oldMaxLength || (hsbWasVis ^ hsbVis))?(PAINT_HSCROLL):0)
 | ((vsb.needsRepaint())?(PAINT_VSCROLL):0);
 }
-if (log.isLoggable(Level.FINEST)) log.finest("Last visible: " + getLastVisibleItem() +
+if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Last visible: " + getLastVisibleItem() +
 ", hsb changed : " + (hsbWasVis ^ hsbVis) + ", items changed " + repaintItems);
 repaint(addedIndex, getLastVisibleItem(), options);
 }
 /**
 // save the current state of the scrollbars
 boolean hsbWasVisible = hsbVis;
 boolean vsbWasVisible = vsbVis;
 int oldLastDisplayed = lastItemDisplayed();
-if (log.isLoggable(Level.FINE)) log.fine("Deleting from " + s + " to " + e);
+if (log.isLoggable(PlatformLogger.FINE)) log.fine("Deleting from " + s + " to " + e);
-if (log.isLoggable(Level.FINEST)) log.finest("Last displayed item: " + oldLastDisplayed + ", items in window " + itemsInWindow() +
+if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Last displayed item: " + oldLastDisplayed + ", items in window " + itemsInWindow() +
 ", size " + items.size());
 if (items.size() == 0) {
 return;
 }
 int focusBound = (items.size() > 0) ? 0 : -1;
 setFocusIndex(Math.max(s-1, focusBound));
 options |= PAINT_FOCUS;
 }
-if (log.isLoggable(Level.FINEST)) log.finest("Multiple selections: " + multipleSelections);
+if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Multiple selections: " + multipleSelections);
 // update vsb.val
 if (vsb.getValue() >= s) {
 if (vsb.getValue() <= e) {
 vsb.setValue(e+1 - diff);
 /**
 * scrollVertical
 * y is the number of items to scroll
 */
 void scrollVertical(int y) {
-if (log.isLoggable(Level.FINE)) log.fine("Scrolling vertically by " + y);
+if (log.isLoggable(PlatformLogger.FINE)) log.fine("Scrolling vertically by " + y);
 int itemsInWin = itemsInWindow();
 int h = getItemHeight();
 int pixelsToScroll = y * h;
 if (vsb.getValue() < -y) {
 /**
 * scrollHorizontal
 * x is the number of pixels to scroll
 */
 void scrollHorizontal(int x) {
-if (log.isLoggable(Level.FINE)) log.fine("Scrolling horizontally by " + y);
+if (log.isLoggable(PlatformLogger.FINE)) log.fine("Scrolling horizontally by " + y);
 int w = getListWidth();
 w -= ((2 * SPACE) + (2 * MARGIN));
 int h = height - (SCROLLBAR_AREA + (2 * MARGIN));
 hsb.setValue(hsb.getValue() + x);
 } finally {
 XToolkit.awtUnlock();
 }
 if (localBuffer == null) {
-if (log.isLoggable(Level.FINE)) log.fine("Creating buffer " + width + "x" + height);
+if (log.isLoggable(PlatformLogger.FINE)) log.fine("Creating buffer " + width + "x" + height);
 // use GraphicsConfig.cCVI() instead of Component.cVI(),
 // because the latter may cause a deadlock with the tree lock
 localBuffer =
 graphicsConfig.createCompatibleVolatileImage(width+1,
 height+1);
 paint(listG, firstItem, lastItem, options, null, null);
 }
 private void paint(Graphics listG, int firstItem, int lastItem, int options,
 Rectangle source, Point distance) {
-if (log.isLoggable(Level.FINER)) log.finer("Repaint from " + firstItem + " to " + lastItem + " options " + options);
+if (log.isLoggable(PlatformLogger.FINER)) log.finer("Repaint from " + firstItem + " to " + lastItem + " options " + options);
 if (firstItem > lastItem) {
 int t = lastItem;
 lastItem = firstItem;
 firstItem = t;
 }
 g.fillRect(0, 0, listWidth, listHeight);
 draw3DRect(g, getSystemColors(), 0, 0, listWidth - 1, listHeight - 1, false);
 }
 private void paintItems(Graphics g, int firstItem, int lastItem, int options) {
-if (log.isLoggable(Level.FINER)) log.finer("Painting items from " + firstItem + " to " + lastItem + ", focused " + focusIndex + ", first " + getFirstVisibleItem() + ", last " + getLastVisibleItem());
+if (log.isLoggable(PlatformLogger.FINER)) log.finer("Painting items from " + firstItem + " to " + lastItem + ", focused " + focusIndex + ", first " + getFirstVisibleItem() + ", last " + getLastVisibleItem());
 firstItem = Math.max(getFirstVisibleItem(), firstItem);
 if (firstItem > lastItem) {
 int t = lastItem;
 lastItem = firstItem;
 firstItem = t;
 }
 firstItem = Math.max(getFirstVisibleItem(), firstItem);
 lastItem = Math.min(lastItem, items.size()-1);
-if (log.isLoggable(Level.FINER)) log.finer("Actually painting items from " + firstItem + " to " + lastItem +
+if (log.isLoggable(PlatformLogger.FINER)) log.finer("Actually painting items from " + firstItem + " to " + lastItem +
 ", items in window " + itemsInWindow());
 for (int i = firstItem; i <= lastItem; i++) {
 paintItem(g, i);
 }
 }
 private void paintItem(Graphics g, int index) {
-if (log.isLoggable(Level.FINEST)) log.finest("Painting item " + index);
+if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Painting item " + index);
 // 4895367 - only paint items which are visible
 if (!isItemHidden(index)) {
 Shape clip = g.getClip();
 int w = getItemWidth();
 int h = getItemHeight();
 int y = getItemY(index);
 int x = getItemX();
-if (log.isLoggable(Level.FINEST)) log.finest("Setting clip " + new Rectangle(x, y, w - (SPACE*2), h-(SPACE*2)));
+if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Setting clip " + new Rectangle(x, y, w - (SPACE*2), h-(SPACE*2)));
 g.setClip(x, y, w - (SPACE*2), h-(SPACE*2));
 // Always paint the background so that focus is unpainted in
 // multiselect mode
 if (isSelected(index)) {
-if (log.isLoggable(Level.FINEST)) log.finest("Painted item is selected");
+if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Painted item is selected");
 g.setColor(getListForeground());
 } else {
 g.setColor(getListBackground());
 }
-if (log.isLoggable(Level.FINEST)) log.finest("Filling " + new Rectangle(x, y, w, h));
+if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Filling " + new Rectangle(x, y, w, h));
 g.fillRect(x, y, w, h);
 if (index <= getLastVisibleItem() && index < items.size()) {
 if (!isEnabled()){
 g.setColor(getDisabledColor());
 g.setClip(clip);
 }
 }
 void paintScrollBar(XScrollbar scr, Graphics g, int x, int y, int width, int height, boolean paintAll) {
-if (log.isLoggable(Level.FINEST)) log.finest("Painting scrollbar " + scr + " width " +
+if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Painting scrollbar " + scr + " width " +
 width + " height " + height + ", paintAll " + paintAll);
 g.translate(x, y);
 scr.paint(g, getSystemColors(), paintAll);
 g.translate(-x, -y);
 }
 private void paintFocus(Graphics g, int options) {
 boolean paintFocus = (options & PAINT_FOCUS) != 0;
 if (paintFocus && !hasFocus()) {
 paintFocus = false;
 }
-if (log.isLoggable(Level.FINE)) log.fine("Painting focus, focus index " + getFocusIndex() + ", focus is " +
+if (log.isLoggable(PlatformLogger.FINE)) log.fine("Painting focus, focus index " + getFocusIndex() + ", focus is " +
 (isItemHidden(getFocusIndex())?("invisible"):("visible")) + ", paint focus is " + paintFocus);
 Shape clip = g.getClip();
 g.setClip(0, 0, listWidth, listHeight);
-if (log.isLoggable(Level.FINEST)) log.finest("Setting focus clip " + new Rectangle(0, 0, listWidth, listHeight));
+if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Setting focus clip " + new Rectangle(0, 0, listWidth, listHeight));
 Rectangle rect = getFocusRect();
 if (prevFocusRect != null) {
 // Erase focus rect
-if (log.isLoggable(Level.FINEST)) log.finest("Erasing previous focus rect " + prevFocusRect);
+if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Erasing previous focus rect " + prevFocusRect);
 g.setColor(getListBackground());
 g.drawRect(prevFocusRect.x, prevFocusRect.y, prevFocusRect.width, prevFocusRect.height);
 prevFocusRect = null;
 }
 if (paintFocus) {
 // Paint new
-if (log.isLoggable(Level.FINEST)) log.finest("Painting focus rect " + rect);
+if (log.isLoggable(PlatformLogger.FINEST)) log.finest("Painting focus rect " + rect);
 g.setColor(getListForeground());  // Focus color is always black on Linux
 g.drawRect(rect.x, rect.y, rect.width, rect.height);
 prevFocusRect = rect;
 }
 g.setClip(clip);

changeset 3938	ef327bd847c0
parent 445	6f717a8cacfb
child 5506	202f599c92aa