compile warnings

65 files changed, 352 insertions, 2710 deletions

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 fffe6f5322..a6bf8279b2 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
@@ -42,27 +42,27 @@ public class nsIAppShell extends nsISupports {
 	}
 
 	public int Create(int[] argc, int[] argv) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), argc, argv);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), argc, argv);
 	}
 
 	public int Run() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());
 	}
 
 	public int Spinup() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
 	}
 
 	public int Spindown() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
 	}
 
 	public int ListenToEventQueue(int aQueue, boolean aListen) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aQueue, aListen);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aQueue, aListen);
 	}
 
 	public int GetNativeEvent(int aRealEvent, int aEvent) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aRealEvent, aEvent);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aRealEvent, aEvent);
 	}
 
 	public int DispatchNativeEvent(boolean aRealEvent, int aEvent) {
@@ -70,6 +70,6 @@ public class nsIAppShell extends nsISupports {
 	}
 
 	public int Exit() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
index 38e1acd3c7..a2676e88fe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
@@ -42,98 +42,98 @@ public class nsIBaseWindow extends nsISupports {
 	}
 
 	public int InitWindow(int parentNativeWindow, int parentWidget, int x, int y, int cx, int cy) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), parentNativeWindow, parentWidget, x, y, cx, cy);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parentNativeWindow, parentWidget, x, y, cx, cy);
 	}
 
 	public int Create() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());
 	}
 
 	public int Destroy() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
 	}
 
 	public int SetPosition(int x, int y) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), x, y);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), x, y);
 	}
 
 	public int GetPosition(int[] x, int[] y) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), x, y);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), x, y);
 	}
 
 	public int SetSize(int cx, int cy, boolean fRepaint) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), cx, cy, fRepaint);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), cx, cy, fRepaint);
 	}
 
 	public int GetSize(int[] cx, int[] cy) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), cx, cy);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), cx, cy);
 	}
 
 	public int SetPositionAndSize(int x, int y, int cx, int cy, boolean fRepaint) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), x, y, cx, cy, fRepaint);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), x, y, cx, cy, fRepaint);
 	}
 
 	public int GetPositionAndSize(int[] x, int[] y, int[] cx, int[] cy) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), x, y, cx, cy);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), x, y, cx, cy);
 	}
 
 	public int Repaint(boolean force) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), force);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), force);
 	}
 
 	public int GetParentWidget(int[] aParentWidget) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 11, getAddress(), aParentWidget);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aParentWidget);
 	}
 
 	public int SetParentWidget(int aParentWidget) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 12, getAddress(), aParentWidget);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aParentWidget);
 	}
 
 	public int GetParentNativeWindow(int[] aParentNativeWindow) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 13, getAddress(), aParentNativeWindow);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aParentNativeWindow);
 	}
 
 	public int SetParentNativeWindow(int aParentNativeWindow) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 14, getAddress(), aParentNativeWindow);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentNativeWindow);
 	}
 
 	public int GetVisibility(boolean[] aVisibility) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 15, getAddress(), aVisibility);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aVisibility);
 	}
 
 	public int SetVisibility(boolean aVisibility) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 16, getAddress(), aVisibility);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aVisibility);
 	}
 
 	public int GetEnabled(boolean[] aEnabled) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 17, getAddress(), aEnabled);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aEnabled);
 	}
 
 	public int SetEnabled(boolean aEnabled) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 18, getAddress(), aEnabled);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aEnabled);
 	}
 
 	public int GetBlurSuppression(boolean[] aBlurSuppression) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 19, getAddress(), aBlurSuppression);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aBlurSuppression);
 	}
 
 	public int SetBlurSuppression(boolean aBlurSuppression) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 20, getAddress(), aBlurSuppression);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aBlurSuppression);
 	}
 
 	public int GetMainWidget(int[] aMainWidget) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 21, getAddress(), aMainWidget);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aMainWidget);
 	}
 
 	public int SetFocus() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 22, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress());
 	}
 
 	public int GetTitle(int[] aTitle) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 23, getAddress(), aTitle);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aTitle);
 	}
 
 	public int SetTitle(char[] aTitle) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 24, getAddress(), aTitle);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aTitle);
 	}
 }
\ No newline at end of file
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
deleted file mode 100644
index 0d8c5bf70f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsICategoryManager extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 6;

-

-	public static final String NS_ICATEGORYMANAGER_IID_STRING =

-		"3275b2cd-af6d-429a-80d7-f0c5120342ac";

-

-	public static final nsID NS_ICATEGORYMANAGER_IID =

-		new nsID(NS_ICATEGORYMANAGER_IID_STRING);

-

-	public nsICategoryManager(int address) {

-		super(address);

-	}

-

-	public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, int[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aCategory, aEntry, _retval);

-	}

-

-	public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, boolean aPersist, boolean aReplace, int[] _retval) {

-		return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

-	}

-

-	public int DeleteCategoryEntry(byte[] aCategory, byte[] aEntry, boolean aPersist) {

-		return XPCOM.NS_ERROR_NOT_IMPLEMENTED;

-	}

-

-	public int DeleteCategory(byte[] aCategory) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aCategory);

-	}

-

-	public int EnumerateCategory(byte[] aCategory, int[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aCategory, _retval);

-	}

-

-	public int EnumerateCategories(int[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), _retval);

-	}

-}
\ No newline at end of file
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
deleted file mode 100644
index 892fe3bffd..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIChannel extends nsIRequest {

-

-	static final int LAST_METHOD_ID = nsIRequest.LAST_METHOD_ID + 16;

-

-	public static final String NS_ICHANNEL_IID_STRING =

-		"c63a055a-a676-4e71-bf3c-6cfa11082018";

-

-	public static final nsID NS_ICHANNEL_IID =

-		new nsID(NS_ICHANNEL_IID_STRING);

-

-	public nsIChannel(int address) {

-		super(address);

-	}

-

-	public int GetOriginalURI(int[] aOriginalURI) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aOriginalURI);

-	}

-

-	public int SetOriginalURI(int aOriginalURI) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aOriginalURI);

-	}

-

-	public int GetURI(int[] aURI) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aURI);

-	}

-

-	public int GetOwner(int[] aOwner) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aOwner);

-	}

-

-	public int SetOwner(int aOwner) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aOwner);

-	}

-

-	public int GetNotificationCallbacks(int[] notificationCallbacks) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), notificationCallbacks);

-	}

-

-	public int SetNotificationCallbacks(int notificationCallbacks) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), notificationCallbacks);

-	}

-

-	public int GetSecurityInfo(int[] aSecurityInfo) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), aSecurityInfo);

-	}

-

-	public int GetContentType(int aContentType) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), aContentType);

-	}

-

-	public int SetContentType(int aContentType) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), aContentType);

-	}

-

-	public int GetContentCharset(int aContentCharset) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 11, getAddress(), aContentCharset);

-	}

-

-	public int SetContentCharset(int aContentCharset) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 12, getAddress(), aContentCharset);

-	}

-

-	public int GetContentLength(int[] aContentLength) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 13, getAddress(), aContentLength);

-	}

-

-	public int SetContentLength(int aContentLength) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 14, getAddress(), aContentLength);

-	}

-

-	public int Open(int[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 15, getAddress(), _retval);

-	}

-

-	public int AsyncOpen(int aListener, int aContext) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 16, getAddress(), aListener, aContext);

-	}

-

-	public static final int LOAD_DOCUMENT_URI = 65536;

-

-	public static final int LOAD_RETARGETED_DOCUMENT_URI = 131072;

-

-	public static final int LOAD_REPLACE = 262144;

-

-	public static final int LOAD_INITIAL_DOCUMENT_URI = 524288;

-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentManager.java
index 7fa258925f..8c4c093c8a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentManager.java
@@ -42,18 +42,18 @@ public class nsIComponentManager extends nsISupports {
 	}
 
 	public int GetClassObject(nsID aClass, nsID aIID, int[] result) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);
 	}
 
 	public int GetClassObjectByContractID(byte[] aContractID, nsID aIID, int[] result) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
 	}
 
 	public int CreateInstance(nsID aClass, int aDelegate, nsID aIID, int[] result) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aClass, aDelegate, aIID, result);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aDelegate, aIID, result);
 	}
 
 	public int CreateInstanceByContractID(byte[] aContractID, int aDelegate, nsID aIID, int[] result) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aContractID, aDelegate, aIID, result);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContractID, aDelegate, aIID, result);
 	}
 }
\ No newline at end of file
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 eade4be932..823ffe1381 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
@@ -42,15 +42,15 @@ public class nsIComponentRegistrar extends nsISupports {
 	}
 
 	public int AutoRegister(int aSpec) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aSpec);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
 	}
 
 	public int AutoUnregister(int aSpec) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aSpec);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
 	}
 
 	public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, int aFactory) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aClass, aClassName, aContractID, aFactory);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aClassName, aContractID, aFactory);
 	}
 
 	public int UnregisterFactory(nsID aClass, int aFactory) {
@@ -74,15 +74,15 @@ public class nsIComponentRegistrar extends nsISupports {
 	}
 
 	public int EnumerateCIDs(int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
 	}
 
 	public int EnumerateContractIDs(int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
 	}
 
 	public int CIDToContractID(nsID aClass, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 11, getAddress(), aClass, _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aClass, _retval);
 	}
 
 	public int ContractIDToCID(byte[] aContractID, nsID[] _retval) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContentViewer.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContentViewer.java
deleted file mode 100644
index d68cf4e371..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContentViewer.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIContentViewer extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 22;

-

-	public static final String NS_ICONTENTVIEWER_IID_STRING =

-		"a6cf9056-15b3-11d2-932e-00805f8add32";

-

-	public static final nsID NS_ICONTENTVIEWER_IID =

-		new nsID(NS_ICONTENTVIEWER_IID_STRING);

-

-	public nsIContentViewer(int address) {

-		super(address);

-	}

-

-	public int Init(int aParentWidget, int aDeviceContext, int aBounds) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aParentWidget, aDeviceContext, aBounds);

-	}

-

-	public int GetContainer(int[] aContainer) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aContainer);

-	}

-

-	public int SetContainer(int aContainer) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aContainer);

-	}

-

-	public int LoadStart(int aDoc) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aDoc);

-	}

-

-	public int LoadComplete(int aStatus) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aStatus);

-	}

-

-	public int Unload() {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress());

-	}

-

-	public int Close() {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress());

-	}

-

-	public int Destroy() {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress());

-	}

-

-	public int Stop() {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress());

-	}

-

-	public int GetDOMDocument(int[] aDOMDocument) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), aDOMDocument);

-	}

-

-	public int SetDOMDocument(int aDOMDocument) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 11, getAddress(), aDOMDocument);

-	}

-

-	public int GetBounds(int aBounds) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 12, getAddress(), aBounds);

-	}

-

-	public int SetBounds(int aBounds) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 13, getAddress(), aBounds);

-	}

-

-	public int GetPreviousViewer(int[] aPreviousViewer) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 14, getAddress(), aPreviousViewer);

-	}

-

-	public int SetPreviousViewer(int aPreviousViewer) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 15, getAddress(), aPreviousViewer);

-	}

-

-	public int Move(int aX, int aY) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 16, getAddress(), aX, aY);

-	}

-

-	public int Show() {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 17, getAddress());

-	}

-

-	public int Hide() {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 18, getAddress());

-	}

-

-	public int GetEnableRendering(boolean[] aEnableRendering) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 19, getAddress(), aEnableRendering);

-	}

-

-	public int SetEnableRendering(boolean aEnableRendering) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 20, getAddress(), aEnableRendering);

-	}

-

-	public int GetSticky(boolean[] aSticky) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 21, getAddress(), aSticky);

-	}

-

-	public int SetSticky(boolean aSticky) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 22, getAddress(), aSticky);

-	}

-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContentViewerContainer.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContentViewerContainer.java
deleted file mode 100644
index fd136fcf67..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContentViewerContainer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIContentViewerContainer extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;

-

-	public static final String NS_ICONTENTVIEWERCONTAINER_IID_STRING =

-		"ea2ce7a0-5c3d-11d4-90c2-0050041caf44";

-

-	public static final nsID NS_ICONTENTVIEWERCONTAINER_IID =

