Bug 270889 - Change params for initEmbedding() to use java.io.File and custom class. Backout lazy discovery of interface info (no longer needed). Better distribute methods in XPCOM and GeckoEmbed classes. r=darin.

extensions/java/xpcom/AppFileLocProvider.java

@@ -0,0 +1,46 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Java XPCOM Bindings.
+ *
+ * The Initial Developer of the Original Code is
+ * IBM Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * IBM Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Javier Pedemonte (jhpedemonte@gmail.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package org.mozilla.xpcom;
+
+import java.io.*;
+
+public interface AppFileLocProvider {
+
+  public File getFile(String prop, boolean[] persistent);
+
+}

extensions/java/xpcom/GeckoEmbed.java

@@ -37,11 +37,11 @@
 
 package org.mozilla.xpcom;
 
+import java.io.*;
+
 public final class GeckoEmbed {
 
-  public static native void initEmbedding(nsILocalFile aMozBinDirectory, nsISupports aAppFileLocProvider);
+  public static native void initEmbedding(File aMozBinDirectory, AppFileLocProvider aAppFileLocProvider);
   public static native void termEmbedding();
-  public static native nsILocalFile newLocalFile(String aPath, boolean followLinks);
-  public static native nsIComponentManager getComponentManager();
-  public static native nsIServiceManager getServiceManager();
-}
+
+}

extensions/java/xpcom/Makefile.in

@@ -54,6 +54,7 @@ REQUIRES	= xpcom \
 DIRS = build
 
 CPPSRCS		= \
+		nsAppFileLocProviderProxy.cpp \
 		nsJavaInterfaces.cpp \
 		nsJavaWrapper.cpp \
 		nsJavaXPTCStub.cpp \
@@ -65,6 +66,7 @@ JAVA_SRCS = \
 		XPCOM.java \
 		XPCOMException.java \
 		GeckoEmbed.java \
+		AppFileLocProvider.java \
 		$(NULL)
 
 LOCAL_INCLUDES	= -I$(JAVA_INCLUDE_PATH)

extensions/java/xpcom/XPCOM.java

@@ -38,10 +38,18 @@
 package org.mozilla.xpcom;
 
 import java.lang.reflect.*;
+import java.io.*;
 
 
 public final class XPCOM {
 
+  public static native nsIServiceManager initXPCOM(File aMozBinDirectory, AppFileLocProvider aAppFileLocProvider);
+  public static native void shutdownXPCOM(nsIServiceManager aServMgr);
+  public static native nsIServiceManager getServiceManager();
+  public static native nsIComponentManager getComponentManager();
+  public static native nsIComponentRegistrar getComponentRegistrar();
+  public static native nsILocalFile newLocalFile(String aPath, boolean followLinks);
+
   // Calling functions used by Java stub classes
   public static native void CallXPCOMMethodVoid(Object thisObj, int fnNumber, Object[] params);
   public static native boolean CallXPCOMMethodBool(Object thisObj, int fnNumber, Object[] params);
@@ -115,4 +123,6 @@ public final class XPCOM {
 
     return iid;
   }
+
 }
+

extensions/java/xpcom/nsAppFileLocProviderProxy.cpp

@@ -0,0 +1,100 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Java XPCOM Bindings.
+ *
+ * The Initial Developer of the Original Code is
+ * IBM Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * IBM Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Javier Pedemonte (jhpedemonte@gmail.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsAppFileLocProviderProxy.h"
+#include "nsILocalFile.h"
+#include "nsJavaXPCOMBindingUtils.h"
+
+
+nsAppFileLocProviderProxy::nsAppFileLocProviderProxy(JNIEnv* env,
+                                                     jobject aJavaObject)
+  : mJavaEnv(env)
+{
+  mJavaLocProvider = mJavaEnv->NewGlobalRef(aJavaObject);
+}
+
+nsAppFileLocProviderProxy::~nsAppFileLocProviderProxy()
+{
+  mJavaEnv->DeleteGlobalRef(mJavaLocProvider);
+}
+
+NS_IMPL_ISUPPORTS1(nsAppFileLocProviderProxy, nsIDirectoryServiceProvider)
+
+// nsIDirectoryServiceProvider
+NS_IMETHODIMP
+nsAppFileLocProviderProxy::GetFile(const char* aProp, PRBool* aIsPersistant,
+                                   nsIFile** aResult)
+{
+  // Setup params for calling Java function
+  jstring prop = mJavaEnv->NewStringUTF(aProp);
+  jbooleanArray persistant = mJavaEnv->NewBooleanArray(1);
+
+  // Create method ID
+  jmethodID mid = nsnull;
+  jclass clazz = mJavaEnv->GetObjectClass(mJavaLocProvider);
+  if (clazz) {
+    mid = mJavaEnv->GetMethodID(clazz, "getFile",
+                                "(Ljava/lang/String;[Z)Ljava/io/File;");
+  }
+
+  // Call Java function
+  jobject javaFile = nsnull;
+  if (mid) {
+    javaFile = mJavaEnv->CallObjectMethod(mJavaLocProvider, mid, prop, persistant);
+  }
+  if (javaFile == nsnull) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // Set boolean output value
+  jboolean isCopy = PR_FALSE;
+  jboolean* array = mJavaEnv->GetBooleanArrayElements(persistant, &isCopy);
+  *aIsPersistant = array[0];
+  if (isCopy) {
+    mJavaEnv->ReleaseBooleanArrayElements(persistant, array, JNI_ABORT);
+  }
+
+  // Set nsIFile result value
+  nsCOMPtr<nsILocalFile> localFile;
+  nsresult rv = File_to_nsILocalFile(mJavaEnv, javaFile,
+                                     getter_AddRefs(localFile));
+  if (NS_SUCCEEDED(rv)) {
+    return localFile->QueryInterface(NS_GET_IID(nsIFile), (void**)aResult);
+  }
+  return rv;
+}
+