From d0b3db034a2ec58704045d426d790d9bc3b10b1c Mon Sep 17 00:00:00 2001 From: "edburns%acm.org" Date: Wed, 17 Jan 2007 11:43:43 +0000 Subject: [PATCH] M build.properties.sample - declare compile.source=1.5 M dom/build.xml M plugins/build.xml M plugins/examples/MediaPlayer/build.xml M plugins/test/build.xml M util/build.xml - remove compile.source property, take it from top level build.properties M plugins/mozilla/Makefile.in - remove hard coded MS_SDK_HOME reference M util/classes/org/mozilla/util/Log.java - This class is the home to the LogStrings property for java supplement M webclient/build-tests.xml - copy properties file - turn on logging M webclient/build.xml - remove compile.source property, take it from top level build.properties - set a FILE_PATH_SEP property - make run.test depend on prepare - make run.test.browser depend on prepare M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/BookmarksImpl.java M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CocoaBrowserControlCanvas.java M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CurrentPageImpl.java M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/HistoryImpl.java M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NavigationImpl.java M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/PreferencesImpl.java M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/RDFEnumeration.java M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/Win32BrowserControlCanvas.java M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WindowControlImpl.java M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java - Define toString() for all the WCRunnable and Runnable impls. M webclient/test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java - Some logging. A util/classes/org/mozilla/LogStrings.properties A webclient/test/automated/src/classes/org/mozilla/webclient/TestLogStrings.properties - LogStrings.properties files for tests and core impl A logging.properties - Logging settings for java supplement git-svn-id: svn://10.0.0.236/trunk@218507 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/java/build.properties.sample | 3 ++ mozilla/java/dom/build.xml | 1 - mozilla/java/logging.properties | 12 +++++ mozilla/java/plugins/build.xml | 1 - .../plugins/examples/MediaPlayer/build.xml | 1 - mozilla/java/plugins/mozilla/Makefile.in | 5 +- mozilla/java/plugins/test/build.xml | 1 - mozilla/java/util/build.xml | 8 +++- .../classes/org/mozilla/LogStrings.properties | 1 + .../util/classes/org/mozilla/util/Log.java | 12 ++++- mozilla/java/webclient/build-tests.xml | 7 +++ mozilla/java/webclient/build.xml | 19 ++++++-- .../impl/wrapper_native/BookmarksImpl.java | 8 ++++ .../CocoaBrowserControlCanvas.java | 4 ++ .../impl/wrapper_native/CurrentPageImpl.java | 46 ++++++++++++++++++- .../wrapper_native/EventRegistrationImpl.java | 12 +++++ .../impl/wrapper_native/HistoryImpl.java | 16 +++++++ .../impl/wrapper_native/NavigationImpl.java | 28 +++++++++-- .../impl/wrapper_native/PreferencesImpl.java | 15 ++++++ .../impl/wrapper_native/RDFEnumeration.java | 12 +++++ .../Win32BrowserControlCanvas.java | 6 ++- .../wrapper_native/WindowControlImpl.java | 14 +++++- .../wrapper_native/WrapperFactoryImpl.java | 25 +++++++++- .../webclient/TestLogStrings.properties | 1 + .../mozilla/webclient/WebclientTestCase.java | 20 +++++--- 25 files changed, 251 insertions(+), 27 deletions(-) create mode 100644 mozilla/java/logging.properties create mode 100644 mozilla/java/util/classes/org/mozilla/LogStrings.properties create mode 100644 mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/TestLogStrings.properties diff --git a/mozilla/java/build.properties.sample b/mozilla/java/build.properties.sample index cc71a6b7307..3ed8660ffb3 100644 --- a/mozilla/java/build.properties.sample +++ b/mozilla/java/build.properties.sample @@ -15,3 +15,6 @@ junit.jar= # When running under MSDev, program arguments are -Djava.library.path=D:\Projects\mozilla\MOZILLA_NIH\FIREFOX_1_5_0_1\mozilla\dist\bin;D:\Projects\mozilla\MOZILLA_NIH\FIREFOX_1_5_0_1\mozilla\dist\bin/components -DNSPR_LOG_MODULES=webclient:4,webclientstub:4 -DNSPR_LOG_FILE=logfile.txt -DBROWSER_BIN_DIR=D:\Projects\mozilla\MOZILLA_NIH\FIREFOX_1_5_0_1\mozilla\dist\bin -DMOZ_SRC=D:\Projects\mozilla\MOZILLA_NIH\FIREFOX_1_5_0_1 -Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=y -classpath D:\Files_2k\netbeans-5.0\ide6\modules\ext\junit-3.8.1.jar;D:\Projects\mozilla\MOZILLA_NIH\FIREFOX_1_5_0_1\mozilla\dist\classes;D:\Projects\mozilla\MOZILLA_NIH\FIREFOX_1_5_0_1\mozilla\dist\classes\test\classes;D:\Files_2k\netbeans-5.0\ide6\ant\lib\junit.jar;D:\Files_2k\netbeans-5.0\ide6\ant\lib\ant-launcher.jar;D:\Files_2k\netbeans-5.0\ide6\ant\lib\ant.jar;D:\Files_2k\netbeans-5.0\ide6\ant\lib\ant-junit.jar org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner org.mozilla.webclient.BrowserControlFactoryTest filtertrace=true haltOnError=true haltOnFailure=true formatter=org.apache.tools.ant.taskdefs.optional.junit.SummaryJUnitResultFormatter showoutput=false formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter propsfile=D:\Projects\mozilla\MOZILLA_NIH\FIREFOX_1_5_0_1\mozilla\java\webclient\junit.properties + +# source level for compilation +compile.source=1.5 diff --git a/mozilla/java/dom/build.xml b/mozilla/java/dom/build.xml index bd48feef277..3402541677a 100644 --- a/mozilla/java/dom/build.xml +++ b/mozilla/java/dom/build.xml @@ -43,7 +43,6 @@ - diff --git a/mozilla/java/logging.properties b/mozilla/java/logging.properties new file mode 100644 index 00000000000..239e09ffff4 --- /dev/null +++ b/mozilla/java/logging.properties @@ -0,0 +1,12 @@ +handlers= java.util.logging.FileHandler + +.level=INFO + + +java.util.logging.FileHandler.pattern = %h/moz-java-log.xml +java.util.logging.FileHandler.limit = 50000 +java.util.logging.FileHandler.append = 1 +java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter + +org.mozilla.webclient.level=FINEST + diff --git a/mozilla/java/plugins/build.xml b/mozilla/java/plugins/build.xml index 014e122dbbf..7e13ff7f9ce 100644 --- a/mozilla/java/plugins/build.xml +++ b/mozilla/java/plugins/build.xml @@ -43,7 +43,6 @@ - diff --git a/mozilla/java/plugins/examples/MediaPlayer/build.xml b/mozilla/java/plugins/examples/MediaPlayer/build.xml index bb4aa484f4d..0136f04b92c 100644 --- a/mozilla/java/plugins/examples/MediaPlayer/build.xml +++ b/mozilla/java/plugins/examples/MediaPlayer/build.xml @@ -43,7 +43,6 @@ - diff --git a/mozilla/java/plugins/mozilla/Makefile.in b/mozilla/java/plugins/mozilla/Makefile.in index 5684958cb51..1ee8b6cfce6 100644 --- a/mozilla/java/plugins/mozilla/Makefile.in +++ b/mozilla/java/plugins/mozilla/Makefile.in @@ -70,10 +70,9 @@ endif include $(topsrcdir)/config/rules.mk ifeq ($(OS_ARCH),WINNT) -MS_SDK_HOME=/cygdrive/d/Files_2k/MICROS~1 INCLUDES += \ - -I$(MS_SDK_HOME)/VC98/Include \ - -I$(MS_SDK_HOME)/VC98/ATL/SRC \ + -I$(MSVCDIR)/Include \ + -I$(MSVCDIR)/ATL/SRC \ -I../src \ -I../src/_xpidlgen \ -I$(MOZILLA_FIVE_HOME)/../include/string \ diff --git a/mozilla/java/plugins/test/build.xml b/mozilla/java/plugins/test/build.xml index ddb75840eb9..12404ddcadb 100644 --- a/mozilla/java/plugins/test/build.xml +++ b/mozilla/java/plugins/test/build.xml @@ -43,7 +43,6 @@ - diff --git a/mozilla/java/util/build.xml b/mozilla/java/util/build.xml index 492efeb9018..602cd5f74ed 100644 --- a/mozilla/java/util/build.xml +++ b/mozilla/java/util/build.xml @@ -43,7 +43,6 @@ - @@ -75,6 +74,13 @@ + + + + + + + diff --git a/mozilla/java/util/classes/org/mozilla/LogStrings.properties b/mozilla/java/util/classes/org/mozilla/LogStrings.properties new file mode 100644 index 00000000000..13e936fed65 --- /dev/null +++ b/mozilla/java/util/classes/org/mozilla/LogStrings.properties @@ -0,0 +1 @@ +# Sample ResourceBundle properties file diff --git a/mozilla/java/util/classes/org/mozilla/util/Log.java b/mozilla/java/util/classes/org/mozilla/util/Log.java index e1a3b374597..b568c785aa9 100644 --- a/mozilla/java/util/classes/org/mozilla/util/Log.java +++ b/mozilla/java/util/classes/org/mozilla/util/Log.java @@ -24,14 +24,24 @@ package org.mozilla.util; import java.util.Date; +import java.util.logging.Logger; /** *

