From 3fd0db98ed4eac8abe506f8697925478ad04f970 Mon Sep 17 00:00:00 2001 From: "edburns%acm.org" Date: Tue, 3 Aug 2004 17:16:57 +0000 Subject: [PATCH] Thanks again to Michael Klepikov for these fixes. M dom/jni/org_mozilla_dom_NodeImpl.cpp - code around the absence of LowerCaseEqualsLiteral in nsTAString.h. I'm surprised the unit tests worked for me all aloung though. M webclient/build.xml - make run.test.browser depend on "main" M webclient/src_moz/EmbedProgress.cpp - deal with null URL passed to ::OnStateChange M webclient/src_moz/HistoryImpl.cpp - Don't cast to PRBool* when you don't need to. M webclient/test/manual/src/classes/org/mozilla/webclient/test/TestBrowser.java - don't swallow the exception from setAppData(). git-svn-id: svn://10.0.0.236/trunk@160299 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/java/dom/jni/org_mozilla_dom_NodeImpl.cpp | 8 ++++---- mozilla/java/webclient/build.xml | 2 +- mozilla/java/webclient/src_moz/EmbedProgress.cpp | 4 +++- mozilla/java/webclient/src_moz/HistoryImpl.cpp | 14 +++++++------- .../org/mozilla/webclient/test/TestBrowser.java | 5 ++++- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/mozilla/java/dom/jni/org_mozilla_dom_NodeImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_NodeImpl.cpp index 9ab8ab256c2..eb4a6b528e7 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_NodeImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_NodeImpl.cpp @@ -690,8 +690,8 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_NodeImpl_getNodeValue nsAutoString typeStr; PRBool isChecked; if (NS_SUCCEEDED(rv = input->GetType(typeStr))) { - if (0 == typeStr.LowerCaseEqualsLiteral("radio") || - 0 == typeStr.LowerCaseEqualsLiteral("checkbox")) { + if (0 == (typeStr.Find("radio", PR_TRUE) && 5 == typeStr.Length()) || + 0 == (typeStr.Find("checkbox", PR_TRUE) && 8 == typeStr.Length())) { if (NS_SUCCEEDED(rv = input->GetChecked(&isChecked))) { if (isChecked) { ret.AssignWithConversion("CHECKED"); @@ -1024,8 +1024,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_NodeImpl_setNodeValue nsString val; if (NS_SUCCEEDED(rv = input->GetType(typeStr))) { - if (0 == typeStr.LowerCaseEqualsLiteral("radio") || - 0 == typeStr.LowerCaseEqualsLiteral("checkbox")) { + if (0 == (typeStr.Find("radio", PR_TRUE) && 5 == typeStr.Length()) || + 0 == (typeStr.Find("checkbox", PR_TRUE) && 8 == typeStr.Length())) { val = *value; if (0 == val.Length()) { input->SetChecked(PR_FALSE); diff --git a/mozilla/java/webclient/build.xml b/mozilla/java/webclient/build.xml index 0f98ad6fdf6..f548392c38f 100644 --- a/mozilla/java/webclient/build.xml +++ b/mozilla/java/webclient/build.xml @@ -304,7 +304,7 @@ ${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.Embedd - + diff --git a/mozilla/java/webclient/src_moz/EmbedProgress.cpp b/mozilla/java/webclient/src_moz/EmbedProgress.cpp index 03ba7c5fe66..8ab97b73020 100644 --- a/mozilla/java/webclient/src_moz/EmbedProgress.cpp +++ b/mozilla/java/webclient/src_moz/EmbedProgress.cpp @@ -92,7 +92,9 @@ EmbedProgress::OnStateChange(nsIWebProgress *aWebProgress, nsXPIDLCString uriString; RequestToURIString(aRequest, getter_Copies(uriString)); - jstring uriJstr = ::util_NewStringUTF(env, (const char *) uriString); + const char * uriCStr = (const char *) uriString; + jstring uriJstr = ::util_NewStringUTF(env, (nsnull != uriCStr + ? uriCStr : "")); PR_LOG(prLogModuleInfo, PR_LOG_DEBUG, ("EmbedProgress::OnStateChange: URI: %s\n", diff --git a/mozilla/java/webclient/src_moz/HistoryImpl.cpp b/mozilla/java/webclient/src_moz/HistoryImpl.cpp index e9251300905..eff7d2acd9e 100644 --- a/mozilla/java/webclient/src_moz/HistoryImpl.cpp +++ b/mozilla/java/webclient/src_moz/HistoryImpl.cpp @@ -67,16 +67,16 @@ JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_HistoryImpl_nativeCanBac if (nativeBrowserControl == nsnull) { ::util_ThrowExceptionToJava(env, "Exception: null nativeBCPtr passed to nativeCanBack"); - return (result == PR_TRUE) ? JNI_TRUE : JNI_FALSE; + return result ? JNI_TRUE : JNI_FALSE; } nsresult rv = - nativeBrowserControl->mNavigation->GetCanGoBack((PRBool *) &result); + nativeBrowserControl->mNavigation->GetCanGoBack(&result); if (NS_FAILED(rv)) { ::util_ThrowExceptionToJava(env, "Exception: Can't GetCanGoBack"); } - return (result == PR_TRUE) ? JNI_TRUE : JNI_FALSE; + return result ? JNI_TRUE : JNI_FALSE; } JNIEXPORT void JNICALL @@ -106,7 +106,7 @@ JNIEXPORT jboolean JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_HistoryImpl_nativeCanForward (JNIEnv *env, jobject obj, jint nativeBCPtr) { - PRBool result = JNI_FALSE; + PRBool result = PR_FALSE; JNIEnv * pEnv = env; jobject jobj = obj; @@ -114,16 +114,16 @@ JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_HistoryImpl_nativeCanFor if (nativeBrowserControl == nsnull) { ::util_ThrowExceptionToJava(env, "Exception: null nativeBCPtr passed to nativeCanForward"); - return (result == PR_TRUE) ? JNI_TRUE : JNI_FALSE; + return result ? JNI_TRUE : JNI_FALSE; } nsresult rv = - nativeBrowserControl->mNavigation->GetCanGoForward((PRBool *) &result); + nativeBrowserControl->mNavigation->GetCanGoForward(&result); if (NS_FAILED(rv)) { ::util_ThrowExceptionToJava(env, "Exception: Can't GetCanGoForward"); } - return (result == PR_TRUE) ? JNI_TRUE : JNI_FALSE; + return result ? JNI_TRUE : JNI_FALSE; } diff --git a/mozilla/java/webclient/test/manual/src/classes/org/mozilla/webclient/test/TestBrowser.java b/mozilla/java/webclient/test/manual/src/classes/org/mozilla/webclient/test/TestBrowser.java index 3f7abb8dd77..abde6fbb026 100644 --- a/mozilla/java/webclient/test/manual/src/classes/org/mozilla/webclient/test/TestBrowser.java +++ b/mozilla/java/webclient/test/manual/src/classes/org/mozilla/webclient/test/TestBrowser.java @@ -92,7 +92,10 @@ public class TestBrowser extends JPanel { try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); BrowserControlFactory.setAppData(System.getProperty("BROWSER_BIN_DIR")); - } catch (Exception e) {} + } catch (Exception e) { + System.out.println("Can't init test browser, exception: " + e + " " + + e.getMessage()); + } JFrame frame = new JFrame("Webclient API Demo - Browser");