--- old/modules/javafx.web/src/main/java/com/sun/webkit/WebPage.java 2018-05-19 16:28:03.003355300 +0300 +++ new/modules/javafx.web/src/main/java/com/sun/webkit/WebPage.java 2018-05-19 16:28:02.621276300 +0300 @@ -26,6 +26,8 @@ package com.sun.webkit; import com.sun.glass.utils.NativeLibLoader; +import com.sun.javafx.logging.PlatformLogger; +import com.sun.javafx.logging.PlatformLogger.Level; import com.sun.webkit.event.WCFocusEvent; import com.sun.webkit.event.WCInputMethodEvent; import com.sun.webkit.event.WCKeyEvent; @@ -56,8 +58,6 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.ReentrantLock; -import java.util.logging.Level; -import java.util.logging.Logger; import netscape.javascript.JSException; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -76,8 +76,8 @@ */ public final class WebPage { - private final static Logger log = Logger.getLogger(WebPage.class.getName()); - private final static Logger paintLog = Logger.getLogger(WebPage.class.getName() + ".paint"); + private final static PlatformLogger log = PlatformLogger.getLogger(WebPage.class.getName()); + private final static PlatformLogger paintLog = PlatformLogger.getLogger(WebPage.class.getName() + ".paint"); private static final int MAX_FRAME_QUEUE_SIZE = 10; @@ -277,8 +277,7 @@ private void updateDirty(WCRectangle clip) { if (paintLog.isLoggable(Level.FINEST)) { - paintLog.log(Level.FINEST, "Entering, " - + "dirtyRects: {0}, currentFrame: {1}", + paintLog.finest("Entering, dirtyRects: {0}, currentFrame: {1}", new Object[] {dirtyRects, currentFrame}); } @@ -300,7 +299,7 @@ if (r.getWidth() <= 0 || r.getHeight() <= 0) { continue; } - paintLog.log(Level.FINEST, "Updating: {0}", r); + paintLog.finest("Updating: {0}", r); WCRenderQueue rq = WCGraphicsManager.getGraphicsManager() .createRenderQueue(r, true); twkUpdateContent(getPage(), rq, r.getIntX() - 1, r.getIntY() - 1, @@ -317,15 +316,13 @@ } if (paintLog.isLoggable(Level.FINEST)) { - paintLog.log(Level.FINEST, "Dirty rects processed, " - + "dirtyRects: {0}, currentFrame: {1}", + paintLog.finest("Dirty rects processed, dirtyRects: {0}, currentFrame: {1}", new Object[] {dirtyRects, currentFrame}); } if (currentFrame.getRQList().size() > 0) { synchronized (frameQueue) { - paintLog.log(Level.FINEST, "About to update frame queue, " - + "frameQueue: {0}", frameQueue); + paintLog.finest("About to update frame queue, frameQueue: {0}", frameQueue); Iterator it = frameQueue.iterator(); while (it.hasNext()) { @@ -335,7 +332,7 @@ if (rq.isOpaque() && rqRect.contains(frame.getEnclosingRect())) { - paintLog.log(Level.FINEST, "Dropping: {0}", frame); + paintLog.finest("Dropping: {0}", frame); frame.drop(); it.remove(); break; @@ -347,20 +344,18 @@ currentFrame = new RenderFrame(); if (frameQueue.size() > MAX_FRAME_QUEUE_SIZE) { - paintLog.log(Level.FINEST, "Frame queue exceeded maximum " + paintLog.finest("Frame queue exceeded maximum " + "size, clearing and requesting full repaint"); dropRenderFrames(); repaintAll(); } - paintLog.log(Level.FINEST, "Frame queue updated, " - + "frameQueue: {0}", frameQueue); + paintLog.finest("Frame queue updated, frameQueue: {0}", frameQueue); } } if (paintLog.isLoggable(Level.FINEST)) { - paintLog.log(Level.FINEST, - "Exiting, dirtyRects: {0}, currentFrame: {1}", + paintLog.finest("Exiting, dirtyRects: {0}, currentFrame: {1}", new Object[] {dirtyRects, currentFrame}); } } @@ -402,7 +397,7 @@ for (WCRectangle r: dirtyRects) { if (scrollRect.contains(r)) { if (paintLog.isLoggable(Level.FINEST)) { - paintLog.log(Level.FINEST, "translating old dirty rect by the delta: " + r); + paintLog.finest("translating old dirty rect by the delta: " + r); } r.translate(dx, dy); } @@ -530,9 +525,9 @@ public void setBounds(int x, int y, int w, int h) { lockPage(); try { - log.log(Level.FINE, "setBounds: " + x + " " + y + " " + w + " " + h); + log.fine("setBounds: " + x + " " + y + " " + w + " " + h); if (isDisposed) { - log.log(Level.FINE, "setBounds() request for a disposed web page."); + log.fine("setBounds() request for a disposed web page."); return; } width = w; @@ -565,9 +560,9 @@ public void setOpaque(long frameID, boolean isOpaque) { lockPage(); try { - log.log(Level.FINE, "setOpaque: " + isOpaque); + log.fine("setOpaque: " + isOpaque); if (isDisposed) { - log.log(Level.FINE, "setOpaque() request for a disposed web page."); + log.fine("setOpaque() request for a disposed web page."); return; } if (!frames.contains(frameID)) { @@ -583,9 +578,9 @@ public void setBackgroundColor(long frameID, int backgroundColor) { lockPage(); try { - log.log(Level.FINE, "setBackgroundColor: " + backgroundColor); + log.fine("setBackgroundColor: " + backgroundColor); if (isDisposed) { - log.log(Level.FINE, "setBackgroundColor() request for a disposed web page."); + log.fine("setBackgroundColor() request for a disposed web page."); return; } if (!frames.contains(frameID)) { @@ -601,10 +596,10 @@ public void setBackgroundColor(int backgroundColor) { lockPage(); try { - log.log(Level.FINE, "setBackgroundColor: " + backgroundColor + + log.fine("setBackgroundColor: " + backgroundColor + " for all frames"); if (isDisposed) { - log.log(Level.FINE, "setBackgroundColor() request for a disposed web page."); + log.fine("setBackgroundColor() request for a disposed web page."); return; } @@ -625,7 +620,7 @@ try { ++updateContentCycleID; - paintLog.log(Level.FINEST, "toPaint: {0}", toPaint); + paintLog.finest("toPaint: {0}", toPaint); if (isDisposed) { paintLog.fine("updateContent() request for a disposed web page."); return; @@ -722,10 +717,10 @@ frameQueue.clear(); } - paintLog.log(Level.FINEST, "Frames to render: {0}", framesToRender); + paintLog.finest("Frames to render: {0}", framesToRender); for (RenderFrame frame : framesToRender) { - paintLog.log(Level.FINEST, "Rendering: {0}", frame); + paintLog.finest("Rendering: {0}", frame); for (WCRenderQueue rq : frame.getRQList()) { gc.saveState(); if (rq.getClip() != null) { @@ -758,9 +753,9 @@ public void dispatchFocusEvent(WCFocusEvent fe) { lockPage(); try { - log.log(Level.FINEST, "dispatchFocusEvent: " + fe); + log.finest("dispatchFocusEvent: " + fe); if (isDisposed) { - log.log(Level.FINE, "Focus event for a disposed web page."); + log.fine("Focus event for a disposed web page."); return; } twkProcessFocusEvent(getPage(), fe.getID(), fe.getDirection()); @@ -773,13 +768,13 @@ public boolean dispatchKeyEvent(WCKeyEvent ke) { lockPage(); try { - log.log(Level.FINEST, "dispatchKeyEvent: " + ke); + log.finest("dispatchKeyEvent: " + ke); if (isDisposed) { - log.log(Level.FINE, "Key event for a disposed web page."); + log.fine("Key event for a disposed web page."); return false; } if (WCKeyEvent.filterEvent(ke)) { - log.log(Level.FINEST, "filtered"); + log.finest("filtered"); return false; } return twkProcessKeyEvent(getPage(), ke.getType(), ke.getText(), @@ -795,9 +790,9 @@ public boolean dispatchMouseEvent(WCMouseEvent me) { lockPage(); try { - log.log(Level.FINEST, "dispatchMouseEvent: " + me.getX() + "," + me.getY()); + log.finest("dispatchMouseEvent: " + me.getX() + "," + me.getY()); if (isDisposed) { - log.log(Level.FINE, "Mouse event for a disposed web page."); + log.fine("Mouse event for a disposed web page."); return false; } @@ -817,9 +812,9 @@ public boolean dispatchMouseWheelEvent(WCMouseWheelEvent me) { lockPage(); try { - log.log(Level.FINEST, "dispatchMouseWheelEvent: " + me); + log.finest("dispatchMouseWheelEvent: " + me); if (isDisposed) { - log.log(Level.FINE, "MouseWheel event for a disposed web page."); + log.fine("MouseWheel event for a disposed web page."); return false; } return twkProcessMouseWheelEvent(getPage(), @@ -835,9 +830,9 @@ public boolean dispatchInputMethodEvent(WCInputMethodEvent ie) { lockPage(); try { - log.log(Level.FINEST, "dispatchInputMethodEvent: " + ie); + log.finest("dispatchInputMethodEvent: " + ie); if (isDisposed) { - log.log(Level.FINE, "InputMethod event for a disposed web page."); + log.fine("InputMethod event for a disposed web page."); return false; } switch (ie.getID()) { @@ -878,11 +873,11 @@ { lockPage(); try { - log.log(Level.FINEST, "dispatchDragOperation: " + x + "," + y + log.finest("dispatchDragOperation: " + x + "," + y + " dndCommand:" + commandId + " dndAction" + dndActionId); if (isDisposed) { - log.log(Level.FINE, "DnD event for a disposed web page."); + log.fine("DnD event for a disposed web page."); return 0; } return twkProcessDrag(getPage(), @@ -915,7 +910,7 @@ lockPage(); try { if (isDisposed) { - log.log(Level.FINE, "getClientTextLocation() request for a disposed web page."); + log.fine("getClientTextLocation() request for a disposed web page."); return new int[] { 0, 0, 0, 0 }; } Invoker.getInvoker().checkEventThread(); @@ -930,7 +925,7 @@ lockPage(); try { if (isDisposed) { - log.log(Level.FINE, "getClientLocationOffset() request for a disposed web page."); + log.fine("getClientLocationOffset() request for a disposed web page."); return 0; } Invoker.getInvoker().checkEventThread(); @@ -945,7 +940,7 @@ lockPage(); try { if (isDisposed) { - log.log(Level.FINE, "getClientInsertPositionOffset() request for a disposed web page."); + log.fine("getClientInsertPositionOffset() request for a disposed web page."); return 0; } return twkGetInsertPositionOffset(getPage()); @@ -959,7 +954,7 @@ lockPage(); try { if (isDisposed) { - log.log(Level.FINE, "getClientCommittedTextOffset() request for a disposed web page."); + log.fine("getClientCommittedTextOffset() request for a disposed web page."); return 0; } return twkGetCommittedTextLength(getPage()); @@ -973,7 +968,7 @@ lockPage(); try { if (isDisposed) { - log.log(Level.FINE, "getClientCommittedText() request for a disposed web page."); + log.fine("getClientCommittedText() request for a disposed web page."); return ""; } return twkGetCommittedText(getPage()); @@ -987,7 +982,7 @@ lockPage(); try { if (isDisposed) { - log.log(Level.FINE, "getClientSelectedText() request for a disposed web page."); + log.fine("getClientSelectedText() request for a disposed web page."); return ""; } return twkGetSelectedText(getPage()); @@ -1004,7 +999,7 @@ public void dispose() { lockPage(); try { - log.log(Level.FINER, "dispose"); + log.finer("dispose"); stop(); dropRenderFrames(); @@ -1014,7 +1009,7 @@ pPage = 0; for (long frameID : frames) { - log.log(Level.FINE, "Undestroyed frame view: " + frameID); + log.fine("Undestroyed frame view: " + frameID); } frames.clear(); @@ -1030,9 +1025,9 @@ public String getName(long frameID) { lockPage(); try { - log.log(Level.FINE, "Get Name: frame = " + frameID); + log.fine("Get Name: frame = " + frameID); if (isDisposed) { - log.log(Level.FINE, "getName() request for a disposed web page."); + log.fine("getName() request for a disposed web page."); return null; } if (!frames.contains(frameID)) { @@ -1048,9 +1043,9 @@ public String getURL(long frameID) { lockPage(); try { - log.log(Level.FINE, "Get URL: frame = " + frameID); + log.fine("Get URL: frame = " + frameID); if (isDisposed) { - log.log(Level.FINE, "getURL() request for a disposed web page."); + log.fine("getURL() request for a disposed web page."); return null; } if (!frames.contains(frameID)) { @@ -1066,9 +1061,9 @@ public String getEncoding() { lockPage(); try { - log.log(Level.FINE, "Get encoding"); + log.fine("Get encoding"); if (isDisposed) { - log.log(Level.FINE, "getEncoding() request for a disposed web page."); + log.fine("getEncoding() request for a disposed web page."); return null; } return twkGetEncoding(getPage()); @@ -1081,9 +1076,9 @@ public void setEncoding(String encoding) { lockPage(); try { - log.log(Level.FINE, "Set encoding: encoding = " + encoding); + log.fine("Set encoding: encoding = " + encoding); if (isDisposed) { - log.log(Level.FINE, "setEncoding() request for a disposed web page."); + log.fine("setEncoding() request for a disposed web page."); return; } if (encoding != null && !encoding.isEmpty()) { @@ -1099,9 +1094,9 @@ public String getInnerText(long frameID) { lockPage(); try { - log.log(Level.FINE, "Get inner text: frame = " + frameID); + log.fine("Get inner text: frame = " + frameID); if (isDisposed) { - log.log(Level.FINE, "getInnerText() request for a disposed web page."); + log.fine("getInnerText() request for a disposed web page."); return null; } if (!frames.contains(frameID)) { @@ -1118,9 +1113,9 @@ public String getRenderTree(long frameID) { lockPage(); try { - log.log(Level.FINE, "Get render tree: frame = " + frameID); + log.fine("Get render tree: frame = " + frameID); if (isDisposed) { - log.log(Level.FINE, "getRenderTree() request for a disposed web page."); + log.fine("getRenderTree() request for a disposed web page."); return null; } if (!frames.contains(frameID)) { @@ -1137,9 +1132,9 @@ public int getUnloadEventListenersCount(long frameID) { lockPage(); try { - log.log(Level.FINE, "frame: " + frameID); + log.fine("frame: " + frameID); if (isDisposed) { - log.log(Level.FINE, "request for a disposed web page."); + log.fine("request for a disposed web page."); return 0; } if (!frames.contains(frameID)) { @@ -1155,9 +1150,9 @@ public String getContentType(long frameID) { lockPage(); try { - log.log(Level.FINE, "Get content type: frame = " + frameID); + log.fine("Get content type: frame = " + frameID); if (isDisposed) { - log.log(Level.FINE, "getContentType() request for a disposed web page."); + log.fine("getContentType() request for a disposed web page."); return null; } if (!frames.contains(frameID)) { @@ -1173,9 +1168,9 @@ public String getTitle(long frameID) { lockPage(); try { - log.log(Level.FINE, "Get title: frame = " + frameID); + log.fine("Get title: frame = " + frameID); if (isDisposed) { - log.log(Level.FINE, "getTitle() request for a disposed web page."); + log.fine("getTitle() request for a disposed web page."); return null; } if (!frames.contains(frameID)) { @@ -1191,9 +1186,9 @@ public WCImage getIcon(long frameID) { lockPage(); try { - log.log(Level.FINE, "Get icon: frame = " + frameID); + log.fine("Get icon: frame = " + frameID); if (isDisposed) { - log.log(Level.FINE, "getIcon() request for a disposed web page."); + log.fine("getIcon() request for a disposed web page."); return null; } if (!frames.contains(frameID)) { @@ -1214,9 +1209,9 @@ public void open(final long frameID, final String url) { lockPage(); try { - log.log(Level.FINE, "Open URL: " + url); + log.fine("Open URL: " + url); if (isDisposed) { - log.log(Level.FINE, "open() request for a disposed web page."); + log.fine("open() request for a disposed web page."); return; } if (!frames.contains(frameID)) { @@ -1240,12 +1235,12 @@ public void load(final long frameID, final String text, final String contentType) { lockPage(); try { - log.log(Level.FINE, "Load text: " + text); + log.fine("Load text: " + text); if (text == null) { return; } if (isDisposed) { - log.log(Level.FINE, "load() request for a disposed web page."); + log.fine("load() request for a disposed web page."); return; } if (!frames.contains(frameID)) { @@ -1270,12 +1265,12 @@ public void stop(final long frameID) { lockPage(); try { - log.log(Level.FINE, "Stop loading: frame = " + frameID); + log.fine("Stop loading: frame = " + frameID); String url; String contentType; if (isDisposed) { - log.log(Level.FINE, "cancel() request for a disposed web page."); + log.fine("cancel() request for a disposed web page."); return; } if (!frames.contains(frameID)) { @@ -1297,9 +1292,9 @@ public void stop() { lockPage(); try { - log.log(Level.FINE, "Stop loading sync"); + log.fine("Stop loading sync"); if (isDisposed) { - log.log(Level.FINE, "stopAll() request for a disposed web page."); + log.fine("stopAll() request for a disposed web page."); return; } twkStopAll(getPage()); @@ -1312,9 +1307,9 @@ public void refresh(final long frameID) { lockPage(); try { - log.log(Level.FINE, "Refresh: frame = " + frameID); + log.fine("Refresh: frame = " + frameID); if (isDisposed) { - log.log(Level.FINE, "refresh() request for a disposed web page."); + log.fine("refresh() request for a disposed web page."); return; } if (!frames.contains(frameID)) { @@ -1334,9 +1329,9 @@ public boolean goBack() { lockPage(); try { - log.log(Level.FINE, "Go back"); + log.fine("Go back"); if (isDisposed) { - log.log(Level.FINE, "goBack() request for a disposed web page."); + log.fine("goBack() request for a disposed web page."); return false; } return twkGoBackForward(getPage(), -1); @@ -1349,9 +1344,9 @@ public boolean goForward() { lockPage(); try { - log.log(Level.FINE, "Go forward"); + log.fine("Go forward"); if (isDisposed) { - log.log(Level.FINE, "goForward() request for a disposed web page."); + log.fine("goForward() request for a disposed web page."); return false; } return twkGoBackForward(getPage(), 1); @@ -1364,9 +1359,9 @@ public boolean copy() { lockPage(); try { - log.log(Level.FINE, "Copy"); + log.fine("Copy"); if (isDisposed) { - log.log(Level.FINE, "copy() request for a disposed web page."); + log.fine("copy() request for a disposed web page."); return false; } long frameID = getMainFrame(); @@ -1384,10 +1379,10 @@ public boolean find(String stringToFind, boolean forward, boolean wrap, boolean matchCase) { lockPage(); try { - log.log(Level.FINE, "Find in page: stringToFind = " + stringToFind + ", " + + log.fine("Find in page: stringToFind = " + stringToFind + ", " + (forward ? "forward" : "backward") + (wrap ? ", wrap" : "") + (matchCase ? ", matchCase" : "")); if (isDisposed) { - log.log(Level.FINE, "find() request for a disposed web page."); + log.fine("find() request for a disposed web page."); return false; } return twkFindInPage(getPage(), stringToFind, forward, wrap, matchCase); @@ -1403,10 +1398,10 @@ { lockPage(); try { - log.log(Level.FINE, "Find in frame: stringToFind = " + stringToFind + ", " + + log.fine("Find in frame: stringToFind = " + stringToFind + ", " + (forward ? "forward" : "backward") + (wrap ? ", wrap" : "") + (matchCase ? ", matchCase" : "")); if (isDisposed) { - log.log(Level.FINE, "find() request for a disposed web page."); + log.fine("find() request for a disposed web page."); return false; } if (!frames.contains(frameID)) { @@ -1440,9 +1435,9 @@ public float getZoomFactor(boolean textOnly) { lockPage(); try { - log.log(Level.FINE, "Get zoom factor, textOnly=" + textOnly); + log.fine("Get zoom factor, textOnly=" + textOnly); if (isDisposed) { - log.log(Level.FINE, "getZoomFactor() request for a disposed web page."); + log.fine("getZoomFactor() request for a disposed web page."); return 1.0f; } long frameID = getMainFrame(); @@ -1460,7 +1455,7 @@ try { log.fine(String.format("Set zoom factor %.2f, textOnly=%b", zoomFactor, textOnly)); if (isDisposed) { - log.log(Level.FINE, "setZoomFactor() request for a disposed web page."); + log.fine("setZoomFactor() request for a disposed web page."); return; } long frameID = getMainFrame(); @@ -1482,9 +1477,9 @@ public void reset(long frameID) { lockPage(); try { - log.log(Level.FINE, "Reset: frame = " + frameID); + log.fine("Reset: frame = " + frameID); if (isDisposed) { - log.log(Level.FINE, "reset() request for a disposed web page."); + log.fine("reset() request for a disposed web page."); return; } if ((frameID == 0) || !frames.contains(frameID)) { @@ -1500,9 +1495,9 @@ public Object executeScript(long frameID, String script) throws JSException { lockPage(); try { - log.log(Level.FINE, "execute script: \"" + script + "\" in frame = " + frameID); + log.fine("execute script: \"" + script + "\" in frame = " + frameID); if (isDisposed) { - log.log(Level.FINE, "executeScript() request for a disposed web page."); + log.fine("executeScript() request for a disposed web page."); return null; } if ((frameID == 0) || !frames.contains(frameID)) { @@ -1518,13 +1513,13 @@ public long getMainFrame() { lockPage(); try { - log.log(Level.FINER, "getMainFrame: page = " + pPage); + log.finer("getMainFrame: page = " + pPage); if (isDisposed) { - log.log(Level.FINE, "getMainFrame() request for a disposed web page."); + log.fine("getMainFrame() request for a disposed web page."); return 0L; } long mainFrameID = twkGetMainFrame(getPage()); - log.log(Level.FINER, "Main frame = " + mainFrameID); + log.finer("Main frame = " + mainFrameID); frames.add(mainFrameID); return mainFrameID; } finally { @@ -1535,9 +1530,9 @@ public long getParentFrame(long childID) { lockPage(); try { - log.log(Level.FINE, "getParentFrame: child = " + childID); + log.fine("getParentFrame: child = " + childID); if (isDisposed) { - log.log(Level.FINE, "getParentFrame() request for a disposed web page."); + log.fine("getParentFrame() request for a disposed web page."); return 0L; } if (!frames.contains(childID)) { @@ -1552,9 +1547,9 @@ public List getChildFrames(long parentID) { lockPage(); try { - log.log(Level.FINE, "getChildFrames: parent = " + parentID); + log.fine("getChildFrames: parent = " + parentID); if (isDisposed) { - log.log(Level.FINE, "getChildFrames() request for a disposed web page."); + log.fine("getChildFrames() request for a disposed web page."); return null; } if (!frames.contains(parentID)) { @@ -1620,9 +1615,9 @@ public Document getDocument(long frameID) { lockPage(); try { - log.log(Level.FINE, "getDocument"); + log.fine("getDocument"); if (isDisposed) { - log.log(Level.FINE, "getDocument() request for a disposed web page."); + log.fine("getDocument() request for a disposed web page."); return null; } @@ -1638,9 +1633,9 @@ public Element getOwnerElement(long frameID) { lockPage(); try { - log.log(Level.FINE, "getOwnerElement"); + log.fine("getOwnerElement"); if (isDisposed) { - log.log(Level.FINE, "getOwnerElement() request for a disposed web page."); + log.fine("getOwnerElement() request for a disposed web page."); return null; } @@ -1659,17 +1654,17 @@ lockPage(); try { if (log.isLoggable(Level.FINE)) { - log.log(Level.FINE, "command: [{0}], value: [{1}]", + log.fine("command: [{0}], value: [{1}]", new Object[] {command, value}); } if (isDisposed) { - log.log(Level.FINE, "Web page is already disposed"); + log.fine("Web page is already disposed"); return false; } boolean result = twkExecuteCommand(getPage(), command, value); - log.log(Level.FINE, "result: [{0}]", result); + log.fine("result: [{0}]", result); return result; } finally { unlockPage(); @@ -1679,15 +1674,15 @@ public boolean queryCommandEnabled(String command) { lockPage(); try { - log.log(Level.FINE, "command: [{0}]", command); + log.fine("command: [{0}]", command); if (isDisposed) { - log.log(Level.FINE, "Web page is already disposed"); + log.fine("Web page is already disposed"); return false; } boolean result = twkQueryCommandEnabled(getPage(), command); - log.log(Level.FINE, "result: [{0}]", result); + log.fine("result: [{0}]", result); return result; } finally { unlockPage(); @@ -1697,15 +1692,15 @@ public boolean queryCommandState(String command) { lockPage(); try { - log.log(Level.FINE, "command: [{0}]", command); + log.fine("command: [{0}]", command); if (isDisposed) { - log.log(Level.FINE, "Web page is already disposed"); + log.fine("Web page is already disposed"); return false; } boolean result = twkQueryCommandState(getPage(), command); - log.log(Level.FINE, "result: [{0}]", result); + log.fine("result: [{0}]", result); return result; } finally { unlockPage(); @@ -1715,15 +1710,15 @@ public String queryCommandValue(String command) { lockPage(); try { - log.log(Level.FINE, "command: [{0}]", command); + log.fine("command: [{0}]", command); if (isDisposed) { - log.log(Level.FINE, "Web page is already disposed"); + log.fine("Web page is already disposed"); return null; } String result = twkQueryCommandValue(getPage(), command); - log.log(Level.FINE, "result: [{0}]", result); + log.fine("result: [{0}]", result); return result; } finally { unlockPage(); @@ -1733,9 +1728,9 @@ public boolean isEditable() { lockPage(); try { - log.log(Level.FINE, "isEditable"); + log.fine("isEditable"); if (isDisposed) { - log.log(Level.FINE, "isEditable() request for a disposed web page."); + log.fine("isEditable() request for a disposed web page."); return false; } @@ -1748,9 +1743,9 @@ public void setEditable(boolean editable) { lockPage(); try { - log.log(Level.FINE, "setEditable"); + log.fine("setEditable"); if (isDisposed) { - log.log(Level.FINE, "setEditable() request for a disposed web page."); + log.fine("setEditable() request for a disposed web page."); return; } @@ -1767,9 +1762,9 @@ public String getHtml(long frameID) { lockPage(); try { - log.log(Level.FINE, "getHtml"); + log.fine("getHtml"); if (isDisposed) { - log.log(Level.FINE, "getHtml() request for a disposed web page."); + log.fine("getHtml() request for a disposed web page."); return null; } if (!frames.contains(frameID)) { @@ -1875,16 +1870,16 @@ public int getFrameHeight(long frameID) { lockPage(); try { - log.log(Level.FINE, "Get page height"); + log.fine("Get page height"); if (isDisposed) { - log.log(Level.FINE, "getFrameHeight() request for a disposed web page."); + log.fine("getFrameHeight() request for a disposed web page."); return 0; } if (!frames.contains(frameID)) { return 0; } int height = twkGetFrameHeight(frameID); - log.log(Level.FINE, "Height = " + height); + log.fine("Height = " + height); return height; } finally { unlockPage(); @@ -1896,9 +1891,9 @@ { lockPage(); try { - log.log(Level.FINE, "Adjust page height"); + log.fine("Adjust page height"); if (isDisposed) { - log.log(Level.FINE, "adjustFrameHeight() request for a disposed web page."); + log.fine("adjustFrameHeight() request for a disposed web page."); return 0; } if (!frames.contains(frameID)) { @@ -1944,9 +1939,7 @@ lockPage(); try { boolean result = twkGetDeveloperExtrasEnabled(getPage()); - log.log(Level.FINE, - "Getting developerExtrasEnabled, result: [{0}]", - result); + log.fine("Getting developerExtrasEnabled, result: [{0}]", result); return result; } finally { unlockPage(); @@ -1956,9 +1949,7 @@ public void setDeveloperExtrasEnabled(boolean enabled) { lockPage(); try { - log.log(Level.FINE, - "Setting developerExtrasEnabled, value: [{0}]", - enabled); + log.fine("Setting developerExtrasEnabled, value: [{0}]", enabled); twkSetDeveloperExtrasEnabled(getPage(), enabled); } finally { unlockPage(); @@ -2051,7 +2042,7 @@ public void connectInspectorFrontend() { lockPage(); try { - log.log(Level.FINE, "Connecting inspector frontend"); + log.fine("Connecting inspector frontend"); twkConnectInspectorFrontend(getPage()); } finally { unlockPage(); @@ -2061,7 +2052,7 @@ public void disconnectInspectorFrontend() { lockPage(); try { - log.log(Level.FINE, "Disconnecting inspector frontend"); + log.fine("Disconnecting inspector frontend"); twkDisconnectInspectorFrontend(getPage()); } finally { unlockPage(); @@ -2072,10 +2063,8 @@ lockPage(); try { if (log.isLoggable(Level.FINE)) { - log.log(Level.FINE, - "Dispatching inspector message from frontend, " - + "message: [{0}]", - message); + log.fine("Dispatching inspector message from frontend, " + + "message: [{0}]", message); } twkDispatchInspectorMessageFromFrontend(getPage(), message); } finally { @@ -2088,18 +2077,18 @@ // ************************************************************************* private void fwkFrameCreated(long frameID) { - log.log(Level.FINE, "Frame created: frame = " + frameID); + log.fine("Frame created: frame = " + frameID); if (frames.contains(frameID)) { - log.log(Level.FINE, "Error in fwkFrameCreated: frame is already in frames"); + log.fine("Error in fwkFrameCreated: frame is already in frames"); return; } frames.add(frameID); } private void fwkFrameDestroyed(long frameID) { - log.log(Level.FINE, "Frame destroyed: frame = " + frameID); + log.fine("Frame destroyed: frame = " + frameID); if (!frames.contains(frameID)) { - log.log(Level.FINE, "Error in fwkFrameDestroyed: frame is not found in frames"); + log.fine("Error in fwkFrameDestroyed: frame is not found in frames"); return; } frames.remove(frameID); @@ -2109,7 +2098,7 @@ lockPage(); try { if (paintLog.isLoggable(Level.FINEST)) { - paintLog.log(Level.FINEST, "x: {0}, y: {1}, w: {2}, h: {3}", + paintLog.finest("x: {0}, y: {1}, w: {2}, h: {3}", new Object[] {x, y, w, h}); } addDirtyRect(new WCRectangle(x, y, w, h)); @@ -2131,7 +2120,7 @@ } private void fwkTransferFocus(boolean forward) { - log.log(Level.FINER, "Transfer focus " + (forward ? "forward" : "backward")); + log.finer("Transfer focus " + (forward ? "forward" : "backward")); if (pageClient != null) { pageClient.transferFocus(forward); @@ -2139,7 +2128,7 @@ } private void fwkSetCursor(long id) { - log.log(Level.FINER, "Set cursor: " + id); + log.finer("Set cursor: " + id); if (pageClient != null) { pageClient.setCursor(id); @@ -2147,7 +2136,7 @@ } private void fwkSetFocus(boolean focus) { - log.log(Level.FINER, "Set focus: " + (focus ? "true" : "false")); + log.finer("Set focus: " + (focus ? "true" : "false")); if (pageClient != null) { pageClient.setFocus(focus); @@ -2155,7 +2144,7 @@ } private void fwkSetTooltip(String tooltip) { - log.log(Level.FINER, "Set tooltip: " + tooltip); + log.finer("Set tooltip: " + tooltip); if (pageClient != null) { pageClient.setTooltip(tooltip); @@ -2163,7 +2152,7 @@ } private void fwkPrint() { - log.log(Level.FINER, "Print"); + log.finer("Print"); if (uiClient != null) { uiClient.print(); @@ -2171,7 +2160,7 @@ } private void fwkSetRequestURL(long pFrame, int id, String url) { - log.log(Level.FINER, "Set request URL: id = " + id + ", url = " + url); + log.finer("Set request URL: id = " + id + ", url = " + url); synchronized (requestURLs) { requestURLs.put(id, url); @@ -2179,7 +2168,7 @@ } private void fwkRemoveRequestURL(long pFrame, int id) { - log.log(Level.FINER, "Set request URL: id = " + id); + log.finer("Set request URL: id = " + id); synchronized (requestURLs) { requestURLs.remove(id); @@ -2189,7 +2178,7 @@ private WebPage fwkCreateWindow( boolean menu, boolean status, boolean toolbar, boolean resizable) { - log.log(Level.FINER, "Create window"); + log.finer("Create window"); if (uiClient != null) { return uiClient.createPage(menu, status, toolbar, resizable); @@ -2198,7 +2187,7 @@ } private void fwkShowWindow() { - log.log(Level.FINER, "Show window"); + log.finer("Show window"); if (uiClient != null) { uiClient.showView(); @@ -2206,7 +2195,7 @@ } private void fwkCloseWindow() { - log.log(Level.FINER, "Close window"); + log.finer("Close window"); if (permitCloseWindowAction()) { if (uiClient != null) { @@ -2216,7 +2205,7 @@ } private WCRectangle fwkGetWindowBounds() { - log.log(Level.FINE, "Get window bounds"); + log.fine("Get window bounds"); if (uiClient != null) { WCRectangle bounds = uiClient.getViewBounds(); @@ -2228,7 +2217,7 @@ } private void fwkSetWindowBounds(int x, int y, int w, int h) { - log.log(Level.FINER, "Set window bounds: " + x + " " + y + " " + w + " " + h); + log.finer("Set window bounds: " + x + " " + y + " " + w + " " + h); if (uiClient != null) { uiClient.setViewBounds(new WCRectangle(x, y, w, h)); @@ -2236,7 +2225,7 @@ } private WCRectangle fwkGetPageBounds() { - log.log(Level.FINER, "Get page bounds"); + log.finer("Get page bounds"); return new WCRectangle(0, 0, width, height); } @@ -2245,7 +2234,7 @@ } private void fwkSetStatusbarText(String text) { - log.log(Level.FINER, "Set statusbar text: " + text); + log.finer("Set statusbar text: " + text); if (uiClient != null) { uiClient.setStatusbarText(text); @@ -2253,7 +2242,7 @@ } private String[] fwkChooseFile(String initialFileName, boolean multiple, String mimeFilters) { - log.log(Level.FINER, "Choose file, initial=" + initialFileName); + log.finer("Choose file, initial=" + initialFileName); return uiClient != null ? uiClient.chooseFile(initialFileName, multiple, mimeFilters) @@ -2267,7 +2256,7 @@ String[] mimeTypes, Object[] values, boolean isImageSource) { - log.log(Level.FINER, "Start drag: "); + log.finer("Start drag: "); if (uiClient != null) { uiClient.startDrag( WCImage.getImage(image), @@ -2279,7 +2268,7 @@ } private WCPoint fwkScreenToWindow(WCPoint ptScreen) { - log.log(Level.FINER, "fwkScreenToWindow"); + log.finer("fwkScreenToWindow"); if (pageClient != null) { return pageClient.screenToWindow(ptScreen); @@ -2288,7 +2277,7 @@ } private WCPoint fwkWindowToScreen(WCPoint ptWindow) { - log.log(Level.FINER, "fwkWindowToScreen"); + log.finer("fwkWindowToScreen"); if (pageClient != null) { return pageClient.windowToScreen(ptWindow); @@ -2298,7 +2287,7 @@ private void fwkAlert(String text) { - log.log(Level.FINE, "JavaScript alert(): text = " + text); + log.fine("JavaScript alert(): text = " + text); if (uiClient != null) { uiClient.alert(text); @@ -2306,7 +2295,7 @@ } private boolean fwkConfirm(String text) { - log.log(Level.FINE, "JavaScript confirm(): text = " + text); + log.fine("JavaScript confirm(): text = " + text); if (uiClient != null) { return uiClient.confirm(text); @@ -2315,7 +2304,7 @@ } private String fwkPrompt(String text, String defaultValue) { - log.log(Level.FINE, "JavaScript prompt(): text = " + text + ", default = " + defaultValue); + log.fine("JavaScript prompt(): text = " + text + ", default = " + defaultValue); if (uiClient != null) { return uiClient.prompt(text, defaultValue); @@ -2324,7 +2313,7 @@ } private boolean fwkCanRunBeforeUnloadConfirmPanel() { - log.log(Level.FINE, "JavaScript canRunBeforeUnloadConfirmPanel()"); + log.fine("JavaScript canRunBeforeUnloadConfirmPanel()"); if (uiClient != null) { return uiClient.canRunBeforeUnloadConfirmPanel(); @@ -2333,7 +2322,7 @@ } private boolean fwkRunBeforeUnloadConfirmPanel(String message) { - log.log(Level.FINE, "JavaScript runBeforeUnloadConfirmPanel(): message = " + message); + log.fine("JavaScript runBeforeUnloadConfirmPanel(): message = " + message); if (uiClient != null) { return uiClient.runBeforeUnloadConfirmPanel(message); @@ -2344,7 +2333,7 @@ private void fwkAddMessageToConsole(String message, int lineNumber, String sourceId) { - log.log(Level.FINE, "fwkAddMessageToConsole(): message = " + message + log.fine("fwkAddMessageToConsole(): message = " + message + ", lineNumber = " + lineNumber + ", sourceId = " + sourceId); if (pageClient != null) { pageClient.addMessageToConsole(message, lineNumber, sourceId); @@ -2355,7 +2344,7 @@ String url, String contentType, double progress, int errorCode) { - log.log(Level.FINER, "Load event: pFrame = " + frameID + ", state = " + state + + log.finer("Load event: pFrame = " + frameID + ", state = " + state + ", url = " + url + ", contenttype=" + contentType + ", progress = " + progress + ", error = " + errorCode); @@ -2366,13 +2355,13 @@ int id, String contentType, double progress, int errorCode) { - log.log(Level.FINER, "Resource load event: pFrame = " + frameID + ", state = " + state + + log.finer("Resource load event: pFrame = " + frameID + ", state = " + state + ", id = " + id + ", contenttype=" + contentType + ", progress = " + progress + ", error = " + errorCode); String url = requestURLs.get(id); if (url == null) { - log.log(Level.FINE, "Error in fwkFireResourceLoadEvent: unknown request id " + id); + log.fine("Error in fwkFireResourceLoadEvent: unknown request id " + id); return; } @@ -2390,7 +2379,7 @@ } private boolean fwkPermitNavigateAction(long pFrame, String url) { - log.log(Level.FINE, "Policy: permit NAVIGATE: pFrame = " + pFrame + ", url = " + url); + log.fine("Policy: permit NAVIGATE: pFrame = " + pFrame + ", url = " + url); if (policyClient != null) { return policyClient.permitNavigateAction(pFrame, str2url(url)); @@ -2399,7 +2388,7 @@ } private boolean fwkPermitRedirectAction(long pFrame, String url) { - log.log(Level.FINE, "Policy: permit REDIRECT: pFrame = " + pFrame + ", url = " + url); + log.fine("Policy: permit REDIRECT: pFrame = " + pFrame + ", url = " + url); if (policyClient != null) { return policyClient.permitRedirectAction(pFrame, str2url(url)); @@ -2408,7 +2397,7 @@ } private boolean fwkPermitAcceptResourceAction(long pFrame, String url) { - log.log(Level.FINE, "Policy: permit ACCEPT_RESOURCE: pFrame + " + pFrame + ", url = " + url); + log.fine("Policy: permit ACCEPT_RESOURCE: pFrame + " + pFrame + ", url = " + url); if (policyClient != null) { return policyClient.permitAcceptResourceAction(pFrame, str2url(url)); @@ -2419,7 +2408,7 @@ private boolean fwkPermitSubmitDataAction(long pFrame, String url, String httpMethod, boolean isSubmit) { - log.log(Level.FINE, "Policy: permit " + (isSubmit ? "" : "RE") + "SUBMIT_DATA: pFrame = " + + log.fine("Policy: permit " + (isSubmit ? "" : "RE") + "SUBMIT_DATA: pFrame = " + pFrame + ", url = " + url + ", httpMethod = " + httpMethod); if (policyClient != null) { @@ -2433,7 +2422,7 @@ } private boolean fwkPermitEnableScriptsAction(long pFrame, String url) { - log.log(Level.FINE, "Policy: permit ENABLE_SCRIPTS: pFrame + " + pFrame + ", url = " + url); + log.fine("Policy: permit ENABLE_SCRIPTS: pFrame + " + pFrame + ", url = " + url); if (policyClient != null) { return policyClient.permitEnableScriptsAction(pFrame, str2url(url)); @@ -2442,7 +2431,7 @@ } private boolean fwkPermitNewWindowAction(long pFrame, String url) { - log.log(Level.FINE, "Policy: permit NEW_PAGE: pFrame = " + pFrame + ", url = " + url); + log.fine("Policy: permit NEW_PAGE: pFrame = " + pFrame + ", url = " + url); if (policyClient != null) { return policyClient.permitNewPageAction(pFrame, str2url(url)); @@ -2452,7 +2441,7 @@ // Called from fwkCloseWindow, that's why no "fwk" prefix private boolean permitCloseWindowAction() { - log.log(Level.FINE, "Policy: permit CLOSE_PAGE"); + log.fine("Policy: permit CLOSE_PAGE"); if (policyClient != null) { // Unfortunately, webkit doesn't provide an information about what @@ -2463,23 +2452,22 @@ } private void fwkRepaintAll() { - log.log(Level.FINE, "Repainting the entire page"); + log.fine("Repainting the entire page"); repaintAll(); } private boolean fwkSendInspectorMessageToFrontend(String message) { if (log.isLoggable(Level.FINE)) { - log.log(Level.FINE, - "Sending inspector message to frontend, message: [{0}]", + log.fine("Sending inspector message to frontend, message: [{0}]", message); } boolean result = false; if (inspectorClient != null) { - log.log(Level.FINE, "Invoking inspector client"); + log.fine("Invoking inspector client"); result = inspectorClient.sendMessageToFrontend(message); } if (log.isLoggable(Level.FINE)) { - log.log(Level.FINE, "Result: [{0}]", result); + log.fine("Result: [{0}]", result); } return result; } @@ -2506,7 +2494,7 @@ try { return newURL(url); } catch (MalformedURLException ex) { - log.log(Level.FINE, "Exception while converting \"" + url + "\" to URL", ex); + log.fine("Exception while converting \"" + url + "\" to URL", ex); } return null; }