-		new nsID(NS_ICONTENTVIEWERCONTAINER_IID_STRING);

-

-	public nsIContentViewerContainer(int address) {

-		super(address);

-	}

-

-	public int Embed(int aDocViewer, byte[] aCommand, int aExtraInfo) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aDocViewer, aCommand, aExtraInfo);

-	}

-

-	public int SetIsPrinting(boolean aIsPrinting) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aIsPrinting);

-	}

-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
index ab9aff1e40..d76cfcab91 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
@@ -54,6 +54,6 @@ public class nsIContextMenuListener extends nsISupports {
 	public static final int CONTEXT_INPUT = 16;
 
 	public int OnShowContextMenu(int aContextFlags, int aEvent, int aNode) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aContextFlags, aEvent, aNode);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aContextFlags, aEvent, aNode);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIController.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIController.java
deleted file mode 100644
index 0562ea7471..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIController.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIController extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
-
-	public static final String NS_ICONTROLLER_IID_STRING =
-		"D5B61B82-1DA4-11d3-BF87-00105A1B0627";
-
-	public static final nsID NS_ICONTROLLER_IID =
-		new nsID(NS_ICONTROLLER_IID_STRING);
-
-	public nsIController(int address) {
-		super(address);
-	}
-
-	public int IsCommandEnabled(byte[] command, boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), command, _retval);
-	}
-
-	public int SupportsCommand(byte[] command, boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), command, _retval);
-	}
-
-	public int DoCommand(byte[] command) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), command);
-	}
-
-	public int OnEvent(byte[] eventName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), eventName);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIControllers.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIControllers.java
deleted file mode 100644
index 3cd090d89f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIControllers.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIControllers extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 11;
-
-	public static final String NS_ICONTROLLERS_IID_STRING =
-		"A5ED3A01-7CC7-11d3-BF87-00105A1B0627";
-
-	public static final nsID NS_ICONTROLLERS_IID =
-		new nsID(NS_ICONTROLLERS_IID_STRING);
-
-	public nsIControllers(int address) {
-		super(address);
-	}
-
-	public int GetCommandDispatcher(int[] aCommandDispatcher) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aCommandDispatcher);
-	}
-
-	public int SetCommandDispatcher(int aCommandDispatcher) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aCommandDispatcher);
-	}
-
-	public int GetControllerForCommand(byte[] command, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), command, _retval);
-	}
-
-	public int InsertControllerAt(int index, int controller) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), index, controller);
-	}
-
-	public int RemoveControllerAt(int index, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), index, _retval);
-	}
-
-	public int GetControllerAt(int index, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), index, _retval);
-	}
-
-	public int AppendController(int controller) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), controller);
-	}
-
-	public int RemoveController(int controller) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), controller);
-	}
-
-	public int GetControllerId(int controller, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), controller, _retval);
-	}
-
-	public int GetControllerById(int controllerID, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), controllerID, _retval);
-	}
-
-	public int GetControllerCount(int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 11, getAddress(), _retval);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
index 2b7b08132f..293919015a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
@@ -48,42 +48,42 @@ public class nsIDOMEvent extends nsISupports {
 	public static final int BUBBLING_PHASE = 3;
 	
 	public int GetType(int aType) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aType);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType);
 	}
 
 	public int GetTarget(int[] aTarget) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aTarget);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aTarget);
 	}
 
 	public int GetCurrentTarget(int[] aCurrentTarget) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aCurrentTarget);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCurrentTarget);
 	}
 
 	public int GetEventPhase(short[] aEventPhase) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aEventPhase);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aEventPhase);
 	}
 
 	public int GetBubbles(boolean[] aBubbles) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aBubbles);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aBubbles);
 	}
 
 	public int GetCancelable(boolean[] aCancelable) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aCancelable);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCancelable);
 	}
 
 	public int GetTimeStamp(int[] aTimeStamp) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), aTimeStamp);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTimeStamp);
 	}
 
 	public int StopPropagation() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
 	}
 
 	public int PreventDefault() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress());
 	}
 
 	public int InitEvent(int eventTypeArg, boolean canBubbleArg, boolean cancelableArg) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), eventTypeArg, canBubbleArg, cancelableArg);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), eventTypeArg, canBubbleArg, cancelableArg);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMLocation.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMLocation.java
deleted file mode 100644
index 4c8a56d660..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMLocation.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDOMLocation extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 20;
-
-	public static final String NS_IDOMLOCATION_IID_STRING =
-		"a6cf906d-15b3-11d2-932e-00805f8add32";
-
-	public static final nsID NS_IDOMLOCATION_IID =
-		new nsID(NS_IDOMLOCATION_IID_STRING);
-
-	public nsIDOMLocation(int address) {
-		super(address);
-	}
-
-	public int GetHash(int aHash) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aHash);
-	}
-
-	public int SetHash(int aHash) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aHash);
-	}
-
-	public int GetHost(int aHost) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aHost);
-	}
-
-	public int SetHost(int aHost) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aHost);
-	}
-
-	public int GetHostname(int aHostname) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aHostname);
-	}
-
-	public int SetHostname(int aHostname) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aHostname);
-	}
-
-	public int GetHref(int aHref) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), aHref);
-	}
-
-	public int SetHref(int aHref) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), aHref);
-	}
-
-	public int GetPathname(int aPathname) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), aPathname);
-	}
-
-	public int SetPathname(int aPathname) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), aPathname);
-	}
-
-	public int GetPort(int aPort) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 11, getAddress(), aPort);
-	}
-
-	public int SetPort(int aPort) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 12, getAddress(), aPort);
-	}
-
-	public int GetProtocol(int aProtocol) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 13, getAddress(), aProtocol);
-	}
-
-	public int SetProtocol(int aProtocol) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 14, getAddress(), aProtocol);
-	}
-
-	public int GetSearch(int aSearch) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 15, getAddress(), aSearch);
-	}
-
-	public int SetSearch(int aSearch) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 16, getAddress(), aSearch);
-	}
-
-	public int Reload(boolean forceget) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 17, getAddress(), forceget);
-	}
-
-	public int Replace(int url) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 18, getAddress(), url);
-	}
-
-	public int Assign(int url) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 19, getAddress(), url);
-	}
-
-	public int ToString(int _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 20, getAddress(), _retval);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
index 17e970adb3..6f4782f9e8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
@@ -42,43 +42,43 @@ public class nsIDOMMouseEvent extends nsIDOMUIEvent {
 	}
 
 	public int GetScreenX(int[] aScreenX) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aScreenX);
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 1, getAddress(), aScreenX);
 	}
 
 	public int GetScreenY(int[] aScreenY) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aScreenY);
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 2, getAddress(), aScreenY);
 	}
 
 	public int GetClientX(int[] aClientX) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aClientX);
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 3, getAddress(), aClientX);
 	}
 
 	public int GetClientY(int[] aClientY) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aClientY);
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 4, getAddress(), aClientY);
 	}
 
 	public int GetCtrlKey(boolean[] aCtrlKey) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aCtrlKey);
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 5, getAddress(), aCtrlKey);
 	}
 
 	public int GetShiftKey(boolean[] aShiftKey) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aShiftKey);
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aShiftKey);
 	}
 
 	public int GetAltKey(boolean[] aAltKey) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), aAltKey);
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), aAltKey);
 	}
 
 	public int GetMetaKey(boolean[] aMetaKey) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), aMetaKey);
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 8, getAddress(), aMetaKey);
 	}
 
 	public int GetButton(short[] aButton) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), aButton);
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 9, getAddress(), aButton);
 	}
 
 	public int GetRelatedTarget(int[] aRelatedTarget) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), aRelatedTarget);
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 10, getAddress(), aRelatedTarget);
 	}
 	
 	public int InitMouseEvent(int typeArg, boolean canBubbleArg, boolean cancelableArg, int[] viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, boolean ctrlKeyArg, boolean altKeyArg, boolean shiftKeyArg, boolean metaKeyArg, short buttonArg, int[] relatedTargetArg) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
index 98c1f91840..09dd9fde55 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
@@ -42,11 +42,11 @@ public class nsIDOMUIEvent extends nsIDOMEvent {
 	}
 	
 	public int GetView(int[] aView) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aView);
+		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 1, getAddress(), aView);
 	}
 
 	public int GetDetail(int[] aDetail) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aDetail);
+		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 2, getAddress(), aDetail);
 	}
 
 	public int InitEvent(int typeArg, boolean canBubbleArg, boolean cancelableArg, int[] viewArg, int detailArg) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
