Bug 458863 - [Common] Replace Vector with ArrayList and friends

Vector -> List, ArrayList

Change-Id: I888585ff319d4591362e302a939107a9950ecfd0
Signed-off-by: Jacek Sieka <arnetheduck@gmail.com>

10 files changed, 137 insertions, 129 deletions

diff --git a/bundles/org.eclipse.swt.tools/Mozilla Generation/org/eclipse/swt/tools/internal/MozillaGenerator.java b/bundles/org.eclipse.swt.tools/Mozilla Generation/org/eclipse/swt/tools/internal/MozillaGenerator.java
index a8c0c939d7..d1f82258f4 100644
--- a/bundles/org.eclipse.swt.tools/Mozilla Generation/org/eclipse/swt/tools/internal/MozillaGenerator.java
+++ b/bundles/org.eclipse.swt.tools/Mozilla Generation/org/eclipse/swt/tools/internal/MozillaGenerator.java
@@ -32,7 +32,7 @@ public class MozillaGenerator {
 	String[][] argTypes;
 	String[][] argNames;
 	String bodyOrder;
-	Hashtable<Integer, Vector<String>> vtbls;
+	Hashtable<Integer, List<String>> vtbls;
 
 	static boolean DEBUG = false;
 
@@ -139,7 +139,7 @@ public class MozillaGenerator {
 	}
 
 	public MozillaGenerator() {
-		vtbls = new Hashtable<Integer, Vector<String>>();
+		vtbls = new Hashtable<Integer, List<String>>();
 	}
 
 	/** Write callbacks */
@@ -263,15 +263,15 @@ public class MozillaGenerator {
 		}
 		vtbl += ");";
 		Integer key = new Integer(argTypes.length);
-		Vector<String> list = vtbls.get(key);
+		List<String> list = vtbls.get(key);
 		if (list == null) {
-			list = new Vector<String>();
+			list = new ArrayList<String>();
 			vtbls.put(key, list);
 		}
 		boolean duplicate = false;
-		Enumeration<String> e = list.elements();
-		while (e.hasMoreElements()) {
-			String s = e.nextElement();
+		Iterator<String> e = list.iterator();
+		while (e.hasNext()) {
+			String s = e.next();
 			if (vtbl.equals(s)) {
 				duplicate = true;
 				break;
@@ -297,7 +297,7 @@ public class MozillaGenerator {
 		}
 		Arrays.sort(keys);
 		for (int i = 0; i < keys.length; i++) {
-			Vector<?> list = vtbls.get(keys[i]);
+			List<String> list = vtbls.get(keys[i]);
 			Object[] elts = list.toArray();
 			Arrays.sort(elts);
 			for (int j = 0; j < elts.length; j++) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java
index 7caed2a53d..53e3d69ede 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java
@@ -12,6 +12,7 @@ package org.eclipse.swt.accessibility;
 
 import java.net.*;
 import java.util.*;
+import java.util.List;
 
 import org.eclipse.swt.*;
 import org.eclipse.swt.graphics.*;
@@ -66,17 +67,17 @@ public class Accessible {
 	NSMutableArray parameterizedAttributeNames = null;
 	NSMutableArray actionNames = null;
 
-	Vector<AccessibleListener> accessibleListeners;
-	Vector<AccessibleControlListener> accessibleControlListeners;
-	Vector<AccessibleTextListener> accessibleTextListeners;
-	Vector<AccessibleActionListener> accessibleActionListeners;
-	Vector<AccessibleEditableTextListener> accessibleEditableTextListeners;
-	Vector<AccessibleHyperlinkListener> accessibleHyperlinkListeners;
-	Vector<AccessibleTableListener> accessibleTableListeners;
-	Vector<AccessibleTableCellListener> accessibleTableCellListeners;
-	Vector<AccessibleTextExtendedListener> accessibleTextExtendedListeners;
-	Vector<AccessibleValueListener> accessibleValueListeners;
-	Vector<AccessibleAttributeListener> accessibleAttributeListeners;
+	List<AccessibleListener> accessibleListeners;
+	List<AccessibleControlListener> accessibleControlListeners;
+	List<AccessibleTextListener> accessibleTextListeners;
+	List<AccessibleActionListener> accessibleActionListeners;
+	List<AccessibleEditableTextListener> accessibleEditableTextListeners;
+	List<AccessibleHyperlinkListener> accessibleHyperlinkListeners;
+	List<AccessibleTableListener> accessibleTableListeners;
+	List<AccessibleTableCellListener> accessibleTableCellListeners;
+	List<AccessibleTextExtendedListener> accessibleTextExtendedListeners;
+	List<AccessibleValueListener> accessibleValueListeners;
+	List<AccessibleAttributeListener> accessibleAttributeListeners;
 
 	Relation relations[] = new Relation[MAX_RELATION_TYPES];
 	Accessible parent;
@@ -115,6 +116,7 @@ public class Accessible {
 	 * @since 3.5
 	 * @deprecated
 	 */
+	@Deprecated
 	protected Accessible() {
 	}
 
@@ -175,7 +177,7 @@ public class Accessible {
 	public void addAccessibleListener(AccessibleListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleListeners == null) accessibleListeners = new Vector<AccessibleListener>();
+		if (accessibleListeners == null) accessibleListeners = new ArrayList<AccessibleListener>();
 		accessibleListeners.add(listener);
 	}
 	
@@ -203,7 +205,7 @@ public class Accessible {
 	public void addAccessibleControlListener(AccessibleControlListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleControlListeners == null) accessibleControlListeners = new Vector<AccessibleControlListener>();
+		if (accessibleControlListeners == null) accessibleControlListeners = new ArrayList<AccessibleControlListener>();
 		accessibleControlListeners.add(listener);
 	}
 
@@ -235,10 +237,10 @@ public class Accessible {
 		checkWidget ();
 		if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
 		if (listener instanceof AccessibleTextExtendedListener) {
-			if (accessibleTextExtendedListeners == null) accessibleTextExtendedListeners = new Vector<AccessibleTextExtendedListener>();
+			if (accessibleTextExtendedListeners == null) accessibleTextExtendedListeners = new ArrayList<AccessibleTextExtendedListener>();
 			accessibleTextExtendedListeners.add ((AccessibleTextExtendedListener) listener);		
 		} else {
-			if (accessibleTextListeners == null) accessibleTextListeners = new Vector<AccessibleTextListener>();
+			if (accessibleTextListeners == null) accessibleTextListeners = new ArrayList<AccessibleTextListener>();
 			accessibleTextListeners.add (listener);
 		}
 	}
@@ -267,7 +269,7 @@ public class Accessible {
 	public void addAccessibleActionListener(AccessibleActionListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleActionListeners == null) accessibleActionListeners = new Vector<AccessibleActionListener>();
+		if (accessibleActionListeners == null) accessibleActionListeners = new ArrayList<AccessibleActionListener>();
 		accessibleActionListeners.add(listener);
 	}
 
@@ -295,7 +297,7 @@ public class Accessible {
 	public void addAccessibleEditableTextListener(AccessibleEditableTextListener listener) {
 	    checkWidget();
 	    if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleEditableTextListeners == null) accessibleEditableTextListeners = new Vector<AccessibleEditableTextListener>();
+		if (accessibleEditableTextListeners == null) accessibleEditableTextListeners = new ArrayList<AccessibleEditableTextListener>();
 	    accessibleEditableTextListeners.add(listener);
 	}
 
@@ -323,7 +325,7 @@ public class Accessible {
 	public void addAccessibleHyperlinkListener(AccessibleHyperlinkListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleHyperlinkListeners == null) accessibleHyperlinkListeners = new Vector<AccessibleHyperlinkListener>();
+		if (accessibleHyperlinkListeners == null) accessibleHyperlinkListeners = new ArrayList<AccessibleHyperlinkListener>();
 		accessibleHyperlinkListeners.add(listener);
 	}
 
@@ -351,7 +353,7 @@ public class Accessible {
 	public void addAccessibleTableListener(AccessibleTableListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleTableListeners == null) accessibleTableListeners = new Vector<AccessibleTableListener>();
+		if (accessibleTableListeners == null) accessibleTableListeners = new ArrayList<AccessibleTableListener>();
 		accessibleTableListeners.add(listener);
 	}
 
@@ -379,7 +381,7 @@ public class Accessible {
 	public void addAccessibleTableCellListener(AccessibleTableCellListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleTableCellListeners == null) accessibleTableCellListeners = new Vector<AccessibleTableCellListener>();
+		if (accessibleTableCellListeners == null) accessibleTableCellListeners = new ArrayList<AccessibleTableCellListener>();
 		accessibleTableCellListeners.add(listener);
 	}
 
@@ -407,7 +409,7 @@ public class Accessible {
 	public void addAccessibleValueListener(AccessibleValueListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleValueListeners == null) accessibleValueListeners = new Vector<AccessibleValueListener>();
+		if (accessibleValueListeners == null) accessibleValueListeners = new ArrayList<AccessibleValueListener>();
 		accessibleValueListeners.add(listener);
 	}
 
@@ -435,7 +437,7 @@ public class Accessible {
 	public void addAccessibleAttributeListener(AccessibleAttributeListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleAttributeListeners == null) accessibleAttributeListeners = new Vector<AccessibleAttributeListener>();
+		if (accessibleAttributeListeners == null) accessibleAttributeListeners = new ArrayList<AccessibleAttributeListener>();
 		accessibleAttributeListeners.add(listener);
 	}
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java
index d75eb50309..957ee3c4d8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java
@@ -12,6 +12,7 @@ package org.eclipse.swt.accessibility;
 
 
 import java.util.*;
+import java.util.List;
 
 import org.eclipse.swt.*;
 import org.eclipse.swt.internal.gtk.*;
@@ -41,22 +42,22 @@ import org.eclipse.swt.widgets.*;
  * @since 2.0
  */
 public class Accessible {
-	Vector<AccessibleListener> accessibleListeners;
-	Vector<AccessibleControlListener> accessibleControlListeners;
-	Vector<AccessibleTextListener> accessibleTextListeners;
-	Vector<AccessibleActionListener> accessibleActionListeners;
-	Vector<AccessibleEditableTextListener> accessibleEditableTextListeners;
-	Vector<AccessibleHyperlinkListener> accessibleHyperlinkListeners;
-	Vector<AccessibleTableListener> accessibleTableListeners;
-	Vector<AccessibleTableCellListener> accessibleTableCellListeners;
-	Vector<AccessibleTextExtendedListener> accessibleTextExtendedListeners;
-	Vector<AccessibleValueListener> accessibleValueListeners;
-	Vector<AccessibleAttributeListener> accessibleAttributeListeners;
+	List<AccessibleListener> accessibleListeners;
+	List<AccessibleControlListener> accessibleControlListeners;
+	List<AccessibleTextListener> accessibleTextListeners;
+	List<AccessibleActionListener> accessibleActionListeners;
+	List<AccessibleEditableTextListener> accessibleEditableTextListeners;
+	List<AccessibleHyperlinkListener> accessibleHyperlinkListeners;
+	List<AccessibleTableListener> accessibleTableListeners;
+	List<AccessibleTableCellListener> accessibleTableCellListeners;
+	List<AccessibleTextExtendedListener> accessibleTextExtendedListeners;
+	List<AccessibleValueListener> accessibleValueListeners;
+	List<AccessibleAttributeListener> accessibleAttributeListeners;
 	Accessible parent;
 	AccessibleObject accessibleObject;
 	Control control;
-	Vector<Relation> relations;
-	Vector<Accessible> children;
+	List<Relation> relations;
+	List<Accessible> children;
 	
 	static class Relation {
 		int type;
@@ -93,8 +94,8 @@ public class Accessible {
 	public Accessible(Accessible parent) {
 		this.parent = checkNull(parent);
 		this.control = parent.control;
-		if (parent.children == null) parent.children = new Vector<Accessible>();
-		parent.children.addElement(this);
+		if (parent.children == null) parent.children = new ArrayList<Accessible>();
+		parent.children.add(this);
 	}
 
 	/**
@@ -140,8 +141,8 @@ public class Accessible {
 	public void addAccessibleListener (AccessibleListener listener) {
 		checkWidget ();
 		if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleListeners == null) accessibleListeners = new Vector<AccessibleListener>();
-		accessibleListeners.addElement (listener);	
+		if (accessibleListeners == null) accessibleListeners = new ArrayList<AccessibleListener>();
+		accessibleListeners.add (listener);	
 	}
 
 	/**
@@ -168,8 +169,8 @@ public class Accessible {
 	public void addAccessibleControlListener (AccessibleControlListener listener) {
 		checkWidget ();
 		if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleControlListeners == null) accessibleControlListeners = new Vector<AccessibleControlListener>();
-		accessibleControlListeners.addElement (listener);		
+		if (accessibleControlListeners == null) accessibleControlListeners = new ArrayList<AccessibleControlListener>();
+		accessibleControlListeners.add (listener);		
 	}
 
 	/**
@@ -200,11 +201,11 @@ public class Accessible {
 		checkWidget ();
 		if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
 		if (listener instanceof AccessibleTextExtendedListener) {
-			if (accessibleTextExtendedListeners == null) accessibleTextExtendedListeners = new Vector<AccessibleTextExtendedListener>();
-			accessibleTextExtendedListeners.addElement ((AccessibleTextExtendedListener)listener);		
+			if (accessibleTextExtendedListeners == null) accessibleTextExtendedListeners = new ArrayList<AccessibleTextExtendedListener>();
+			accessibleTextExtendedListeners.add ((AccessibleTextExtendedListener)listener);		
 		} else {
-			if (accessibleTextListeners == null) accessibleTextListeners = new Vector<AccessibleTextListener>();
-			accessibleTextListeners.addElement (listener);
+			if (accessibleTextListeners == null) accessibleTextListeners = new ArrayList<AccessibleTextListener>();
+			accessibleTextListeners.add (listener);
 		}
 	}
 	
@@ -232,8 +233,8 @@ public class Accessible {
 	public void addAccessibleActionListener(AccessibleActionListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleActionListeners == null) accessibleActionListeners = new Vector<AccessibleActionListener>();
-		accessibleActionListeners.addElement(listener);
+		if (accessibleActionListeners == null) accessibleActionListeners = new ArrayList<AccessibleActionListener>();
+		accessibleActionListeners.add(listener);
 	}
 
 	/**
@@ -260,8 +261,8 @@ public class Accessible {
 	public void addAccessibleEditableTextListener(AccessibleEditableTextListener listener) {
 	    checkWidget();
 	    if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleEditableTextListeners == null) accessibleEditableTextListeners = new Vector<AccessibleEditableTextListener>();
-	    accessibleEditableTextListeners.addElement(listener);
+		if (accessibleEditableTextListeners == null) accessibleEditableTextListeners = new ArrayList<AccessibleEditableTextListener>();
+	    accessibleEditableTextListeners.add(listener);
 	}
 
 	/**
@@ -288,8 +289,8 @@ public class Accessible {
 	public void addAccessibleHyperlinkListener(AccessibleHyperlinkListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleHyperlinkListeners == null) accessibleHyperlinkListeners = new Vector<AccessibleHyperlinkListener>();
-		accessibleHyperlinkListeners.addElement(listener);
+		if (accessibleHyperlinkListeners == null) accessibleHyperlinkListeners = new ArrayList<AccessibleHyperlinkListener>();
+		accessibleHyperlinkListeners.add(listener);
 	}
 
 	/**
@@ -316,8 +317,8 @@ public class Accessible {
 	public void addAccessibleTableListener(AccessibleTableListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleTableListeners == null) accessibleTableListeners = new Vector<AccessibleTableListener>();
-		accessibleTableListeners.addElement(listener);
+		if (accessibleTableListeners == null) accessibleTableListeners = new ArrayList<AccessibleTableListener>();
+		accessibleTableListeners.add(listener);
 	}
 
 	/**
@@ -344,8 +345,8 @@ public class Accessible {
 	public void addAccessibleTableCellListener(AccessibleTableCellListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleTableCellListeners == null) accessibleTableCellListeners = new Vector<AccessibleTableCellListener>();
-		accessibleTableCellListeners.addElement(listener);
+		if (accessibleTableCellListeners == null) accessibleTableCellListeners = new ArrayList<AccessibleTableCellListener>();
+		accessibleTableCellListeners.add(listener);
 	}
 
 	/**
@@ -372,8 +373,8 @@ public class Accessible {
 	public void addAccessibleValueListener(AccessibleValueListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleValueListeners == null) accessibleValueListeners = new Vector<AccessibleValueListener>();
-		accessibleValueListeners.addElement(listener);
+		if (accessibleValueListeners == null) accessibleValueListeners = new ArrayList<AccessibleValueListener>();
+		accessibleValueListeners.add(listener);
 	}
 
 	/**
@@ -400,8 +401,8 @@ public class Accessible {
 	public void addAccessibleAttributeListener(AccessibleAttributeListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleAttributeListeners == null) accessibleAttributeListeners = new Vector<AccessibleAttributeListener>();
-		accessibleAttributeListeners.addElement(listener);
+		if (accessibleAttributeListeners == null) accessibleAttributeListeners = new ArrayList<AccessibleAttributeListener>();
+		accessibleAttributeListeners.add(listener);
 	}
 
 	/**
@@ -415,7 +416,7 @@ public class Accessible {
 	 */
 	public void addRelation(int type, Accessible target) {
 		checkWidget();
-		if (relations == null) relations = new Vector<Relation>();
+		if (relations == null) relations = new ArrayList<Relation>();
 		Relation relation = new Relation(type, target);
 		if (relations.indexOf(relation) != -1) return;
 		relations.add(relation);
@@ -426,7 +427,7 @@ public class Accessible {
 		if (relations == null) return;
 		if (accessibleObject == null) return;
 		for (int i = 0; i < relations.size(); i++) {
-			Relation relation = relations.elementAt(i);
+			Relation relation = relations.get(i);
 			accessibleObject.addRelation(relation.type, relation.target);
 		}
 	}
@@ -450,7 +451,7 @@ public class Accessible {
 	public void dispose () {
 		if (parent == null) return;
 		release();
-		parent.children.removeElement(this);
+		parent.children.remove(this);
 		parent = null;
 	}
 
@@ -546,7 +547,7 @@ public class Accessible {
 	void release () {
 		if (children != null) {
 			for (int i = 0; i < children.size(); i++) {
-				Accessible child = children.elementAt(i);
+				Accessible child = children.get(i);
 				child.dispose();
 			}
 		}
@@ -579,7 +580,7 @@ public class Accessible {
 		checkWidget ();
 		if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
 		if (accessibleControlListeners != null) {
-			accessibleControlListeners.removeElement(listener);
+			accessibleControlListeners.remove(listener);
 			if (accessibleControlListeners.isEmpty()) accessibleControlListeners = null;
 		}
 	}
@@ -607,7 +608,7 @@ public class Accessible {
 		checkWidget ();
 		if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
 		if (accessibleListeners != null) {
-			accessibleListeners.removeElement(listener);
+			accessibleListeners.remove(listener);
 			if (accessibleListeners.isEmpty()) accessibleListeners = null;
 		}
 	}
@@ -639,12 +640,12 @@ public class Accessible {
 		if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
 		if (listener instanceof AccessibleTextExtendedListener) {
 			if (accessibleTextExtendedListeners != null) {
-				accessibleTextExtendedListeners.removeElement (listener);
+				accessibleTextExtendedListeners.remove (listener);
 				if (accessibleTextExtendedListeners.isEmpty()) accessibleTextExtendedListeners = null;
 			}
 		} else {
 			if (accessibleTextListeners != null) {
-				accessibleTextListeners.removeElement (listener);
+				accessibleTextListeners.remove (listener);
 				if (accessibleTextListeners.isEmpty()) accessibleTextListeners = null;
 			}
 		}
@@ -675,7 +676,7 @@ public class Accessible {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 		if (accessibleActionListeners != null) {
-			accessibleActionListeners.removeElement(listener);
+			accessibleActionListeners.remove(listener);
 			if (accessibleActionListeners.isEmpty()) accessibleActionListeners = null;
 		}
 	}
@@ -705,7 +706,7 @@ public class Accessible {
 	    checkWidget();
 	    if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 	    if (accessibleEditableTextListeners != null) {
-	    	accessibleEditableTextListeners.removeElement(listener);
+	    	accessibleEditableTextListeners.remove(listener);
 			if (accessibleEditableTextListeners.isEmpty()) accessibleEditableTextListeners = null;
 	    }
 	}
@@ -735,7 +736,7 @@ public class Accessible {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 		if (accessibleHyperlinkListeners != null) {
-			accessibleHyperlinkListeners.removeElement(listener);
+			accessibleHyperlinkListeners.remove(listener);
 			if (accessibleHyperlinkListeners.isEmpty()) accessibleHyperlinkListeners = null;
 		}
 	}
@@ -765,7 +766,7 @@ public class Accessible {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 		if (accessibleTableListeners != null) {
-			accessibleTableListeners.removeElement(listener);
+			accessibleTableListeners.remove(listener);
 			if (accessibleTableListeners.isEmpty()) accessibleTableListeners = null;
 		}
 	}
@@ -795,7 +796,7 @@ public class Accessible {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 		if (accessibleTableCellListeners != null) {
-			accessibleTableCellListeners.removeElement(listener);
+			accessibleTableCellListeners.remove(listener);
 			if (accessibleTableCellListeners.isEmpty()) accessibleTableCellListeners = null;
 		}
 	}
@@ -825,7 +826,7 @@ public class Accessible {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 		if (accessibleValueListeners != null) {
-			accessibleValueListeners.removeElement(listener);
+			accessibleValueListeners.remove(listener);
 			if (accessibleValueListeners.isEmpty()) accessibleValueListeners = null;
 		}
 	}
@@ -855,7 +856,7 @@ public class Accessible {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 		if (accessibleAttributeListeners != null) {
-			accessibleAttributeListeners.removeElement(listener);
+			accessibleAttributeListeners.remove(listener);
 			if (accessibleAttributeListeners.isEmpty()) accessibleAttributeListeners = null;
 		}
 	}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java
index 6dfa664fc1..3d11b63925 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java
@@ -10,14 +10,15 @@
  *******************************************************************************/
 package org.eclipse.swt.accessibility;
 
-import java.util.Locale;
-import java.util.Vector;
+import java.util.*;
+import java.util.List;
+
 import org.eclipse.swt.*;
-import org.eclipse.swt.widgets.*;
 import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.internal.ole.win32.*;
 import org.eclipse.swt.internal.win32.*;
 import org.eclipse.swt.ole.win32.*;
-import org.eclipse.swt.internal.ole.win32.*;
+import org.eclipse.swt.widgets.*;
 
 /**
  * Instances of this class provide a bridge between application
@@ -58,21 +59,21 @@ public class Accessible {
 		objIAccessibleHypertext, /*objIAccessibleImage,*/ objIAccessibleTable2, objIAccessibleTableCell,
 		objIAccessibleText, objIAccessibleValue; /* objIAccessibleRelation is defined in Relation class */
 	IAccessible iaccessible;
-	Vector<AccessibleListener> accessibleListeners;
-	Vector<AccessibleControlListener> accessibleControlListeners;
-	Vector<AccessibleTextListener> accessibleTextListeners;
-	Vector<AccessibleActionListener> accessibleActionListeners;
-	Vector<AccessibleEditableTextListener> accessibleEditableTextListeners;
-	Vector<AccessibleHyperlinkListener> accessibleHyperlinkListeners;
-	Vector<AccessibleTableListener> accessibleTableListeners;
-	Vector<AccessibleTableCellListener> accessibleTableCellListeners;
-	Vector<AccessibleTextExtendedListener> accessibleTextExtendedListeners;
-	Vector<AccessibleValueListener> accessibleValueListeners;
-	Vector<AccessibleAttributeListener> accessibleAttributeListeners;
+	List<AccessibleListener> accessibleListeners;
+	List<AccessibleControlListener> accessibleControlListeners;
+	List<AccessibleTextListener> accessibleTextListeners;
+	List<AccessibleActionListener> accessibleActionListeners;
+	List<AccessibleEditableTextListener> accessibleEditableTextListeners;
+	List<AccessibleHyperlinkListener> accessibleHyperlinkListeners;
+	List<AccessibleTableListener> accessibleTableListeners;
+	List<AccessibleTableCellListener> accessibleTableCellListeners;
+	List<AccessibleTextExtendedListener> accessibleTextExtendedListeners;
+	List<AccessibleValueListener> accessibleValueListeners;
+	List<AccessibleAttributeListener> accessibleAttributeListeners;
 	Relation relations[] = new Relation[MAX_RELATION_TYPES];
 	Object[] variants;
 	Accessible parent;
-	Vector<Accessible> children = new Vector<Accessible>();
+	List<Accessible> children = new ArrayList<Accessible>();
 	Control control;
 	int uniqueID = -1;
 	int [] tableChange; // type, rowStart, rowCount, columnStart, columnCount
@@ -561,7 +562,7 @@ public class Accessible {
 	public void addAccessibleListener(AccessibleListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleListeners == null) accessibleListeners = new Vector<AccessibleListener>();
+		if (accessibleListeners == null) accessibleListeners = new ArrayList<AccessibleListener>();
 		accessibleListeners.add(listener);
 	}
 	
@@ -589,7 +590,7 @@ public class Accessible {
 	public void addAccessibleControlListener(AccessibleControlListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleControlListeners == null) accessibleControlListeners = new Vector<AccessibleControlListener>();
+		if (accessibleControlListeners == null) accessibleControlListeners = new ArrayList<AccessibleControlListener>();
 		accessibleControlListeners.add(listener);
 	}
 
@@ -621,10 +622,10 @@ public class Accessible {
 		checkWidget ();
 		if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
 		if (listener instanceof AccessibleTextExtendedListener) {
-			if (accessibleTextExtendedListeners == null) accessibleTextExtendedListeners = new Vector<AccessibleTextExtendedListener>();
+			if (accessibleTextExtendedListeners == null) accessibleTextExtendedListeners = new ArrayList<AccessibleTextExtendedListener>();
 			accessibleTextExtendedListeners.add ((AccessibleTextExtendedListener) listener);		
 		} else {
-			if (accessibleTextListeners == null) accessibleTextListeners = new Vector<AccessibleTextListener>();
+			if (accessibleTextListeners == null) accessibleTextListeners = new ArrayList<AccessibleTextListener>();
 			accessibleTextListeners.add (listener);
 		}
 	}
@@ -653,7 +654,7 @@ public class Accessible {
 	public void addAccessibleActionListener(AccessibleActionListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleActionListeners == null) accessibleActionListeners = new Vector<AccessibleActionListener>();
+		if (accessibleActionListeners == null) accessibleActionListeners = new ArrayList<AccessibleActionListener>();
 		accessibleActionListeners.add(listener);
 	}
 
@@ -681,7 +682,7 @@ public class Accessible {
 	public void addAccessibleEditableTextListener(AccessibleEditableTextListener listener) {
 	    checkWidget();
 	    if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleEditableTextListeners == null) accessibleEditableTextListeners = new Vector<AccessibleEditableTextListener>();
+		if (accessibleEditableTextListeners == null) accessibleEditableTextListeners = new ArrayList<AccessibleEditableTextListener>();
 	    accessibleEditableTextListeners.add(listener);
 	}
 
@@ -709,7 +710,7 @@ public class Accessible {
 	public void addAccessibleHyperlinkListener(AccessibleHyperlinkListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleHyperlinkListeners == null) accessibleHyperlinkListeners = new Vector<AccessibleHyperlinkListener>();
+		if (accessibleHyperlinkListeners == null) accessibleHyperlinkListeners = new ArrayList<AccessibleHyperlinkListener>();
 		accessibleHyperlinkListeners.add(listener);
 	}
 
@@ -737,7 +738,7 @@ public class Accessible {
 	public void addAccessibleTableListener(AccessibleTableListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleTableListeners == null) accessibleTableListeners = new Vector<AccessibleTableListener>();
+		if (accessibleTableListeners == null) accessibleTableListeners = new ArrayList<AccessibleTableListener>();
 		accessibleTableListeners.add(listener);
 	}
 
@@ -765,7 +766,7 @@ public class Accessible {
 	public void addAccessibleTableCellListener(AccessibleTableCellListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleTableCellListeners == null) accessibleTableCellListeners = new Vector<AccessibleTableCellListener>();
+		if (accessibleTableCellListeners == null) accessibleTableCellListeners = new ArrayList<AccessibleTableCellListener>();
 		accessibleTableCellListeners.add(listener);
 	}
 
@@ -793,7 +794,7 @@ public class Accessible {
 	public void addAccessibleValueListener(AccessibleValueListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleValueListeners == null) accessibleValueListeners = new Vector<AccessibleValueListener>();
+		if (accessibleValueListeners == null) accessibleValueListeners = new ArrayList<AccessibleValueListener>();
 		accessibleValueListeners.add(listener);
 	}
 
@@ -821,7 +822,7 @@ public class Accessible {
 	public void addAccessibleAttributeListener(AccessibleAttributeListener listener) {
 		checkWidget();
 		if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		if (accessibleAttributeListeners == null) accessibleAttributeListeners = new Vector<AccessibleAttributeListener>();
+		if (accessibleAttributeListeners == null) accessibleAttributeListeners = new ArrayList<AccessibleAttributeListener>();
 		accessibleAttributeListeners.add(listener);
 	}
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java
index be790c5516..7940d1cacf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java
@@ -11,6 +11,7 @@
 package org.eclipse.swt.browser;
 
 import java.util.*;
+import java.util.List;
 
 import org.eclipse.swt.*;
 import org.eclipse.swt.widgets.*;
@@ -33,8 +34,8 @@ abstract class WebBrowser {
 	static final String ERROR_ID = "org.eclipse.swt.browser.error"; // $NON-NLS-1$
 	static final String EXECUTE_ID = "SWTExecuteTemporaryFunction"; // $NON-NLS-1$
 
-	static Vector<String[]> NativePendingCookies = new Vector<String[]> ();
-	static Vector<String[]> MozillaPendingCookies = new Vector<String[]> ();
+	static List<String[]> NativePendingCookies = new ArrayList<String[]> ();
+	static List<String[]> MozillaPendingCookies = new ArrayList<String[]> ();
 	static String CookieName, CookieValue, CookieUrl;
 	static boolean CookieResult;
 	static Runnable MozillaClearSessions, NativeClearSessions;
@@ -293,7 +294,7 @@ public static boolean SetCookie (String value, String url, boolean addToPending)
 	return CookieResult;
 }
 
-static void SetPendingCookies (Vector<String[]> pendingCookies) {
+static void SetPendingCookies (List<String[]> pendingCookies) {
 	for (String[] current : pendingCookies) {
 		SetCookie (current[0], current[1], false);
 	}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/DefaultContent.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/DefaultContent.java
index 429f64a174..5cc953dcbb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/DefaultContent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/DefaultContent.java
@@ -10,16 +10,17 @@
  *******************************************************************************/
 package org.eclipse.swt.custom;
 
+import java.util.*;
+import java.util.List;
+
 import org.eclipse.swt.*;
-import org.eclipse.swt.internal.Compatibility;
+import org.eclipse.swt.internal.*;
 import org.eclipse.swt.widgets.*;
 
-import java.util.Vector;
-
 class DefaultContent implements StyledTextContent {
 	private final static String LineDelimiter = System.getProperty("line.separator");
 
-	Vector<StyledTextListener> textListeners = new Vector<StyledTextListener>(); // stores text listeners for event sending
+	List<StyledTextListener> textListeners = new ArrayList<StyledTextListener>(); // stores text listeners for event sending
 	char[] textStore = new char[0];	// stores the actual text
 	int gapStart = -1;	// the character position start of the gap
 	int gapEnd = -1;	// the character position after the end of the gap
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
index 324542a70f..2ea2882468 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
@@ -12,6 +12,7 @@ package org.eclipse.swt.custom;
 
 
 import java.util.*;
+import java.util.List;
 
 import org.eclipse.swt.*;
 import org.eclipse.swt.accessibility.*;
@@ -677,8 +678,8 @@ public class StyledText extends Canvas {
 	class RTFWriter extends TextWriter {
 		static final int DEFAULT_FOREGROUND = 0;
 		static final int DEFAULT_BACKGROUND = 1;
-		Vector<Color> colorTable;
-		Vector<Font> fontTable;
+		List<Color> colorTable;
+		List<Font> fontTable;
 		boolean WriteUnicode;
 		
 	/**
@@ -692,8 +693,8 @@ public class StyledText extends Canvas {
 	 */
 	public RTFWriter(int start, int length) {
 		super(start, length);
-		colorTable = new Vector<Color>();
-		fontTable = new Vector<Font>();
+		colorTable = new ArrayList<Color>();
+		fontTable = new ArrayList<Font>();
 		colorTable.add(getForeground());
 		colorTable.add(getBackground());
 		fontTable.add(getFont());
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
index d6f9c7a8f4..6cb059a9c9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
@@ -57,7 +57,7 @@ class Mozilla extends WebBrowser {
 	boolean updateLastNavigateUrl;
 	Shell tip = null;
 	Listener listener;
-	Vector<LONG> unhookedDOMWindows = new Vector<LONG> ();
+	List<LONG> unhookedDOMWindows = new ArrayList<LONG> ();
 	String lastNavigateURL;
 	byte[] htmlBytes;
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java
index 5c79ba8a30..0a4718ad22 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java
@@ -12,10 +12,10 @@ package org.eclipse.swt.browser;
 
 import java.io.File;
 import java.util.*;
+import java.util.List;
 
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.internal.*;
 import org.eclipse.swt.internal.mozilla.*;
 import org.eclipse.swt.internal.win32.*;
@@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.*;
 
 class MozillaDelegate {
 	Browser browser;
-	Vector<Composite> childWindows = new Vector<Composite> (9);
+	List<Composite> childWindows = new ArrayList<Composite> (9);
 	static long /*int*/ MozillaProc;
 	static Callback SubclassProc;
 	
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoader.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoader.java
index ca43c171d2..a5b7f37698 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoader.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoader.java
@@ -12,9 +12,10 @@ package org.eclipse.swt.graphics;
 
 
 import java.io.*;
-import java.util.Vector;
+import java.util.*;
+
 import org.eclipse.swt.*;
-import org.eclipse.swt.internal.Compatibility;
+import org.eclipse.swt.internal.*;
 import org.eclipse.swt.internal.image.*;
 
 /**
@@ -100,7 +101,7 @@ public class ImageLoader {
 	/*
 	 * the set of ImageLoader event listeners, created on demand
 	 */
-	Vector<ImageLoaderListener> imageLoaderListeners;
+	List<ImageLoaderListener> imageLoaderListeners;
 
 /**
  * Construct a new empty ImageLoader.
@@ -285,7 +286,7 @@ public void save(String filename, int format) {
 public void addImageLoaderListener(ImageLoaderListener listener) {
 	if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
 	if (imageLoaderListeners == null) {
-		imageLoaderListeners = new Vector<ImageLoaderListener>();
+		imageLoaderListeners = new ArrayList<ImageLoaderListener>();
 	}
 	imageLoaderListeners.add(listener);
 }