From f59e06b5b6b27fd7e70510d2b41ea487a04c81c9 Mon Sep 17 00:00:00 2001 From: "pedemont%us.ibm.com" Date: Fri, 16 Dec 2005 17:32:45 +0000 Subject: [PATCH] Nomenclature change. No bug. git-svn-id: svn://10.0.0.236/trunk@186168 18797224-902f-48f8-a5cc-f745e15eee43 --- .../java/xpcom/glue/nsJavaXPCOMGlue.cpp | 4 ++-- .../java/xpcom/interfaces/Mozilla.java | 20 +++++++++---------- .../java/xpcom/nsJavaXPCOMBindingUtils.cpp | 2 +- .../java/xpcom/nsJavaXPCOMBindingUtils.h | 4 ++-- mozilla/extensions/java/xpcom/src/Makefile.in | 2 +- .../java/xpcom/tests/TestJavaProxy.java | 4 ++-- .../java/xpcom/tests/TestProps.java | 2 +- .../genifaces/GenerateJavaInterfaces.cpp | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/mozilla/extensions/java/xpcom/glue/nsJavaXPCOMGlue.cpp b/mozilla/extensions/java/xpcom/glue/nsJavaXPCOMGlue.cpp index d46f70f317b..3c9a9144fb9 100644 --- a/mozilla/extensions/java/xpcom/glue/nsJavaXPCOMGlue.cpp +++ b/mozilla/extensions/java/xpcom/glue/nsJavaXPCOMGlue.cpp @@ -63,7 +63,7 @@ JNI_OnUnload(JavaVM* vm, void* reserved) } /******************************** - * Javaconnect JNI interfaces + * JavaXPCOM JNI interfaces ********************************/ typedef void (*JX_InitEmbeddingFunc) (JNIEnv*, jobject, jobject, jobject, @@ -132,7 +132,7 @@ GetJavaFilePath(JNIEnv* env, jobject aFile) // Calls XPCOMGlueStartup using the given java.io.File object, and loads -// the Javaconnect methods from the XUL shared library. +// the JavaXPCOM methods from the XUL shared library. nsresult Initialize(JNIEnv* env, jobject aXPCOMPath) { diff --git a/mozilla/extensions/java/xpcom/interfaces/Mozilla.java b/mozilla/extensions/java/xpcom/interfaces/Mozilla.java index 053fcd64c0e..6978049c1b4 100644 --- a/mozilla/extensions/java/xpcom/interfaces/Mozilla.java +++ b/mozilla/extensions/java/xpcom/interfaces/Mozilla.java @@ -51,7 +51,7 @@ public class Mozilla implements IGRE, IXPCOM, IXPCOMError { private static Mozilla mozillaInstance = new Mozilla(); - private static final String JAVACONNECT_JAR = "javaconnect.jar"; + private static final String JAVAXPCOM_JAR = "javaxpcom.jar"; private IGRE gre = null; @@ -73,7 +73,7 @@ public class Mozilla implements IGRE, IXPCOM, IXPCOMError { /** * Locates the path of a GRE with the specified properties. This method * will only return GREs that support Java embedding (looks for the - * presence of "javaconnect.jar"). + * presence of "javaxpcom.jar"). *