index c3607a1db6..3208ae60bd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
@@ -42,70 +42,70 @@ public class nsIDOMWindow extends nsISupports {
 	}
 
 	public int GetDocument(int[] aDocument) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aDocument);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aDocument);
 	}
 
 	public int GetParent(int[] aParent) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aParent);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent);
 	}
 
 	public int GetTop(int[] aTop) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aTop);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aTop);
 	}
 
 	public int GetScrollbars(int[] scrollbars) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), scrollbars);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), scrollbars);
 	}
 
 	public int GetFrames(int[] frames) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), frames);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), frames);
 	}
 
 	public int GetName(int aName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aName);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aName);
 	}
 
 	public int SetName(int aName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), aName);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aName);
 	}
 
 	public int GetTextZoom(float[] aTextZoom) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), aTextZoom);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aTextZoom);
 	}
 
 	public int SetTextZoom(float aTextZoom) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), aTextZoom);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aTextZoom);
 	}
 
 	public int GetScrollX(int[] aScrollX) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), aScrollX);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aScrollX);
 	}
 
 	public int GetScrollY(int[] aScrollY) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 11, getAddress(), aScrollY);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aScrollY);
 	}
 
 	public int ScrollTo(int xScroll, int yScroll) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 12, getAddress(), xScroll, yScroll);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), xScroll, yScroll);
 	}
 
 	public int ScrollBy(int xScrollDif, int yScrollDif) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 13, getAddress(), xScrollDif, yScrollDif);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), xScrollDif, yScrollDif);
 	}
 
 	public int GetSelection(int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 14, getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval);
 	}
 
 	public int ScrollByLines(int numLines) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 15, getAddress(), numLines);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), numLines);
 	}
 
 	public int ScrollByPages(int numPages) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 16, getAddress(), numPages);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), numPages);
 	}
 
 	public int SizeToContent() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 17, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress());
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
deleted file mode 100644
index b497180b06..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDirectoryService extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
-
-	public static final String NS_IDIRECTORYSERVICE_IID_STRING =
-		"57a66a60-d43a-11d3-8cc2-00609792278c";
-
-	public static final nsID NS_IDIRECTORYSERVICE_IID =
-		new nsID(NS_IDIRECTORYSERVICE_IID_STRING);
-
-	public nsIDirectoryService(int address) {
-		super(address);
-	}
-
-	public int Init() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress());
-	}
-
-	public int RegisterProvider(int prov) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), prov);
-	}
-
-	public int UnregisterProvider(int prov) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), prov);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
deleted file mode 100644
index b82d6ed7ed..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDirectoryServiceProvider extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;
-
-	public static final String NS_IDIRECTORYSERVICEPROVIDER_IID_STRING =
-		"bbf8cab0-d43a-11d3-8cc2-00609792278c";
-
-	public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID =
-		new nsID(NS_IDIRECTORYSERVICEPROVIDER_IID_STRING);
-
-	public nsIDirectoryServiceProvider(int address) {
-		super(address);
-	}
-
-	public int GetFile(byte[] prop, boolean[] persistent, int[] _retval) {
-		return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
deleted file mode 100644
index ac4e1a5ef5..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDirectoryServiceProvider2 extends nsIDirectoryServiceProvider {
-
-	static final int LAST_METHOD_ID = nsIDirectoryServiceProvider.LAST_METHOD_ID + 1;
-
-	public static final String NS_IDIRECTORYSERVICEPROVIDER2_IID_STRING =
-		"2f977d4b-5485-11d4-87e2-0010a4e75ef2";
-
-	public static final nsID NS_IDIRECTORYSERVICEPROVIDER2_IID =
-		new nsID(NS_IDIRECTORYSERVICEPROVIDER2_IID_STRING);
-
-	public nsIDirectoryServiceProvider2(int address) {
-		super(address);
-	}
-
-	public int GetFiles(byte[] prop, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), prop, _retval);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java
index 400e6dd85a..a9d51cde46 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java
@@ -42,11 +42,11 @@ public class nsIDocShell extends nsISupports {
 	}

 

 	public int LoadURI(int uri, int loadInfo, int aLoadFlags, boolean firstParty) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);

 	}

 

 	public int LoadStream(int aStream, int aURI, int aContentType, int aContentCharset, int aLoadInfo) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);

 	}

 

 	public int InternalLoad(int aURI, int aReferrer, int aOwner, boolean aInheritOwner, char[] aWindowTarget, int aPostDataStream, int aHeadersStream, int aLoadFlags, int aSHEntry, boolean firstParty, int[] aDocShell, int[] aRequest) {

@@ -54,99 +54,99 @@ public class nsIDocShell extends nsISupports {
 	}

 

 	public int CreateLoadInfo(int[] loadInfo) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), loadInfo);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);

 	}

 

 	public int PrepareForNewContentModel() {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress());

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());

 	}

 

 	public int SetCurrentURI(int aURI) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aURI);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);

 	}

 

 	public int FireUnloadNotification() {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress());

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress());

 	}

 

 	public int GetPresContext(int[] aPresContext) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), aPresContext);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);

 	}

 

 	public int GetPresShell(int[] aPresShell) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), aPresShell);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);

 	}

 

 	public int GetEldestPresShell(int[] aEldestPresShell) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);

 	}

 

 	public int GetContentViewer(int[] aContentViewer) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 11, getAddress(), aContentViewer);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);

 	}

 

 	public int GetChromeEventHandler(int[] aChromeEventHandler) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);

 	}

 

 	public int SetChromeEventHandler(int aChromeEventHandler) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);

 	}

 

 	public int GetParentURIContentListener(int[] aParentURIContentListener) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 14, getAddress(), aParentURIContentListener);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentURIContentListener);

 	}

 

 	public int SetParentURIContentListener(int aParentURIContentListener) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 15, getAddress(), aParentURIContentListener);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aParentURIContentListener);

 	}

 

 	public int GetDocumentCharsetInfo(int[] aDocumentCharsetInfo) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 16, getAddress(), aDocumentCharsetInfo);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aDocumentCharsetInfo);

 	}

 

 	public int SetDocumentCharsetInfo(int aDocumentCharsetInfo) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 17, getAddress(), aDocumentCharsetInfo);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocumentCharsetInfo);

 	}

 

 	public int GetAllowPlugins(boolean[] allowPlugins) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 18, getAddress(), allowPlugins);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), allowPlugins);

 	}

 

 	public int SetAllowPlugins(boolean allowPlugins) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 19, getAddress(), allowPlugins);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), allowPlugins);

 	}

 

 	public int GetAllowJavascript(boolean[] aAllowJavascript) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 20, getAddress(), aAllowJavascript);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aAllowJavascript);

 	}

 

 	public int SetAllowJavascript(boolean aAllowJavascript) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 21, getAddress(), aAllowJavascript);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aAllowJavascript);

 	}

 

 	public int GetAllowMetaRedirects(boolean[] allowMetaRedirects) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 22, getAddress(), allowMetaRedirects);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), allowMetaRedirects);

 	}

 

 	public int SetAllowMetaRedirects(boolean allowMetaRedirects) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 23, getAddress(), allowMetaRedirects);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), allowMetaRedirects);

 	}

 

 	public int GetAllowSubframes(boolean[] allowSubframes) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 24, getAddress(), allowSubframes);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), allowSubframes);

 	}

 

 	public int SetAllowSubframes(boolean allowSubframes) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 25, getAddress(), allowSubframes);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), allowSubframes);

 	}

 

 	public int GetAllowImages(boolean[] allowImages) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 26, getAddress(), allowImages);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), allowImages);

 	}

 

 	public int SetAllowImages(boolean allowImages) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 27, getAddress(), allowImages);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), allowImages);

 	}

 

 	public static final int ENUMERATE_FORWARDS = 0;

@@ -154,7 +154,7 @@ public class nsIDocShell extends nsISupports {
 	public static final int ENUMERATE_BACKWARDS = 1;

 

 	public int GetDocShellEnumerator(int aItemType, int aDirection, int[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 28, getAddress(), aItemType, aDirection, _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aItemType, aDirection, _retval);

 	}

 

 	public static final int APP_TYPE_UNKNOWN = 0;

@@ -162,59 +162,59 @@ public class nsIDocShell extends nsISupports {
 	public static final int APP_TYPE_MAIL = 1;

 

 	public int GetAppType(int[] aAppType) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 29, getAddress(), aAppType);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aAppType);

 	}

 

 	public int SetAppType(int aAppType) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 30, getAddress(), aAppType);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aAppType);

 	}

 

 	public int GetAllowAuth(boolean[] aAllowAuth) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 31, getAddress(), aAllowAuth);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), aAllowAuth);

 	}

 

 	public int SetAllowAuth(boolean aAllowAuth) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 32, getAddress(), aAllowAuth);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aAllowAuth);

 	}

 

 	public int GetZoom(float[] aZoom) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 33, getAddress(), aZoom);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), aZoom);

 	}

 

 	public int SetZoom(float aZoom) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 34, getAddress(), aZoom);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), aZoom);

 	}

 

 	public int GetMarginWidth(int[] aMarginWidth) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 35, getAddress(), aMarginWidth);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), aMarginWidth);

 	}

 

 	public int SetMarginWidth(int aMarginWidth) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 36, getAddress(), aMarginWidth);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aMarginWidth);

 	}

 

 	public int GetMarginHeight(int[] aMarginHeight) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 37, getAddress(), aMarginHeight);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), aMarginHeight);

 	}

 

 	public int SetMarginHeight(int aMarginHeight) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 38, getAddress(), aMarginHeight);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), aMarginHeight);

 	}

 

 	public int GetHasFocus(boolean[] hasFocus) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 39, getAddress(), hasFocus);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), hasFocus);

 	}

 

 	public int SetHasFocus(boolean hasFocus) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 40, getAddress(), hasFocus);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), hasFocus);

 	}

 

 	public int GetCanvasHasFocus(boolean[] canvasHasFocus) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 41, getAddress(), canvasHasFocus);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), canvasHasFocus);

 	}

 

 	public int SetCanvasHasFocus(boolean canvasHasFocus) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 42, getAddress(), canvasHasFocus);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), canvasHasFocus);

 	}

 

 	public int TabToTreeOwner(boolean forward, boolean[] tookFocus) {

@@ -236,34 +236,34 @@ public class nsIDocShell extends nsISupports {
 	public static final int LOAD_CMD_HISTORY = 4;

 

 	public int GetBusyFlags(int[] busyFlags) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 44, getAddress(), busyFlags);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), busyFlags);

 	}

 

 	public int GetLoadType(int[] aLoadType) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 45, getAddress(), aLoadType);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aLoadType);

 	}

 

 	public int SetLoadType(int aLoadType) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 46, getAddress(), aLoadType);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aLoadType);

 	}

 

 	public int IsBeingDestroyed(boolean[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 47, getAddress(), _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), _retval);

 	}

 

 	public int GetIsExecutingOnLoadHandler(boolean[] aIsExecutingOnLoadHandler) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 48, getAddress(), aIsExecutingOnLoadHandler);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aIsExecutingOnLoadHandler);

 	}

 

 	public int GetLayoutHistoryState(int[] aLayoutHistoryState) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 49, getAddress(), aLayoutHistoryState);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aLayoutHistoryState);

 	}

 

 	public int SetLayoutHistoryState(int aLayoutHistoryState) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 50, getAddress(), aLayoutHistoryState);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aLayoutHistoryState);

 	}

 

 	public int GetShouldSaveLayoutState(boolean[] aShouldSaveLayoutState) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 51, getAddress(), aShouldSaveLayoutState);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aShouldSaveLayoutState);

 	}

 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShellTreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShellTreeItem.java
deleted file mode 100644
index 77352aa3e1..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShellTreeItem.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDocShellTreeItem extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 15;
-
-	public static final String NS_IDOCSHELLTREEITEM_IID_STRING =
-		"B52AE780-A966-11d3-AFC7-00A024FFC08C";
-
-	public static final nsID NS_IDOCSHELLTREEITEM_IID =
-		new nsID(NS_IDOCSHELLTREEITEM_IID_STRING);
-
-	public nsIDocShellTreeItem(int address) {
-		super(address);
-	}
-
-	public int GetName(int[] aName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aName);
-	}
-
-	public int SetName(char[] aName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aName);
-	}
-
-	public int NameEquals(char[] name, boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), name, _retval);
-	}
-
-	public static final int typeChrome = 0;
-
-	public static final int typeContent = 1;
-
-	public static final int typeContentWrapper = 2;
-
-	public static final int typeChromeWrapper = 3;
-
-	public static final int typeAll = 2147483647;
-
-	public int GetItemType(int[] aItemType) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aItemType);
-	}
-
-	public int SetItemType(int aItemType) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aItemType);
-	}
-
-	public int GetParent(int[] aParent) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aParent);
-	}
-
-	public int SetParent(int aParent) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), aParent);
-	}
-
-	public int GetSameTypeParent(int[] aSameTypeParent) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), aSameTypeParent);
-	}
-
-	public int GetRootTreeItem(int[] aRootTreeItem) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), aRootTreeItem);
-	}
-
-	public int GetSameTypeRootTreeItem(int[] aSameTypeRootTreeItem) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), aSameTypeRootTreeItem);
-	}
-
-	public int FindItemWithName(char[] name, int aRequestor, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 11, getAddress(), name, aRequestor, _retval);
-	}
-
-	public int GetTreeOwner(int[] aTreeOwner) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 12, getAddress(), aTreeOwner);
-	}
-
-	public int SetTreeOwner(int aTreeOwner) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 13, getAddress(), aTreeOwner);
-	}
-
-	public int GetChildOffset(int[] aChildOffset) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 14, getAddress(), aChildOffset);
-	}
-
-	public int SetChildOffset(int aChildOffset) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 15, getAddress(), aChildOffset);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocumentLoaderFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocumentLoaderFactory.java
deleted file mode 100644
index aaa9083ee1..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocumentLoaderFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIDocumentLoaderFactory extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;

-

-	public static final String NS_IDOCUMENTLOADERFACTORY_IID_STRING =

-		"df15f850-5d98-11d4-9f4d-0010a4053fd0";

-

-	public static final nsID NS_IDOCUMENTLOADERFACTORY_IID =

-		new nsID(NS_IDOCUMENTLOADERFACTORY_IID_STRING);

-

-	public nsIDocumentLoaderFactory(int address) {

-		super(address);

-	}

-

-	public int CreateInstance(byte[] aCommand, int aChannel, int aLoadGroup, byte[] aContentType, int aContainer, int aExtraInfo, int[] aDocListenerResult, int[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aCommand, aChannel, aLoadGroup, aContentType, aContainer, aExtraInfo, aDocListenerResult, _retval);

-	}

-

-	public int CreateInstanceForDocument(int aContainer, int aDocument, byte[] aCommand, int[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aContainer, aDocument, aCommand, _retval);

-	}

-

-	public int CreateBlankDocument(int aLoadGroup, int[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aLoadGroup, _retval);

-	}

-}
\ No newline at end of file
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 e9ded9d9e1..0f0b1b31aa 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
@@ -42,55 +42,55 @@ public class nsIDownload extends nsISupports {
 	}
 
 	public int Init(int aSource, int aTarget, int aDisplayName, int aMIMEInfo, long startTime, int aPersist) {
-		//return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aPersist);
+		//return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aPersist);
 		return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
 	}
 
 	public int GetSource(int[] aSource) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aSource);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);
 	}
 
 	public int GetTarget(int[] aTarget) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aTarget);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aTarget);
 	}
 
 	public int GetPersist(int[] aPersist) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aPersist);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPersist);
 	}
 
 	public int GetPercentComplete(int[] aPercentComplete) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aPercentComplete);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPercentComplete);
 	}
 
 	public int GetDisplayName(int[] aDisplayName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aDisplayName);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDisplayName);
 	}
 
 	public int SetDisplayName(int aDisplayName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), aDisplayName);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDisplayName);
 	}
 
 	public int GetStartTime(int[] aStartTime) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), aStartTime);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStartTime);
 	}
 
 	public int GetMIMEInfo(int[] aMIMEInfo) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), aMIMEInfo);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aMIMEInfo);
 	}
 
 	public int GetListener(int[] aListener) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), aListener);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aListener);
 	}
 
 	public int SetListener(int aListener) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 11, getAddress(), aListener);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aListener);
 	}
 
 	public int GetObserver(int[] aObserver) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 12, getAddress(), aObserver);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aObserver);
 	}
 
 	public int SetObserver(int[] aObserver) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 13, getAddress(), aObserver);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aObserver);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