Logging facility.

* @author Keith Bernstein - * @version $Id: Log.java,v 1.3 2005-03-15 02:49:16 edburns%acm.org Exp $ + * @version $Id: Log.java,v 1.4 2007-01-17 11:43:43 edburns%acm.org Exp $ */ public class Log extends Object { + + public static Logger getLogger( String loggerName ) { + return Logger.getLogger(loggerName, LOG_STRINGS ); + } + + public static final String LOG_STRINGS = "org.mozilla.LogStrings"; + public static final String LOG = "org.mozilla"; + + public static final Logger LOGGER = getLogger(LOG); static String applicationName = "APPLICATION NAME UNKNOWN [call setApplicationName() from main]"; static String applicationVersion = "APPLICATION VERSION UNKNOWN [call setApplicationVersion() from main]"; static String applicationVersionDate = "APPLICATION VERSION DATE UNKNOWN [call setApplicationVersionDate() from main]"; diff --git a/mozilla/java/webclient/build-tests.xml b/mozilla/java/webclient/build-tests.xml index 4b94e80dec8..225d731260f 100644 --- a/mozilla/java/webclient/build-tests.xml +++ b/mozilla/java/webclient/build-tests.xml @@ -119,6 +119,12 @@ + + + + + + @@ -158,6 +164,7 @@ + diff --git a/mozilla/java/webclient/build.xml b/mozilla/java/webclient/build.xml index bea4f1e4b20..357519ca2cb 100644 --- a/mozilla/java/webclient/build.xml +++ b/mozilla/java/webclient/build.xml @@ -43,7 +43,6 @@ - @@ -75,6 +74,20 @@ + + + + + + + + + + + + + + - + - + diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/BookmarksImpl.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/BookmarksImpl.java index 9f9df2cc824..6b39941338b 100644 --- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/BookmarksImpl.java +++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/BookmarksImpl.java @@ -162,6 +162,10 @@ public TreeModel getBookmarks() throws IllegalStateException getNativeWrapperFactory())); return result; } + public String toString() { + return "WCRunnable.nativeGetBookmarks"; + } + }); if (-1 == nativeBookmarks.intValue()) { @@ -202,6 +206,10 @@ public BookmarkEntry newBookmarkEntry(String url) finalUrl, false)); return result; } + public String toString() { + return "WCRunnable.nativeNewBookmarkEntry"; + } + }); if (-1 != newNode.intValue()) { diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CocoaBrowserControlCanvas.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CocoaBrowserControlCanvas.java index c373aa38476..411d0974600 100644 --- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CocoaBrowserControlCanvas.java +++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CocoaBrowserControlCanvas.java @@ -61,6 +61,10 @@ public class CocoaBrowserControlCanvas extends BrowserControlCanvas { new Integer(CocoaBrowserControlCanvas.this.getHandleToPeer()); return result; } + public String toString() { + return "WCRunnable.getHandleToPeer"; + } + }); return result.intValue(); } diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CurrentPageImpl.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CurrentPageImpl.java index cc1b32f44ef..0c8c17df003 100644 --- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CurrentPageImpl.java +++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CurrentPageImpl.java @@ -103,6 +103,10 @@ public void copyCurrentSelectionToSystemClipboard() nativeCopyCurrentSelectionToSystemClipboard(CurrentPageImpl.this.getNativeBrowserControl()); return null; } + public String toString() { + return "WCRunnable.nativeCopyCurrentSelectionToSystemClipboard"; + } + }); } @@ -116,6 +120,10 @@ public Selection getSelection() { selection); return null; } + public String toString() { + return "WCRunnable.nativeGetSelection"; + } + }); return selection; @@ -135,6 +143,10 @@ public void highlightSelection(Selection selection) { startOffset, endOffset); return null; } + public String toString() { + return "WCRunnable.nativeHighlightSelection"; + } + }); } } @@ -144,7 +156,11 @@ public void clearAllSelections() { public Object run() { nativeClearAllSelections(CurrentPageImpl.this.getNativeBrowserControl()); return null; - } + } + public String toString() { + return "WCRunnable.nativeClearAllSelections"; + } + }); } public void findInPage(String stringToFind, boolean forward, boolean matchCase) @@ -166,7 +182,11 @@ public boolean find(String toFind, boolean dir, boolean doCase) boolean rc = nativeFind(CurrentPageImpl.this.getNativeBrowserControl(), stringToFind, forward, matchCase); return rc ? Boolean.TRUE : Boolean.FALSE; - } + } + public String toString() { + return "WCRunnable.nativeFind"; + } + }); return result.booleanValue(); } @@ -186,6 +206,10 @@ public boolean findNext() boolean rc = nativeFindNext(CurrentPageImpl.this.getNativeBrowserControl()); return rc ? Boolean.TRUE : Boolean.FALSE; } + public String toString() { + return "WCRunnable.nativeFindNext"; + } + }); return result.booleanValue(); } @@ -236,6 +260,10 @@ public String getSource() selection); return null; } + public String toString() { + return "WCRunnable.nativeGetSource"; + } + }); HTMLContent = selection.toString(); @@ -271,6 +299,10 @@ public void selectAll() { nativeSelectAll(CurrentPageImpl.this.getNativeBrowserControl()); return null; } + public String toString() { + return "WCRunnable.nativeSelectAll"; + } + }); } @@ -280,6 +312,11 @@ public void print() public void run() { nativePrint(CurrentPageImpl.this.getNativeBrowserControl()); } + public String toString() { + return "Runnable.nativePrint"; + } + + }); } @@ -291,6 +328,11 @@ public void printPreview(boolean pre) nativePrintPreview(CurrentPageImpl.this.getNativeBrowserControl(), preview); } + public String toString() { + return "Runnable.nativePrintPreview"; + } + + }); } diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java index 8a476c358f9..146ed9ce672 100644 --- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java +++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java @@ -160,6 +160,10 @@ public void addDocumentLoadListener(DocumentLoadListener listener) true); return null; } + public String toString() { + return "WCRunnable.nativeSetCapturePageInfo"; + } + }); } @@ -188,6 +192,10 @@ public void removeDocumentLoadListener(DocumentLoadListener listener) false); return null; } + public String toString() { + return "WCRunnable.nativeSetCapturePageInfo"; + } + }); } @@ -269,6 +277,10 @@ public void setNewWindowListener(NewWindowListener listener) } return null; } + public String toString() { + return "WCRunnable.nativeSetNewWindowListenerAttached"; + } + }); newWindowListener = listener; diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/HistoryImpl.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/HistoryImpl.java index 93532ae7b49..3ad8a75deaa 100644 --- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/HistoryImpl.java +++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/HistoryImpl.java @@ -84,6 +84,10 @@ public void back() nativeBack(getNativeBrowserControl()); return null; } + public String toString() { + return "WCRunnable.nativeBack"; + } + }); } @@ -98,6 +102,10 @@ public boolean canBack() boolean canBack = nativeCanBack(getNativeBrowserControl()); return new Boolean(canBack); } + public String toString() { + return "WCRunnable.nativeCanBack"; + } + }); return result.booleanValue(); @@ -141,6 +149,10 @@ public void forward() nativeForward(getNativeBrowserControl()); return null; } + public String toString() { + return "WCRunnable.nativeForward"; + } + }); } @@ -155,6 +167,10 @@ public boolean canForward() boolean canForward = nativeCanForward(getNativeBrowserControl()); return new Boolean(canForward); } + public String toString() { + return "WCRunnable.nativecanForward"; + } + }); return result.booleanValue(); diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NavigationImpl.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NavigationImpl.java index ebcfe1fb1d7..f1aa6338299 100644 --- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NavigationImpl.java +++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NavigationImpl.java @@ -89,6 +89,10 @@ public void loadURL(String absoluteURL) public void run() { NavigationImpl.this.nativeLoadURL(bc, url); } + public String toString() { + return "Runnable.nativeLoadURL"; + } + }); } @@ -116,6 +120,11 @@ public void loadURL(String absoluteURL) finalContentType, finalContentLength, finalLoadInfo); } + public String toString() { + return "Runnable.nativeLoadFromStream"; + } + + }); } @@ -132,7 +141,11 @@ public void refresh(long loadFlags) nativeRefresh(NavigationImpl.this.getNativeBrowserControl(), finalLoadFlags); return null; - } + } + public String toString() { + return "WCRunnable.nativeRefresh"; + } + }); } @@ -146,6 +159,10 @@ public void stop() nativeStop(getNativeBrowserControl()); return null; } + public String toString() { + return "WCRunnable.nativeStop"; + } + }); } @@ -210,7 +227,12 @@ public void post(String argUrl, postData, postHeadersLength, postHeaders); - } + } + public String toString() { + return "Runnable.nativePost"; + } + + }); } @@ -253,7 +275,7 @@ public static void main(String [] args) Log.setApplicationName("NavigationImpl"); Log.setApplicationVersion("0.0"); - Log.setApplicationVersionDate("$Id: NavigationImpl.java,v 1.11 2004-06-24 16:23:42 edburns%acm.org Exp $"); + Log.setApplicationVersionDate("$Id: NavigationImpl.java,v 1.12 2007-01-17 11:43:43 edburns%acm.org Exp $"); try { org.mozilla.webclient.BrowserControlFactory.setAppData(args[0]); diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/PreferencesImpl.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/PreferencesImpl.java index 86d531459b7..f9c07e8653a 100644 --- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/PreferencesImpl.java +++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/PreferencesImpl.java @@ -114,6 +114,9 @@ public void setPref(String prefName, String prefValue) nativeSetIntPref(getWrapperFactory().getNativeWrapperFactory(), finalName, intVal.intValue()); return null; } + public String toString() { + return "WCRunnable.nativeSetIntPref"; + } }); } catch (NumberFormatException e) { @@ -127,6 +130,10 @@ public void setPref(String prefName, String prefValue) finalName, boolVal.booleanValue()); return null; } + public String toString() { + return "WCRunnable.nativeSetBoolPref"; + } + }); } else { @@ -138,6 +145,10 @@ public void setPref(String prefName, String prefValue) nativeSetUnicharPref(getWrapperFactory().getNativeWrapperFactory(), finalName, finalValue); return null; } + public String toString() { + return "WCRunnable.nativeSetUnicharPref"; + } + }); } } @@ -153,6 +164,10 @@ public Properties getPrefs() PreferencesImpl.this.props); return result; } + public String toString() { + return "WCRunnable.nativeGetPrefs"; + } + }); return props; diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/RDFEnumeration.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/RDFEnumeration.java index 7c45184d1ae..4bcb1e4b336 100644 --- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/RDFEnumeration.java +++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/RDFEnumeration.java @@ -107,6 +107,10 @@ protected void finalize() throws Throwable nativeFinalize(RDFEnumeration.this.nativeContext); return null; } + public String toString() { + return "WCRunnable.nativeFinalize"; + } + }); super.finalize(); } @@ -126,6 +130,10 @@ public boolean hasMoreElements() RDFEnumeration.this.nativeRDFNode)); return result; } + public String toString() { + return "WCRunnable.nativeHasMoreElements"; + } + }); return result.booleanValue(); } @@ -142,6 +150,10 @@ public Object nextElement() RDFEnumeration.this.nativeRDFNode)); return result; } + public String toString() { + return "WCRunnable.nativeNextElement"; + } + }); if (-1 != nextNativeRDFNode.intValue()) { diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/Win32BrowserControlCanvas.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/Win32BrowserControlCanvas.java index 1e1fc034b95..7d8c2be1ad3 100644 --- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/Win32BrowserControlCanvas.java +++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/Win32BrowserControlCanvas.java @@ -39,7 +39,7 @@ import org.mozilla.webclient.impl.wrapper_native.NativeEventThread; * There is one instance of the BrowserControlCanvas per top level awt Frame. - * @version $Id: Win32BrowserControlCanvas.java,v 1.1 2004-04-20 16:17:41 edburns%acm.org Exp $ + * @version $Id: Win32BrowserControlCanvas.java,v 1.2 2007-01-17 11:43:43 edburns%acm.org Exp $ * * @see org.mozilla.webclient.BrowserControlCanvasFactory * @@ -74,6 +74,10 @@ public class Win32BrowserControlCanvas extends BrowserControlCanvas { new Integer(Win32BrowserControlCanvas.this.getHandleToPeer()); return result; } + public String toString() { + return "WCRunnable.getHandleToPeer"; + } + }); return result.intValue(); } diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WindowControlImpl.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WindowControlImpl.java index 8267c06f197..218125d7c93 100644 --- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WindowControlImpl.java +++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WindowControlImpl.java @@ -91,6 +91,10 @@ public void setBounds(Rectangle rect) newBounds.width, newBounds.height); return null; } + public String toString() { + return "WCRunnable.nativeSetBounds"; + } + }); } @@ -115,6 +119,10 @@ public void createWindow(int nativeWindow, Rectangle rect) finalHeight, bc); return null; } + public String toString() { + return "WCRunnable.nativeRealize"; + } + }); } @@ -160,6 +168,10 @@ public void setVisible(boolean newState) nativeSetVisible(getNativeBrowserControl(), finalBool); return null; } + public String toString() { + return "WCRunnable.nativeSetVisible"; + } + }); } @@ -206,7 +218,7 @@ public static void main(String [] args) Log.setApplicationName("WindowControlImpl"); Log.setApplicationVersion("0.0"); - Log.setApplicationVersionDate("$Id: WindowControlImpl.java,v 1.5 2004-04-22 06:41:02 edburns%acm.org Exp $"); + Log.setApplicationVersionDate("$Id: WindowControlImpl.java,v 1.6 2007-01-17 11:43:43 edburns%acm.org Exp $"); try { org.mozilla.webclient.BrowserControlFactory.setAppData(args[0]); diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java index f3ba22159ba..5b1cc62980c 100644 --- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java +++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java @@ -149,7 +149,11 @@ public class WrapperFactoryImpl extends Object implements WrapperFactory { public Object run() { WrapperFactoryImpl.this.nativeInitBrowserControl(nativeWrapperFactory, nativeBrowserControl); return null; - } + } + public String toString() { + return "WCRunnable.nativeInitBrowserControl"; + } + }); browserControls.put(result, new Integer(nativeBrowserControl)); @@ -167,6 +171,10 @@ public class WrapperFactoryImpl extends Object implements WrapperFactory { WrapperFactoryImpl.this.nativeDestroyBrowserControl(nativeBrowserControl); return null; } + public String toString() { + return "WCRunnable.nativeDeleteBrowserControl"; + } + }); } } @@ -293,7 +301,12 @@ public class WrapperFactoryImpl extends Object implements WrapperFactory { WrapperFactoryImpl.this.nativeAppInitialize(finalStr, nativeWrapperFactory, eventThread); - } + } + public String toString() { + return "Runnable.nativeAppInitialize"; + } + + }); eventThread.start(); @@ -330,6 +343,10 @@ public class WrapperFactoryImpl extends Object implements WrapperFactory { WrapperFactoryImpl.this.nativeAppSetup(nativeWrapperFactory); return null; } + public String toString() { + return "WCRunnable.nativeAppSetup"; + } + }); } catch (RuntimeException e) { @@ -373,6 +390,10 @@ public void terminate() throws Exception WrapperFactoryImpl.this.terminated = true; return null; } + public String toString() { + return "WCRunnable.nativeTerminate"; + } + }); eventThread.delete(); diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/TestLogStrings.properties b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/TestLogStrings.properties new file mode 100644 index 00000000000..13e936fed65 --- /dev/null +++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/TestLogStrings.properties @@ -0,0 +1 @@ +# Sample ResourceBundle properties file diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java index 9427e85b03f..9b2c947f243 100644 --- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java +++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java @@ -1,5 +1,5 @@ /* - * $Id: WebclientTestCase.java,v 1.9 2005-08-09 04:43:00 edburns%acm.org Exp $ + * $Id: WebclientTestCase.java,v 1.10 2007-01-17 11:43:43 edburns%acm.org Exp $ */ /* @@ -33,14 +33,11 @@ import java.util.List; import java.io.IOException; import java.io.File; - -import org.mozilla.util.Assert; -import org.mozilla.util.ParameterCheck; +import java.util.logging.Logger; import junit.framework.TestCase; import junit.framework.TestSuite; import junit.framework.TestResult; -import junit.framework.Test; import org.mozilla.util.THTTPD; @@ -50,7 +47,7 @@ import org.mozilla.util.THTTPD; * * Lifetime And Scope

