From 010a1ef961070dc2bcea1d8f0fed0ede4d16d97a Mon Sep 17 00:00:00 2001 From: "pedemont%us.ibm.com" Date: Wed, 27 Sep 2006 15:13:14 +0000 Subject: [PATCH] Bug 329522 - Use RegisterNatives for associating Java native methods with their implementation. r=bsmedberg Original committer: pedemont%us.ibm.com Original revision: 1.3 Original date: 2006/04/03 21:16:49 git-svn-id: svn://10.0.0.236/trunk@212524 18797224-902f-48f8-a5cc-f745e15eee43 --- .../src/org/mozilla/xpcom/internal/GREImpl.java | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/mozilla/extensions/java/xpcom/src/org/mozilla/xpcom/internal/GREImpl.java b/mozilla/extensions/java/xpcom/src/org/mozilla/xpcom/internal/GREImpl.java index 8df7d6012a5..c2362541697 100644 --- a/mozilla/extensions/java/xpcom/src/org/mozilla/xpcom/internal/GREImpl.java +++ b/mozilla/extensions/java/xpcom/src/org/mozilla/xpcom/internal/GREImpl.java @@ -13,9 +13,8 @@ * * 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 + * The Initial Developer of the Original Code is IBM Corporation. + * Portions created by the Initial Developer are Copyright (C) 2006 * IBM Corporation. All Rights Reserved. * * Contributor(s): @@ -41,17 +40,11 @@ import java.io.*; import org.mozilla.xpcom.*; -public class GREImpl implements IGRE { +public class GREImpl extends JavaXPCOMMethods implements IGRE { public void initEmbedding(File aLibXULDirectory, File aAppDirectory, - IAppFileLocProvider aAppDirProvider) { - // load JNI library - String path = ""; - if (aLibXULDirectory != null) { - path = aLibXULDirectory + File.separator; - } - System.load(path + System.mapLibraryName("javaxpcomglue")); - + IAppFileLocProvider aAppDirProvider) { + registerJavaXPCOMMethods(aLibXULDirectory); initEmbeddingNative(aLibXULDirectory, aAppDirectory, aAppDirProvider); }