index 87a3c10e9b..c19f2772b4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
@@ -48,34 +48,34 @@ public class nsIEmbeddingSiteWindow extends nsISupports {
 	public static final int DIM_FLAGS_SIZE_OUTER = 4;
 
 	public int SetDimensions(int flags, int x, int y, int cx, int cy) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), flags, x, y, cx, cy);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), flags, x, y, cx, cy);
 	}
 
 	public int GetDimensions(int flags, int[] x, int[] y, int[] cx, int[] cy) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), flags, x, y, cx, cy);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), flags, x, y, cx, cy);
 	}
 
 	public int SetFocus() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
 	}
 
 	public int GetVisibility(boolean[] aVisibility) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aVisibility);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aVisibility);
 	}
 
 	public int SetVisibility(boolean aVisibility) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aVisibility);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aVisibility);
 	}
 
 	public int GetTitle(int[] aTitle) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aTitle);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aTitle);
 	}
 
 	public int SetTitle(char[] aTitle) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), aTitle);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTitle);
 	}
 
 	public int GetSiteWindow(int[] aSiteWindow) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), aSiteWindow);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aSiteWindow);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEventSink.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEventSink.java
deleted file mode 100644
index 523b9b3ce3..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEventSink.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIEventSink extends nsISupports {
-	
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
-
-	public static final String NS_IEVENTSINK_IID_STRING =
-		"C0D3A7C8-1DD1-11B2-8903-ADCD22D004AB";
-
-	public static final nsID NS_IEVENTSINK_IID =
-		new nsID(NS_IEVENTSINK_IID_STRING);
-		
-	public nsIEventSink(int address) {
-		super(address);
-	}
-		
-	public int DispatchEvent(int anEvent, boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), anEvent, _retval);
-	}
-	
-	public int DragEvent(int aMessage, short aMouseGlobalX, short aMouseGlobalY, short aKeyModifiers, boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aMessage, aMouseGlobalX, aMouseGlobalY, aKeyModifiers, _retval);
-	}
-	
-	public int Scroll(boolean aVertical, short aNumLines, short aMouseLocalX, short aMouseLocalY, boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aVertical, aNumLines, aMouseLocalX, aMouseLocalY, _retval);
-
-	}
-	
-	public int Idle() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java
index 35ae98274c..160a1dc8f6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java
@@ -42,10 +42,10 @@ public class nsIFactory extends nsISupports {
 	}
 
 	public int CreateInstance(int aOuter, nsID iid, int[] result) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aOuter, iid, result);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aOuter, iid, result);
 	}
 
 	public int LockFactory(boolean lock) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), lock);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), lock);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java
index 1795307627..fa813aff7e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java
@@ -46,182 +46,182 @@ public class nsIFile extends nsISupports {
 	public static final int DIRECTORY_TYPE = 1;
 
 	public int Append(int node) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), node);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), node);
 	}
 
 	public int AppendNative(int node) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), node);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), node);
 	}
 
 	public int Normalize() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
 	}
 
 	public int Create(int type, int permissions) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), type, permissions);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), type, permissions);
 	}
 
 	public int GetLeafName(int aLeafName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aLeafName);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLeafName);
 	}
 
 	public int SetLeafName(int aLeafName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aLeafName);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLeafName);
 	}
 
 	public int GetNativeLeafName(int aNativeLeafName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), aNativeLeafName);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNativeLeafName);
 	}
 
 	public int SetNativeLeafName(int aNativeLeafName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), aNativeLeafName);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNativeLeafName);
 	}
 
 	public int CopyTo(int newParentDir, int newName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), newParentDir, newName);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), newParentDir, newName);
 	}
 
 	public int CopyToNative(int newParentDir, int newName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), newParentDir, newName);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), newParentDir, newName);
 	}
 
 	public int CopyToFollowingLinks(int newParentDir, int newName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 11, getAddress(), newParentDir, newName);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), newParentDir, newName);
 	}
 
 	public int CopyToFollowingLinksNative(int newParentDir, int newName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 12, getAddress(), newParentDir, newName);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), newParentDir, newName);
 	}
 
 	public int MoveTo(int newParentDir, int newName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 13, getAddress(), newParentDir, newName);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), newParentDir, newName);
 	}
 
 	public int MoveToNative(int newParentDir, int newName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 14, getAddress(), newParentDir, newName);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), newParentDir, newName);
 	}
 
 	public int Remove(boolean recursive) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 15, getAddress(), recursive);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), recursive);
 	}
 
 	public int GetPermissions(int[] permissions) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 16, getAddress(), permissions);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), permissions);
 	}
 
 	public int SetPermissions(int permissions) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 17, getAddress(), permissions);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), permissions);
 	}
 
 	public int GetPermissionsOfLink(int[] aPermissionsOfLink) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 18, getAddress(), aPermissionsOfLink);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPermissionsOfLink);
 	}
 
 	public int SetPermissionsOfLink(int aPermissionsOfLink) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 19, getAddress(), aPermissionsOfLink);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPermissionsOfLink);
 	}
 
 	public int GetLastModifiedTime(long[] aLastModifiedTime) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 20, getAddress(), aLastModifiedTime);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aLastModifiedTime);
 	}
 
 	public int SetLastModifiedTime(long aLastModifiedTime) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 21, getAddress(), aLastModifiedTime);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aLastModifiedTime);
 	}
 
 	public int GetLastModifiedTimeOfLink(long[] aLastModifiedTimeOfLink) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 22, getAddress(), aLastModifiedTimeOfLink);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aLastModifiedTimeOfLink);
 	}
 
 	public int SetLastModifiedTimeOfLink(long aLastModifiedTimeOfLink) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 23, getAddress(), aLastModifiedTimeOfLink);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aLastModifiedTimeOfLink);
 	}
 
 	public int GetFileSize(long[] aFileSize) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 24, getAddress(), aFileSize);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aFileSize);
 	}
 
 	public int SetFileSize(long aFileSize) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 25, getAddress(), aFileSize);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aFileSize);
 	}
 
 	public int GetFileSizeOfLink(long[] aFileSizeOfLink) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 26, getAddress(), aFileSizeOfLink);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aFileSizeOfLink);
 	}
 
 	public int GetTarget(int aTarget) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 27, getAddress(), aTarget);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aTarget);
 	}
 
 	public int GetNativeTarget(int aNativeTarget) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 28, getAddress(), aNativeTarget);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aNativeTarget);
 	}
 
 	public int GetPath(int aPath) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 29, getAddress(), aPath);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aPath);
 	}
 
 	public int GetNativePath(int aNativePath) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 30, getAddress(), aNativePath);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aNativePath);
 	}
 
 	public int Exists(boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 31, getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), _retval);
 	}
 
 	public int IsWritable(boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 32, getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), _retval);
 	}
 
 	public int IsReadable(boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 33, getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), _retval);
 	}
 
 	public int IsExecutable(boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 34, getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), _retval);
 	}
 
 	public int IsHidden(boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 35, getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), _retval);
 	}
 
 	public int IsDirectory(boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 36, getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), _retval);
 	}
 
 	public int IsFile(boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 37, getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), _retval);
 	}
 
 	public int IsSymlink(boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 38, getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), _retval);
 	}
 
 	public int IsSpecial(boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 39, getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), _retval);
 	}
 
 	public int CreateUnique(int type, int permissions) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 40, getAddress(), type, permissions);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), type, permissions);
 	}
 
 	public int Clone(int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 41, getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), _retval);
 	}
 
 	public int Equals(int inFile, boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 42, getAddress(), inFile, _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), inFile, _retval);
 	}
 
 	public int Contains(int inFile, boolean recur, boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 43, getAddress(), inFile, recur, _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), inFile, recur, _retval);
 	}
 
 	public int GetParent(int[] aParent) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 44, getAddress(), aParent);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aParent);
 	}
 
 	public int GetDirectoryEntries(int[] directoryEntries) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 45, getAddress(), directoryEntries);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), directoryEntries);
 	}
 }
\ No newline at end of file
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 79e2285124..78556a2b5e 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
@@ -42,42 +42,42 @@ public class nsIHelperAppLauncher extends nsISupports {
 	}
 
 	public int GetMIMEInfo(int[] aMIMEInfo) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
 	}
 
 	public int GetSource(int[] aSource) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aSource);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);
 	}
 
 	public int GetSuggestedFileName(int[] aSuggestedFileName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
 	}
 
 	public int SaveToDisk(int aNewFileLocation, boolean aRememberThisPreference) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
 	}
 
 	public int LaunchWithApplication(int aApplication, boolean aRememberThisPreference) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
 	}
 
 	public int Cancel() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
 	}
 
 	public int SetWebProgressListener(int aWebProgressListener) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), aWebProgressListener);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aWebProgressListener);
 	}
 
 	public int CloseProgressWindow() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
 	}
 
 	public int GetTargetFile(int[] aTargetFile) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), aTargetFile);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aTargetFile);
 	}
 	
 	public int GetTimeDownloadStarted(int aTimeDownloadStarted) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
index a32d341cb4..d44d297a91 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
@@ -42,10 +42,10 @@ public class nsIHelperAppLauncherDialog extends nsISupports {
 	}
 
 	public int Show(int aLauncher, int aContext, boolean aForced) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aLauncher, aContext, aForced);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLauncher, aContext, aForced);
 	}
 
 	public int PromptForSaveToFile(int aLauncher, int aWindowContext, int aDefaultFile, int aSuggestedFileExtension, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aLauncher, aWindowContext, aDefaultFile, aSuggestedFileExtension, _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aLauncher, aWindowContext, aDefaultFile, aSuggestedFileExtension, _retval);
 	}
 }
\ No newline at end of file
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 d6e935e559..36ce11afb6 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
@@ -42,35 +42,35 @@ public class nsIIOService extends nsISupports {
 	}

 

 	public int GetProtocolHandler(byte[] aScheme, int[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aScheme, _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aScheme, _retval);

 	}

 

 	public int GetProtocolFlags(byte[] aScheme, int[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aScheme, _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aScheme, _retval);

 	}

 

 	public int NewURI(int aSpec, byte[] aOriginCharset, int aBaseURI, int[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);

 	}

 

 	public int NewFileURI(int aFile, int[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aFile, _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile, _retval);

 	}

 

 	public int NewChannelFromURI(int aURI, int[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aURI, _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aURI, _retval);

 	}

 

 	public int NewChannel(int aSpec, byte[] aOriginCharset, int aBaseURI, int[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);

 	}

 

 	public int GetOffline(boolean[] aOffline) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), aOffline);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aOffline);

 	}

 

 	public int SetOffline(boolean aOffline) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), aOffline);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aOffline);

 	}

 

 	public int AllowPort(int aPort, byte[] aScheme, boolean[] _retval) {

@@ -78,6 +78,6 @@ public class nsIIOService extends nsISupports {
 	}

 

 	public int ExtractScheme(int urlString, int _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), urlString, _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), urlString, _retval);

 	}

 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java
index 9ab34888bc..ebd96c6e8e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java
@@ -42,22 +42,22 @@ public class nsIInputStream extends nsISupports {
 	}

 

 	public int Close() {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress());

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());

 	}

 

 	public int Available(int[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);

 	}

 

 	public int Read(int aBuf, int aCount, int[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aBuf, aCount, _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aBuf, aCount, _retval);

 	}

 

 	public int ReadSegments(int aWriter, int aClosure, int aCount, int[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aWriter, aClosure, aCount, _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWriter, aClosure, aCount, _retval);

 	}

 

 	public int IsNonBlocking(boolean[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);

 	}

 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStreamChannel.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStreamChannel.java
