diff options
| author | Grant Gayed <grant_gayed@ca.ibm.com> | 2013-06-25 11:20:27 -0400 |
|---|---|---|
| committer | Grant Gayed <grant_gayed@ca.ibm.com> | 2013-06-25 11:20:27 -0400 |
| commit | 61ef4aabdf27aa1ae4bf019955e3166ba778c10f (patch) | |
| tree | 6ea0ab082476479a8043ebff6f4cd97d207b8134 | |
| parent | b05ed3b2410bf9880ea77e7dcf0101adc35a621a (diff) | |
| download | eclipse.platform.swt-61ef4aabdf27aa1ae4bf019955e3166ba778c10f.tar.gz eclipse.platform.swt-61ef4aabdf27aa1ae4bf019955e3166ba778c10f.tar.xz eclipse.platform.swt-61ef4aabdf27aa1ae4bf019955e3166ba778c10f.zip | |
Bug 411058 - finish trimming XPCOM interfaces down to the functions that
are used
58 files changed, 6 insertions, 1629 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java index d4a05b68fe..dd3e13e1ba 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java @@ -144,7 +144,7 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef(); return XPCOM.NS_OK; } - if (guid.Equals (nsIProgressDialog.NS_IPROGRESSDIALOG_IID)) { + if (guid.Equals (XPCOM.NS_IPROGRESSDIALOG_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF); AddRef(); return XPCOM.NS_OK; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download_1_8.java index 89993904ab..116c4dcffb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download_1_8.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download_1_8.java @@ -180,7 +180,7 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef(); return XPCOM.NS_OK; } - if (guid.Equals (nsIProgressDialog_1_8.NS_IPROGRESSDIALOG_IID)) { + if (guid.Equals (XPCOM.NS_IPROGRESSDIALOG_1_8_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {progressDialog.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 6f8bd81664..e6a13f89fc 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 @@ -2892,7 +2892,7 @@ void navigate (long /*int*/ requestHandle) { 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) || guid.Equals (nsIHttpHeaderVisitor.NS_IHTTPHEADERVISITOR_IID)) { + if (guid.Equals (nsISupports.NS_ISUPPORTS_IID) || guid.Equals (XPCOM.NS_IHTTPHEADERVISITOR_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {getAddress ()}, C.PTR_SIZEOF); refCount++; 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 9a37cef648..8beae68f0e 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 @@ -74,6 +74,9 @@ public class XPCOM extends C { 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_IHTTPHEADERVISITOR_IID = new nsID("0cf40717-d7c1-4a94-8c1e-d6c9734101bb"); //$NON-NLS-1$ + public static final nsID NS_IPROGRESSDIALOG_IID = new nsID("88a478b3-af65-440a-94dc-ed9b154d2990"); //$NON-NLS-1$ + public static final nsID NS_IPROGRESSDIALOG_1_8_IID = new nsID("20e790a2-76c6-462d-851a-22ab6cbbe48b"); //$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$ diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java index af4fc4512b..8d0e076f2a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java @@ -45,31 +45,7 @@ public class nsIAppShell extends nsISupports { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), argc, argv); } - public int Run() { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress()); - } - public int Spinup() { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress()); } - - public int Spindown() { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress()); - } - - public int ListenToEventQueue(long /*int*/ aQueue, int aListen) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aQueue, aListen); - } - - public int GetNativeEvent(long /*int*/ aRealEvent, long /*int*/[] aEvent) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aRealEvent, aEvent); - } - - public int DispatchNativeEvent(int aRealEvent, long /*int*/ aEvent) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aRealEvent, aEvent); - } - - public int Exit() { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress()); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java index 9540c34db1..9aace28431 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java @@ -46,18 +46,10 @@ public class nsIAuthInformation extends nsISupports { public static final int NEED_DOMAIN = 4; public static final int ONLY_PASSWORD = 8; - public int GetFlags(int[] aFlags) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aFlags); - } - public int GetRealm(long /*int*/ aRealm) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aRealm); } - public int GetAuthenticationScheme(long /*int*/ aAuthenticationScheme) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aAuthenticationScheme); - } - public int GetUsername(long /*int*/ aUsername) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aUsername); } @@ -73,12 +65,4 @@ public class nsIAuthInformation extends nsISupports { public int SetPassword(long /*int*/ aPassword) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aPassword); } - - public int GetDomain(long /*int*/ aDomain) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aDomain); - } - - public int SetDomain(long /*int*/ aDomain) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDomain); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICategoryManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICategoryManager.java index 910a35bb41..c862489d04 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICategoryManager.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICategoryManager.java @@ -48,20 +48,4 @@ public class nsICategoryManager extends nsISupports { public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, long /*int*/[] _retval) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCategory, aEntry, aValue, aPersist, aReplace, _retval); } - - public int DeleteCategoryEntry(byte[] aCategory, byte[] aEntry, int aPersist) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCategory, aEntry, aPersist); - } - - public int DeleteCategory(byte[] aCategory) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aCategory); - } - - public int EnumerateCategory(byte[] aCategory, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCategory, _retval); - } - - public int EnumerateCategories(long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java index 96a7e6b4cd..dafdcafa15 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java @@ -48,24 +48,4 @@ public class nsICertOverrideService extends nsISupports { public int RememberValidityOverride(long /*int*/ aHostName, int aPort, long /*int*/ aCert, int aOverrideBits, int aTemporary) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aHostName, aPort, aCert, aOverrideBits, aTemporary); } - - public int HasMatchingOverride(long /*int*/ aHostName, int aPort, long /*int*/ aCert, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aHostName, aPort, aCert, aOverrideBits, aIsTemporary, _retval); - } - - public int GetValidityOverride(long /*int*/ aHostName, int aPort, long /*int*/ aHashAlg, long /*int*/ aFingerprint, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aHostName, aPort, aHashAlg, aFingerprint, aOverrideBits, aIsTemporary, _retval); - } - - public int ClearValidityOverride(long /*int*/ aHostName, int aPort) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHostName, aPort); - } - - public int GetAllOverrideHostsWithPorts(int[] aCount, long /*int*/[] aHostsWithPortsArray) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCount, aHostsWithPortsArray); - } - - public int IsCertUsedForOverrides(long /*int*/ aCert, int aCheckTemporaries, int aCheckPermanents, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCert, aCheckTemporaries, aCheckPermanents, _retval); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java index 945b0d817a..d2d8d6c818 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java @@ -41,27 +41,7 @@ public class nsICertificateDialogs extends nsISupports { super(address); } - public int ConfirmDownloadCACert(long /*int*/ ctx, long /*int*/ cert, int[] trust, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), ctx, cert, trust, _retval); - } - - public int NotifyCACertExists(long /*int*/ ctx) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), ctx); - } - - public int SetPKCS12FilePassword(long /*int*/ ctx, long /*int*/ password, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ctx, password, _retval); - } - - public int GetPKCS12FilePassword(long /*int*/ ctx, long /*int*/ password, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), ctx, password, _retval); - } - public int ViewCert(long /*int*/ ctx, long /*int*/ cert) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), ctx, cert); } - - public int CrlImportStatusDialog(long /*int*/ ctx, long /*int*/ crl) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), ctx, crl); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java index dabb8a14a4..4f7db9efb5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java @@ -47,85 +47,14 @@ public class nsIChannel extends nsIRequest { super(address); } - public int GetOriginalURI(long /*int*/[] aOriginalURI) { - return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 1, getAddress(), aOriginalURI); - } - - public int SetOriginalURI(long /*int*/ aOriginalURI) { - return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 2, getAddress(), aOriginalURI); - } - public int GetURI(long /*int*/[] aURI) { return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 3, getAddress(), aURI); } - public int GetOwner(long /*int*/[] aOwner) { - return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 4, getAddress(), aOwner); - } - - public int SetOwner(long /*int*/ aOwner) { - return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 5, getAddress(), aOwner); - } - - public int GetNotificationCallbacks(long /*int*/[] aNotificationCallbacks) { - return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 6, getAddress(), aNotificationCallbacks); - } - public int SetNotificationCallbacks(long /*int*/ aNotificationCallbacks) { return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 7, getAddress(), aNotificationCallbacks); } - public int GetSecurityInfo(long /*int*/[] aSecurityInfo) { - return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 8, getAddress(), aSecurityInfo); - } - - public int GetContentType(long /*int*/ aContentType) { - return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 9, getAddress(), aContentType); - } - - public int SetContentType(long /*int*/ aContentType) { - return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 10, getAddress(), aContentType); - } - - public int GetContentCharset(long /*int*/ aContentCharset) { - return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 11, getAddress(), aContentCharset); - } - - public int SetContentCharset(long /*int*/ aContentCharset) { - return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 12, getAddress(), aContentCharset); - } - - public int GetContentLength(int[] aContentLength) { - return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 13, getAddress(), aContentLength); - } - - public int SetContentLength(int aContentLength) { - return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 14, getAddress(), aContentLength); - } - - public int Open(long /*int*/[] _retval) { - return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 15, getAddress(), _retval); - } - - public int AsyncOpen(long /*int*/ aListener, long /*int*/ aContext) { - return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 16, getAddress(), aListener, aContext); - } - - public int GetContentDisposition(int[] aContentDisposition) { - if (!(IsXULRunner10 || IsXULRunner17)) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 17, getAddress(), aContentDisposition); - } - - public int GetContentDispositionFilename(long /*int*/ aContentDispositionFilename) { - if (!(IsXULRunner10 || IsXULRunner17)) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 18, getAddress(), aContentDispositionFilename); - } - - public int GetContentDispositionHeader(long /*int*/ aContentDispositionHeader) { - if (!(IsXULRunner10 || IsXULRunner17)) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 19, getAddress(), aContentDispositionHeader); - } - public static final int LOAD_DOCUMENT_URI = 65536; public static final int LOAD_RETARGETED_DOCUMENT_URI = 131072; public static final int LOAD_REPLACE = 262144; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIClassInfo.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIClassInfo.java index f560a33403..75db2848bb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIClassInfo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIClassInfo.java @@ -41,30 +41,6 @@ public class nsIClassInfo extends nsISupports { super(address); } - public int GetInterfaces(int[] count, long /*int*/[] array) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), count, array); - } - - public int GetHelperForLanguage(int language, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), language, _retval); - } - - public int GetContractID(long /*int*/[] aContractID) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContractID); - } - - public int GetClassDescription(long /*int*/[] aClassDescription) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClassDescription); - } - - public int GetClassID(long /*int*/ aClassID) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClassID); - } - - public int GetImplementationLanguage(int[] aImplementationLanguage) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aImplementationLanguage); - } - public static final int SINGLETON = 1; public static final int THREADSAFE = 2; public static final int MAIN_THREAD_ONLY = 4; @@ -73,12 +49,4 @@ public class nsIClassInfo extends nsISupports { public static final int EAGER_CLASSINFO = 32; public static final int CONTENT_NODE = 64; // public static final int RESERVED = 2147483648; - - public int GetFlags(int[] aFlags) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFlags); - } - - public int GetClassIDNoAlloc(long /*int*/ aClassIDNoAlloc) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aClassIDNoAlloc); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java index 6d3ad8557d..022becfe9a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java @@ -45,47 +45,7 @@ public class nsIComponentRegistrar extends nsISupports { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec); } - public int AutoUnregister(long /*int*/ aSpec) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec); - } - public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFactory) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aClassName, aContractID, aFactory); } - - public int UnregisterFactory(nsID aClass, long /*int*/ aFactory) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClass, aFactory); - } - - public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFile, byte[] aLoaderStr, byte[] aType) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClass, aClassName, aContractID, aFile, aLoaderStr, aType); - } - - public int UnregisterFactoryLocation(nsID aClass, long /*int*/ aFile) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aClass, aFile); - } - - public int IsCIDRegistered(nsID aClass, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aClass, _retval); - } - - public int IsContractIDRegistered(byte[] aContractID, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aContractID, _retval); - } - - public int EnumerateCIDs(long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval); - } - - public int EnumerateContractIDs(long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval); - } - - public int CIDToContractID(nsID aClass, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aClass, _retval); - } - - public int ContractIDToCID(byte[] aContractID, long /*int*/ _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aContractID, _retval); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookie.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookie.java index c2c69f2555..4f59ff66e6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookie.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookie.java @@ -45,14 +45,6 @@ public class nsICookie extends nsISupports { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName); } - public int GetValue(long /*int*/ aValue) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aValue); - } - - public int GetIsDomain(int[] aIsDomain) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aIsDomain); - } - public int GetHost(long /*int*/ aHost) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHost); } @@ -61,32 +53,7 @@ public class nsICookie extends nsISupports { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPath); } - public int GetIsSecure(int[] aIsSecure) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aIsSecure); - } - public int GetExpires(long[] aExpires) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aExpires); } - - public static final int STATUS_UNKNOWN = 0; - public static final int STATUS_ACCEPTED = 1; - public static final int STATUS_DOWNGRADED = 2; - public static final int STATUS_FLAGGED = 3; - public static final int STATUS_REJECTED = 4; - - public int GetStatus(long /*int*/ aStatus) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStatus); - } - - public static final int POLICY_UNKNOWN = 0; - public static final int POLICY_NONE = 1; - public static final int POLICY_NO_CONSENT = 2; - public static final int POLICY_IMPLICIT_CONSENT = 3; - public static final int POLICY_EXPLICIT_CONSENT = 4; - public static final int POLICY_NO_II = 5; - - public int GetPolicy(long /*int*/ aPolicy) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPolicy); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieManager.java index 0fd37c2b27..b1c12372e7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieManager.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieManager.java @@ -41,10 +41,6 @@ public class nsICookieManager extends nsISupports { super(address); } - public int RemoveAll() { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress()); - } - public int GetEnumerator(long /*int*/[] aEnumerator) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEnumerator); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService.java index 7bd64ad102..5a3b532e41 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService.java @@ -45,19 +45,7 @@ public class nsICookieService extends nsISupports { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval); } - public int GetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aChannel, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval); - } - public int SetCookieString(long /*int*/ aURI, long /*int*/ aPrompt, byte[] aCookie, long /*int*/ aChannel) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel); } - - public int SetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aPrompt, byte[] aCookie, byte[] aServerTime, long /*int*/ aChannel) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel); - } - - public int GetCookieIconIsVisible(int[] aCookieIconIsVisible) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCookieIconIsVisible); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java index 0a9f2e0fdd..5e7e78225c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java @@ -45,15 +45,7 @@ public class nsICookieService_1_9 extends nsISupports { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval); } - public int GetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aChannel, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval); - } - public int SetCookieString(long /*int*/ aURI, long /*int*/ aPrompt, byte[] aCookie, long /*int*/ aChannel) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel); } - - public int SetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aPrompt, byte[] aCookie, byte[] aServerTime, long /*int*/ aChannel) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java index fa4a2b151f..bb780515ff 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java @@ -44,8 +44,4 @@ public class nsIDOMSerializer extends nsISupports { public int SerializeToString(long /*int*/ root, long /*int*/[] _retval) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), root, _retval); } - - public int SerializeToStream(long /*int*/ root, long /*int*/ stream, byte[] charset) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), root, stream, charset); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java index 0503814ad3..f3fed6e0a0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java @@ -44,8 +44,4 @@ public class nsIDOMSerializer_1_7 extends nsISupports { public int SerializeToString(long /*int*/ root, long /*int*/ _retval) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), root, _retval); } - - public int SerializeToStream(long /*int*/ root, long /*int*/ stream, long /*int*/ charset) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), root, stream, charset); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java index c0ddc94544..2e93642169 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java @@ -48,8 +48,4 @@ public class nsIDOMWindowCollection extends nsISupports { public int Item(int index, long /*int*/[] _retval) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), index, _retval); } - - public int NamedItem(long /*int*/ name, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), name, _retval); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload.java index 314c81d245..c93386bbe3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload.java @@ -40,56 +40,4 @@ public class nsIDownload extends nsISupports { public nsIDownload(long /*int*/ address) { super(address); } - - public int Init(long /*int*/ aSource, long /*int*/ aTarget, char[] aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aPersist) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aPersist); - } - - public int GetSource(long /*int*/[] aSource) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource); - } - - public int GetTarget(long /*int*/[] aTarget) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aTarget); - } - - public int GetPersist(long /*int*/[] aPersist) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPersist); - } - - public int GetPercentComplete(int[] aPercentComplete) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPercentComplete); - } - - public int GetDisplayName(long /*int*/[] aDisplayName) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDisplayName); - } - - public int SetDisplayName(char[] aDisplayName) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDisplayName); - } - - public int GetStartTime(long[] aStartTime) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStartTime); - } - - public int GetMIMEInfo(long /*int*/[] aMIMEInfo) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aMIMEInfo); - } - - public int GetListener(long /*int*/[] aListener) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aListener); - } - - public int SetListener(long /*int*/ aListener) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aListener); - } - - public int GetObserver(long /*int*/[] aObserver) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aObserver); - } - - public int SetObserver(long /*int*/ aObserver) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aObserver); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java index afd727c1b5..a80ed9bc97 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java @@ -40,44 +40,4 @@ public class nsIDownload_1_8 extends nsITransfer { public nsIDownload_1_8(long /*int*/ address) { super(address); } - - public int GetTargetFile(long /*int*/[] aTargetFile) { - return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 1, getAddress(), aTargetFile); - } - - public int GetPercentComplete(int[] aPercentComplete) { - return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 2, getAddress(), aPercentComplete); - } - - public int GetAmountTransferred(long /*int*/ aAmountTransferred) { - return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 3, getAddress(), aAmountTransferred); - } - - public int GetSize(long /*int*/ aSize) { - return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 4, getAddress(), aSize); - } - - public int GetSource(long /*int*/[] aSource) { - return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 5, getAddress(), aSource); - } - - public int GetTarget(long /*int*/[] aTarget) { - return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 6, getAddress(), aTarget); - } - - public int GetCancelable(long /*int*/[] aCancelable) { - return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 7, getAddress(), aCancelable); - } - - public int GetDisplayName(long /*int*/[] aDisplayName) { - return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 8, getAddress(), aDisplayName); - } - - public int GetStartTime(long[] aStartTime) { - return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 9, getAddress(), aStartTime); - } - - public int GetMIMEInfo(long /*int*/[] aMIMEInfo) { - return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 10, getAddress(), aMIMEInfo); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFocusManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFocusManager.java index 44b06f6dd4..dd5752890d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFocusManager.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFocusManager.java @@ -47,50 +47,14 @@ public class nsIFocusManager extends nsISupports { super(address); } - public int GetActiveWindow(long /*int*/[] aActiveWindow) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aActiveWindow); - } - - public int SetActiveWindow(long /*int*/ aActiveWindow) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aActiveWindow); - } - - public int GetFocusedWindow(long /*int*/[] aFocusedWindow) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aFocusedWindow); - } - - public int SetFocusedWindow(long /*int*/ aFocusedWindow) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFocusedWindow); - } - public int GetFocusedElement(long /*int*/[] aFocusedElement) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFocusedElement); } - public int GetLastFocusMethod(long /*int*/ window, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), window, _retval); - } - public int SetFocus(long /*int*/ aElement, int aFlags) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aElement, aFlags); } - public int MoveFocus(long /*int*/ aWindow, long /*int*/ aStartElement, int aType, int aFlags, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aWindow, aStartElement, aType, aFlags, _retval); - } - - public int ClearFocus(long /*int*/ aWindow) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aWindow); - } - - public int GetFocusedElementForWindow(long /*int*/ aWindow, int aDeep, long /*int*/[] aFocusedWindow, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aWindow, aDeep, aFocusedWindow, _retval); - } - - public int MoveCaretToFocus(long /*int*/ aWindow) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aWindow); - } - public static final int FLAG_RAISE = 1; public static final int FLAG_NOSCROLL = 2; public static final int FLAG_NOSWITCHFRAME = 4; @@ -105,33 +69,4 @@ public class nsIFocusManager extends nsISupports { public static final int MOVEFOCUS_LAST = 6; public static final int MOVEFOCUS_ROOT = 7; public static final int MOVEFOCUS_CARET = 8; - - public int WindowRaised(long /*int*/ aWindow) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aWindow); - } - - public int WindowLowered(long /*int*/ aWindow) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aWindow); - } - - public int ContentRemoved(long /*int*/ aDocument, long /*int*/ aElement) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocument, aElement); - } - - public int WindowShown(long /*int*/ aWindow) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aWindow); - } - - public int WindowHidden(long /*int*/ aWindow) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aWindow); - } - - public int FireDelayedEvents(long /*int*/ aDocument) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocument); - } - - public int FocusPlugin(long /*int*/ aPlugin) { - if (!(IsXULRunner10 || IsXULRunner17)) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPlugin); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java index 9dd6fa3c40..afbc48fb92 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java @@ -41,39 +41,11 @@ public class nsIHelperAppLauncher extends nsISupports { super(address); } - public int GetMIMEInfo(long /*int*/[] aMIMEInfo) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo); - } - - public int GetSource(long /*int*/[] aSource) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource); - } - - public int GetSuggestedFileName(long /*int*/[] aSuggestedFileName) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName); - } - public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference); } - public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference); - } - public int Cancel() { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress()); } - - public int SetWebProgressListener(long /*int*/ aWebProgressListener) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aWebProgressListener); - } - - public int CloseProgressWindow() { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress()); - } - - public int GetDownloadInfo(long /*int*/[] aSourceUrl, long[] aTimeDownloadStarted, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSourceUrl, aTimeDownloadStarted, _retval); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java index d88bb2cc80..63fe4c3c29 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java @@ -41,39 +41,7 @@ public class nsIHelperAppLauncher_1_8 extends nsICancelable { super(address); } - public int GetMIMEInfo(long /*int*/[] aMIMEInfo) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo); - } - - public int GetSource(long /*int*/[] aSource) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource); - } - - public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName); - } - public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) { return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference); } - - public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference); - } - - public int SetWebProgressListener(long /*int*/ aWebProgressListener) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener); - } - - public int CloseProgressWindow() { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress()); - } - - public int GetTargetFile(long /*int*/[] aTargetFile) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile); - } - - public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTimeDownloadStarted); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java index 76e0ea8244..86656dcb38 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java @@ -41,43 +41,7 @@ public class nsIHelperAppLauncher_1_9 extends nsICancelable { super(address); } - public int GetMIMEInfo(long /*int*/[] aMIMEInfo) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo); - } - - public int GetSource(long /*int*/[] aSource) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource); - } - - public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName); - } - public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) { return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference); } - - public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference); - } - - public int SetWebProgressListener(long /*int*/ aWebProgressListener) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener); - } - - public int CloseProgressWindow() { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress()); - } - - public int GetTargetFile(long /*int*/[] aTargetFile) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile); - } - - public int GetTargetFileIsExecutable(int[] aTargetFileIsExecutable) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable); - } - - public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java index 022162df5d..c4777cb71e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java @@ -41,47 +41,7 @@ public class nsIHelperAppLauncher_8 extends nsICancelable { super(address); } - public int GetMIMEInfo(long /*int*/[] aMIMEInfo) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo); - } - - public int GetSource(long /*int*/[] aSource) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource); - } - - public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName); - } - public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) { return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference); } - - public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference); - } - - public int SetWebProgressListener(long /*int*/ aWebProgressListener) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener); - } - - public int CloseProgressWindow() { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress()); - } - - public int GetTargetFile(long /*int*/[] aTargetFile) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile); - } - - public int GetTargetFileIsExecutable(int[] aTargetFileIsExecutable) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable); - } - - public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted); - } - - public int GetContentLength(long /*int*/ aContentLength) { - return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 11, getAddress(), aContentLength); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpChannel.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpChannel.java index 22eb5fa2cf..ab94aab68c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpChannel.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpChannel.java @@ -41,79 +41,7 @@ public class nsIHttpChannel extends nsIChannel { super(address); } - public int GetRequestMethod(long /*int*/ aRequestMethod) { - return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 1, getAddress(), aRequestMethod); - } - - public int SetRequestMethod(long /*int*/ aRequestMethod) { - return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 2, getAddress(), aRequestMethod); - } - - public int GetReferrer(long /*int*/[] aReferrer) { - return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 3, getAddress(), aReferrer); - } - - public int SetReferrer(long /*int*/ aReferrer) { - return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 4, getAddress(), aReferrer); - } - - public int GetRequestHeader(long /*int*/ aHeader, long /*int*/ _retval) { - return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 5, getAddress(), aHeader, _retval); - } - - public int SetRequestHeader(long /*int*/ aHeader, long /*int*/ aValue, int aMerge) { - return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 6, getAddress(), aHeader, aValue, aMerge); - } - public int VisitRequestHeaders(long /*int*/ aVisitor) { return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 7, getAddress(), aVisitor); } - - public int GetAllowPipelining(int[] aAllowPipelining) { - return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 8, getAddress(), aAllowPipelining); - } - - public int SetAllowPipelining(int aAllowPipelining) { - return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 9, getAddress(), aAllowPipelining); - } - - public int GetRedirectionLimit(int[] aRedirectionLimit) { - return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 10, getAddress(), aRedirectionLimit); - } - - public int SetRedirectionLimit(int aRedirectionLimit) { - return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 11, getAddress(), aRedirectionLimit); - } - - public int GetResponseStatus(int[] aResponseStatus) { - return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 12, getAddress(), aResponseStatus); - } - - public int GetResponseStatusText(long /*int*/ aResponseStatusText) { - return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 13, getAddress(), aResponseStatusText); - } - - public int GetRequestSucceeded(int[] aRequestSucceeded) { - return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 14, getAddress(), aRequestSucceeded); - } - - public int GetResponseHeader(long /*int*/ header, long /*int*/ _retval) { - return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 15, getAddress(), header, _retval); - } - - public int SetResponseHeader(long /*int*/ header, long /*int*/ value, int merge) { - return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 16, getAddress(), header, value, merge); - } - - public int VisitResponseHeaders(long /*int*/ aVisitor) { - return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 17, getAddress(), aVisitor); - } - - public int IsNoStoreResponse(int[] _retval) { - return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 18, getAddress(), _retval); - } - - public int IsNoCacheResponse(int[] _retval) { - return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 19, getAddress(), _retval); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpHeaderVisitor.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpHeaderVisitor.java deleted file mode 100644 index 14c061890f..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpHeaderVisitor.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) 2011, 2012 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIHttpHeaderVisitor extends nsISupports { - - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1; - - public static final String NS_IHTTPHEADERVISITOR_IID_STR = - "0cf40717-d7c1-4a94-8c1e-d6c9734101bb"; - - public static final nsID NS_IHTTPHEADERVISITOR_IID = - new nsID(NS_IHTTPHEADERVISITOR_IID_STR); - - public nsIHttpHeaderVisitor(long /*int*/ address) { - super(address); - } - - public int VisitHeader(long /*int*/ aHeader, long /*int*/ aValue) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aHeader, aValue); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIIOService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIIOService.java index bef6907be2..16fbffe9ca 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIIOService.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIIOService.java @@ -41,43 +41,7 @@ public class nsIIOService extends nsISupports { super(address); } - public int GetProtocolHandler(byte[] aScheme, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aScheme, _retval); - } - - public int GetProtocolFlags(byte[] aScheme, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aScheme, _retval); - } - public int NewURI(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval); } - - public int NewFileURI(long /*int*/ aFile, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile, _retval); - } - - public int NewChannelFromURI(long /*int*/ aURI, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aURI, _retval); - } - - public int NewChannel(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval); - } - - public int GetOffline(int[] aOffline) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aOffline); - } - - public int SetOffline(int aOffline) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aOffline); - } - - public int AllowPort(int aPort, byte[] aScheme, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPort, aScheme, _retval); - } - - public int ExtractScheme(long /*int*/ urlString, long /*int*/ _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), urlString, _retval); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java index a8cfaf708e..4310272933 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java @@ -41,14 +41,6 @@ public class nsIJSContextStack extends nsISupports { super(address); } - public int GetCount(int[] aCount) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCount); - } - - public int Peek(long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval); - } - public int Pop(long /*int*/[] _retval) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java index 70b0a073e9..1266faf20b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java @@ -41,10 +41,6 @@ public class nsIMIMEInputStream extends nsIInputStream { super(address); } - public int GetAddContentLength(int[] aAddContentLength) { - return XPCOM.VtblCall(nsIInputStream.LAST_METHOD_ID + 1, getAddress(), aAddContentLength); - } - public int SetAddContentLength(int aAddContentLength) { return XPCOM.VtblCall(nsIInputStream.LAST_METHOD_ID + 2, getAddress(), aAddContentLength); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMemory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMemory.java index d3b47412f1..2fbed867c2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMemory.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMemory.java @@ -45,19 +45,7 @@ public class nsIMemory extends nsISupports { return XPCOM.nsIMemory_Alloc(getAddress(), size); } - public long /*int*/ Realloc(long /*int*/ ptr, int newSize) { - return XPCOM.nsIMemory_Realloc(getAddress(), ptr, newSize); - } - public int Free(long /*int*/ ptr) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ptr); } - - public int HeapMinimize(int immediate) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), immediate); - } - - public int IsLowMemory(int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserverService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserverService.java index 83a8e1fb7c..1e5f4fcd9f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserverService.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserverService.java @@ -41,19 +41,7 @@ public class nsIObserverService extends nsISupports { super(address); } - public int AddObserver(long /*int*/ anObserver, byte[] aTopic, int ownsWeak) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), anObserver, aTopic, ownsWeak); - } - - public int RemoveObserver(long /*int*/ anObserver, byte[] aTopic) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), anObserver, aTopic); - } - public int NotifyObservers(long /*int*/ aSubject, byte[] aTopic, char[] someData) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSubject, aTopic, someData); } - - public int EnumerateObservers(byte[] aTopic, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aTopic, _retval); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java index 321f0cb04f..dad2d1fa08 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java @@ -41,14 +41,6 @@ public class nsIPrefLocalizedString extends nsISupports { super(address); } - public int GetData(long /*int*/[] aData) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aData); - } - - public int SetData(char[] aData) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData); - } - public int ToString(long /*int*/[] _retval) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java index d4f6c16fb5..be9f1f4001 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java @@ -41,18 +41,6 @@ public class nsIPrefService extends nsISupports { super(address); } - public int ReadUserPrefs(long /*int*/ aFile) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aFile); - } - - public int ResetPrefs() { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress()); - } - - public int ResetUserPrefs() { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress()); - } - public int SavePrefFile(long /*int*/ aFile) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile); } @@ -60,8 +48,4 @@ public class nsIPrefService extends nsISupports { public int GetBranch(byte[] aPrefRoot, long /*int*/[] _retval) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefRoot, _retval); } - - public int GetDefaultBranch(byte[] aPrefRoot, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPrefRoot, _retval); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java deleted file mode 100644 index d2f6106b11..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java +++ /dev/null @@ -1,63 +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, 2012 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIProgressDialog extends nsIDownload { - - static final int LAST_METHOD_ID = nsIDownload.LAST_METHOD_ID + 5; - - public static final String NS_IPROGRESSDIALOG_IID_STR = - "88a478b3-af65-440a-94dc-ed9b154d2990"; - - public static final nsID NS_IPROGRESSDIALOG_IID = - new nsID(NS_IPROGRESSDIALOG_IID_STR); - - public nsIProgressDialog(long /*int*/ address) { - super(address); - } - - public int Open(long /*int*/ aParent) { - return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 1, getAddress(), aParent); - } - - public int GetCancelDownloadOnClose(int[] aCancelDownloadOnClose) { - return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 2, getAddress(), aCancelDownloadOnClose); - } - - public int SetCancelDownloadOnClose(int aCancelDownloadOnClose) { - return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose); - } - - public int GetDialog(long /*int*/[] aDialog) { - return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 4, getAddress(), aDialog); - } - - public int SetDialog(long /*int*/ aDialog) { - return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 5, getAddress(), aDialog); - } -} diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java deleted file mode 100644 index 9e19a06c99..0000000000 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java +++ /dev/null @@ -1,71 +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, 2012 IBM Corp. All Rights Reserved. - * - * ***** END LICENSE BLOCK ***** */ -package org.eclipse.swt.internal.mozilla; - -public class nsIProgressDialog_1_8 extends nsIDownload_1_8 { - - static final int LAST_METHOD_ID = nsIDownload_1_8.LAST_METHOD_ID + 7; - - public static final String NS_IPROGRESSDIALOG_IID_STR = - "20e790a2-76c6-462d-851a-22ab6cbbe48b"; - - public static final nsID NS_IPROGRESSDIALOG_IID = - new nsID(NS_IPROGRESSDIALOG_IID_STR); - - public nsIProgressDialog_1_8(long /*int*/ address) { - super(address); - } - - public int Open(long /*int*/ aParent) { - return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 1, getAddress(), aParent); - } - - public int GetCancelDownloadOnClose(int[] aCancelDownloadOnClose) { - return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 2, getAddress(), aCancelDownloadOnClose); - } - - public int SetCancelDownloadOnClose(int aCancelDownloadOnClose) { - return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose); - } - - public int GetObserver(long /*int*/[] aObserver) { - return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 4, getAddress(), aObserver); - } - - public int SetObserver(long /*int*/ aObserver) { - return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 5, getAddress(), aObserver); - } - - public int GetDialog(long /*int*/[] aDialog) { - return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 6, getAddress(), aDialog); - } - - public int SetDialog(long /*int*/ aDialog) { - return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 7, getAddress(), aDialog); - } -} 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 fc326a4cca..365e277eb7 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 @@ -52,6 +52,4 @@ public class nsIPromptService { 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; - - /* 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/nsIProperties.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProperties.java index 121a2023ec..6caaf11593 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProperties.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProperties.java @@ -44,20 +44,4 @@ public class nsIProperties extends nsISupports { public int Get(byte[] prop, nsID iid, long /*int*/[] result) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, iid, result); } - - public int Set(byte[] prop, long /*int*/ value) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prop, value); - } - - public int Has(byte[] prop, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prop, _retval); - } - - public int Undefine(byte[] prop) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), prop); - } - - public int GetKeys(int[] count, long /*int*/[] keys) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), count, keys); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequest.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequest.java index 160b3e4fd3..e6a4fc3190 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequest.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequest.java @@ -45,42 +45,6 @@ public class nsIRequest extends nsISupports { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName); } - public int IsPending(int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval); - } - - public int GetStatus(long /*int*/[] aStatus) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aStatus); - } - - public int Cancel(int aStatus) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aStatus); - } - - public int Suspend() { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress()); - } - - public int Resume() { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress()); - } - - public int GetLoadGroup(long /*int*/[] aLoadGroup) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aLoadGroup); - } - - public int SetLoadGroup(long /*int*/ aLoadGroup) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aLoadGroup); - } - - public int GetLoadFlags(long /*int*/[] aLoadFlags) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aLoadFlags); - } - - public int SetLoadFlags(int aLoadFlags) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aLoadFlags); - } - public static final int LOAD_NORMAL = 0; public static final int LOAD_BACKGROUND = 1; public static final int INHIBIT_CACHING = 128; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java index a614334ffe..a258754b26 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java @@ -51,18 +51,6 @@ public class nsISSLStatus extends nsISupports { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aServerCert); } - public int GetCipherName(long /*int*/[] aCipherName) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCipherName); - } - - public int GetKeyLength(int[] aKeyLength) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aKeyLength); - } - - public int GetSecretKeyLength(int[] aSecretKeyLength) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aSecretKeyLength); - } - public int GetIsDomainMismatch(int[] aIsDomainMismatch) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aIsDomainMismatch); } @@ -74,9 +62,4 @@ public class nsISSLStatus extends nsISupports { public int GetIsUntrusted(int[] aIsUntrusted) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aIsUntrusted); } - - public int GetIsExtendedValidation(int[] aIsExtendedValidation) { - if (!(IsXULRunner10 || IsXULRunner17)) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aIsExtendedValidation); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISeekableStream.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISeekableStream.java index 2b845646b2..edaeb777c5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISeekableStream.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISeekableStream.java @@ -52,8 +52,4 @@ public class nsISeekableStream extends nsISupports { public int Tell(long[] _retval) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval); } - - public int SetEOF() { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress()); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISerializable.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISerializable.java index a2fac0052f..433beb40f5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISerializable.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISerializable.java @@ -40,12 +40,4 @@ public class nsISerializable extends nsISupports { public nsISerializable(long /*int*/ address) { super(address); } - - public int Read(long /*int*/ aInputStream) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aInputStream); - } - - public int Write(long /*int*/ aOutputStream) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aOutputStream); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIServiceManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIServiceManager.java index 31c682619c..e00b5196f5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIServiceManager.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIServiceManager.java @@ -48,12 +48,4 @@ public class nsIServiceManager extends nsISupports { public int GetServiceByContractID(byte[] aContractID, nsID aIID, long /*int*/[] result) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result); } - - public int IsServiceInstantiated(nsID aClass, nsID aIID, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aIID, _retval); - } - - public int IsServiceInstantiatedByContractID(byte[] aContractID, nsID aIID, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContractID, aIID, _retval); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITransfer.java index 5b5a24eee5..0c6893838b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITransfer.java @@ -40,8 +40,4 @@ public class nsITransfer extends nsIWebProgressListener2 { public nsITransfer(long /*int*/ address) { super(address); } - - public int Init(long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aTempFile, long /*int*/ aCancelable) { - return XPCOM.VtblCall(nsIWebProgressListener2.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aTempFile, aCancelable); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java index 5f1f7358c1..a7478e1982 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java @@ -51,133 +51,11 @@ public class nsIURI extends nsISupports { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec); } - public int SetSpec(long /*int*/ aSpec) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec); - } - - public int GetPrePath(long /*int*/ aPrePath) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrePath); - } - - public int GetScheme(long /*int*/ aScheme) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScheme); - } - - public int SetScheme(long /*int*/ aScheme) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aScheme); - } - - public int GetUserPass(long /*int*/ aUserPass) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aUserPass); - } - - public int SetUserPass(long /*int*/ aUserPass) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aUserPass); - } - - public int GetUsername(long /*int*/ aUsername) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aUsername); - } - - public int SetUsername(long /*int*/ aUsername) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aUsername); - } - - public int GetPassword(long /*int*/ aPassword) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPassword); - } - - public int SetPassword(long /*int*/ aPassword) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPassword); - } - - public int GetHostPort(long /*int*/ aHostPort) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aHostPort); - } - - public int SetHostPort(long /*int*/ aHostPort) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aHostPort); - } - public int GetHost(long /*int*/ aHost) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aHost); } - public int SetHost(long /*int*/ aHost) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aHost); - } - - public int GetPort(int[] aPort) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aPort); - } - - public int SetPort(int aPort) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPort); - } - public int GetPath(long /*int*/ aPath) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPath); } - - public int SetPath(long /*int*/ aPath) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPath); - } - - public int Equals(long /*int*/ other, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), other, _retval); - } - - public int SchemeIs(byte[] scheme, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), scheme, _retval); - } - - public int Clone(long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval); - } - - public int Resolve(long /*int*/ relativePath, long /*int*/ _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), relativePath, _retval); - } - - public int GetAsciiSpec(long /*int*/ aAsciiSpec) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAsciiSpec); - } - - public int GetAsciiHost(long /*int*/ aAsciiHost) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAsciiHost); - } - - public int GetOriginCharset(long /*int*/ aOriginCharset) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aOriginCharset); - } - - public int GetRef(long /*int*/ aRef) { - if (!(IsXULRunner10 || IsXULRunner17)) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aRef); - } - - public int SetRef(long /*int*/ aRef) { - if (!(IsXULRunner10 || IsXULRunner17)) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aRef); - } - - public int EqualsExceptRef(long /*int*/ other, int[] _retval) { - if (!(IsXULRunner10 || IsXULRunner17)) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), other, _retval); - } - - public int CloneIgnoringRef(long /*int*/[] _retval) { - if (!(IsXULRunner10 || IsXULRunner17)) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), _retval); - } - - public int GetSpecIgnoringRef(long /*int*/ aSpecIgnoringRef) { - if (!(IsXULRunner10 || IsXULRunner17)) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), aSpecIgnoringRef); - } - - public int GetHasRef(int[] aHasRef) { - if (!(IsXULRunner10 || IsXULRunner17)) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aHasRef); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIUploadChannel.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIUploadChannel.java index 8c819c7b75..735cddb6d0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIUploadChannel.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIUploadChannel.java @@ -41,10 +41,6 @@ public class nsIUploadChannel extends nsISupports { super(address); } - public int SetUploadStream(long /*int*/ aStream, long /*int*/ aContentType, int aContentLength) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aStream, aContentType, aContentLength); - } - public int GetUploadStream(long /*int*/[] aUploadStream) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aUploadStream); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java index f3d0d90d44..c0beee516a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java @@ -51,42 +51,10 @@ public class nsIVariant extends nsISupports { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aDataType); } - public int GetAsInt8(long /*int*/ _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval); - } - - public int GetAsInt16(long /*int*/ _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval); - } - public int GetAsInt32(int[] _retval) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), _retval); } - public int GetAsInt64(long[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval); - } - - public int GetAsUint8(long /*int*/ _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval); - } - - public int GetAsUint16(short[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), _retval); - } - - public int GetAsUint32(int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), _retval); - } - - public int GetAsUint64(long /*int*/ _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval); - } - - public int GetAsFloat(float[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval); - } - public int GetAsDouble(long /*int*/ _retval) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), _retval); } @@ -102,63 +70,10 @@ public class nsIVariant extends nsISupports { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), _retval); } - public int GetAsChar(byte[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), _retval); - } - - public int GetAsWChar(char[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval); - } - - public int GetAsID(long /*int*/ retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), retval); - } - - public int GetAsAString(long /*int*/ _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), _retval); - } - - public int GetAsDOMString(long /*int*/ _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), _retval); - } - - public int GetAsACString(long /*int*/ _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), _retval); - } - - public int GetAsAUTF8String(long /*int*/ _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), _retval); - } - - public int GetAsString(long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), _retval); - } - - public int GetAsWString(long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval); - } - - public int GetAsISupports(long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval); - } - - public int GetAsJSVal(long /*int*/[] _retval) { - if (!(IsXULRunner10 || IsXULRunner17)) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), _retval); - } - - public int GetAsInterface(long /*int*/[] iid, long /*int*/[] iface) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + ((IsXULRunner10 || IsXULRunner17) ? 24 : 23), getAddress(), iid, iface); - } - public int GetAsArray(short[] type, long /*int*/ iid, int[] count, long /*int*/[] ptr) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + ((IsXULRunner10 || IsXULRunner17) ? 25 : 24), getAddress(), type, iid, count, ptr); } - public int GetAsStringWithSize(int[] size, long /*int*/[] str) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + ((IsXULRunner10 || IsXULRunner17) ? 26 : 25), getAddress(), size, str); - } - public int GetAsWStringWithSize(int[] size, long /*int*/[] str) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + ((IsXULRunner10 || IsXULRunner17) ? 27 : 26), getAddress(), size, str); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java index a6028a91ee..c6c7658038 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java @@ -55,18 +55,10 @@ public class nsIWebBrowser extends nsISupports { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aListener, aIID); } - public int GetContainerWindow(long /*int*/[] aContainerWindow) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContainerWindow); - } - public int SetContainerWindow(long /*int*/ aContainerWindow) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContainerWindow); } - public int GetParentURIContentListener(long /*int*/[] aParentURIContentListener) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParentURIContentListener); - } - public int SetParentURIContentListener(long /*int*/ aParentURIContentListener) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParentURIContentListener); } @@ -74,14 +66,4 @@ public class nsIWebBrowser extends nsISupports { public int GetContentDOMWindow(long /*int*/[] aContentDOMWindow) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aContentDOMWindow); } - - public int GetIsActive(int[] aIsActive) { - if (!(IsXULRunner10 || IsXULRunner17)) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aIsActive); - } - - public int SetIsActive(int aIsActive) { - if (!(IsXULRunner10 || IsXULRunner17)) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aIsActive); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java index af21c182a2..d8ace9c425 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java @@ -48,28 +48,4 @@ public class nsIWebBrowserFocus extends nsISupports { public int Deactivate() { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress()); } - - public int SetFocusAtFirstElement() { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress()); - } - - public int SetFocusAtLastElement() { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress()); - } - - public int GetFocusedWindow(long /*int*/[] aFocusedWindow) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFocusedWindow); - } - - public int SetFocusedWindow(long /*int*/ aFocusedWindow) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aFocusedWindow); - } - - public int GetFocusedElement(long /*int*/[] aFocusedElement) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFocusedElement); - } - - public int SetFocusedElement(long /*int*/ aFocusedElement) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aFocusedElement); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java index 78d67d53a3..211bb86530 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java @@ -57,10 +57,6 @@ public class nsIWebNavigation extends nsISupports { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress()); } - public int GotoIndex(int index) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), index); - } - public static final int LOAD_FLAGS_MASK = 65535; public static final int LOAD_FLAGS_NONE = 0; public static final int LOAD_FLAGS_IS_REFRESH = 16; @@ -87,23 +83,7 @@ public class nsIWebNavigation extends nsISupports { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), stopFlags); } - public int GetDocument(long /*int*/[] aDocument) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDocument); - } - public int GetCurrentURI(long /*int*/[] aCurrentURI) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aCurrentURI); } - - public int GetReferringURI(long /*int*/[] aReferringURI) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aReferringURI); - } - - public int GetSessionHistory(long /*int*/[] aSessionHistory) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aSessionHistory); - } - - public int SetSessionHistory(long /*int*/ aSessionHistory) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSessionHistory); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgress.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgress.java index 9abde41d7a..1686342c7a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgress.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgress.java @@ -52,19 +52,7 @@ public class nsIWebProgress extends nsISupports { public static final int NOTIFY_LOCATION = 128; public static final int NOTIFY_ALL = 255; - public int AddProgressListener(long /*int*/ listener, int aNotifyMask) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), listener, aNotifyMask); - } - - public int RemoveProgressListener(long /*int*/ listener) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), listener); - } - public int GetDOMWindow(long /*int*/[] aDOMWindow) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDOMWindow); } - - public int GetIsLoadingDocument(int[] aIsLoadingDocument) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aIsLoadingDocument); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java index 0f3cdb0a31..ea91a5676f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java @@ -40,8 +40,4 @@ public class nsIWebProgressListener2 extends nsIWebProgressListener { public nsIWebProgressListener2(long /*int*/ address) { super(address); } - - public int OnProgressChange64(long /*int*/ aWebProgress, long /*int*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) { - return XPCOM.VtblCall(nsIWebProgressListener.LAST_METHOD_ID + 1, getAddress(), aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java index 865f975e35..dcf407e68b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java @@ -41,30 +41,6 @@ public class nsIWindowWatcher extends nsISupports { super(address); } - public int OpenWindow(long /*int*/ aParent, byte[] aUrl, byte[] aName, byte[] aFeatures, long /*int*/ aArguments, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aUrl, aName, aFeatures, aArguments, _retval); - } - - public int RegisterNotification(long /*int*/ aObserver) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aObserver); - } - - public int UnregisterNotification(long /*int*/ aObserver) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aObserver); - } - - public int GetWindowEnumerator(long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), _retval); - } - - public int GetNewPrompter(long /*int*/ aParent, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, _retval); - } - - public int GetNewAuthPrompter(long /*int*/ aParent, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, _retval); - } - public int SetWindowCreator(long /*int*/ creator) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), creator); } @@ -72,16 +48,4 @@ public class nsIWindowWatcher extends nsISupports { public int GetChromeForWindow(long /*int*/ aWindow, long /*int*/[] _retval) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aWindow, _retval); } - - public int GetWindowByName(char[] aTargetName, long /*int*/ aCurrentWindow, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aTargetName, aCurrentWindow, _retval); - } - - public int GetActiveWindow(long /*int*/[] aActiveWindow) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aActiveWindow); - } - - public int SetActiveWindow(long /*int*/ aActiveWindow) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aActiveWindow); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java index 442a156f7d..0a68afb681 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java @@ -41,50 +41,6 @@ public class nsIWritableVariant extends nsIVariant { super(address); } - public int GetWritable(int[] aWritable) { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 1, getAddress(), aWritable); - } - - public int SetWritable(int aWritable) { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 2, getAddress(), aWritable); - } - -// public int SetAsInt8(!ERROR UNKNOWN C TYPE <PRUint8 >! aValue) { -// return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 3, getAddress(), aValue); -// } -// -// public int SetAsInt16(!ERROR UNKNOWN C TYPE <PRInt16 >! aValue) { -// return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 4, getAddress(), aValue); -// } - - public int SetAsInt32(int aValue) { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 5, getAddress(), aValue); - } - - public int SetAsInt64(long aValue) { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 6, getAddress(), aValue); - } - -// public int SetAsUint8(!ERROR UNKNOWN C TYPE <PRUint8 >! aValue) { -// return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 7, getAddress(), aValue); -// } - - public int SetAsUint16(short aValue) { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 8, getAddress(), aValue); - } - - public int SetAsUint32(int aValue) { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 9, getAddress(), aValue); - } - -// public int SetAsUint64(!ERROR UNKNOWN C TYPE <PRUint64 >! aValue) { -// return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 10, getAddress(), aValue); -// } - - public int SetAsFloat(float aValue) { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 11, getAddress(), aValue); - } - public int SetAsDouble(double aValue) { return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 12, getAddress(), aValue); } @@ -97,66 +53,14 @@ public class nsIWritableVariant extends nsIVariant { return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 13, getAddress(), aValue); } -// public int SetAsChar(!ERROR UNKNOWN C TYPE <char >! aValue) { -// return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 14, getAddress(), aValue); -// } -// -// public int SetAsWChar(!ERROR UNKNOWN C TYPE <PRUnichar >! aValue) { -// return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 15, getAddress(), aValue); -// } - - public int SetAsID(long /*int*/ aValue) { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 16, getAddress(), aValue); - } - - public int SetAsAString(long /*int*/ aValue) { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 17, getAddress(), aValue); - } - - public int SetAsDOMString(long /*int*/ aValue) { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 18, getAddress(), aValue); - } - - public int SetAsACString(long /*int*/ aValue) { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 19, getAddress(), aValue); - } - - public int SetAsAUTF8String(long /*int*/ aValue) { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 20, getAddress(), aValue); - } - - public int SetAsString(byte[] aValue) { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 21, getAddress(), aValue); - } - - public int SetAsWString(char[] aValue) { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 22, getAddress(), aValue); - } - - public int SetAsISupports(long /*int*/ aValue) { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 23, getAddress(), aValue); - } - - public int SetAsInterface(nsID iid, long /*int*/ iface) { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 24, getAddress(), iid, iface); - } - public int SetAsArray(short type, long /*int*/ iid, int count, long /*int*/ ptr) { return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 25, getAddress(), type, iid, count, ptr); } - public int SetAsStringWithSize(int size, byte[] str) { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 26, getAddress(), size, str); - } - public int SetAsWStringWithSize(int size, char[] str) { return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 27, getAddress(), size, str); } - public int SetAsVoid() { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 28, getAddress()); - } - public int SetAsEmpty() { return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 29, getAddress()); } @@ -164,8 +68,4 @@ public class nsIWritableVariant extends nsIVariant { public int SetAsEmptyArray() { return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 30, getAddress()); } - - public int SetFromVariant(long /*int*/ aValue) { - return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 31, getAddress(), aValue); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509Cert.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509Cert.java index d4756ab689..397f36a7d7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509Cert.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509Cert.java @@ -41,86 +41,18 @@ public class nsIX509Cert extends nsISupports { super(address); } - public int GetNickname(long /*int*/ aNickname) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNickname); - } - - public int GetEmailAddress(long /*int*/ aEmailAddress) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEmailAddress); - } - - public int GetEmailAddresses(int[] length, long /*int*/[] addresses) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), length, addresses); - } - - public int ContainsEmailAddress(long /*int*/ aEmailAddress, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aEmailAddress, _retval); - } - - public int GetSubjectName(long /*int*/ aSubjectName) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aSubjectName); - } - public int GetCommonName(long /*int*/ aCommonName) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCommonName); } - public int GetOrganization(long /*int*/ aOrganization) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aOrganization); - } - - public int GetOrganizationalUnit(long /*int*/ aOrganizationalUnit) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aOrganizationalUnit); - } - - public int GetSha1Fingerprint(long /*int*/ aSha1Fingerprint) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSha1Fingerprint); - } - - public int GetMd5Fingerprint(long /*int*/ aMd5Fingerprint) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aMd5Fingerprint); - } - - public int GetTokenName(long /*int*/ aTokenName) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aTokenName); - } - - public int GetIssuerName(long /*int*/ aIssuerName) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aIssuerName); - } - - public int GetSerialNumber(long /*int*/ aSerialNumber) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSerialNumber); - } - public int GetIssuerCommonName(long /*int*/ aIssuerCommonName) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aIssuerCommonName); } - public int GetIssuerOrganization(long /*int*/ aIssuerOrganization) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aIssuerOrganization); - } - - public int GetIssuerOrganizationUnit(long /*int*/ aIssuerOrganizationUnit) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aIssuerOrganizationUnit); - } - - public int GetIssuer(long /*int*/[] aIssuer) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aIssuer); - } - public int GetValidity(long /*int*/[] aValidity) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aValidity); } - public int GetDbKey(long /*int*/[] aDbKey) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aDbKey); - } - - public int GetWindowTitle(long /*int*/[] aWindowTitle) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aWindowTitle); - } - public static final int UNKNOWN_CERT = 0; public static final int CA_CERT = 1; public static final int USER_CERT = 2; @@ -147,32 +79,4 @@ public class nsIX509Cert extends nsISupports { public static final int CERT_USAGE_ProtectedObjectSigner = 9; public static final int CERT_USAGE_StatusResponder = 10; public static final int CERT_USAGE_AnyCA = 11; - - public int GetChain(long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval); - } - - public int GetUsagesArray(int ignoreOcsp, int[] verified, int[] count, long /*int*/[] usages) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), ignoreOcsp, verified, count, usages); - } - - public int GetUsagesString(int ignoreOcsp, int[] verified, long /*int*/ usages) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), ignoreOcsp, verified, usages); - } - - public int VerifyForUsage(int usage, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), usage, _retval); - } - - public int GetASN1Structure(long /*int*/[] aASN1Structure) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aASN1Structure); - } - - public int GetRawDER(int[] length, long /*int*/[] data) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), length, data); - } - - public int Equals(long /*int*/ other, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval); - } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java index 90b546e3df..4aa9be310b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java @@ -41,34 +41,10 @@ public class nsIX509CertValidity extends nsISupports { super(address); } - public int GetNotBefore(long /*int*/ aNotBefore) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNotBefore); - } - - public int GetNotBeforeLocalTime(long /*int*/ aNotBeforeLocalTime) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aNotBeforeLocalTime); - } - - public int GetNotBeforeLocalDay(long /*int*/ aNotBeforeLocalDay) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aNotBeforeLocalDay); - } - public int GetNotBeforeGMT(long /*int*/ aNotBeforeGMT) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNotBeforeGMT); } - public int GetNotAfter(long /*int*/ aNotAfter) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aNotAfter); - } - - public int GetNotAfterLocalTime(long /*int*/ aNotAfterLocalTime) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aNotAfterLocalTime); - } - - public int GetNotAfterLocalDay(long /*int*/ aNotAfterLocalDay) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNotAfterLocalDay); - } - public int GetNotAfterGMT(long /*int*/ aNotAfterGMT) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNotAfterGMT); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java index 93463818a3..873ccaf262 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java @@ -40,40 +40,4 @@ public class nsIXPCSecurityManager extends nsISupports { public nsIXPCSecurityManager(long /*int*/ address) { super(address); } - - public static final int HOOK_CREATE_WRAPPER = 1; - - public static final int HOOK_CREATE_INSTANCE = 2; - - public static final int HOOK_GET_SERVICE = 4; - - public static final int HOOK_CALL_METHOD = 8; - - public static final int HOOK_GET_PROPERTY = 16; - - public static final int HOOK_SET_PROPERTY = 32; - - public static final int HOOK_ALL = 63; - - public int CanCreateWrapper(long /*int*/ aJSContext, nsID aIID, long /*int*/ aObj, long /*int*/ aClassInfo, long /*int*/[] aPolicy) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aJSContext, aIID, aObj, aClassInfo, aPolicy); - } - - public int CanCreateInstance(long /*int*/ aJSContext, nsID aCID) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aJSContext, aCID); - } - - public int CanGetService(long /*int*/ aJSContext, nsID aCID) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aJSContext, aCID); - } - - public static final int ACCESS_CALL_METHOD = 0; - - public static final int ACCESS_GET_PROPERTY = 1; - - public static final int ACCESS_SET_PROPERTY = 2; - - public int CanAccess(int aAction, long /*int*/ aCallContext, long /*int*/ aJSContext, long /*int*/ aJSObject, long /*int*/ aObj, long /*int*/ aClassInfo, long /*int*/ aName, long /*int*/[] aPolicy) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aAction, aCallContext, aJSContext, aJSObject, aObj, aClassInfo, aName, aPolicy); - } } |