update javadoc

12 files changed, 142 insertions, 102 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java
index e4f3b6c3f4..6408bb29df 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java
@@ -269,12 +269,17 @@ public boolean isDisposed () {
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_INVALID_ARGUMENT - if data is null or datatypes is null 
  *          or the length of data is not the same as the length of dataTypes</li>
- *   </ul>
- *  @exception SWTError <ul>
+ * </ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *  @exception SWTError <ul>
  *    <li>ERROR_CANNOT_SET_CLIPBOARD - if the clipboard is locked or otherwise unavailable</li>
-  * </ul>
+ * </ul>
+ * 
+ * <p>NOTE: ERROR_CANNOT_SET_CLIPBOARD should be an SWTException, since it is a
+ * recoverable error, but can not be changed due to backward compatability.</p>
  */
 public void setContents(Object[] data, Transfer[] dataTypes) {
 	checkWidget();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java
index 455de67b75..d6b23cd166 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java
@@ -122,13 +122,17 @@ public class DragSource extends Widget {
  * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
  *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
  * @exception SWTError <ul>
  *    <li>ERROR_CANNOT_INIT_DRAG - unable to initiate drag source; this will occur if more than one
  *        drag source is created for a control or if the operating system will not allow the creation
  *        of the drag source</li>
  * </ul>
- *
- * @see DragSource#dispose
+ * 
+ * <p>NOTE: ERROR_CANNOT_INIT_DRAG should be an SWTException, since it is a
+ * recoverable error, but can not be changed due to backward compatability.</p>
+ * 
+ * @see Widget#dispose
  * @see DragSource#checkSubclass
  * @see DND#DROP_NONE
  * @see DND#DROP_COPY
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java
index 8fb55b5369..3205b0f715 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java
@@ -106,11 +106,15 @@ public class DropTarget extends Widget {
  * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
  *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
  * @exception SWTError <ul>
  *    <li>ERROR_CANNOT_INIT_DROP - unable to initiate drop target; this will occur if more than one
  *        drop target is created for a control or if the operating system will not allow the creation
  *        of the drop target</li>
  * </ul>
+ *
+ * <p>NOTE: ERROR_CANNOT_INIT_DROP should be an SWTException, since it is a
+ * recoverable error, but can not be changed due to backward compatability.</p>
  * 
  * @see DropTarget#dispose
  * @see DropTarget#checkSubclass
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/Browser.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/Browser.java
index d9050097af..6f5987f499 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/Browser.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/Browser.java
@@ -338,7 +338,7 @@ public Browser(Composite parent, int style) {
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
  * 
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -364,7 +364,7 @@ public void addCloseWindowListener(CloseWindowListener listener) {
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
  * 
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -390,7 +390,7 @@ public void addLocationListener(LocationListener listener) {
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
  * 
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -416,7 +416,7 @@ public void addOpenWindowListener(OpenWindowListener listener) {
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
  * 
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -442,7 +442,7 @@ public void addProgressListener(ProgressListener listener) {
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
  * 
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -468,7 +468,7 @@ public void addStatusTextListener(StatusTextListener listener) {
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
  * 
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -494,7 +494,7 @@ public void addTitleListener(TitleListener listener) {
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
  * 
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -515,7 +515,7 @@ public void addVisibilityWindowListener(VisibilityWindowListener listener) {
  *
  * @return <code>true</code> if the operation was successful and <code>false</code> otherwise
  *
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -711,7 +711,7 @@ static Browser findBrowser(int /*long*/ handle) {
  *
  * @return <code>true</code> if the operation was successful and <code>false</code> otherwise
  *
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -739,7 +739,7 @@ public boolean forward() {
  *
  * @return the current URL or an empty <code>String</code> if there is no current URL
  *
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -943,7 +943,7 @@ void onResize() {
 /**
  * Refresh the current page.
  *
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -977,7 +977,7 @@ public void refresh() {
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
  * 
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -1015,7 +1015,7 @@ public void removeCloseWindowListener(CloseWindowListener listener) {
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
  * 
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -1053,7 +1053,7 @@ public void removeLocationListener(LocationListener listener) {
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
  * 
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -1091,7 +1091,7 @@ public void removeOpenWindowListener(OpenWindowListener listener) {
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
  * 
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -1129,7 +1129,7 @@ public void removeProgressListener(ProgressListener listener) {
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
  * 
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -1167,7 +1167,7 @@ public void removeStatusTextListener(StatusTextListener listener) {
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
  * 
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -1205,7 +1205,7 @@ public void removeTitleListener(TitleListener listener) {
  *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
  * </ul>
  * 
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -1245,7 +1245,7 @@ public void removeVisibilityWindowListener(VisibilityWindowListener listener) {
  *    <li>ERROR_NULL_ARGUMENT - if the html is null</li>
  * </ul>
  * 
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -1292,7 +1292,7 @@ public boolean setText(String html) {
  *    <li>ERROR_NULL_ARGUMENT - if the url is null</li>
  * </ul>
  * 
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
@@ -1321,7 +1321,7 @@ public boolean setUrl(String url) {
 /**
  * Stop any loading and rendering activity.
  *
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *    <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
  *    <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
  * </ul>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java
index fbf525327d..0ce692a143 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java
@@ -362,7 +362,7 @@ public static void error (int code, int hresult) {
  * @param extension the program extension
  * @return a string that is the OLE program id or an empty string
  *
- * @exception SWTError <ul>
+ * @exception IllegalArgumentException <ul>
  *		<li>ERROR_NULL_ARGUMENT when extension is null</li>
  *	</ul>
  */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java
index 67b0aa8993..193bca8513 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java
@@ -102,7 +102,7 @@ OleAutomation(IDispatch idispatch) {
  * @param clientSite the site for the OLE Document or ActiveX Control whose additional functionality 
  *        you need to access
  *
- * @exception SWTError <ul>
+ * @exception IllegalArgumentException <ul>
  *		<li>ERROR_INVALID_INTERFACE_ADDRESS when called with an invalid client site
  *	</ul>
  */
@@ -466,7 +466,7 @@ private int invoke(int dispIdMember, int wFlags, Variant[] rgvarg, int[] rgdispi
  * @param dispIdMember the ID of the method as specified by the IDL of the ActiveX Control; the
  *        value for the ID can be obtained using OleAutomation.getIDsOfNames
  *
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *		<li>ERROR_ACTION_NOT_PERFORMED when method invocation fails
  *	</ul>
  */
@@ -487,7 +487,7 @@ public void invokeNoReply(int dispIdMember) {
  * @param rgvarg an array of arguments for the method.  All arguments are considered to be
  *        read only unless the Variant is a By Reference Variant type.
  *
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *		<li>ERROR_ACTION_NOT_PERFORMED when method invocation fails
  *	</ul>
  */
@@ -515,7 +515,7 @@ public void invokeNoReply(int dispIdMember, Variant[] rgvarg) {
  *        all arguments must have an identifier - identifiers can be obtained using 
  *        OleAutomation.getIDsOfNames
  *
- * @exception SWTError <ul>
+ * @exception SWTException <ul>
  *		<li>ERROR_ACTION_NOT_PERFORMED when method invocation fails
  *	</ul>
  */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java
index 0d75a112f9..2f26e12054 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java
@@ -153,15 +153,16 @@ protected OleClientSite(Composite parent, int style) {
  * @param style the bitwise OR'ing of widget styles
  * @param file the file that is to be opened in this OLE Document
  *
- * @exception SWTError
+ * @exception IllegalArgumentException
+ * <ul><li>ERROR_NULL_ARGUMENT when the parent is null
+ *     <li>ERROR_INVALID_ARGUMENT when the parent is not an OleFrame</ul> 
+ * @exception SWTException
  * <ul><li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread
- *     <li>ERROR_NULL_ARGUMENT when the parent is null</ul>
- * @exception SWTError
- * <ul><li>ERROR_CANNOT_CREATE_OBJECT when failed to create OLE Object
- *     <li>ERROR_INVALID_ARGUMENT when the parent is not an OleFrame
+ *     <li>ERROR_CANNOT_CREATE_OBJECT when failed to create OLE Object
  *     <li>ERROR_CANNOT_OPEN_FILE when failed to open file
- *     <li>ERROR_INTERFACES_NOT_INITIALIZED when unable to create callbacks for OLE Interfaces</ul>
- *
+ *     <li>ERROR_INTERFACE_NOT_FOUND when unable to create callbacks for OLE Interfaces
+ *     <li>ERROR_INVALID_CLASSID
+ * </ul>
  */
 public OleClientSite(Composite parent, int style, File file) {
 	this(parent, style);
@@ -212,14 +213,16 @@ public OleClientSite(Composite parent, int style, File file) {
  *               in the registry for the desired OLE Document (for example, the VersionIndependentProgID
  *               for Word is Word.Document)
  *
- * @exception SWTError
- * <ul><li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread
+ * @exception IllegalArgumentException
+ *<ul>
  *     <li>ERROR_NULL_ARGUMENT when the parent is null
- *     <li>ERROR_INVALID_CLASSID when the progId does not map to a registered CLSID
  *     <li>ERROR_INVALID_ARGUMENT when the parent is not an OleFrame
+ *</ul>
+ * @exception SWTException
+ * <ul><li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread
+ *     <li>ERROR_INVALID_CLASSID when the progId does not map to a registered CLSID
  *     <li>ERROR_CANNOT_CREATE_OBJECT when failed to create OLE Object
- *     <li>ERROR_INTERFACES_NOT_INITIALIZED when unable to create callbacks for OLE Interfaces</ul>
- *
+ * </ul>
  */
 public OleClientSite(Composite parent, int style, String progId) {
 	this(parent, style);
@@ -268,15 +271,15 @@ public OleClientSite(Composite parent, int style, String progId) {
  *               for Word is Word.Document)
  * @param file the file that is to be opened in this OLE Document
  *
- * @exception SWTError
+ * @exception IllegalArgumentException
+ * <ul><li>ERROR_NULL_ARGUMENT when the parent is null
+ *     <li>ERROR_INVALID_ARGUMENT when the parent is not an OleFrame</ul>
+ * @exception SWTException
  * <ul><li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread
- *     <li>ERROR_NULL_ARGUMENT when the parent is null
  *     <li>ERROR_INVALID_CLASSID when the progId does not map to a registered CLSID
  *     <li>ERROR_CANNOT_CREATE_OBJECT when failed to create OLE Object
  *     <li>ERROR_CANNOT_OPEN_FILE when failed to open file
- *     <li>ERROR_INVALID_ARGUMENT when the parent is not an OleFrame
- *     <li>ERROR_INTERFACES_NOT_INITIALIZED when unable to create callbacks for OLE Interfaces</ul>
- *
+ * </ul>
  */
 public OleClientSite(Composite parent, int style, String progId, File file) {
 	this(parent, style);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java
index b9310608a9..c27dfb2be1 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java
@@ -69,15 +69,16 @@ public class OleControlSite extends OleClientSite
  *               in the registry for this Control (for example, the VersionIndependentProgID for 
  *               Internet Explorer is Shell.Explorer)
  *
- * @exception SWTError
- * <ul><li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread
+ *@exception IllegalArgumentException <ul>
  *     <li>ERROR_NULL_ARGUMENT when the parent is null
+ *</ul>
+ * @exception SWTException <ul>
+ *     <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread
  *     <li>ERROR_INVALID_CLASSID when the progId does not map to a registered CLSID
  *     <li>ERROR_CANNOT_CREATE_OBJECT when failed to create OLE Object
  *     <li>ERROR_CANNOT_ACCESS_CLASSFACTORY when Class Factory could not be found
  *     <li>ERROR_CANNOT_CREATE_LICENSED_OBJECT when failed to create a licensed OLE Object
- *     <li>ERROR_INTERFACES_NOT_INITIALIZED when unable to create callbacks for OLE Interfaces</ul>
- *
+ * </ul>
  */
 public OleControlSite(Composite parent, int style, String progId) {
 	super(parent, style);
@@ -154,8 +155,9 @@ public OleControlSite(Composite parent, int style, String progId) {
  * 
  * @param listener the listener
  *
- * @exception SWTError 
- *	<ul><li>ERROR_NULL_ARGUMENT when listener is null</li></ul>
+ * @exception IllegalArgumentException <ul> 
+ *	    <li>ERROR_NULL_ARGUMENT when listener is null</li>
+ * </ul>
  */
 public void addEventListener(int eventID, OleListener listener) {
 	if (listener == null) OLE.error (SWT.ERROR_NULL_ARGUMENT);
@@ -238,8 +240,9 @@ static GUID getDefaultEventSinkGUID(IUnknown unknown) {
  * 
  * @param listener the listener
  *
- * @exception SWTError 
- *	<ul><li>ERROR_NULL_ARGUMENT when listener is null</li></ul>
+ * @exception IllegalArgumentException <ul> 
+ *	   <li>ERROR_NULL_ARGUMENT when listener is null</li>
+ * </ul>
  */
 public void addEventListener(OleAutomation automation, int eventID, OleListener listener) {
 	if (listener == null || automation == null) OLE.error (SWT.ERROR_NULL_ARGUMENT);
@@ -310,8 +313,9 @@ protected void addObjectReferences() {
  * @param propertyID the identifier of the property
  * @param listener the listener
  *
- * @exception SWTError 
- *	<ul><li>ERROR_NULL_ARGUMENT when listener is null</li></ul>
+ * @exception IllegalArgumentException <ul> 
+ *	    <li>ERROR_NULL_ARGUMENT when listener is null</li>
+ * </ul>
  */
 public void addPropertyListener(int propertyID, OleListener listener) {
 	if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
@@ -616,8 +620,9 @@ protected void releaseObjectInterfaces() {
  * 
  * @param listener the listener
  *
- * @exception SWTError
- *	<ul><li>ERROR_NULL_ARGUMENT when listener is null</li></ul>
+ * @exception IllegalArgumentException <ul>
+ *	    <li>ERROR_NULL_ARGUMENT when listener is null</li>
+ * </ul>
  */
 public void removeEventListener(int eventID, OleListener listener) {
 	checkWidget();
@@ -642,8 +647,9 @@ public void removeEventListener(int eventID, OleListener listener) {
  * 
  * @param listener the listener
  *
- * @exception SWTError
- *	<ul><li>ERROR_NULL_ARGUMENT when listener is null</li></ul>
+ * @exception IllegalArgumentException <ul>
+ *	    <li>ERROR_NULL_ARGUMENT when listener is null</li>
+ * </ul>
  */
 public void removeEventListener(OleAutomation automation, GUID guid, int eventID, OleListener listener) {
 	checkWidget();
@@ -661,8 +667,9 @@ public void removeEventListener(OleAutomation automation, GUID guid, int eventID
  * 
  * @param listener the listener
  *
- * @exception SWTError
- *	<ul><li>ERROR_NULL_ARGUMENT when listener is null</li></ul>
+ * @exception IllegalArgumentException <ul>
+ *	    <li>ERROR_NULL_ARGUMENT when listener is null</li>
+ * </ul>
  */
 public void removeEventListener(OleAutomation automation, int eventID, OleListener listener) {
 	checkWidget();
@@ -716,8 +723,9 @@ void removeEventListener(int iunknown, GUID guid, int eventID, OleListener liste
  *
  * @param listener the listener
  *
- * @exception SWTError
- *	<ul><li>ERROR_NULL_ARGUMENT when listener is null</li></ul>
+ * @exception IllegalArgumentException <ul>
+ *	    <li>ERROR_NULL_ARGUMENT when listener is null</li>
+ * </ul>
  */
 public void removePropertyListener(int propertyID, OleListener listener) {
 	if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java
index 5dbae2c917..79a784578e 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java
@@ -132,10 +132,12 @@ private int Invoke(int dispIdMember, int riid, int lcid, int dwFlags, int pDispP
 * @param eventType the desired SWT event
 * @param event the event data
 *
-* @exception SWTError <ul>
+* @exception IllegalArgumentException <ul>
+* 		<li>ERROR_NULL_ARGUMENT when handler is null</li>
+* </ul>
+* @exception SWTException <ul>
 *		<li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
 *		<li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
-* 		<li>ERROR_NULL_ARGUMENT when handler is null</li>
 *	</ul>
 */
 private void notifyListener (int eventType, OleEvent event) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java
index 37ad44914d..62cdbb4363 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java
@@ -66,10 +66,12 @@ final public class OleFrame extends Composite
  * @param parent a composite widget (cannot be null)
  * @param style the bitwise OR'ing of widget styles
  *
- * @exception SWTError
- * <ul><li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread
+ * @exception IllegalArgumentException <ul>
  *     <li>ERROR_NULL_ARGUMENT when the parent is null
- *     <li>ERROR_INTERFACES_NOT_INITIALIZED when unable to create callbacks for OLE Interfaces</ul>
+ * </ul>
+ * @exception SWTException <ul>
+ *     <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread
+ * </ul>
  *
  */
 public OleFrame(Composite parent, int style) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java
index 3a446824e6..989876705c 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java
@@ -114,10 +114,12 @@ private void disposeCOMInterfaces() {
 * @param eventType the desired SWT event
 * @param event the event data
 *
-* @exception SWTError <ul>
+* @exception IllegalArgumentException <ul>
+* 		<li>ERROR_NULL_ARGUMENT when handler is null</li>
+* </ul>
+* @exception SWTException <ul>
 *		<li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
 *		<li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
-* 		<li>ERROR_NULL_ARGUMENT when handler is null</li>
 *	</ul>
 */
 private void notifyListener (int eventType, OleEvent event) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java
index 57b55182e8..64e5731240 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java
@@ -192,8 +192,9 @@ public void dispose() {
  *
  * @return the OleAutomation object represented by this Variant
  *
- * @exception SWTError
- *		ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant can not be coerced into an OleAutomation object
+ * @exception SWTException <ul>
+ *     <li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant can not be coerced into an OleAutomation object</li>
+ * </ul>
  */
 public OleAutomation getAutomation() {
 	if (type == COM.VT_EMPTY) {
@@ -234,8 +235,9 @@ public OleAutomation getAutomation() {
  * 
  * @return the IDispatch object represented by this Variant
  *
- * @exception SWTError
- *		ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant can not be coerced into an IDispatch object
+ * @exception SWTException <ul>
+ *     <li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant can not be coerced into an IDispatch object</li>
+ * </ul>
  */
 public IDispatch getDispatch() {
 	if (type == COM.VT_EMPTY) {
@@ -273,8 +275,9 @@ public IDispatch getDispatch() {
  *
  * @return the Java boolean represented by this Variant
  *
- * @exception SWTError
- * <ul><li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant can not be coerced into a boolean</ul>
+ * @exception SWTException <ul>
+ *     <li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant can not be coerced into a boolean</li>
+ * </ul>
  *
  */
 public boolean getBoolean() {
@@ -380,8 +383,9 @@ void getData(int pData){
  *
  * @return the Java float represented by this Variant
  *
- * @exception SWTError
- * <ul><li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant can not be coerced into a float</ul>
+ * @exception SWTException <ul>
+ *     <li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant can not be coerced into a float</li>
+ * </ul>
  */
 public float getFloat() {
 	if (type == COM.VT_EMPTY) {
@@ -418,8 +422,9 @@ public float getFloat() {
  *
  * @return the Java int represented by this Variant
  *
- * @exception SWTError
- * <ul><li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant can not be coerced into a int</ul>
+ * @exception SWTException <ul>
+ *     <li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant can not be coerced into a int</li>
+ * </ul>
  */
 public int getInt() {
 	if (type == COM.VT_EMPTY) {
@@ -455,8 +460,9 @@ public int getInt() {
  *
  * @return the Java short represented by this Variant
  *
- * @exception SWTError
- * <ul><li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant can not be coerced into a short</ul>
+ * @exception SWTException <ul>
+ *     <li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant can not be coerced into a short</li>
+ * </ul>
  */
 public short getShort() {
 	if (type == COM.VT_EMPTY) {
@@ -493,8 +499,9 @@ public short getShort() {
  *
  * @return the Java String represented by this Variant
  *
- * @exception SWTError
- * <ul><li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant can not be coerced into a String</ul>
+ * @exception SWTException <ul>
+ *     <li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant can not be coerced into a String</li>
+ * </ul>
  */
 public String getString() {
 	if (type == COM.VT_EMPTY) {
@@ -545,9 +552,10 @@ public short getType() {
  *
  * @return the IUnknown object represented by this Variant
  *
- * @exception SWTError
- * <ul><li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant can not be coerced into 
- *			an IUnknown object</ul>
+ * @exception SWTException <ul>
+ *     <li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant can not be coerced into 
+ *			an IUnknown object</li>
+ * </ul>
  */
 public IUnknown getUnknown() {
 	if (type == COM.VT_EMPTY) {
@@ -583,9 +591,10 @@ public IUnknown getUnknown() {
  * 
  * @param val the new boolean value
  * 
- * @exception SWTError
- * <ul><li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant is not 
- *			a (VT_BYREF | VT_BOOL) object</ul>
+ * @exception SWTException <ul>
+ *     <li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant is not 
+ *			a (VT_BYREF | VT_BOOL) object</li>
+ * </ul>
  *
  * @since 2.1
  */
@@ -600,9 +609,10 @@ public void setByRef(boolean val) {
  * 
  * @param val the new float value
  * 
- * @exception SWTError
- * <ul><li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant is not 
- *			a (VT_BYREF | VT_R4) object</ul>
+ * @exception SWTException <ul>
+ *     <li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant is not 
+ *			a (VT_BYREF | VT_R4) object</li>
+ * </ul>
  *
  * @since 2.1
  */
@@ -617,9 +627,9 @@ public void setByRef(float val) {
  * 
  * @param val the new integer value
  * 
- * @exception SWTError
- * <ul><li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant is not 
- *			a (VT_BYREF | VT_I4) object</ul>
+ * @exception SWTException <ul>
+ *     <li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant is not a (VT_BYREF | VT_I4) object</li>
+ * </ul>
  *
  * @since 2.1
  */
@@ -634,9 +644,9 @@ public void setByRef(int val) {
  * 
  * @param val the new short value
  * 
- * @exception SWTError
- * <ul><li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant is not 
- *			a (VT_BYREF | VT_I2) object</ul>
+ * @exception SWTException <ul>
+ *     <li>ERROR_CANNOT_CHANGE_VARIANT_TYPE when type of Variant is not a (VT_BYREF | VT_I2) object
+ * </ul>
  *
  * @since 2.1
  */