deleted file mode 100644
index 3331d6917b..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStreamChannel.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIInputStreamChannel extends nsIChannel {

-

-	static final int LAST_METHOD_ID = nsIChannel.LAST_METHOD_ID + 3;

-

-	public static final String NS_IINPUTSTREAMCHANNEL_IID_STRING =

-		"560a64ce-6d66-44db-b38e-864469c52d03";

-

-	public static final nsID NS_IINPUTSTREAMCHANNEL_IID =

-		new nsID(NS_IINPUTSTREAMCHANNEL_IID_STRING);

-

-	public nsIInputStreamChannel(int address) {

-		super(address);

-	}

-

-	public int SetURI(int aURI) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aURI);

-	}

-

-	public int GetContentStream(int[] aContentStream) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aContentStream);

-	}

-

-	public int SetContentStream(int aContentStream) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aContentStream);

-	}

-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
index d469b8277b..4ddd7968d0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
@@ -42,6 +42,6 @@ public class nsIInterfaceRequestor extends nsISupports {
 	}
 
 	public int GetInterface(nsID uuid, int[] result) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), uuid, result);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uuid, result);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILoadGroup.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILoadGroup.java
deleted file mode 100644
index ff577690e6..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILoadGroup.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsILoadGroup extends nsIRequest {

-

-	static final int LAST_METHOD_ID = nsIRequest.LAST_METHOD_ID + 10;

-

-	public static final String NS_ILOADGROUP_IID_STRING =

-		"3de0a31c-feaf-400f-9f1e-4ef71f8b20cc";

-

-	public static final nsID NS_ILOADGROUP_IID =

-		new nsID(NS_ILOADGROUP_IID_STRING);

-

-	public nsILoadGroup(int address) {

-		super(address);

-	}

-

-	public int GetGroupObserver(int[] aGroupObserver) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aGroupObserver);

-	}

-

-	public int SetGroupObserver(int aGroupObserver) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aGroupObserver);

-	}

-

-	public int GetDefaultLoadRequest(int[] aDefaultLoadRequest) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aDefaultLoadRequest);

-	}

-

-	public int SetDefaultLoadRequest(int aDefaultLoadRequest) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aDefaultLoadRequest);

-	}

-

-	public int AddRequest(int aRequest, int aContext) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aRequest, aContext);

-	}

-

-	public int RemoveRequest(int aRequest, int aContext, int aStatus) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aRequest, aContext, aStatus);

-	}

-

-	public int GetRequests(int[] requests) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), requests);

-	}

-

-	public int GetActiveCount(int[] aActiveCount) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), aActiveCount);

-	}

-

-	public int GetNotificationCallbacks(int[] notificationCallbacks) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), notificationCallbacks);

-	}

-

-	public int SetNotificationCallbacks(int notificationCallbacks) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), notificationCallbacks);

-	}

-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java
index ef43e86e94..f3161d57ba 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java
@@ -42,70 +42,70 @@ public class nsILocalFile extends nsIFile {
 	}
 
 	public int InitWithPath(int filePath) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), filePath);
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 1, getAddress(), filePath);
 	}
 
 	public int InitWithNativePath(int filePath) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), filePath);
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 2, getAddress(), filePath);
 	}
 
 	public int InitWithFile(int aFile) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aFile);
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 3, getAddress(), aFile);
 	}
 
 	public int GetFollowLinks(boolean[] followLinks) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), followLinks);
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 4, getAddress(), followLinks);
 	}
 
 	public int SetFollowLinks(boolean followLinks) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), followLinks);
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 5, getAddress(), followLinks);
 	}
 
 	public int OpenNSPRFileDesc(int flags, int mode, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), flags, mode, _retval);
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 6, getAddress(), flags, mode, _retval);
 	}
 
 	public int OpenANSIFileDesc(byte[] mode, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), mode, _retval);
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 7, getAddress(), mode, _retval);
 	}
 
 	public int Load(int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), _retval);
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 8, getAddress(), _retval);
 	}
 
 	public int GetDiskSpaceAvailable(long[] aDiskSpaceAvailable) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), aDiskSpaceAvailable);
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 9, getAddress(), aDiskSpaceAvailable);
 	}
 
 	public int AppendRelativePath(int relativeFilePath) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), relativeFilePath);
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 10, getAddress(), relativeFilePath);
 	}
 
 	public int AppendRelativeNativePath(int relativeFilePath) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 11, getAddress(), relativeFilePath);
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 11, getAddress(), relativeFilePath);
 	}
 
 	public int GetPersistentDescriptor(int aPersistentDescriptor) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 12, getAddress(), aPersistentDescriptor);
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 12, getAddress(), aPersistentDescriptor);
 	}
 
 	public int SetPersistentDescriptor(int aPersistentDescriptor) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 13, getAddress(), aPersistentDescriptor);
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 13, getAddress(), aPersistentDescriptor);
 	}
 
 	public int Reveal() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 14, getAddress());
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 14, getAddress());
 	}
 
 	public int Launch() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 15, getAddress());
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 15, getAddress());
 	}
 
 	public int GetRelativeDescriptor(int fromFile, int _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 16, getAddress(), fromFile, _retval);
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 16, getAddress(), fromFile, _retval);
 	}
 
 	public int SetRelativeDescriptor(int fromFile, int relativeDesc) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 17, getAddress(), fromFile, relativeDesc);
+		return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 17, getAddress(), fromFile, relativeDesc);
 	}
 }
\ No newline at end of file
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 31b209d77c..f2ecfdccfc 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
@@ -42,22 +42,22 @@ public class nsIMemory extends nsISupports {
 	}
 
 	public int Alloc(int size) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), size);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), size);
 	}
 
 	public int Realloc(int ptr, int newSize) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), ptr, newSize);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), ptr, newSize);
 	}
 
 	public void Free(int ptr) {
-		XPCOM.VtblCallNoRet(super.LAST_METHOD_ID + 3, getAddress(), ptr);
+		XPCOM.VtblCallNoRet(nsISupports.LAST_METHOD_ID + 3, getAddress(), ptr);
 	}
 
 	public int HeapMinimize(boolean immediate) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), immediate);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), immediate);
 	}
 
 	public int IsLowMemory(boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserver.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserver.java
deleted file mode 100644
index a92a686a7e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserver.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIObserver extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;
-
-	public static final String NS_IOBSERVER_IID_STRING =
-		"DB242E01-E4D9-11d2-9DDE-000064657374";
-
-	public static final nsID NS_IOBSERVER_IID =
-		new nsID(NS_IOBSERVER_IID_STRING);
-
-	public nsIObserver(int address) {
-		super(address);
-	}
-
-	public int Observe(int aSubject, byte[] aTopic, char[] aData) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aSubject, aTopic, aData);
-	}
-}
\ No newline at end of file
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
deleted file mode 100644
index 3cabf991f5..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserverService.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIObserverService extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
-
-	public static final String NS_IOBSERVERSERVICE_IID_STRING =
-		"D07F5192-E3D1-11d2-8ACD-00105A1B8860";
-
-	public static final nsID NS_IOBSERVERSERVICE_IID =
-		new nsID(NS_IOBSERVERSERVICE_IID_STRING);
-
-	public nsIObserverService(int address) {
-		super(address);
-	}
-
-	public int AddObserver(int anObserver, byte[] aTopic, boolean ownsWeak) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), anObserver, aTopic, ownsWeak);
-	}
-
-	public int RemoveObserver(int anObserver, byte[] aTopic) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), anObserver, aTopic);
-	}
-
-	public int NotifyObservers(int aSubject, byte[] aTopic, char[] someData) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aSubject, aTopic, someData);
-	}
-
-	public int EnumerateObservers(byte[] aTopic, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aTopic, _retval);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPref.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPref.java
deleted file mode 100644
index f39b375b6f..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPref.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIPref extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 45;
-
-	public static final String NS_IPREF_IID_STRING =
-		"a22ad7b0-ca86-11d1-a9a4-00805f8a7ac4";
-
-	public static final nsID NS_IPREF_IID =
-		new nsID(NS_IPREF_IID_STRING);
-
-	public nsIPref(int address) {
-		super(address);
-	}
-
-	public int ReadUserPrefs(int aFile) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aFile);
-	}
-
-	public int ResetPrefs() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress());
-	}
-
-	public int ResetUserPrefs() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress());
-	}
-
-	public int SavePrefFile(int aFile) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aFile);
-	}
-
-	public int GetBranch(byte[] aPrefRoot, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aPrefRoot, _retval);
-	}
-
-	public int GetDefaultBranch(byte[] aPrefRoot, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aPrefRoot, _retval);
-	}
-
-	public static final int ePrefInvalid = 0;
-
-	public static final int ePrefLocked = 1;
-
-	public static final int ePrefUserset = 2;
-
-	public static final int ePrefConfig = 4;
-
-	public static final int ePrefRemote = 8;
-
-	public static final int ePrefLilocal = 16;
-
-	public static final int ePrefString = 32;
-
-	public static final int ePrefInt = 64;
-
-	public static final int ePrefBool = 128;
-
-	public static final int ePrefValuetypeMask = 224;
-
-	public int GetRoot(int[] aRoot) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), aRoot);
-	}
-
-	public int GetPrefType(byte[] aPrefName, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), aPrefName, _retval);
-	}
-
-	public int GetBoolPref(byte[] aPrefName, boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), aPrefName, _retval);
-	}
-
-	public int SetBoolPref(byte[] aPrefName, int aValue) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), aPrefName, aValue);
-	}
-
-	public int GetCharPref(byte[] aPrefName, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 11, getAddress(), aPrefName, _retval);
-	}
-
-	public int SetCharPref(byte[] aPrefName, byte[] aValue) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 12, getAddress(), aPrefName, aValue);
-	}
-
-	public int GetIntPref(byte[] aPrefName, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 13, getAddress(), aPrefName, _retval);
-	}
-
-	public int SetIntPref(byte[] aPrefName, int aValue) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 14, getAddress(), aPrefName, aValue);
-	}
-
-	public int GetComplexValue(byte[] aPrefName, nsID aType, int[] aValue) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 15, getAddress(), aPrefName, aType, aValue);
-	}
-
-	public int SetComplexValue(byte[] aPrefName, nsID aType, int aValue) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 16, getAddress(), aPrefName, aType, aValue);
-	}
-
-	public int ClearUserPref(byte[] aPrefName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 17, getAddress(), aPrefName);
-	}
-
-	public int PrefIsLocked(byte[] aPrefName, boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 18, getAddress(), aPrefName, _retval);
-	}
-
-	public int LockPref(byte[] aPrefName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 19, getAddress(), aPrefName);
-	}
-
-	public int UnlockPref(byte[] aPrefName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 20, getAddress(), aPrefName);
-	}
-
-	public int ResetBranch(byte[] aStartingAt) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 21, getAddress(), aStartingAt);
-	}
-
-	public int DeleteBranch(byte[] aStartingAt) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 22, getAddress(), aStartingAt);
-	}
-
-	public int GetChildList(byte[] aStartingAt, int[] aCount, int[] aChildArray) {
-		return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-	}
-
-	public int AddObserver(byte[] aDomain, int aObserver, boolean aHoldWeak) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 24, getAddress(), aDomain, aObserver, aHoldWeak);
-	}
-
-	public int RemoveObserver(byte[] aDomain, int aObserver) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 25, getAddress(), aDomain, aObserver);
-	}
-
-	public int CopyCharPref(byte[] pref, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 26, getAddress(), pref, _retval);
-	}
-
-	public int CopyDefaultCharPref(byte[] pref, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 27, getAddress(), pref, _retval);
-	}
-
-	public int GetDefaultBoolPref(byte[] pref, boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 28, getAddress(), pref, _retval);
-	}
-
-	public int GetDefaultIntPref(byte[] pref, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 29, getAddress(), pref, _retval);
-	}
-
-	public int SetDefaultBoolPref(byte[] pref, boolean value) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 30, getAddress(), pref, value);
-	}
-
-	public int SetDefaultCharPref(byte[] pref, byte[] value) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 31, getAddress(), pref, value);
-	}
-
-	public int SetDefaultIntPref(byte[] pref, int value) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 32, getAddress(), pref, value);
-	}
-
-	public int CopyUnicharPref(byte[] pref, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 33, getAddress(), pref, _retval);
-	}
-
-	public int CopyDefaultUnicharPref(byte[] pref, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 34, getAddress(), pref, _retval);
-	}
-
-	public int SetUnicharPref(byte[] pref, char[] value) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 35, getAddress(), pref, value);
-	}
-
-	public int SetDefaultUnicharPref(byte[] pref, char[] value) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 36, getAddress(), pref, value);
-	}
-
-	public int GetLocalizedUnicharPref(byte[] pref, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 37, getAddress(), pref, _retval);
-	}
-
-	public int GetDefaultLocalizedUnicharPref(byte[] pref, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 38, getAddress(), pref, _retval);
-	}
-
-	public int GetFilePref(byte[] pref, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 39, getAddress(), pref, _retval);
-	}
-
-	public int SetFilePref(byte[] pref, int value, boolean setDefault) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 40, getAddress(), pref, value, setDefault);
-	}
-
-	public int GetFileXPref(byte[] pref, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 41, getAddress(), pref, _retval);
-	}
-
-	public int SetFileXPref(byte[] pref, int value) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 42, getAddress(), pref, value);
-	}
-
-	public int RegisterCallback(byte[] domain, int callback, int closure) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 43, getAddress(), domain, callback, closure);
-	}
-
-	public int UnregisterCallback(byte[] domain, int callback, int closure) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 44, getAddress(), domain, callback, closure);
-	}
-
-	public int EnumerateChildren(byte[] parent, int callback, int data) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 45, getAddress(), parent, callback, data);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProfile.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProfile.java
deleted file mode 100644
index 01267ad069..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProfile.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIProfile extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;
-
-	public static final String NS_IPROFILE_IID_STRING =
-		"02b0625a-e7f3-11d2-9f5a-006008a6efe9";
-
-	public static final nsID NS_IPROFILE_IID =
-		new nsID(NS_IPROFILE_IID_STRING);
-
-	public nsIProfile(int address) {
-		super(address);
-	}
-
-	public int GetProfileCount(int[] aProfileCount) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aProfileCount);
-	}
-
-	public int GetProfileList(int[] length, int[] profileNames) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), length, profileNames);
-	}
-
-	public int ProfileExists(char[] profileName, boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), profileName, _retval);
-	}
-
-	public int GetCurrentProfile(int[] aCurrentProfile) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aCurrentProfile);
-	}
-
-	public int SetCurrentProfile(char[] aCurrentProfile) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aCurrentProfile);
-	}
-
-	public static final int SHUTDOWN_PERSIST = 1;
-
-	public static final int SHUTDOWN_CLEANSE = 2;
-
-	public int ShutDownCurrentProfile(int shutDownType) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), shutDownType);
-	}
-
-	public int CreateNewProfile(char[] profileName, char[] nativeProfileDir, char[] langcode, boolean useExistingDir) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), profileName, nativeProfileDir, langcode, useExistingDir);
-	}
-
-	public int RenameProfile(char[] oldName, char[] newName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), oldName, newName);
-	}
-
-	public int DeleteProfile(char[] name, boolean canDeleteFiles) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), name, canDeleteFiles);
-	}
-
-	public int CloneProfile(char[] profileName) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), profileName);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProfileChangeStatus.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProfileChangeStatus.java
deleted file mode 100644
index 3a340a33e1..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProfileChangeStatus.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIProfileChangeStatus extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;
-
-	public static final String NS_IPROFILECHANGESTATUS_IID_STRING =
-		"2f977d43-5485-11d4-87e2-0010a4e75ef2";
-
-	public static final nsID NS_IPROFILECHANGESTATUS_IID =
-		new nsID(NS_IPROFILECHANGESTATUS_IID_STRING);
-
-	public nsIProfileChangeStatus(int address) {
-		super(address);
-	}
-
-	public int VetoChange() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress());
-	}
-
-	public int ChangeFailed() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress());
-	}
-}
\ No newline at end of file
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
index 0b429204ec..9a21ae0bb1 100644
--- 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
@@ -42,22 +42,22 @@ public class nsIProgressDialog extends nsIDownload {
 	}
 
 	public int Open(int aParent) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aParent);