* - * @version $Id: WebclientTestCase.java,v 1.9 2005-08-09 04:43:00 edburns%acm.org Exp $ + * @version $Id: WebclientTestCase.java,v 1.10 2007-01-17 11:43:43 edburns%acm.org Exp $ * * @see Blah * @see Bloo @@ -66,6 +63,10 @@ public abstract class WebclientTestCase extends TestCase public static final String WEBCLIENTSTUB_LOG_MODULE = "webclientstub"; public static final String WEBCLIENT_LOG_MODULE = "webclient"; public static String OUTPUT_FILE_ROOT = "build.test/"; +public static final String TEST_LOG = "org.mozilla.webclient.test"; +public static final String TEST_LOG_STRINGS = "org.mozilla.webclient.TestLogStrings"; + +public static final Logger LOGGER = getLogger(TEST_LOG); // // Class Variables @@ -99,6 +100,11 @@ public WebclientTestCase(String name) // Class methods // +public static Logger getLogger( String loggerName ) { + return Logger.getLogger(loggerName, TEST_LOG_STRINGS ); +} + + // // Methods From TestCase // @@ -115,6 +121,8 @@ public void setUp() "mozilla" + File.separator + "java" + File.separator + "webclient" + File.separator + OUTPUT_FILE_ROOT; + LOGGER.info(this.getClass().getName() + " setUp()"); + } //