From 79b3264bcfb1aefdb7fd2a28644ea20314e30e13 Mon Sep 17 00:00:00 2001 From: Grant Gayed Date: Fri, 26 Apr 2013 11:39:33 -0400 Subject: remove interface definition files for incoming interfaces --- .../common/library/xpcom_custom.cpp | 58 --------- .../eclipse/swt/browser/AppFileLocProvider.java | 4 +- .../org/eclipse/swt/browser/DownloadFactory.java | 2 +- .../eclipse/swt/browser/DownloadFactory_1_8.java | 2 +- .../org/eclipse/swt/browser/ExternalFactory.java | 2 +- .../common/org/eclipse/swt/browser/FilePicker.java | 8 +- .../org/eclipse/swt/browser/FilePickerFactory.java | 2 +- .../swt/browser/HelperAppLauncherDialog.java | 2 +- .../browser/HelperAppLauncherDialogFactory.java | 2 +- .../swt/browser/HelperAppLauncherDialog_1_9.java | 2 +- .../common/org/eclipse/swt/browser/Mozilla.java | 18 +-- .../org/eclipse/swt/browser/PromptAuth2.java | 2 +- .../org/eclipse/swt/browser/PromptFactory.java | 4 +- .../org/eclipse/swt/browser/PromptService2.java | 2 +- .../eclipse/swt/browser/PromptService2Factory.java | 6 +- .../org/eclipse/swt/browser/WindowCreator2.java | 4 +- .../org/eclipse/swt/internal/mozilla/XPCOM.java | 42 +++---- .../swt/internal/mozilla/nsIAuthPrompt2.java | 55 -------- .../swt/internal/mozilla/nsIBadCertListener2.java | 47 ------- .../internal/mozilla/nsIContextMenuListener.java | 54 -------- .../swt/internal/mozilla/nsIDirectoryService.java | 55 -------- .../mozilla/nsIDirectoryServiceProvider.java | 47 ------- .../mozilla/nsIDirectoryServiceProvider2.java | 47 ------- .../eclipse/swt/internal/mozilla/nsIFactory.java | 51 -------- .../swt/internal/mozilla/nsIFilePicker.java | 95 ++++---------- .../swt/internal/mozilla/nsIFilePicker_1_8.java | 139 --------------------- .../mozilla/nsIHelperAppLauncherDialog.java | 55 -------- .../mozilla/nsIHelperAppLauncherDialog_1_9.java | 55 -------- .../swt/internal/mozilla/nsIPromptFactory.java | 47 ------- .../swt/internal/mozilla/nsIPromptService.java | 44 +------ .../swt/internal/mozilla/nsIPromptService2.java | 51 -------- .../internal/mozilla/nsISupportsWeakReference.java | 47 ------- .../swt/internal/mozilla/nsITooltipListener.java | 51 -------- .../internal/mozilla/nsIURIContentListener.java | 75 ----------- .../swt/internal/mozilla/nsIWeakReference.java | 47 ------- .../internal/mozilla/nsIWebBrowserChromeFocus.java | 51 -------- .../swt/internal/mozilla/nsIWindowCreator.java | 47 ------- .../swt/internal/mozilla/nsIWindowCreator2.java | 49 -------- .../Eclipse SWT PI/gtk/library/os_custom.c | 4 - 39 files changed, 75 insertions(+), 1300 deletions(-) delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthPrompt2.java delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptFactory.java delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService2.java delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITooltipListener.java delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWeakReference.java delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java delete mode 100644 bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp index 2802144345..09c20b4402 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_custom.cpp @@ -145,64 +145,6 @@ fail: } #endif -#ifndef NO__1JS_1EvaluateUCScript -JNIEXPORT jint JNICALL XPCOM_NATIVE(_1JS_1EvaluateUCScript) - (JNIEnv *env, jclass that, jbyteArray mozillaPath, jintLong arg0, jintLong arg1, jcharArray arg2, jint arg3, jbyteArray arg4, jint arg5, jintLongArray arg6) -{ - jbyte *lpmozillaPath=NULL; - jchar *lparg2=NULL; - jbyte *lparg4=NULL; - jintLong *lparg6=NULL; - jint rc = 0; - XPCOM_NATIVE_ENTER(env, that, _1JS_1EvaluateUCScriptForPrincipals_FUNC); - if (mozillaPath) if ((lpmozillaPath = env->GetByteArrayElements(mozillaPath, NULL)) == NULL) goto fail; - if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail; - if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail; - if (arg6) if ((lparg6 = env->GetIntLongArrayElements(arg6, NULL)) == NULL) goto fail; -/* - rc = (jint)JS_EvaluateUCScript(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, lparg7); -*/ - { - -#ifdef _WIN32 - static int initialized = 0; - static FARPROC fp = NULL; - if (!initialized) { - HMODULE hm = LoadLibrary((const char *)lpmozillaPath); - if (hm) { - fp = GetProcAddress(hm, "JS_EvaluateUCScript"); - } - initialized = 1; - } - if (fp) { - rc = (jint)((jint (*)(jintLong, jintLong, jchar *, jint, jbyte *, jint, jintLong *))fp)(arg0, arg1, lparg2, arg3, lparg4, arg5, lparg6); - } -#else -#define CALLING_CONVENTION - static int initialized = 0; - static void *fp = NULL; - if (!initialized) { - void* handle = dlopen((const char *)lpmozillaPath, RTLD_LAZY); - if (handle) { - fp = dlsym(handle, "JS_EvaluateUCScript"); - } - initialized = 1; - } - if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jchar *, jint, jbyte *, jint, jintLong *))fp)(arg0, arg1, lparg2, arg3, lparg4, arg5, lparg6); - } -#endif /* _WIN32 */ - } -fail: - if (arg6 && lparg6) env->ReleaseIntLongArrayElements(arg6, lparg6, 0); - if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0); - if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0); - if (mozillaPath && lpmozillaPath) env->ReleaseByteArrayElements(mozillaPath, lpmozillaPath, 0); - XPCOM_NATIVE_EXIT(env, that, _1JS_1EvaluateUCScript_FUNC); - return rc; -} -#endif - #ifndef NO__1JS_1GetGlobalObject JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1JS_1GetGlobalObject) (JNIEnv *env, jclass that, jbyteArray mozillaPath, jintLong arg0) diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java index cc6379c579..d84eb741be 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java @@ -120,12 +120,12 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIDirectoryServiceProvider.NS_IDIRECTORYSERVICEPROVIDER_IID)) { + if (guid.Equals (XPCOM.NS_IDIRECTORYSERVICEPROVIDER_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {directoryServiceProvider.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIDirectoryServiceProvider2.NS_IDIRECTORYSERVICEPROVIDER2_IID)) { + if (guid.Equals (XPCOM.NS_IDIRECTORYSERVICEPROVIDER2_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {directoryServiceProvider2.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory.java index a0e2f2136b..a425ed81ea 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory.java @@ -69,7 +69,7 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) { + if (guid.Equals (XPCOM.NS_IFACTORY_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory_1_8.java index a6bf534ebe..59d5f63c30 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory_1_8.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory_1_8.java @@ -69,7 +69,7 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) { + if (guid.Equals (XPCOM.NS_IFACTORY_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/ExternalFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/ExternalFactory.java index f90ef3d0e9..f6a16af9a5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/ExternalFactory.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/ExternalFactory.java @@ -69,7 +69,7 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) { + if (guid.Equals (XPCOM.NS_IFACTORY_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java index 2a792f9b09..43e4812446 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java @@ -85,7 +85,7 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE; nsID guid = new nsID (); XPCOM.memmove (guid, riid, nsID.sizeof); - + if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF); AddRef (); @@ -96,17 +96,17 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIFilePicker.NS_IFILEPICKER_IID)) { + if (guid.Equals (nsIFilePicker.NS_IFILEPICKER_10_IID)) { XPCOM.memmove(ppvObject, new long /*int*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIFilePicker_1_8.NS_IFILEPICKER_IID)) { + if (guid.Equals (nsIFilePicker.NS_IFILEPICKER_1_8_IID)) { XPCOM.memmove(ppvObject, new long /*int*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIFilePicker_1_8.NS_IFILEPICKER_10_IID)) { + if (guid.Equals (nsIFilePicker.NS_IFILEPICKER_IID)) { XPCOM.memmove(ppvObject, new long /*int*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePickerFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePickerFactory.java index 2ac1bfbcff..3a8ed26b59 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePickerFactory.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePickerFactory.java @@ -69,7 +69,7 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) { + if (guid.Equals (XPCOM.NS_IFACTORY_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog.java index a8d9d5a011..9f2ecb7541 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog.java @@ -77,7 +77,7 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIHelperAppLauncherDialog.NS_IHELPERAPPLAUNCHERDIALOG_IID)) { + if (guid.Equals (XPCOM.NS_IHELPERAPPLAUNCHERDIALOG_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java index 80ed72e8ab..e20e0638b9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java @@ -69,7 +69,7 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) { + if (guid.Equals (XPCOM.NS_IFACTORY_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java index 5599b9bf2a..99c3a97739 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java @@ -77,7 +77,7 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIHelperAppLauncherDialog_1_9.NS_IHELPERAPPLAUNCHERDIALOG_IID)) { + if (guid.Equals (XPCOM.NS_IHELPERAPPLAUNCHERDIALOG_1_9_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java index b3a71848fd..f45e4f5864 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java @@ -1592,12 +1592,12 @@ static String getMozillaPath () { nsIServiceManager serviceManager = new nsIServiceManager (result[0]); result[0] = 0; byte[] buffer = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_DIRECTORYSERVICE_CONTRACTID, true); - rc = serviceManager.GetServiceByContractID (buffer, nsIDirectoryService.NS_IDIRECTORYSERVICE_IID, result); + rc = serviceManager.GetServiceByContractID (buffer, XPCOM.NS_IDIRECTORYSERVICE_IID, result); if (rc != XPCOM.NS_OK) error (rc); if (result[0] == 0) error (XPCOM.NS_NOINTERFACE); serviceManager.Release(); - nsIDirectoryService directoryService = new nsIDirectoryService (result[0]); + nsISupports directoryService = new nsISupports (result[0]); result[0] = 0; rc = directoryService.QueryInterface (nsIProperties.NS_IPROPERTIES_IID, result); if (rc != XPCOM.NS_OK) error (rc); @@ -3429,7 +3429,7 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIWeakReference.NS_IWEAKREFERENCE_IID)) { + if (guid.Equals (XPCOM.NS_IWEAKREFERENCE_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; @@ -3449,7 +3449,7 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIWebBrowserChromeFocus.NS_IWEBBROWSERCHROMEFOCUS_IID)) { + if (guid.Equals (XPCOM.NS_IWEBBROWSERCHROMEFOCUS_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {webBrowserChromeFocus.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; @@ -3469,27 +3469,27 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsISupportsWeakReference.NS_ISUPPORTSWEAKREFERENCE_IID)) { + if (guid.Equals (XPCOM.NS_ISUPPORTSWEAKREFERENCE_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {supportsWeakReference.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIContextMenuListener.NS_ICONTEXTMENULISTENER_IID)) { + if (guid.Equals (XPCOM.NS_ICONTEXTMENULISTENER_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {contextMenuListener.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIURIContentListener.NS_IURICONTENTLISTENER_IID)) { + if (guid.Equals (XPCOM.NS_IURICONTENTLISTENER_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {uriContentListener.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsITooltipListener.NS_ITOOLTIPLISTENER_IID)) { + if (guid.Equals (XPCOM.NS_ITOOLTIPLISTENER_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {tooltipListener.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIBadCertListener2.NS_IBADCERTLISTENER2_IID)) { + if (guid.Equals (XPCOM.NS_IBADCERTLISTENER2_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {badCertListener.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptAuth2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptAuth2.java index abef771eec..b280f545c5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptAuth2.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptAuth2.java @@ -72,7 +72,7 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIAuthPrompt2.NS_IAUTHPROMPT2_IID)) { + if (guid.Equals (XPCOM.NS_IAUTHPROMPT2_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {promptAuth.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptFactory.java index 3f3da8e90e..54ff4bb1c3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptFactory.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptFactory.java @@ -68,7 +68,7 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIPromptFactory.NS_IPROMPTFACTORY_IID)) { + if (guid.Equals (XPCOM.NS_IPROMPTFACTORY_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; @@ -98,7 +98,7 @@ int GetPrompt (long /*int*/ aParent, long /*int*/ iid, long /*int*/ result) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIAuthPrompt2.NS_IAUTHPROMPT2_IID)) { + if (guid.Equals (XPCOM.NS_IAUTHPROMPT2_IID)) { PromptAuth2 promptAuth = new PromptAuth2(); promptAuth.AddRef (); promptAuth.setParent (aParent); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java index bb8f380c53..e1245c775d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java @@ -105,7 +105,7 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIPromptService2.NS_IPROMPTSERVICE2_IID)) { + if (guid.Equals (XPCOM.NS_IPROMPTSERVICE2_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {promptService2.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2Factory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2Factory.java index 8c7c18921a..7cd6f472ab 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2Factory.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2Factory.java @@ -69,7 +69,7 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) { + if (guid.Equals (XPCOM.NS_IFACTORY_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; @@ -90,13 +90,13 @@ int Release () { int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) { nsID guid = new nsID (); XPCOM.memmove (guid, iid, nsID.sizeof); - if (guid.Equals (nsIPromptService2.NS_IPROMPTSERVICE2_IID) || guid.Equals(nsIPromptService.NS_IPROMPTSERVICE_IID)) { + if (guid.Equals (XPCOM.NS_IPROMPTSERVICE2_IID) || guid.Equals(nsIPromptService.NS_IPROMPTSERVICE_IID)) { PromptService2 promptService = new PromptService2 (); promptService.AddRef (); XPCOM.memmove (result, new long /*int*/[] {promptService.getAddress ()}, C.PTR_SIZEOF); return XPCOM.NS_OK; } - if (guid.Equals (nsIPromptFactory.NS_IPROMPTFACTORY_IID)) { + if (guid.Equals (XPCOM.NS_IPROMPTFACTORY_IID)) { PromptFactory promptFactory = new PromptFactory(); promptFactory.AddRef (); XPCOM.memmove (result, new long /*int*/[] {promptFactory.getAddress ()}, C.PTR_SIZEOF); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/WindowCreator2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/WindowCreator2.java index 78c21ab875..88ed52dff2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/WindowCreator2.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/WindowCreator2.java @@ -86,12 +86,12 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIWindowCreator.NS_IWINDOWCREATOR_IID)) { + if (guid.Equals (XPCOM.NS_IWINDOWCREATOR_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {windowCreator.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIWindowCreator2.NS_IWINDOWCREATOR2_IID)) { + if (guid.Equals (XPCOM.NS_IWINDOWCREATOR2_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {windowCreator2.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java index df560df68c..faf6c0644d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java @@ -64,6 +64,18 @@ public class XPCOM extends C { public static final nsID NS_IWEBBROWSER_CID = new nsID ("F1EAC761-87E9-11d3-AF80-00A024FFC08C"); //$NON-NLS-1$ public static final nsID NS_IXPCONNECT_CID = new nsID ("CB6593E0-F9B2-11d2-BDD6-000064657374"); //$NON-NLS-1$ + /* IID constants */ + public static final nsID NS_IAUTHPROMPT2_IID = new nsID ("651395eb-8612-4876-8ac0-a88d4dce9e1e"); //$NON-NLS-1$ + public static final nsID NS_IBADCERTLISTENER2_IID = new nsID ("2c3d268c-ad82-49f3-99aa-e9ffddd7a0dc"); //$NON-NLS-1$ + public static final nsID NS_ICONTEXTMENULISTENER_IID = new nsID ("3478b6b0-3875-11d4-94ef-0020183bf181"); //$NON-NLS-1$ + public static final nsID NS_IDIRECTORYSERVICE_IID = new nsID ("57a66a60-d43a-11d3-8cc2-00609792278c"); //$NON-NLS-1$ + public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID = new nsID ("bbf8cab0-d43a-11d3-8cc2-00609792278c"); //$NON-NLS-1$ + public static final nsID NS_IDIRECTORYSERVICEPROVIDER2_IID = new nsID ("2f977d4b-5485-11d4-87e2-0010a4e75ef2"); //$NON-NLS-1$ + public static final nsID NS_IFACTORY_IID = new nsID ("00000001-0000-0000-c000-000000000046"); //$NON-NLS-1$ + public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID = new nsID ("d7ebddf0-4c84-11d4-807a-00600811a9c3"); //$NON-NLS-1$ + public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_1_9_IID = new nsID ("f3704fdc-8ae6-4eba-a3c3-f02958ac0649"); //$NON-NLS-1$ + public static final nsID NS_IPROMPTFACTORY_IID = new nsID ("2532b748-75db-4732-9173-78d3bf34f694"); //$NON-NLS-1$ + public static final nsID NS_IPROMPTSERVICE2_IID = new nsID ("cf86d196-dbee-4482-9dfa-3477aa128319"); //$NON-NLS-1$ public static final nsID NS_ISCRIPTCONTEXT_1_9_IID = new nsID ("e7b9871d-3adc-4bf7-850d-7fb9554886bf"); //$NON-NLS-1$ public static final nsID NS_ISCRIPTCONTEXT_1_9_2_IID = new nsID ("87482b5e-e019-4df5-9bc2-b2a51b1f2d28"); //$NON-NLS-1$ public static final nsID NS_ISCRIPTCONTEXT_10_IID = new nsID ("2e583bf4-3c1f-432d-8283-8dee7eccc88b"); //$NON-NLS-1$ @@ -74,7 +86,15 @@ public class XPCOM extends C { public static final nsID NS_ISCRIPTGLOBALOBJECT_1_9_IID = new nsID ("6afecd40-0b9a-4cfd-8c42-0f645cd91829"); //$NON-NLS-1$ public static final nsID NS_ISCRIPTOBJECTOWNER_IID = new nsID ("8f6bca7e-ce42-11d1-b724-00600891d8c9"); //$NON-NLS-1$ public static final nsID NS_ISECURITYCHECKEDCOMPONENT_IID = new nsID ("0dad9e8c-a12d-4dcb-9a6f-7d09839356e1"); //$NON-NLS-1$ - + public static final nsID NS_ISUPPORTSWEAKREFERENCE_IID = new nsID ("9188bc86-f92e-11d2-81ef-0060083a0bcf"); //$NON-NLS-1$ + public static final nsID NS_ITOOLTIPLISTENER_IID = new nsID ("44b78386-1dd2-11b2-9ad2-e4eee2ca1916"); //$NON-NLS-1$ + public static final nsID NS_IURICONTENTLISTENER_IID = new nsID ("94928ab3-8b63-11d3-989d-001083010e9b"); //$NON-NLS-1$ + public static final nsID NS_IWEAKREFERENCE_IID = new nsID ("9188bc85-f92e-11d2-81ef-0060083a0bcf"); //$NON-NLS-1$ + public static final nsID NS_IWEBBROWSERCHROMEFOCUS_IID = new nsID ("d2206418-1dd1-11b2-8e55-acddcd2bcfb8"); //$NON-NLS-1$ + public static final nsID NS_IWINDOWCREATOR_IID = new nsID ("30465632-a777-44cc-90f9-8145475ef999"); //$NON-NLS-1$ + public static final nsID NS_IWINDOWCREATOR2_IID = new nsID ("f673ec81-a4b0-11d6-964b-eb5a2bf216fc"); //$NON-NLS-1$ + + /* contract ID constants */ public static final String EXTERNAL_CONTRACTID = "@eclipse.org/external;1"; //$NON-NLS-1$ public static final String NS_AUTHPROMPTER_CONTRACTID = "@mozilla.org/passwordmanager/authpromptfactory;1"; //$NON-NLS-1$ public static final String NS_CERTOVERRIDE_CONTRACTID = "@mozilla.org/security/certoverride;1"; //$NON-NLS-1$ @@ -212,16 +232,6 @@ public static final native int strlen_PRUnichar(long /*int*/ s); /** @method flags=no_gen */ public static final native long /*int*/ CALLBACK_JSNative(long /*int*/ func); -///** @method flags=no_gen */ -//public static final native long /*int*/ _JS_CallFunctionName(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, byte[] name, int argc, long /*int*/ argv, long /*int*/ rval); -//public static final long /*int*/ JS_CallFunctionName(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, byte[] name, int argc, long /*int*/ argv, long /*int*/ rval) { -// lock.lock(); -// try { -// return _JS_CallFunctionName(mozillaPath, cx, obj, name, argc, argv, rval); -// } finally { -// lock.unlock(); -// } -//} /** @method flags=no_gen */ public static final native long /*int*/ _JS_DefineFunction(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, byte[] name, long /*int*/ call, int nargs, int flags); public static final long /*int*/ JS_DefineFunction(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, byte[] name, long /*int*/ call, int nargs, int flags) { @@ -242,16 +252,6 @@ public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, lon lock.unlock(); } } -///** @method flags=no_gen */ -//public static final native int _JS_EvaluateUCScript(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, char[] chars, int length, byte[] filename, int lineno, long /*int*/[] retVal); -//public static final int JS_EvaluateUCScript(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, char[] chars, int length, byte[] filename, int lineno, long /*int*/[] retVal) { -// lock.lock(); -// try { -// return _JS_EvaluateUCScript(mozillaPath, cx, obj, chars, length, filename, lineno, retVal); -// } finally { -// lock.unlock(); -// } -//} /** @method flags=no_gen */ public static final native long /*int*/ _JS_GetGlobalObject(byte[] mozillaPath, long /*int*/ cx); public static final long /*int*/ JS_GetGlobalObject(byte[] mozillaPath, long /*int*/ cx) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthPrompt2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthPrompt2.java deleted file mode 100644 index f13efea66f..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthPrompt2.java +++ /dev/null @@ -1,55 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2012 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIAuthPrompt2 extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2; - - public static final String NS_IAUTHPROMPT2_IID_STR = - "651395eb-8612-4876-8ac0-a88d4dce9e1e"; - - public static final nsID NS_IAUTHPROMPT2_IID = - new nsID(NS_IAUTHPROMPT2_IID_STR); - - public nsIAuthPrompt2(long /*int*/ address) { - super(address); - } - - public static final int LEVEL_NONE = 0; - public static final int LEVEL_PW_ENCRYPTED = 1; - public static final int LEVEL_SECURE = 2; - - public int PromptAuth(long /*int*/ aParent, long /*int*/ aChannel, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) { - return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 1, getAddress(), aParent, aChannel, level, authInfo, checkboxLabel, checkValue, _retval); - } - - public int AsyncPromptAuth(long /*int*/ aParent, long /*int*/ aChannel, long /*int*/ aCallback, long /*int*/ aContext, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java deleted file mode 100644 index 583214061c..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java +++ /dev/null @@ -1,47 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2003, 2011 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIBadCertListener2 extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1; - - public static final String NS_IBADCERTLISTENER2_IID_STR = - "2c3d268c-ad82-49f3-99aa-e9ffddd7a0dc"; - - public static final nsID NS_IBADCERTLISTENER2_IID = - new nsID(NS_IBADCERTLISTENER2_IID_STR); - - public nsIBadCertListener2(long /*int*/ address) { - super(address); - } - - public int NotifyCertProblem(long /*int*/ socketInfo, long /*int*/ status, long /*int*/ targetSite, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), socketInfo, status, targetSite, _retval); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java deleted file mode 100644 index 3e4d4b92c8..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java +++ /dev/null @@ -1,54 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2003, 2011 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIContextMenuListener extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1; - - public static final String NS_ICONTEXTMENULISTENER_IID_STR = - "3478b6b0-3875-11d4-94ef-0020183bf181"; - - public static final nsID NS_ICONTEXTMENULISTENER_IID = - new nsID(NS_ICONTEXTMENULISTENER_IID_STR); - - public nsIContextMenuListener(long /*int*/ address) { - super(address); - } - - public static final int CONTEXT_NONE = 0; - public static final int CONTEXT_LINK = 1; - public static final int CONTEXT_IMAGE = 2; - public static final int CONTEXT_DOCUMENT = 4; - public static final int CONTEXT_TEXT = 8; - public static final int CONTEXT_INPUT = 16; - - public int OnShowContextMenu(int aContextFlags, long /*int*/ aEvent, long /*int*/ aNode) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aContextFlags, aEvent, aNode); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java deleted file mode 100644 index 9b0719748b..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java +++ /dev/null @@ -1,55 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2003 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIDirectoryService extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3; - - public static final String NS_IDIRECTORYSERVICE_IID_STR = - "57a66a60-d43a-11d3-8cc2-00609792278c"; - - public static final nsID NS_IDIRECTORYSERVICE_IID = - new nsID(NS_IDIRECTORYSERVICE_IID_STR); - - public nsIDirectoryService(long /*int*/ address) { - super(address); - } - - public int Init() { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress()); - } - - public int RegisterProvider(long /*int*/ prov) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prov); - } - - public int UnregisterProvider(long /*int*/ prov) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prov); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java deleted file mode 100644 index 435d97d05c..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java +++ /dev/null @@ -1,47 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIDirectoryServiceProvider extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1; - - public static final String NS_IDIRECTORYSERVICEPROVIDER_IID_STR = - "bbf8cab0-d43a-11d3-8cc2-00609792278c"; - - public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID = - new nsID(NS_IDIRECTORYSERVICEPROVIDER_IID_STR); - - public nsIDirectoryServiceProvider(long /*int*/ address) { - super(address); - } - - public int GetFile(byte[] prop, int[] persistent, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, persistent, _retval); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java deleted file mode 100644 index a3b68f2609..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java +++ /dev/null @@ -1,47 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2003, 2011 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIDirectoryServiceProvider2 extends nsIDirectoryServiceProvider { - - static final int LAST_METHOD_ID = nsIDirectoryServiceProvider.LAST_METHOD_ID + 1; - - public static final String NS_IDIRECTORYSERVICEPROVIDER2_IID_STRING = - "2f977d4b-5485-11d4-87e2-0010a4e75ef2"; - - public static final nsID NS_IDIRECTORYSERVICEPROVIDER2_IID = - new nsID(NS_IDIRECTORYSERVICEPROVIDER2_IID_STRING); - - public nsIDirectoryServiceProvider2(long /*int*/ address) { - super(address); - } - - public int GetFiles(byte[] prop, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsIDirectoryServiceProvider.LAST_METHOD_ID + 1, getAddress(), prop, _retval); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java deleted file mode 100644 index 3429f561e2..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java +++ /dev/null @@ -1,51 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIFactory extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2; - - public static final String NS_IFACTORY_IID_STR = - "00000001-0000-0000-c000-000000000046"; - - public static final nsID NS_IFACTORY_IID = - new nsID(NS_IFACTORY_IID_STR); - - public nsIFactory(long /*int*/ address) { - super(address); - } - - public int CreateInstance(long /*int*/ aOuter, nsID iid, long /*int*/[] result) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aOuter, iid, result); - } - - public int LockFactory(int lock) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), lock); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker.java index d40380b5fc..a7b7bff45c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker.java @@ -27,26 +27,32 @@ * ***** END LICENSE BLOCK ***** */ package org.eclipse.swt.internal.mozilla; -public class nsIFilePicker extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 18 :15); +public class nsIFilePicker { public static final String NS_IFILEPICKER_IID_STR = "c47de916-1dd1-11b2-8141-82507fa02b21"; - - public static final String NS_IFILEPICKER_17_IID_STR = + + public static final String NS_IFILEPICKER_1_8_IID_STR = + "80faf095-c807-4558-a2cc-185ed70754ea"; + + public static final String NS_IFILEPICKER_10_IID_STR = "f2c0e216-5d07-4df4-bbcb-37683077ae7e"; + public static final String NS_IFILEPICKER_17_IID_STR = + "60e2dfb6-3fc7-4a2c-8137-16bef44536fc"; + public static final nsID NS_IFILEPICKER_IID = new nsID(NS_IFILEPICKER_IID_STR); - + + public static final nsID NS_IFILEPICKER_1_8_IID = + new nsID(NS_IFILEPICKER_1_8_IID_STR); + + public static final nsID NS_IFILEPICKER_10_IID = + new nsID(NS_IFILEPICKER_10_IID_STR); + public static final nsID NS_IFILEPICKER_17_IID = new nsID(NS_IFILEPICKER_17_IID_STR); - public nsIFilePicker(long /*int*/ address) { - super(address); - } - public static final int modeOpen = 0; public static final int modeSave = 1; public static final int modeGetFolder = 2; @@ -62,69 +68,10 @@ public class nsIFilePicker extends nsISupports { public static final int filterXUL = 32; public static final int filterApps = 64; - public int Init(long /*int*/ parent, char[] title, int mode) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode); - } - - public int AppendFilters(int filterMask) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), filterMask); - } - - public int AppendFilter(char[] title, char[] filter) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter); - } - - public int GetDefaultString(long /*int*/[] aDefaultString) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString); - } - - public int SetDefaultString(char[] aDefaultString) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString); - } - - public int GetDefaultExtension(long /*int*/[] aDefaultExtension) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension); - } - - public int SetDefaultExtension(char[] aDefaultExtension) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDefaultExtension); - } - - public int GetFilterIndex(int[] aFilterIndex) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aFilterIndex); - } - - public int SetFilterIndex(int aFilterIndex) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex); - } - - public int GetDisplayDirectory(long /*int*/[] aDisplayDirectory) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory); - } - - public int SetDisplayDirectory(long /*int*/ aDisplayDirectory) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory); - } - - public int GetFile(long /*int*/[] aFile) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile); - } - - public int GetFileURL(long /*int*/[] aFileURL) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL); - } - - public int GetFiles(long /*int*/[] aFiles) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles); - } + /* the following constants are defined as of mozilla 8 */ + public static final int filterAllowURLs = 128; + public static final int filterAudio = 256; + public static final int filterVideo = 512; - public int Show(long /*int*/ _retval) { - if (IsXULRunner17) System.out.println("nsifilepicker.Show() is deprecated in xulr17"); - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 17 : 15), getAddress(), _retval); - } - - public int Open(long /*int*/ aFilePickerShownCallback) { - if (!IsXULRunner17) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aFilePickerShownCallback); - } + /* outgoing functions removed because this is an implemented interface */ } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java deleted file mode 100644 index e0cdd2e2a4..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java +++ /dev/null @@ -1,139 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2003, 2011 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIFilePicker_1_8 extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 15); - - public static final String NS_IFILEPICKER_IID_STR = - "80faf095-c807-4558-a2cc-185ed70754ea"; - - public static final String NS_IFILEPICKER_10_IID_STR = - "f2c0e216-5d07-4df4-bbcb-37683077ae7e"; - - public static final nsID NS_IFILEPICKER_IID = - new nsID(NS_IFILEPICKER_IID_STR); - - public static final nsID NS_IFILEPICKER_10_IID = - new nsID(NS_IFILEPICKER_10_IID_STR); - - public nsIFilePicker_1_8(long /*int*/ address) { - super(address); - } - - public static final int modeOpen = 0; - public static final int modeSave = 1; - public static final int modeGetFolder = 2; - public static final int modeOpenMultiple = 3; - public static final int returnOK = 0; - public static final int returnCancel = 1; - public static final int returnReplace = 2; - public static final int filterAll = 1; - public static final int filterHTML = 2; - public static final int filterText = 4; - public static final int filterImages = 8; - public static final int filterXML = 16; - public static final int filterXUL = 32; - public static final int filterApps = 64; - - /* the following constants are defined in mozilla 8 */ - public static final int filterAllowURLs = 128; - public static final int filterAudio = 256; - public static final int filterVideo = 512; - - public int Init(long /*int*/ parent, long /*int*/ title, short mode) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode); - } - - public int AppendFilters(int filterMask) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), filterMask); - } - - public int AppendFilter(long /*int*/ title, long /*int*/ filter) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter); - } - - public int GetDefaultString(long /*int*/ aDefaultString) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString); - } - - public int SetDefaultString(long /*int*/ aDefaultString) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString); - } - - public int GetDefaultExtension(long /*int*/ aDefaultExtension) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension); - } - - public int SetDefaultExtension(long /*int*/ aDefaultExtension) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDefaultExtension); - } - - public int GetFilterIndex(int[] aFilterIndex) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aFilterIndex); - } - - public int SetFilterIndex(int aFilterIndex) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex); - } - - public int GetDisplayDirectory(long /*int*/[] aDisplayDirectory) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory); - } - - public int SetDisplayDirectory(long /*int*/ aDisplayDirectory) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory); - } - - public int GetFile(long /*int*/[] aFile) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile); - } - - public int GetFileURL(long /*int*/[] aFileURL) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL); - } - - public int GetFiles(long /*int*/[] aFiles) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles); - } - - public int Show(long /*int*/ _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 15), getAddress(), _retval); - } - - public int GetAddToRecentDocs(int[] aAddToRecentDocs) { - if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aAddToRecentDocs); - } - - public int SetAddToRecentDocs(int aAddToRecentDocs) { - if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aAddToRecentDocs); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java deleted file mode 100644 index cca3b464da..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java +++ /dev/null @@ -1,55 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2004, 2011 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIHelperAppLauncherDialog extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3; - - public static final String NS_IHELPERAPPLAUNCHERDIALOG_IID_STR = - "d7ebddf0-4c84-11d4-807a-00600811a9c3"; - - public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID = - new nsID(NS_IHELPERAPPLAUNCHERDIALOG_IID_STR); - - public nsIHelperAppLauncherDialog(long /*int*/ address) { - super(address); - } - - public int Show(long /*int*/ aLauncher, long /*int*/ aContext) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLauncher, aContext); - } - - public int PromptForSaveToFile(long /*int*/ aWindowContext, char[] aDefaultFile, char[] aSuggestedFileExtension, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWindowContext, aDefaultFile, aSuggestedFileExtension, _retval); - } - - public int ShowProgressDialog(long /*int*/ aLauncher, long /*int*/ aContext) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aLauncher, aContext); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java deleted file mode 100644 index 332abfccca..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java +++ /dev/null @@ -1,55 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2003, 2011 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIHelperAppLauncherDialog_1_9 extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2; - - public static final String NS_IHELPERAPPLAUNCHERDIALOG_IID_STR = - "f3704fdc-8ae6-4eba-a3c3-f02958ac0649"; - - public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID = - new nsID(NS_IHELPERAPPLAUNCHERDIALOG_IID_STR); - - public nsIHelperAppLauncherDialog_1_9(long /*int*/ address) { - super(address); - } - - public static final int REASON_CANTHANDLE = 0; - public static final int REASON_SERVERREQUEST = 1; - public static final int REASON_TYPESNIFFED = 2; - - public int Show(long /*int*/ aLauncher, long /*int*/ aWindowContext, int aReason) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLauncher, aWindowContext, aReason); - } - - public int PromptForSaveToFile(long /*int*/ aLauncher, long /*int*/ aWindowContext, char[] aDefaultFileName, char[] aSuggestedFileExtension, int aForcePrompt, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aLauncher, aWindowContext, aDefaultFileName, aSuggestedFileExtension, aForcePrompt, _retval); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptFactory.java deleted file mode 100644 index 1a467a0ab7..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptFactory.java +++ /dev/null @@ -1,47 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2012 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIPromptFactory extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1; - - public static final String NS_IPROMPTFACTORY_IID_STR = - "2532b748-75db-4732-9173-78d3bf34f694"; - - public static final nsID NS_IPROMPTFACTORY_IID = - new nsID(NS_IPROMPTFACTORY_IID_STR); - - public nsIPromptFactory(long /*int*/ address) { - super(address); - } - - public int getPrompt(long /*int*/ aParent, nsID iid, long /*int*/[] result) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, iid, result); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService.java index 9cfb774a19..94f402f8a9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService.java @@ -27,9 +27,7 @@ * ***** END LICENSE BLOCK ***** */ package org.eclipse.swt.internal.mozilla; -public class nsIPromptService extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9; +public class nsIPromptService { public static final String NS_IPROMPTSERVICE_IID_STR = "1630c61a-325e-49ca-8759-a31b16c47aa5"; @@ -37,26 +35,6 @@ public class nsIPromptService extends nsISupports { public static final nsID NS_IPROMPTSERVICE_IID = new nsID(NS_IPROMPTSERVICE_IID_STR); - public nsIPromptService(long /*int*/ address) { - super(address); - } - - public int Alert(long /*int*/ aParent, char[] aDialogTitle, char[] aText) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aDialogTitle, aText); - } - - public int AlertCheck(long /*int*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState); - } - - public int Confirm(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aParent, aDialogTitle, aText, _retval); - } - - public int ConfirmCheck(long /*int*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState, _retval); - } - public static final int BUTTON_POS_0 = 1; public static final int BUTTON_POS_1 = 256; public static final int BUTTON_POS_2 = 65536; @@ -74,24 +52,6 @@ public class nsIPromptService extends nsISupports { public static final int BUTTON_DELAY_ENABLE = 67108864; public static final int STD_OK_CANCEL_BUTTONS = 513; public static final int STD_YES_NO_BUTTONS = 1027; - - public int ConfirmEx(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, aDialogTitle, aText, aButtonFlags, aButton0Title, aButton1Title, aButton2Title, aCheckMsg, aCheckState, _retval); - } - - public int Prompt(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, aDialogTitle, aText, aValue, aCheckMsg, aCheckState, _retval); - } - - public int PromptUsernameAndPassword(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aUsername, long /*int*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParent, aDialogTitle, aText, aUsername, aPassword, aCheckMsg, aCheckState, _retval); - } - - public int PromptPassword(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParent, aDialogTitle, aText, aPassword, aCheckMsg, aCheckState, _retval); - } - public int Select(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int aCount, long /*int*/[] aSelectList, int[] aOutSelection, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aParent, aDialogTitle, aText, aCount, aSelectList, aOutSelection, _retval); - } + /* outgoing functions removed because this is an implemented interface */ } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService2.java deleted file mode 100644 index 5d0207fc1f..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService2.java +++ /dev/null @@ -1,51 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIPromptService2 extends nsIPromptService { - - static final int LAST_METHOD_ID = nsIPromptService.LAST_METHOD_ID + 2; - - public static final String NS_IPROMPTSERVICE2_IID_STR = - "cf86d196-dbee-4482-9dfa-3477aa128319"; - - public static final nsID NS_IPROMPTSERVICE2_IID = - new nsID(NS_IPROMPTSERVICE2_IID_STR); - - public nsIPromptService2(long /*int*/ address) { - super(address); - } - - public int PromptAuth(long /*int*/ aParent, long /*int*/ aChannel, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) { - return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 1, getAddress(), aParent, aChannel, level, authInfo, checkboxLabel, checkValue, _retval); - } - - public int AsyncPromptAuth(long /*int*/ aParent, long /*int*/ aChannel, long /*int*/ aCallback, long /*int*/ aContext, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java deleted file mode 100644 index 92f390afa5..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java +++ /dev/null @@ -1,47 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2003, 2011 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsISupportsWeakReference extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1; - - public static final String NS_ISUPPORTSWEAKREFERENCE_IID_STR = - "9188bc86-f92e-11d2-81ef-0060083a0bcf"; - - public static final nsID NS_ISUPPORTSWEAKREFERENCE_IID = - new nsID(NS_ISUPPORTSWEAKREFERENCE_IID_STR); - - public nsISupportsWeakReference(long /*int*/ address) { - super(address); - } - - public int GetWeakReference(long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITooltipListener.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITooltipListener.java deleted file mode 100644 index c362e6b1b9..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITooltipListener.java +++ /dev/null @@ -1,51 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2004, 2011 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsITooltipListener extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2; - - public static final String NS_ITOOLTIPLISTENER_IID_STR = - "44b78386-1dd2-11b2-9ad2-e4eee2ca1916"; - - public static final nsID NS_ITOOLTIPLISTENER_IID = - new nsID(NS_ITOOLTIPLISTENER_IID_STR); - - public nsITooltipListener(long /*int*/ address) { - super(address); - } - - public int OnShowTooltip(int aXCoords, int aYCoords, char[] aTipText) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aXCoords, aYCoords, aTipText); - } - - public int OnHideTooltip() { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress()); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java deleted file mode 100644 index 8b2235f2cb..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java +++ /dev/null @@ -1,75 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIURIContentListener extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8; - - public static final String NS_IURICONTENTLISTENER_IID_STR = - "94928ab3-8b63-11d3-989d-001083010e9b"; - - public static final nsID NS_IURICONTENTLISTENER_IID = - new nsID(NS_IURICONTENTLISTENER_IID_STR); - - public nsIURIContentListener(long /*int*/ address) { - super(address); - } - - public int OnStartURIOpen(long /*int*/ aURI, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, _retval); - } - - public int DoContent(byte[] aContentType, int aIsContentPreferred, long /*int*/ aRequest, long /*int*/[] aContentHandler, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContentType, aIsContentPreferred, aRequest, aContentHandler, _retval); - } - - public int IsPreferred(byte[] aContentType, long /*int*/[] aDesiredContentType, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContentType, aDesiredContentType, _retval); - } - - public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, long /*int*/[] aDesiredContentType, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContentType, aIsContentPreferred, aDesiredContentType, _retval); - } - - public int GetLoadCookie(long /*int*/[] aLoadCookie) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLoadCookie); - } - - public int SetLoadCookie(long /*int*/ aLoadCookie) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLoadCookie); - } - - public int GetParentContentListener(long /*int*/[] aParentContentListener) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParentContentListener); - } - - public int SetParentContentListener(long /*int*/ aParentContentListener) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParentContentListener); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWeakReference.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWeakReference.java deleted file mode 100644 index 7a37dbd41d..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWeakReference.java +++ /dev/null @@ -1,47 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2003, 2011 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIWeakReference extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1; - - public static final String NS_IWEAKREFERENCE_IID_STR = - "9188bc85-f92e-11d2-81ef-0060083a0bcf"; - - public static final nsID NS_IWEAKREFERENCE_IID = - new nsID(NS_IWEAKREFERENCE_IID_STR); - - public nsIWeakReference(long /*int*/ address) { - super(address); - } - - public int QueryReferent(nsID uuid, long /*int*/[] result) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uuid, result); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java deleted file mode 100644 index 4f85413a52..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java +++ /dev/null @@ -1,51 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2003, 2011 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIWebBrowserChromeFocus extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2; - - public static final String NS_IWEBBROWSERCHROMEFOCUS_IID_STR = - "d2206418-1dd1-11b2-8e55-acddcd2bcfb8"; - - public static final nsID NS_IWEBBROWSERCHROMEFOCUS_IID = - new nsID(NS_IWEBBROWSERCHROMEFOCUS_IID_STR); - - public nsIWebBrowserChromeFocus(long /*int*/ address) { - super(address); - } - - public int FocusNextElement() { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress()); - } - - public int FocusPrevElement() { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress()); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java deleted file mode 100644 index 0db573ee20..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java +++ /dev/null @@ -1,47 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2003, 2011 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIWindowCreator extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1; - - public static final String NS_IWINDOWCREATOR_IID_STR = - "30465632-a777-44cc-90f9-8145475ef999"; - - public static final nsID NS_IWINDOWCREATOR_IID = - new nsID(NS_IWINDOWCREATOR_IID_STR); - - public nsIWindowCreator(long /*int*/ address) { - super(address); - } - - public int CreateChromeWindow(long /*int*/ parent, int chromeFlags, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, _retval); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java deleted file mode 100644 index 7596227d07..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java +++ /dev/null @@ -1,49 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.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 Mozilla Communicator client code, released March 31, 1998. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by Netscape are Copyright (C) 1998-1999 - * Netscape Communications Corporation. All Rights Reserved. - * - * Contributor(s): - * - * IBM - * - Binding to permit interfacing between Mozilla and SWT - * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIWindowCreator2 extends nsIWindowCreator { - - static final int LAST_METHOD_ID = nsIWindowCreator.LAST_METHOD_ID + 1; - - public static final String NS_IWINDOWCREATOR2_IID_STR = - "f673ec81-a4b0-11d6-964b-eb5a2bf216fc"; - - public static final nsID NS_IWINDOWCREATOR2_IID = - new nsID(NS_IWINDOWCREATOR2_IID_STR); - - public nsIWindowCreator2(long /*int*/ address) { - super(address); - } - - public static final int PARENT_IS_LOADING_OR_RUNNING_TIMEOUT = 1; - - public int CreateChromeWindow2(long /*int*/ parent, int chromeFlags, int contextFlags, long /*int*/ uri, int[] cancel, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsIWindowCreator.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, contextFlags, uri, cancel, _retval); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c index f3e78ab482..ea7dcef6e5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c @@ -342,10 +342,6 @@ void swt_fixed_restack (SwtFixed *fixed, GtkWidget *widget, GtkWidget *sibling, priv->children = g_list_remove_link (priv->children, list); g_list_free_1 (list); -// fprintf(stdout, "here1 c=%ld %s\n", child->widget, g_type_name(G_OBJECT_TYPE(child->widget))); -// fflush(stdout); - - list = NULL; if (sibling) { list = priv->children; -- cgit