+		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 1, getAddress(), aParent);
 	}
 
 	public int GetCancelDownloadOnClose(boolean[] aCancelDownloadOnClose) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aCancelDownloadOnClose);
+		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 2, getAddress(), aCancelDownloadOnClose);
 	}
 
 	public int SetCancelDownloadOnClose(boolean aCancelDownloadOnClose) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
+		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
 	}
 
 	public int GetDialog(int[] aDialog) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aDialog);
+		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 4, getAddress(), aDialog);
 	}
 
 	public int SetDialog(int[] aDialog) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aDialog);
+		return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 5, getAddress(), aDialog);
 	}
 }
\ No newline at end of file
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 e84264b454..645c68d8f1 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
@@ -42,7 +42,7 @@ public class nsIPromptService extends nsISupports {
 	}
 
 	public int Alert(int parent, char[] dialogTitle, char[] text) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), parent, dialogTitle, text);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, dialogTitle, text);
 	}
 
 	public int AlertCheck(int parent, char[] dialogTitle, char[] text, char[] checkMsg, boolean[] checkValue) {
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
deleted file mode 100644
index bcd5a0ad2c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProperties.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 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIProperties extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
-
-	public static final String NS_IPROPERTIES_IID_STRING =
-		"78650582-4e93-4b60-8e85-26ebd3eb14ca";
-
-	public static final nsID NS_IPROPERTIES_IID =
-		new nsID(NS_IPROPERTIES_IID_STRING);
-
-	public nsIProperties(int address) {
-		super(address);
-	}
-
-	public int Get(byte[] prop, nsID iid, int[] result) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), prop, iid, result);
-	}
-
-	public int Set(byte[] prop, int value) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), prop, value);
-	}
-
-	public int Has(byte[] prop, boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), prop, _retval);
-	}
-
-	public int Undefine(byte[] prop) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), prop);
-	}
-
-	public int GetKeys(int[] count, int[] keys) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), count, keys);
-	}
-}
\ No newline at end of file
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
deleted file mode 100644
index b9fa86f641..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIRequest extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;

-

-	public static final String NS_IREQUEST_IID_STRING =

-		"ef6bfbd2-fd46-48d8-96b7-9f8f0fd387fe";

-

-	public static final nsID NS_IREQUEST_IID =

-		new nsID(NS_IREQUEST_IID_STRING);

-

-	public nsIRequest(int address) {

-		super(address);

-	}

-

-	public int GetName(int aName) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aName);

-	}

-

-	public int IsPending(boolean[] _retval) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), _retval);

-	}

-

-	public int GetStatus(int[] status) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), status);

-	}

-

-	public int Cancel(int aStatus) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aStatus);

-	}

-

-	public int Suspend() {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress());

-	}

-

-	public int Resume() {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress());

-	}

-

-	public int GetLoadGroup(int[] aLoadGroup) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), aLoadGroup);

-	}

-

-	public int SetLoadGroup(int aLoadGroup) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), aLoadGroup);

-	}

-

-	public int GetLoadFlags(int[] loadFlags) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), loadFlags);

-	}

-

-	public int SetLoadFlags(int loadFlags) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), loadFlags);

-	}

-

-	public static final int LOAD_NORMAL = 0;

-

-	public static final int LOAD_BACKGROUND = 1;

-

-	public static final int INHIBIT_CACHING = 128;

-

-	public static final int INHIBIT_PERSISTENT_CACHING = 256;

-

-	public static final int LOAD_BYPASS_CACHE = 512;

-

-	public static final int LOAD_FROM_CACHE = 1024;

-

-	public static final int VALIDATE_ALWAYS = 2048;

-

-	public static final int VALIDATE_NEVER = 4096;

-

-	public static final int VALIDATE_ONCE_PER_SESSION = 8192;

-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequestObserver.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequestObserver.java
deleted file mode 100644
index 657328bee9..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequestObserver.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIRequestObserver extends nsISupports {

-

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;

-

-	public static final String NS_IREQUESTOBSERVER_IID_STRING =

-		"fd91e2e0-1481-11d3-9333-00104ba0fd40";

-

-	public static final nsID NS_IREQUESTOBSERVER_IID =

-		new nsID(NS_IREQUESTOBSERVER_IID_STRING);

-

-	public nsIRequestObserver(int address) {

-		super(address);

-	}

-

-	public int OnStartRequest(int aRequest, int aContext) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aRequest, aContext);

-	}

-

-	public int OnStopRequest(int aRequest, int aContext, int aStatusCode) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aRequest, aContext, aStatusCode);

-	}

-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptContext.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptContext.java
deleted file mode 100644
index 2686d56bdb..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptContext.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIScriptContext extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;
-
-	public static final String NS_ISCRIPTCONTEXT_IID_STRING =
-		"8f6bca7d-ce42-11d1-b724-00600891d8c9";
-
-	public static final nsID NS_ISCRIPTCONTEXT_IID =
-		new nsID(NS_ISCRIPTCONTEXT_IID_STRING);
-
-	public nsIScriptContext(int address) {
-		super(address);
-	}
-
-	public int EvaluateString(int aScript, int aScopeObject, int aPrincipal, int aURL, int aLineNo, int aVersion, int aRetValue, boolean[] aIsUndefined) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aScript, aScopeObject, aPrincipal, aURL, aLineNo, aVersion, aRetValue, aIsUndefined);
-	}
-
-	public int EvaluateStringWithValue(int aScript, int aScopeObject, int aPrincipal, int aURL, int aLineNo, int aVersion, int[] aRetValue, boolean[] aIsUndefined) {
-		return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptGlobalObject.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptGlobalObject.java
deleted file mode 100644
index e9a14e8f04..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptGlobalObject.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIScriptGlobalObject extends nsISupports {
-
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 6;
-
-	public static final String NS_ISCRIPTGLOBALOBJECT_IID_STRING =
-		"2b16fc80-fa41-11d1-9bc3-0060088ca6b3";
-
-	public static final nsID NS_ISCRIPTGLOBALOBJECT_IID =
-		new nsID(NS_ISCRIPTGLOBALOBJECT_IID_STRING);
-
-	public nsIScriptGlobalObject(int address) {
-		super(address);
-	}
-
-	public int SetContext(int[] aContext) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aContext);
-	}
-
-	public int GetContext(int[] aContext) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aContext);
-	}
-
-	public int SetNewDocument(int[] aDocument, boolean aRemoveEventListeners, boolean aClearScope) {
-		return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
-	}
-
-	public int SetDocShell(int[] aDocShell) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aDocShell);
-	}
-
-	public int GetDocShell(int[] aDocShell) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aDocShell);
-	}
-
-	public int SetOpenerWindow(int aOpener) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aOpener);
-	}
-}
\ No newline at end of file
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 6b377eeeb0..38898caf6f 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
@@ -42,18 +42,18 @@ public class nsIServiceManager extends nsISupports {
 	}
 
 	public int GetService(nsID aClass, nsID aIID, int[] result) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);
 	}
 
 	public int GetServiceByContractID(byte[] aContractID, nsID aIID, int[] result) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
 	}
 
 	public int IsServiceInstantiated(nsID aClass, nsID aIID, boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aClass, aIID, _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aIID, _retval);
 	}
 
 	public int IsServiceInstantiatedByContractID(byte[] aContractID, nsID aIID, boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aContractID, aIID, _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContractID, aIID, _retval);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIStreamListener.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIStreamListener.java
deleted file mode 100644
index 9bbcbc3ea3..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIStreamListener.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****

- * Version: MPL 1.1

- *

- * The contents of this file are subject to the Mozilla Public License Version

- * 1.1 (the "License"); you may not use this file except in compliance with

- * the License. You may obtain a copy of the License at

- * http://www.mozilla.org/MPL/

- *

- * Software distributed under the License is distributed on an "AS IS" basis,

- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

- * for the specific language governing rights and limitations under the

- * License.

- *

- * The Original Code is Mozilla Communicator client code, released March 31, 1998.

- *

- * The Initial Developer of the Original Code is

- * Netscape Communications Corporation.

- * Portions created by Netscape are Copyright (C) 1998-1999

- * Netscape Communications Corporation.  All Rights Reserved.

- *

- * Contributor(s):

- *

- * IBM

- * -  Binding to permit interfacing between Mozilla and SWT