* Currently this uses a "first-fit" algorithm, it does not select * the newest available GRE. @@ -194,7 +194,7 @@ public class Mozilla implements IGRE, IXPCOM, IXPCOMError { File xpcomLib = new File(xulDir, "libxpcom.dylib"); if (xpcomLib.canRead()) { File grePath = xpcomLib.getCanonicalFile().getParentFile(); - File jar = new File(grePath, JAVACONNECT_JAR); + File jar = new File(grePath, JAVAXPCOM_JAR); if (jar.canRead()) { // found GRE return grePath; @@ -224,7 +224,7 @@ public class Mozilla implements IGRE, IXPCOM, IXPCOMError { for (int i = 0; i < files.length; i++) { if (checkVersion(files[i].getName(), aVersions)) { File xpcomLib = new File(files[i], "libxpcom.dylib"); - File jar = new File(files[i], JAVACONNECT_JAR); + File jar = new File(files[i], JAVAXPCOM_JAR); if (xpcomLib.canRead() && jar.canRead()) { return files[i]; } @@ -382,7 +382,7 @@ public class Mozilla implements IGRE, IXPCOM, IXPCOMError { File grePath = new File(pathStr); if (grePath.exists()) { File xpcomLib = new File(grePath, "xpcom.dll"); - File jar = new File(grePath, JAVACONNECT_JAR); + File jar = new File(grePath, JAVAXPCOM_JAR); if (xpcomLib.canRead() && jar.canRead()) { // found a good GRE return grePath; @@ -499,7 +499,7 @@ public class Mozilla implements IGRE, IXPCOM, IXPCOMError { File grePath = new File(pathStr); if (grePath.exists()) { File xpcomLib = new File(grePath, "libxpcom.so"); - File jar = new File(grePath, JAVACONNECT_JAR); + File jar = new File(grePath, JAVAXPCOM_JAR); if (xpcomLib.canRead() && jar.canRead()) { // found a good GRE return grePath; @@ -584,7 +584,7 @@ public class Mozilla implements IGRE, IXPCOM, IXPCOMError { */ public void initEmbedding(File aLibXULDirectory, File aAppDirectory, IAppFileLocProvider aAppDirProvider) throws XPCOMException { - loadJavaconnect(aLibXULDirectory, true); + loadJavaXPCOM(aLibXULDirectory, true); gre.initEmbedding(aLibXULDirectory, aAppDirectory, aAppDirProvider); } @@ -593,9 +593,9 @@ public class Mozilla implements IGRE, IXPCOM, IXPCOMError { * @param aLoadGREImpl * @throws XPCOMException */ - private void loadJavaconnect(File aLibXULDirectory, boolean aLoadGREImpl) + private void loadJavaXPCOM(File aLibXULDirectory, boolean aLoadGREImpl) throws XPCOMException { - File jar = new File(aLibXULDirectory, JAVACONNECT_JAR); + File jar = new File(aLibXULDirectory, JAVAXPCOM_JAR); if (!jar.exists()) { throw new XPCOMException(NS_ERROR_FILE_INVALID_PATH); } @@ -667,7 +667,7 @@ public class Mozilla implements IGRE, IXPCOM, IXPCOMError { */ public nsIServiceManager initXPCOM(File aMozBinDirectory, IAppFileLocProvider aAppFileLocProvider) throws XPCOMException { - loadJavaconnect(aMozBinDirectory, false); + loadJavaXPCOM(aMozBinDirectory, false); return xpcom.initXPCOM(aMozBinDirectory, aAppFileLocProvider); } diff --git a/mozilla/extensions/java/xpcom/nsJavaXPCOMBindingUtils.cpp b/mozilla/extensions/java/xpcom/nsJavaXPCOMBindingUtils.cpp index fb0a89c2789..75797c7adc1 100644 --- a/mozilla/extensions/java/xpcom/nsJavaXPCOMBindingUtils.cpp +++ b/mozilla/extensions/java/xpcom/nsJavaXPCOMBindingUtils.cpp @@ -914,7 +914,7 @@ ThrowException(JNIEnv* env, const nsresult aErrorCode, const char* aMessage) methodSig.AppendLiteral(")V"); // In some instances (such as in shutdownXPCOM() and termEmbedding()), we - // will need to throw an exception when Javaconnect has already been + // will need to throw an exception when JavaXPCOM has already been // terminated. In such a case, 'xpcomExceptionClass' will be null. So we // reset it temporarily in order to throw the appropriate exception. if (xpcomExceptionClass == nsnull) { diff --git a/mozilla/extensions/java/xpcom/nsJavaXPCOMBindingUtils.h b/mozilla/extensions/java/xpcom/nsJavaXPCOMBindingUtils.h index 4e5cd8db3d7..cac0d73948a 100644 --- a/mozilla/extensions/java/xpcom/nsJavaXPCOMBindingUtils.h +++ b/mozilla/extensions/java/xpcom/nsJavaXPCOMBindingUtils.h @@ -118,9 +118,9 @@ extern PRLock* gJavaXPCOMLock; extern PRBool gJavaXPCOMInitialized; /** - * Initialize global structures used by Javaconnect. + * Initialize global structures used by JavaXPCOM. * @param env Java environment pointer - * @return PR_TRUE if Javaconnect is initialized; PR_FALSE if an error occurred + * @return PR_TRUE if JavaXPCOM is initialized; PR_FALSE if an error occurred */ PRBool InitializeJavaGlobals(JNIEnv *env); diff --git a/mozilla/extensions/java/xpcom/src/Makefile.in b/mozilla/extensions/java/xpcom/src/Makefile.in index 93ba6233aed..81e67a3a8a2 100755 --- a/mozilla/extensions/java/xpcom/src/Makefile.in +++ b/mozilla/extensions/java/xpcom/src/Makefile.in @@ -65,7 +65,7 @@ CPPSRCS = \ nsJavaXPCOMBindingUtils.cpp \ $(NULL) -JARFILE = javaconnect.jar +JARFILE = javaxpcom.jar JARFILE_SRC = $(patsubst %.jar,%-src.jar,$(JARFILE)) JAVA_SRCS = \ diff --git a/mozilla/extensions/java/xpcom/tests/TestJavaProxy.java b/mozilla/extensions/java/xpcom/tests/TestJavaProxy.java index a53feef774e..dffd8596922 100644 --- a/mozilla/extensions/java/xpcom/tests/TestJavaProxy.java +++ b/mozilla/extensions/java/xpcom/tests/TestJavaProxy.java @@ -41,12 +41,12 @@ import java.io.File; /** * Tests that if calls to XPCOM functions return the same object, then - * the Javaconnect interface creates the proper Java proxies. + * the JavaXPCOM interface creates the proper Java proxies. *

* The XPCOM call to nsISupports supp = entries.getNext() returns * an object, for which we create an nsISupports Java proxy. Then, * the XPCOM call to supp.queryInterface(nsIFile.NS_IFILE_IID) - * will return the same object (same address). Javaconnect needs to be smart + * will return the same object (same address). JavaXPCOM needs to be smart * enough to create a new nsIFile proxy, rather than reusing the * nsISupports one that was previously created. *

diff --git a/mozilla/extensions/java/xpcom/tests/TestProps.java b/mozilla/extensions/java/xpcom/tests/TestProps.java index c33c958e0b4..5ed152d347f 100644 --- a/mozilla/extensions/java/xpcom/tests/TestProps.java +++ b/mozilla/extensions/java/xpcom/tests/TestProps.java @@ -41,7 +41,7 @@ import java.util.*; /** - * Simple testcase that uses the nsIProperties interface to test the Javaconnect + * Simple testcase that uses the nsIProperties interface to test the JavaXPCOM * code. In particular, it tests for 'out' and 'array' params (see method call * to getKeys). */ diff --git a/mozilla/extensions/java/xpcom/tools/genifaces/GenerateJavaInterfaces.cpp b/mozilla/extensions/java/xpcom/tools/genifaces/GenerateJavaInterfaces.cpp index d3479951998..c389051cbbb 100644 --- a/mozilla/extensions/java/xpcom/tools/genifaces/GenerateJavaInterfaces.cpp +++ b/mozilla/extensions/java/xpcom/tools/genifaces/GenerateJavaInterfaces.cpp @@ -106,7 +106,7 @@ public: } else { - // In Javaconnect, we handle weak references internally; no need for the + // In JavaXPCOM, we handle weak references internally; no need for the // |nsIWeakReference| interface. So just return |nsISupports|. if (iid->Equals(NS_GET_IID(nsIWeakReference))) { *aResult = (char*) nsMemory::Clone(isupp_str, sizeof(isupp_str));