- * -  Copyright (C) 2003 IBM Corp.  All Rights Reserved.

- *

- * ***** END LICENSE BLOCK ***** */

-package org.eclipse.swt.internal.mozilla;

-

-public class nsIStreamListener extends nsIRequestObserver {

-

-	static final int LAST_METHOD_ID = nsIRequestObserver.LAST_METHOD_ID + 1;

-

-	public static final String NS_ISTREAMLISTENER_IID_STRING =

-		"1a637020-1482-11d3-9333-00104ba0fd40";

-

-	public static final nsID NS_ISTREAMLISTENER_IID =

-		new nsID(NS_ISTREAMLISTENER_IID_STRING);

-

-	public nsIStreamListener(int address) {

-		super(address);

-	}

-

-	public int OnDataAvailable(int aRequest, int aContext, int aInputStream, int aOffset, int aCount) {

-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aRequest, aContext, aInputStream, aOffset, aCount);

-	}

-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
index 6716c8f77d..b9653ae18b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
@@ -42,6 +42,6 @@ public class nsISupportsWeakReference extends nsISupports {
     }
 
     public int GetWeakReference(int[] retVal) {
-        return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), retVal);
+        return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), retVal);
     }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITooltipListener.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
index 5de5e87a11..42ccd9670f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
@@ -42,10 +42,10 @@ public class nsITooltipListener extends nsISupports {
 	}
 
 	public int OnShowTooltip(int aXCoords, int aYCoords, int aTipText) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aXCoords, aYCoords, aTipText);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aXCoords, aYCoords, aTipText);
 	}
 
 	public int OnHideTooltip() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());
 	}
 }
\ No newline at end of file
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 95c7029a79..b3dc51a0f5 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
@@ -42,106 +42,106 @@ public class nsIURI extends nsISupports {
 	}
 
 	public int GetSpec(int aSpec) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aSpec);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
 	}
 
 	public int SetSpec(int aSpec) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aSpec);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
 	}
 
 	public int GetPrePath(int aPrePath) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aPrePath);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrePath);
 	}
 
 	public int GetScheme(int aScheme) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aScheme);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScheme);
 	}
 
 	public int SetScheme(int aScheme) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aScheme);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aScheme);
 	}
 
 	public int GetUserPass(int userPass) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), userPass);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), userPass);
 	}
 
 	public int SetUserPass(int userPass) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), userPass);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), userPass);
 	}
 
 	public int GetUsername(int aUsername) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), aUsername);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aUsername);
 	}
 
 	public int SetUsername(int aUsername) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), aUsername);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aUsername);
 	}
 
 	public int GetPassword(int aPassword) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), aPassword);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPassword);
 	}
 
 	public int SetPassword(int aPassword) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 11, getAddress(), aPassword);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPassword);
 	}
 
 	public int GetHostPort(int aHostPort) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 12, getAddress(), aHostPort);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aHostPort);
 	}
 
 	public int SetHostPort(int aHostPort) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 13, getAddress(), aHostPort);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aHostPort);
 	}
 
 	public int GetHost(int aHost) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 14, getAddress(), aHost);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aHost);
 	}
 
 	public int SetHost(int aHost) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 15, getAddress(), aHost);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aHost);
 	}
 
 	public int GetPort(int[] aPort) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 16, getAddress(), aPort);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aPort);
 	}
 
 	public int SetPort(int aPort) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 17, getAddress(), aPort);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPort);
 	}
 
 	public int GetPath(int aPath) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 18, getAddress(), aPath);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPath);
 	}
 
 	public int SetPath(int aPath) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 19, getAddress(), aPath);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPath);
 	}
 
 	public int Equals(int other, boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 20, getAddress(), other, _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), other, _retval);
 	}
 
 	public int SchemeIs(byte[] scheme, boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 21, getAddress(), scheme, _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), scheme, _retval);
 	}
 
 	public int Clone(int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 22, getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
 	}
 
 	public int Resolve(int relativePath, int _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 23, getAddress(), relativePath, _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), relativePath, _retval);
 	}
 
 	public int GetAsciiSpec(int aAsciiSpec) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 24, getAddress(), aAsciiSpec);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAsciiSpec);
 	}
 
 	public int GetAsciiHost(int aAsciiHost) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 25, getAddress(), aAsciiHost);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAsciiHost);
 	}
 
 	public int GetOriginCharset(int aOriginCharset) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 26, getAddress(), aOriginCharset);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aOriginCharset);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
index 1c51f06e5e..b7434da92d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
@@ -42,7 +42,7 @@ public class nsIURIContentListener extends nsISupports {
 	}
 
 	public int OnStartURIOpen(int aURI, boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aURI, _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, _retval);
 	}
 
 	public int DoContent(byte[] aContentType, boolean aIsContentPreferred, int aRequest, int[] aContentHandler, boolean[] _retval) {
@@ -58,18 +58,18 @@ public class nsIURIContentListener extends nsISupports {
 	}
 
 	public int GetLoadCookie(int[] aLoadCookie) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aLoadCookie);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLoadCookie);
 	}
 
 	public int SetLoadCookie(int aLoadCookie) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aLoadCookie);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLoadCookie);
 	}
 
 	public int GetParentContentListener(int[] aParentContentListener) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), aParentContentListener);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParentContentListener);
 	}
 
 	public int SetParentContentListener(int aParentContentListener) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), aParentContentListener);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParentContentListener);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWeakReference.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
index af2b551d38..2d4788ac27 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
@@ -42,6 +42,6 @@ public class nsIWeakReference extends nsISupports {
 	}
 
 	public int QueryReferent(nsID uuid, int[] result) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), uuid, result);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uuid, result);
 	}
 }
\ No newline at end of file
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 29ca0a017f..2e605f4d36 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
@@ -42,30 +42,30 @@ public class nsIWebBrowser extends nsISupports {
 	}
 
 	public int AddWebBrowserListener(int aListener, nsID aIID) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aListener, aIID);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aListener, aIID);
 	}
 
 	public int RemoveWebBrowserListener(int aListener, nsID aIID) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aListener, aIID);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aListener, aIID);
 	}
 
 	public int GetContainerWindow(int[] aContainerWindow) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aContainerWindow);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContainerWindow);
 	}
 
 	public int SetContainerWindow(int aContainerWindow) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aContainerWindow);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContainerWindow);
 	}
 
 	public int GetParentURIContentListener(int[] aParentURIContentListener) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aParentURIContentListener);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParentURIContentListener);
 	}
 
 	public int SetParentURIContentListener(int aParentURIContentListener) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aParentURIContentListener);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParentURIContentListener);
 	}
 
 	public int GetContentDOMWindow(int[] aContentDOMWindow) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), aContentDOMWindow);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aContentDOMWindow);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
index d2138e5cf8..f175327494 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
@@ -48,15 +48,15 @@ public class nsIWebBrowserChrome extends nsISupports {
 	public static final int STATUS_LINK = 3;
 
 	public int SetStatus(int statusType, char[] status) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), statusType, status);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), statusType, status);
 	}
 
 	public int GetWebBrowser(int[] aWebBrowser) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aWebBrowser);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebBrowser);
 	}
 
 	public int SetWebBrowser(int aWebBrowser) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aWebBrowser);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebBrowser);
 	}
 
 	public static final int CHROME_DEFAULT = 1;
@@ -108,30 +108,30 @@ public class nsIWebBrowserChrome extends nsISupports {
 	public static final int CHROME_ALL = 4094;
 
 	public int GetChromeFlags(int[] chromeFlags) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), chromeFlags);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), chromeFlags);
 	}
 
 	public int SetChromeFlags(int chromeFlags) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), chromeFlags);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), chromeFlags);
 	}
 
 	public int DestroyBrowserWindow() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
 	}
 
 	public int SizeBrowserTo(int aCX, int aCY) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), aCX, aCY);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aCX, aCY);
 	}
 
 	public int ShowAsModal() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
 	}
 
 	public int IsWindowModal(boolean[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
 	}
 
 	public int ExitModalEventLoop(int aStatus) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), aStatus);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aStatus);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
index ae4643b2be..0c8b11a9ba 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
@@ -42,10 +42,10 @@ public class nsIWebBrowserChromeFocus extends nsISupports {
 	}
 
 	public int FocusNextElement() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
 	}
 
 	public int FocusPrevElement() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());
 	}
 }
\ No newline at end of file
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 b25ecc5e97..9e2e0acfd0 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
@@ -42,34 +42,34 @@ public class nsIWebBrowserFocus extends nsISupports {
 	}
 
 	public int Activate() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
 	}
 
 	public int Deactivate() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());
 	}
 
 	public int SetFocusAtFirstElement() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
 	}
 
 	public int SetFocusAtLastElement() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
 	}
 
 	public int GetFocusedWindow(int[] aFocusedWindow) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aFocusedWindow);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFocusedWindow);
 	}
 
 	public int SetFocusedWindow(int aFocusedWindow) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aFocusedWindow);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aFocusedWindow);
 	}
 
 	public int GetFocusedElement(int[] aFocusedElement) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), aFocusedElement);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFocusedElement);
 	}
 
 	public int SetFocusedElement(int aFocusedElement) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), aFocusedElement);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aFocusedElement);
 	}
 }
\ No newline at end of file
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 cf9bbe7538..993ba3f8db 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
@@ -42,23 +42,23 @@ public class nsIWebNavigation extends nsISupports {
 	}
 
 	public int GetCanGoBack(boolean[] aCanGoBack) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aCanGoBack);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCanGoBack);
 	}
 
 	public int GetCanGoForward(boolean[] aCanGoForward) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aCanGoForward);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCanGoForward);
 	}
 
 	public int GoBack() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
 	}
 
 	public int GoForward() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
 	}
 
 	public int GotoIndex(int index) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), index);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), index);
 	}
 
 	public static final int LOAD_FLAGS_MASK = 65535;
@@ -80,11 +80,11 @@ public class nsIWebNavigation extends nsISupports {
 	public static final int LOAD_FLAGS_CHARSET_CHANGE = 1024;
 
 	public int LoadURI(char[] uri, int loadFlags, int referrer, int postData, int headers) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), uri, loadFlags, referrer, postData, headers);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), uri, loadFlags, referrer, postData, headers);
 	}
 
 	public int Reload(int reloadFlags) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), reloadFlags);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), reloadFlags);
 	}
 
 	public static final int STOP_NETWORK = 1;
@@ -94,26 +94,26 @@ public class nsIWebNavigation extends nsISupports {
 	public static final int STOP_ALL = 3;
 
 	public int Stop(int stopFlags) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), stopFlags);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), stopFlags);
 	}
 
 	public int GetDocument(int[] aDocument) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), aDocument);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDocument);
 	}
 
 	public int GetCurrentURI(int[] aCurrentURI) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), aCurrentURI);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aCurrentURI);
 	}
 
 	public int GetReferringURI(int[] aReferringURI) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 11, getAddress(), aReferringURI);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aReferringURI);
 	}
 
 	public int GetSessionHistory(int[] aSessionHistory) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 12, getAddress(), aSessionHistory);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aSessionHistory);
 	}
 
 	public int SetSessionHistory(int aSessionHistory) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 13, getAddress(), aSessionHistory);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSessionHistory);
 	}
 }
\ No newline at end of file
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 adc9531626..8f69429a36 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
@@ -62,18 +62,18 @@ public class nsIWebProgress extends nsISupports {
 	public static final int NOTIFY_ALL = 255;
 
 	public int AddProgressListener(int listener, int aNotifyMask) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), listener, aNotifyMask);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), listener, aNotifyMask);
 	}
 
 	public int RemoveProgressListener(int listener) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), listener);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), listener);
 	}
 
 	public int GetDOMWindow(int[] aDOMWindow) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aDOMWindow);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDOMWindow);
 	}
 
 	public int GetIsLoadingDocument(boolean[] aIsLoadingDocument) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aIsLoadingDocument);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aIsLoadingDocument);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
index 9fb24b9d93..c028ca4c63 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
@@ -72,22 +72,22 @@ public class nsIWebProgressListener extends nsISupports {
 	public static final int STATE_SECURE_LOW = 131072;
 
 	public int OnStateChange(int aWebProgress, int aRequest, int aStateFlags, int aStatus) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aWebProgress, aRequest, aStateFlags, aStatus);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aWebProgress, aRequest, aStateFlags, aStatus);
 	}
 
 	public int OnProgressChange(int aWebProgress, int aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
 	}
 
 	public int OnLocationChange(int aWebProgress, int aRequest, int location) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aWebProgress, aRequest, location);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebProgress, aRequest, location);
 	}
 
 	public int OnStatusChange(int aWebProgress, int aRequest, int aStatus, char[] aMessage) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aWebProgress, aRequest, aStatus, aMessage);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWebProgress, aRequest, aStatus, aMessage);
 	}
 
 	public int OnSecurityChange(int aWebProgress, int aRequest, int state) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aWebProgress, aRequest, state);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aWebProgress, aRequest, state);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWidget.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWidget.java
deleted file mode 100644
index 6d30e0bad0..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWidget.java
+++ /dev/null
@@ -1,343 +0,0 @@
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIWidget extends nsISupports {
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 83;
-	
-	public nsIWidget(int address) {
-		super(address);
-	}
-	
-	public int Create(nsIWidget aParent, int aRect, int aHandleEventFunction, int aContext, int aAppShell, int aToolkit, int aInitData) {
-		int aParentAddress = aParent != null ? aParent.getAddress() : 0;
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), aParentAddress, aRect, aHandleEventFunction, aContext, aAppShell, aToolkit, aInitData);
-	}
-	
-	public int Create(int aParent, int aRect, int aHandleEventFunction, int aContext, int aAppShell, int aToolkit, int aInitData) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aParent, aRect, aHandleEventFunction, aContext, aAppShell, aToolkit, aInitData);
-	}
-	
-	public int GetClientData(int[] aClientData) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aClientData);
-	}
-	
-	public int SetClientData(int[] aClientData) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), aClientData);
-	}
-	
-	public int Destroy() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress());
-	}
-	
-	public int SetParent(int aNewParent) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aNewParent);
-	}
-	
-	public int GetParent() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress());
-	}
-	
-	public int GetChildren() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress());
-	}
-	
-	public int Show(boolean aState) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), aState);
-	}
-	
-	public int SetModal(boolean aModal) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), aModal);
-	}
-	
-	public int IsVisible(boolean aState) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 11, getAddress(), aState);
-	}
-	
-	public int ConstrainPosition(boolean aAllowSlop, int[] aX, int[] aY) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 12, getAddress(), aAllowSlop, aX, aY);
-	}
-	
-	public int Move(int aX, int aY) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 13, getAddress(), aX, aY); 
-	}
-	
-	public int Resize(int aWidth, int aHeight, boolean aRepaint) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 14, getAddress(), aWidth, aHeight, aRepaint); 
-	}
-	
-	public int Resize(int aX, int aY, int aWidth, int aHeight, boolean aRepaint) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 15, getAddress(), aX, aY, aWidth, aHeight, aRepaint);
-	}
-	
-	public int SetZIndex(int aZIndex) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 16, getAddress(), aZIndex);
-	}
-	
-	public int GetZIndex(int[] aZindex) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 17, getAddress(), aZindex);
-	}
-	
-	public int PlaceBehind(int aWidget, boolean aActivate) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 18, getAddress(), aWidget, aActivate); 
-	}
-	
-	public int SetSizeMode(int aMode) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 19, getAddress(), aMode); 
-	}
-	
-	public int GetSizeMode(int[] aMode) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 20, getAddress(), aMode);
-	}
-	
-	public int Enable(boolean aState) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 21, getAddress(), aState);
-	}
-	
-	public int IsEnabled(boolean[] aState) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 22, getAddress(), aState);
-	}
-	
-	public int SetFocus(boolean aRaise) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 23, getAddress(), aRaise);
-	}
-	
-	public int GetBounds(int aRect) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 24, getAddress(), aRect);
-	}
-	
-	public int GetScreenBounds(int aRect) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 25, getAddress(), aRect);
-	}
-	
-	public int GetClientBounds(int aRect) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 26, getAddress(), aRect);
-	}
-	
-	public int GetBorderSize(int[] aWidth, int[] aHeight) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 27, getAddress(), aWidth, aHeight);
-	}
-	
-	public int GetForegroundColor() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 28, getAddress()); 
-	}
-	
-	public int SetForegroundColor(int aColor) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 29, getAddress(), aColor);
-	}
-	
-	public int GetBackgroundColor() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 30, getAddress());
-	}
-	
-	public int SetBackgroundColor(int aColor) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 31, getAddress(), aColor);
-	}
-	
-	public int GetFont() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 32, getAddress());
-	}
-	
-	public int SetFont(int aFont) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 33, getAddress(), aFont);
-	}
-	
-	public int GetCursor() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 34, getAddress());
-	}
-	
-	public int SetCursor(int aCursor) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 35, getAddress(), aCursor);
-	}
-	
-	public int GetWindowType(int aWindowType) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 36, getAddress(), aWindowType);
-	}
-	
-	public int SetWindowTranslucency(boolean aTranslucent) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 37, getAddress(), aTranslucent);
-	}
-	
-	public int GetWindowTranslucency(boolean[] aTranslucent) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 38, getAddress(), aTranslucent);
-	}
-	
-	public int UpdateTranslucentWindowAlpha(int aRect, int[] aAlphas) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 39, getAddress(), aRect, aAlphas);
-	}
-	
-	public int HideWindowChrome(boolean aShouldHide) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 40, getAddress(), aShouldHide);
-	}
-	
-	public int MakeFullScreen(boolean aFullScreen) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 41, getAddress(), aFullScreen);
-	}
-	
-	public int Validate() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 42, getAddress());
-	}
-	
-	public int Invalidate(boolean aIsSynchronous) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 43, getAddress(), aIsSynchronous);
-	}
-	
-	public int Invalidate(int aRect, boolean aIsSynchronous) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 44, getAddress(), aRect, aIsSynchronous);
-	}
-	
-	public int InvalidateRegion(int aRegion, boolean aIsSynchronous) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 45, getAddress());
-	}
-	
-	public int Update() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 46, getAddress());
-	}
-	
-	public int AddMouseListener(int aListener) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 47, getAddress(), aListener);
-	}
-	
-	public int AddEventListener(int aListener) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 48, getAddress(), aListener);
-	}
-	
-	public int AddMenuListener(int aListener) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 49, getAddress(), aListener);
-	}
-	
-	public int GetToolkit() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 50, getAddress());
-	}
-	
-	public int SetColorMap(int aColorMap) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 51, getAddress(), aColorMap);
-	}
-	
-	public int Scroll(int aDx, int aDy, int aClipRect) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 52, getAddress(), aDx, aDy, aClipRect);
-	}
-	
-	public int ScrollWidgets(int aDx, int aDy) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 53, getAddress(), aDx, aDy);
-	}
-	
-	public int ScrollRect(int aScrRect, int aDx, int aDy) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 54, getAddress(), aScrRect, aDx, aDy);
-	}
-
-	public void AddChild(int aChild) {
-		XPCOM.VtblCallNoRet(super.LAST_METHOD_ID + 55, getAddress(), aChild);
-	}
-	
-	public void RemoveChild(int aChild) {
-		XPCOM.VtblCallNoRet(super.LAST_METHOD_ID + 56, getAddress(), aChild);
-	}
-
-	public int GetNativeData(int aDataType) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 57, getAddress(), aDataType);
-	}
-	
-	public void FreeNativeData(int data, int aDataType) {
-		XPCOM.VtblCallNoRet(super.LAST_METHOD_ID + 58, getAddress(), data, aDataType);
-	}
-	
-	public int GetRenderingContext() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 59, getAddress());
-	}
-	
-	public int GetDeviceContext() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 60, getAddress());
-	}
-	
-	public int GetAppShell() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 61, getAddress());
-	}
-	
-	public int SetBorderStyle(int aBorderStyle) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 62, getAddress(), aBorderStyle);
-	}
-	
-	public int SetTitle(int aTitle) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 63, getAddress(), aTitle);
-	}
-	
-	public int SetIcon(int anIconSpec) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 64, getAddress(), anIconSpec);
-	}
-	
-	public int SetMenuBar(int aMenuBar) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 65, getAddress(), aMenuBar);
-	}
-	
-	public int ShowMenuBar(boolean aShow) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 66, getAddress(), aShow);
-	}
-	
-	public int WidgetToScreen(int aOldRect, int aNewRect) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 67, getAddress(), aOldRect, aNewRect);
-	}
-	
-	public int ScreenToWidget(int aOldRect, int aNewRect) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 68, getAddress(), aOldRect, aNewRect);
-	}
-	
-	public int BeginResizingChildren() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 69, getAddress());
-	}
-	
-	public int EndResizingChidren() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 70, getAddress());
-	}
-	
-	public int GetPreferredSize(int aWidth, int aHeight) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 71, getAddress(), aWidth, aHeight);
-	}
-	
-	public int SetPreferredSize(int aWidth, int aHeight) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 72, getAddress(), aWidth, aHeight);
-	}
-	
-	public int DispatchEvent(int event, int aStatus) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 73, getAddress(), event, aStatus);
-	}
-	
-	public int Paint(int aRenderingContext, int aDirtyRect) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 74, getAddress(), aRenderingContext, aDirtyRect);
-	}
-	
-	public int EnableDragDrop(boolean aEnable) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 75, getAddress(), aEnable);
-	}
-	
-	public void ConvertToDeviceCoordinates(int[] aX, int[] aY) {
-		XPCOM.VtblCallNoRet(super.LAST_METHOD_ID + 76, getAddress(), aX, aY);
-	}
-	
-	public int CaptureMouse(boolean aCapture) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 77, getAddress(), aCapture);
-	}
-	
-	public int GetWindowClass(char[] aClass) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 78, getAddress(), aClass);
-	}
-	
-	public int SetWindowClass(char[] aClass) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 79, getAddress(), aClass);
-	}
-	
-	public int CaptureRollupEvents(int aListener, boolean aDoCapture, boolean aConsumeRollupEvent) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 80, getAddress(), aListener, aDoCapture, aConsumeRollupEvent);
-	}
-	
-	public int ModalEventFilter(boolean aRealEvent, int aEvent, boolean[] aForWindow) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 81, getAddress(), aRealEvent, aEvent, aForWindow);
-	}
-	
-	public int GetAttention() {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 82, getAddress());
-	}
-	
-	public int GetLastInputEventTime(int[] aTime) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 83, getAddress(), aTime);
-	}
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
index 19df8298f2..62f44ad562 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
@@ -42,6 +42,6 @@ public class nsIWindowCreator extends nsISupports {
 	}
 
 	public int CreateChromeWindow(int parent, int chromeFlags, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, _retval);
 	}
 }
\ No newline at end of file
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 d5cb5f8bcf..c80f6ead1c 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
@@ -46,42 +46,42 @@ public class nsIWindowWatcher extends nsISupports {
 	}
 
 	public int RegisterNotification(int aObserver) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 2, getAddress(), aObserver);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aObserver);
 	}
 
 	public int UnregisterNotification(int aObserver) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 3, getAddress(), aObserver);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aObserver);
 	}
 
 	public int GetWindowEnumerator(int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 4, getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), _retval);
 	}
 
 	public int GetNewPrompter(int aParent, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 5, getAddress(), aParent, _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, _retval);
 	}
 
 	public int GetNewAuthPrompter(int aParent, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 6, getAddress(), aParent, _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, _retval);
 	}
 
 	public int SetWindowCreator(int creator) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 7, getAddress(), creator);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), creator);
 	}
 
 	public int GetChromeForWindow(int aWindow, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 8, getAddress(), aWindow, _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aWindow, _retval);
 	}
 
 	public int GetWindowByName(char[] aTargetName, int aCurrentWindow, int[] _retval) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 9, getAddress(), aTargetName, aCurrentWindow, _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aTargetName, aCurrentWindow, _retval);
 	}
 
 	public int GetActiveWindow(int[] aActiveWindow) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 10, getAddress(), aActiveWindow);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aActiveWindow);
 	}
 
 	public int SetActiveWindow(int aActiveWindow) {
-		return XPCOM.VtblCall(super.LAST_METHOD_ID + 11, getAddress(), aActiveWindow);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aActiveWindow);
 	}
 }
\ No newline at end of file