*** empty log message ***

21 files changed, 2244 insertions, 203 deletions

diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/PerformanceTests.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/PerformanceTests.java
index 11dafb0e1e..b4050efae8 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/PerformanceTests.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/PerformanceTests.java
@@ -59,7 +59,7 @@ public PerformanceTests() {
 	addTest(Test_org_eclipse_swt_graphics_Image.suite());
 	addTest(Test_org_eclipse_swt_graphics_Cursor.suite());
 	addTest(Test_org_eclipse_swt_graphics_DeviceData.suite());
-	addTest(Test_org_eclipse_swt_graphics_ImageLoaderEvent.suite());
+//	addTest(Test_org_eclipse_swt_graphics_ImageLoaderEvent.suite());
 	addTest(Test_org_eclipse_swt_graphics_RGB.suite());
 	addTest(Test_org_eclipse_swt_graphics_Font.suite());
 	addTest(Test_org_eclipse_swt_graphics_Rectangle.suite());
@@ -91,7 +91,7 @@ public PerformanceTests() {
 //	addTest(Test_org_eclipse_swt_widgets_Shell.suite());
 //	//addTest(Test_org_eclipse_swt_widgets_Decorations.suite());
 //	addTest(Test_org_eclipse_swt_widgets_Label.suite());
-//	addTest(Test_org_eclipse_swt_widgets_Button.suite());
+	addTest(Test_org_eclipse_swt_widgets_Button.suite());
 //	addTest(Test_org_eclipse_swt_widgets_List.suite());
 //	addTest(Test_org_eclipse_swt_widgets_Text.suite());
 //	addTest(Test_org_eclipse_swt_widgets_ScrollBar.suite());
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/SwtPerformanceTestCase.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/SwtPerformanceTestCase.java
index 580dc36d5f..15b6a3d07a 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/SwtPerformanceTestCase.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/SwtPerformanceTestCase.java
@@ -43,7 +43,9 @@ protected PerformanceMeter createMeter(String id) {
 	Performance performance = Performance.getDefault();
 	String scenarioId = performance.getDefaultScenarioId(this);
 	if (id != null) scenarioId += ": " + id;
-	return performance.createPerformanceMeter(scenarioId);
+	PerformanceMeter meter = performance.createPerformanceMeter(scenarioId);
+	performance.tagAsSummary(meter, id, Dimension.CPU_TIME);
+	return meter;
 }
 
 protected void disposeMeter(PerformanceMeter meter) {
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Color.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Color.java
index 9bfb37d7fe..2b401ffbb1 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Color.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Color.java
@@ -23,7 +23,6 @@ import org.eclipse.test.performance.PerformanceMeter;
  * @see org.eclipse.swt.graphics.Color
  */
 public class Test_org_eclipse_swt_graphics_Color extends SwtPerformanceTestCase {
-	static final int COUNT = 10000;
 
 public Test_org_eclipse_swt_graphics_Color(String name) {
 	super(name);
@@ -39,6 +38,8 @@ protected void setUp() throws Exception {
 }
 
 public void test_ConstructorLorg_eclipse_swt_graphics_DeviceIII() {
+	final int COUNT = 3000000;
+	
 	Color[] colors = new Color [COUNT];
 
 	PerformanceMeter meter = createMeter();
@@ -56,6 +57,8 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceIII() {
 }
 
 public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_RGB() {
+	final int COUNT = 2500000;	// 5000000 causes OOM
+	
 	Color[] colors = new Color [COUNT];
 	RGB rgb = new RGB(102, 255, 3);
 
@@ -74,6 +77,8 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_gra
 }
 
 public void test_dispose() {
+	final int COUNT = 1000000;	// 5000000 causes OOM 
+	
 	Color[] colors = new Color [COUNT];
 	for (int i = 0; i < COUNT; i++) {
 		colors[i] = new Color(display, 255,0,128);
@@ -99,6 +104,8 @@ public void test_dispose() {
 }
 
 public void test_equalsLjava_lang_Object() {
+	final int COUNT = 60000000;
+	
 	Color color1 = new Color(display, 0, 128, 255);
 	Color color2 = new Color(display, 0, 128, 255);
 	
@@ -131,6 +138,8 @@ public void test_equalsLjava_lang_Object() {
 }
 
 public void test_getBlue() {
+	final int COUNT = 300000000;
+	
 	Color color = new Color(display, 128, 64, 255);
 	
 	PerformanceMeter meter = createMeter();
@@ -146,6 +155,8 @@ public void test_getBlue() {
 }
 
 public void test_getGreen() {
+	final int COUNT = 300000000;
+	
 	Color color = new Color(display, 128, 64, 255);
 	
 	PerformanceMeter meter = createMeter();
@@ -161,6 +172,8 @@ public void test_getGreen() {
 }
 
 public void test_getRGB() {
+	final int COUNT = 20000000;
+	
 	Color color = new Color(display, 128, 64, 255);
 	
 	PerformanceMeter meter = createMeter();
@@ -176,6 +189,8 @@ public void test_getRGB() {
 }
 
 public void test_getRed() {
+	final int COUNT = 300000000;
+	
 	Color color = new Color(display, 128, 64, 255);
 	
 	PerformanceMeter meter = createMeter();
@@ -191,6 +206,8 @@ public void test_getRed() {
 }
 
 public void test_hashCode() {
+	final int COUNT = 600000000;
+	
 	Color color = new Color(display, 128, 64, 255);
 	
 	PerformanceMeter meter = createMeter();
@@ -206,6 +223,8 @@ public void test_hashCode() {
 }
 
 public void test_isDisposed() {
+	final int COUNT = 600000000;
+	
 	Color color = new Color(display, 128, 128, 128);
 	
 	PerformanceMeter meter = createMeter("not disposed");
@@ -229,10 +248,6 @@ public void test_isDisposed() {
 	disposeMeter(meter);
 }
 
-public void test_win32_newLorg_eclipse_swt_graphics_DeviceI() {
-	// do not test - Windows platform only
-}
-
 public static Test suite() {
 	TestSuite suite = new TestSuite();
 	java.util.Vector methodNames = methodNames();
@@ -254,7 +269,6 @@ public static java.util.Vector methodNames() {
 	methodNames.addElement("test_getRed");
 	methodNames.addElement("test_hashCode");
 	methodNames.addElement("test_isDisposed");
-	methodNames.addElement("test_win32_newLorg_eclipse_swt_graphics_DeviceI");
 	return methodNames;
 }
 protected void runTest() throws Throwable {
@@ -268,7 +282,6 @@ protected void runTest() throws Throwable {
 	else if (getName().equals("test_getRed")) test_getRed();
 	else if (getName().equals("test_hashCode")) test_hashCode();
 	else if (getName().equals("test_isDisposed")) test_isDisposed();
-	else if (getName().equals("test_win32_newLorg_eclipse_swt_graphics_DeviceI")) test_win32_newLorg_eclipse_swt_graphics_DeviceI();
 }
 
 /* custom */
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Cursor.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Cursor.java
index 51a60e857e..d4629a2261 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Cursor.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Cursor.java
@@ -27,7 +27,6 @@ import org.eclipse.test.performance.PerformanceMeter;
  * @see org.eclipse.swt.graphics.Cursor
  */
 public class Test_org_eclipse_swt_graphics_Cursor extends SwtPerformanceTestCase {
-	static final int COUNT = 10000;
 
 public Test_org_eclipse_swt_graphics_Cursor(String name) {
 	super(name);
@@ -43,6 +42,8 @@ protected void setUp() throws Exception {
 }
 
 public void test_ConstructorLorg_eclipse_swt_graphics_DeviceI() {
+	final int COUNT = 600000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	Cursor[] cursors = new Cursor [COUNT];
@@ -63,6 +64,8 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_gra
 }
 
 public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageDataLorg_eclipse_swt_graphics_ImageDataII() {
+	final int COUNT = 1000000;
+	
 	int numFormats = imageFormats.length;
 	String fileName = imageFilenames[0];
 	for (int i = 0; i < numFormats; i++) {
@@ -100,6 +103,8 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_gra
 	}
 }
 public void test_dispose() {
+	final int COUNT = 2000000;
+	
 	Cursor[] cursors = new Cursor [COUNT];
 	for (int i = 0; i < COUNT; i++) {
 		cursors[i] = new Cursor(display, SWT.CURSOR_ARROW);
@@ -125,6 +130,8 @@ public void test_dispose() {
 }
 
 public void test_equalsLjava_lang_Object() {
+	final int COUNT = 60000000;
+	
 	/* 
 	 * Note: Two cursors are only considered equal if their handles are equal.
 	 * So since Windows reuses cursor handles, and other platforms do not,
@@ -147,6 +154,8 @@ public void test_equalsLjava_lang_Object() {
 }
 
 public void test_hashCode() {
+	final int COUNT = 600000000;
+	
 	Cursor cursor = new Cursor(display, SWT.CURSOR_WAIT);
 	
 	PerformanceMeter meter = createMeter();
@@ -162,6 +171,8 @@ public void test_hashCode() {
 }
 
 public void test_isDisposed() {
+	final int COUNT = 500000000;
+	
 	Cursor cursor = new Cursor(display, SWT.CURSOR_WAIT);
 	
 	PerformanceMeter meter = createMeter("not disposed");
@@ -185,10 +196,6 @@ public void test_isDisposed() {
 	disposeMeter(meter);
 }
 
-public void test_win32_newLorg_eclipse_swt_graphics_DeviceI() {
-	// do not test - Windows only
-}
-
 public static Test suite() {
 	TestSuite suite = new TestSuite();
 	java.util.Vector methodNames = methodNames();
@@ -207,7 +214,6 @@ public static java.util.Vector methodNames() {
 	methodNames.addElement("test_equalsLjava_lang_Object");
 	methodNames.addElement("test_hashCode");
 	methodNames.addElement("test_isDisposed");
-	methodNames.addElement("test_win32_newLorg_eclipse_swt_graphics_DeviceI");
 	return methodNames;
 }
 protected void runTest() throws Throwable {
@@ -218,7 +224,6 @@ protected void runTest() throws Throwable {
 	else if (getName().equals("test_equalsLjava_lang_Object")) test_equalsLjava_lang_Object();
 	else if (getName().equals("test_hashCode")) test_hashCode();
 	else if (getName().equals("test_isDisposed")) test_isDisposed();
-	else if (getName().equals("test_win32_newLorg_eclipse_swt_graphics_DeviceI")) test_win32_newLorg_eclipse_swt_graphics_DeviceI();
 }
 
 /* custom */
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_DeviceData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_DeviceData.java
index 395107f81a..4c33abe0ff 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_DeviceData.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_DeviceData.java
@@ -22,7 +22,6 @@ import org.eclipse.test.performance.PerformanceMeter;
  * @see org.eclipse.swt.graphics.DeviceData
  */
 public class Test_org_eclipse_swt_graphics_DeviceData extends SwtPerformanceTestCase {
-	static final int COUNT = 1000;
 
 public Test_org_eclipse_swt_graphics_DeviceData(String name) {
 	super(name);
@@ -33,6 +32,8 @@ public static void main(String[] args) {
 }
 
 public void test_Constructor() {
+	final int COUNT = 40000000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Font.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Font.java
index f5514b105e..9712cc4e40 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Font.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Font.java
@@ -26,7 +26,6 @@ import junit.textui.*;
  * @see org.eclipse.swt.graphics.Font
  */
 public class Test_org_eclipse_swt_graphics_Font extends SwtPerformanceTestCase {
-	static final int COUNT = 1000;
 	Display display;
 
 public Test_org_eclipse_swt_graphics_Font(String name) {
@@ -43,6 +42,8 @@ protected void setUp() throws Exception {
 }
 
 public void test_ConstructorLorg_eclipse_swt_graphics_Device$Lorg_eclipse_swt_graphics_FontData() {
+	final int COUNT = 10000;	// 20000 causes No More Handles
+	
 	FontData[] data = new FontData [1];
 	data[0] = new FontData (SwtJunit.testFontName, 10, SWT.BOLD | SWT.ITALIC); 
 	Font[] fonts = new Font[COUNT];
@@ -62,6 +63,8 @@ public void test_ConstructorLorg_eclipse_swt_graphics_Device$Lorg_eclipse_swt_gr
 }
 
 public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_FontData() {
+	final int COUNT = 10000;	// 20000 causes No More Handles
+	
 	FontData data = new FontData (SwtJunit.testFontName, 10, SWT.BOLD | SWT.ITALIC);
 	Font[] fonts = new Font[COUNT];
 	
@@ -80,6 +83,8 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_gra
 }
 
 public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_StringII() {
+	final int COUNT = 10000;	// 20000 causes No More Handles
+	
 	Font[] fonts = new Font[COUNT];
 	
 	PerformanceMeter meter = createMeter("no name");
@@ -182,6 +187,8 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_StringII(
 }
 
 public void test_dispose() {
+	final int COUNT = 10000;	// 20000 causes No More Handles
+	
 	Font[] fonts = new Font [COUNT];
 	for (int i = 0; i < COUNT; i++) {
 		fonts[i] = new Font(display, SwtJunit.testFontName, 10, SWT.NORMAL);
@@ -207,6 +214,8 @@ public void test_dispose() {
 }
 
 public void test_equalsLjava_lang_Object() {
+	final int COUNT = 60000000;
+	
 	// Fonts are only equal if their handles are the same
 	Font font = new Font(display, SwtJunit.testFontName, 10, SWT.NORMAL);
 
@@ -238,6 +247,8 @@ public void test_equalsLjava_lang_Object() {
 }
 
 public void test_getFontData() {
+	final int COUNT = 300000;
+	
 	Font font = new Font(display, SwtJunit.testFontName, 40, SWT.BOLD | SWT.ITALIC);
 	
 	PerformanceMeter meter = createMeter();
@@ -253,6 +264,8 @@ public void test_getFontData() {
 }
 
 public void test_hashCode() {
+	final int COUNT = 600000000;
+	
 	Font font = new Font(display, SwtJunit.testFontName, 40, SWT.BOLD | SWT.ITALIC);
 	
 	PerformanceMeter meter = createMeter();
@@ -268,6 +281,8 @@ public void test_hashCode() {
 }
 
 public void test_isDisposed() {
+	final int COUNT = 500000000;
+	
 	Font font = new Font(display, SwtJunit.testFontName, 10, SWT.NORMAL);
 	
 	PerformanceMeter meter = createMeter("not disposed");
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_FontData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_FontData.java
index 51576331cf..6b0465df65 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_FontData.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_FontData.java
@@ -24,7 +24,6 @@ import org.eclipse.test.performance.PerformanceMeter;
  * @see org.eclipse.swt.graphics.FontData
  */
 public class Test_org_eclipse_swt_graphics_FontData extends SwtPerformanceTestCase {
-	static final int COUNT = 10000;
 
 public Test_org_eclipse_swt_graphics_FontData(String name) {
 	super(name);
@@ -35,6 +34,8 @@ public static void main(String[] args) {
 }
 
 public void test_Constructor() {
+	final int COUNT = 6000000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -45,6 +46,8 @@ public void test_Constructor() {
 }
 
 public void test_ConstructorLjava_lang_String() {
+	final int COUNT = 300000;
+	
 	FontData fd = new FontData(SwtJunit.testFontName, 10, SWT.NORMAL);
 	String fdString = fd.toString();
 	
@@ -58,6 +61,8 @@ public void test_ConstructorLjava_lang_String() {
 }
 
 public void test_ConstructorLjava_lang_StringII() {
+	final int COUNT = 2000000;
+	
 	FontData fd = new FontData(SwtJunit.testFontName, 10, SWT.NORMAL);
 	String fdString = fd.toString();
 	
@@ -72,6 +77,8 @@ public void test_ConstructorLjava_lang_StringII() {
 }
 
 public void test_equalsLjava_lang_Object() {
+	final int COUNT = 3000000;
+	
 	FontData fd1 = new FontData(SwtJunit.testFontName, 10, SWT.NORMAL);
 	FontData fd2 = new FontData(SwtJunit.testFontName, 10, SWT.NORMAL);
 	FontData fd3 = new FontData(SwtJunit.testFontName, 12, SWT.NORMAL);
@@ -93,7 +100,24 @@ public void test_equalsLjava_lang_Object() {
 	disposeMeter(meter);
 }
 
+public void test_getHeight() {
+	final int COUNT = 600000000;
+	
+	FontData data = new FontData(SwtJunit.testFontName, 10, SWT.NORMAL);
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		data.getHeight();
+	}
+	meter.stop();
+	
+	disposeMeter(meter);
+}
+
 public void test_getLocale() {
+	final int COUNT = 6000000;
+	
 	FontData data = new FontData(SwtJunit.testFontName, 10, SWT.NORMAL);
 	
 	PerformanceMeter meter = createMeter();
@@ -106,7 +130,39 @@ public void test_getLocale() {
 	disposeMeter(meter);
 }
 
+public void test_getName() {
+	final int COUNT = 6000000;
+	
+	FontData data = new FontData(SwtJunit.testFontName, 10, SWT.NORMAL);
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		data.getName();
+	}
+	meter.stop();
+	
+	disposeMeter(meter);
+}
+
+public void test_getStyle() {
+	final int COUNT = 300000000;
+	
+	FontData data = new FontData(SwtJunit.testFontName, 10, SWT.NORMAL);
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		data.getStyle();
+	}
+	meter.stop();
+	
+	disposeMeter(meter);
+}
+
 public void test_hashCode() {
+	final int COUNT = 4000000;
+	
 	FontData data = new FontData(SwtJunit.testFontName, 10, SWT.NORMAL);
 	
 	PerformanceMeter meter = createMeter();
@@ -120,7 +176,24 @@ public void test_hashCode() {
 
 }
 
+public void test_setHeightI() {
+	final int COUNT = 360000000;
+	
+	FontData data = new FontData(SwtJunit.testFontName, 10, SWT.NORMAL);
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		data.setHeight(12);
+	}
+	meter.stop();
+	
+	disposeMeter(meter);
+}
+
 public void test_setLocaleLjava_lang_String() {
+	final int COUNT = 20000;
+	
 	FontData data = new FontData(SwtJunit.testFontName, 10, SWT.NORMAL);
 	String localeString = Locale.ENGLISH.toString();
 	
@@ -134,6 +207,39 @@ public void test_setLocaleLjava_lang_String() {
 	disposeMeter(meter);
 }
 
+public void test_setNameLjava_lang_String() {
+	final int COUNT = 3000000;
+	
+	FontData data = new FontData(SwtJunit.testFontName, 10, SWT.NORMAL);
+	String name = "name";
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		data.setName(name);
+	}
+	meter.stop();
+	
+	disposeMeter(meter);
+}
+
+public void test_setStyleI() {
+	final int COUNT = 50000000;
+	
+	FontData data = new FontData(SwtJunit.testFontName, 10, SWT.NORMAL);
+	int style = SWT.ITALIC | SWT.BOLD;
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		data.setStyle(style);
+	}
+	meter.stop();
+	
+	disposeMeter(meter);
+}
+
+
 public void test_win32_newLorg_eclipse_swt_internal_win32_LOGFONTI() {
 	// do not test - Windows only
 }
@@ -153,9 +259,15 @@ public static java.util.Vector methodNames() {
 	methodNames.addElement("test_ConstructorLjava_lang_String");
 	methodNames.addElement("test_ConstructorLjava_lang_StringII");
 	methodNames.addElement("test_equalsLjava_lang_Object");
+	methodNames.addElement("test_getHeight");
 	methodNames.addElement("test_getLocale");
+	methodNames.addElement("test_getName");
+	methodNames.addElement("test_getStyle");
 	methodNames.addElement("test_hashCode");
+	methodNames.addElement("test_setHeightI");
 	methodNames.addElement("test_setLocaleLjava_lang_String");
+	methodNames.addElement("test_setNameLjava_lang_String");
+	methodNames.addElement("test_setStyleI");
 	methodNames.addElement("test_win32_newLorg_eclipse_swt_internal_win32_LOGFONTI");
 	return methodNames;
 }
@@ -164,9 +276,15 @@ protected void runTest() throws Throwable {
 	else if (getName().equals("test_ConstructorLjava_lang_String")) test_ConstructorLjava_lang_String();
 	else if (getName().equals("test_ConstructorLjava_lang_StringII")) test_ConstructorLjava_lang_StringII();
 	else if (getName().equals("test_equalsLjava_lang_Object")) test_equalsLjava_lang_Object();
+	else if (getName().equals("test_getHeight")) test_getHeight();
 	else if (getName().equals("test_getLocale")) test_getLocale();
+	else if (getName().equals("test_getName")) test_getName();
+	else if (getName().equals("test_getStyle")) test_getStyle();
 	else if (getName().equals("test_hashCode")) test_hashCode();
+	else if (getName().equals("test_setHeightI")) test_setHeightI();
 	else if (getName().equals("test_setLocaleLjava_lang_String")) test_setLocaleLjava_lang_String();
+	else if (getName().equals("test_setNameLjava_lang_String")) test_setNameLjava_lang_String();
+	else if (getName().equals("test_setStyleI")) test_setStyleI();
 	else if (getName().equals("test_win32_newLorg_eclipse_swt_internal_win32_LOGFONTI")) test_win32_newLorg_eclipse_swt_internal_win32_LOGFONTI();
 }
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_FontMetrics.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_FontMetrics.java
index f2f158ee6f..225980ddc6 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_FontMetrics.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_FontMetrics.java
@@ -24,7 +24,6 @@ import org.eclipse.test.performance.PerformanceMeter;
  * @see org.eclipse.swt.graphics.FontMetrics
  */
 public class Test_org_eclipse_swt_graphics_FontMetrics extends SwtPerformanceTestCase {
-	static final int COUNT = 1000;
 
 public Test_org_eclipse_swt_graphics_FontMetrics(String name) {
 	super(name);
@@ -48,6 +47,8 @@ protected void tearDown() throws Exception {
 }
 
 public void test_equalsLjava_lang_Object() {
+	final int COUNT = 50000000;
+	
 	FontMetrics fm1 = gc.getFontMetrics();
 	
 	Font oldFont = gc.getFont();
@@ -80,6 +81,8 @@ public void test_equalsLjava_lang_Object() {
 }
 
 public void test_getAscent() {
+	final int COUNT = 500000000;
+	
 	FontMetrics fm = gc.getFontMetrics();
 	
 	PerformanceMeter meter = createMeter();
@@ -92,6 +95,8 @@ public void test_getAscent() {
 }
 
 public void test_getAverageCharWidth() {
+	final int COUNT = 500000000;
+	
 	FontMetrics fm = gc.getFontMetrics();
 	
 	PerformanceMeter meter = createMeter();
@@ -105,6 +110,8 @@ public void test_getAverageCharWidth() {
 }
 
 public void test_getDescent() {
+	final int COUNT = 500000000;
+	
 	FontMetrics fm = gc.getFontMetrics();
 	
 	PerformanceMeter meter = createMeter();
@@ -118,6 +125,8 @@ public void test_getDescent() {
 }
 
 public void test_getHeight() {
+	final int COUNT = 500000000;
+	
 	FontMetrics fm = gc.getFontMetrics();
 	
 	PerformanceMeter meter = createMeter();
@@ -131,6 +140,8 @@ public void test_getHeight() {
 }
 
 public void test_getLeading() {
+	final int COUNT = 500000000;
+	
 	FontMetrics fm = gc.getFontMetrics();
 	
 	PerformanceMeter meter = createMeter();
@@ -144,6 +155,8 @@ public void test_getLeading() {
 }
 
 public void test_hashCode() {
+	final int COUNT = 70000000;
+	
 	FontMetrics fm = gc.getFontMetrics();
 	
 	PerformanceMeter meter = createMeter();
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_GC.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_GC.java
index 595ee72988..6c05b732e4 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_GC.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_GC.java
@@ -25,7 +25,6 @@ import org.eclipse.test.performance.*;
  * @see org.eclipse.swt.graphics.GC
  */
 public class Test_org_eclipse_swt_graphics_GC extends SwtPerformanceTestCase {
-	static final int COUNT = 10000;
 
 public Test_org_eclipse_swt_graphics_GC(String name) {
 	super(name);
@@ -51,7 +50,8 @@ protected void tearDown() throws Exception {
 	shell.dispose();
 }
 public void test_ConstructorLorg_eclipse_swt_graphics_Drawable() {
-	final int count = COUNT / 10;
+	int count = 4000;	// 5000 causes No More Handles
+
 	Image[] images = new Image [count];
 	for (int i = 0; i < count; i++) {
 		images[i] = new Image(display, 10, 10);		
@@ -72,7 +72,7 @@ public void test_ConstructorLorg_eclipse_swt_graphics_Drawable() {
 	
 	disposeMeter(meter);
 
-	final int count2 = COUNT % 100;
+	count /= 10;
 	
 	Class printerClass = null;
 	try {
@@ -81,9 +81,9 @@ public void test_ConstructorLorg_eclipse_swt_graphics_Drawable() {
 		// Printer class not present (eSWT). Skip test.
 		return;
 	}
-	Object[] printers = new Object[count2];
+	Object[] printers = new Object[count];
 	try {
-		for (int i = 0; i < count2; i++) {
+		for (int i = 0; i < count; i++) {
 			printers[i] = printerClass.newInstance();
 		}
 	} catch (InstantiationException e1) {
@@ -94,20 +94,21 @@ public void test_ConstructorLorg_eclipse_swt_graphics_Drawable() {
 
 	meter = createMeter("printer");
 	meter.start();
-	for (int i = 0; i < count2; i++) {
+	for (int i = 0; i < count; i++) {
 		gcs[i] = new GC((Printer) printers[i]);
 	}
 	meter.stop();
 
-	for (int i = 0; i < count2; i++) {
+	for (int i = 0; i < count; i++) {
 		gcs[i].dispose();
+		((Printer)printers[i]).dispose();
 	}
 
 	disposeMeter(meter);
 }
 
 public void test_ConstructorLorg_eclipse_swt_graphics_DrawableI() {
-	final int count = COUNT / 10;
+	int count = 4000;	// 5000 causes No More Handles
 	
 	Image[] images = new Image[count];
 	for (int i = 0; i < count; i++) {
@@ -129,7 +130,8 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DrawableI() {
 	
 	disposeMeter(meter);
 
-	final int count2 = COUNT / 100;
+	count /= 10;
+	
 	Class printerClass = null;
 	try {
 		printerClass = Class.forName("org.eclipse.swt.printing.Printer");
@@ -137,9 +139,9 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DrawableI() {
 		// Printer class not present (eSWT). Skip test.
 		return;
 	}
-	Object[] printers = new Object[count2];
+	Object[] printers = new Object[count];
 	try {
-		for (int i = 0; i < count2; i++) {
+		for (int i = 0; i < count; i++) {
 			printers[i] = printerClass.newInstance();
 		}
 	} catch (InstantiationException e1) {
@@ -150,19 +152,22 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DrawableI() {
 
 	meter = createMeter("printer");
 	meter.start();
-	for (int i = 0; i < count2; i++) {
+	for (int i = 0; i < count; i++) {
 		gcs[i] = new GC((Printer) printers[i], SWT.RIGHT_TO_LEFT);
 	}
 	meter.stop();
 
-	for (int i = 0; i < count2; i++) {
+	for (int i = 0; i < count; i++) {
 		gcs[i].dispose();
+		((Printer)printers[i]).dispose();
 	}
 
 	disposeMeter(meter);
 }
 
 public void test_copyAreaIIIIII() {
+	final int COUNT = 1500000;
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -191,6 +196,8 @@ public void test_copyAreaIIIIII() {
 }
 
 public void test_copyAreaLorg_eclipse_swt_graphics_ImageII() {
+	final int COUNT = 4000;	// 5000 causes No More Handles
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -208,21 +215,19 @@ public void test_copyAreaLorg_eclipse_swt_graphics_ImageII() {
 	gc.drawLine(5, 5, 10, 10);
 	gc.drawLine(5, 10, 10, 5);
 	
-	final int count = COUNT / 10;
-	
-	Image[] images = new Image[count];
-	for (int i = 0; i < count; i++) {
+	Image[] images = new Image[COUNT];
+	for (int i = 0; i < COUNT; i++) {
 		images[i] = new Image(display, 15, 15);
 	}
 
 	PerformanceMeter meter = createMeter();
 	meter.start();
-	for (int i = 0; i < count; i++) {
+	for (int i = 0; i < COUNT; i++) {
 		gc.copyArea(images[i], coords[i][0], coords[i][1]);
 	}
 	meter.stop();
 
-	for (int i = 0; i < count; i++) {
+	for (int i = 0; i < COUNT; i++) {
 		images[i].dispose();
 	}
 
@@ -230,24 +235,23 @@ public void test_copyAreaLorg_eclipse_swt_graphics_ImageII() {
 }
 
 public void test_dispose() {
-	final int count = COUNT / 10;
-	Image[] images = new Image [count];
-	for (int i = 0; i < count; i++) {
-		images[i] = new Image(display, 10, 10); 
-	}
-	GC[] gcs = new GC [count];
-	for (int i = 0; i < count; i++) {
+	final int COUNT = 2000;	// 4000 causes No More Handles
+
+	Image[] images = new Image [COUNT];
+	GC[] gcs = new GC [COUNT];
+	for (int i = 0; i < COUNT; i++) {
+		images[i] = new Image(display, 10, 10);
 		gcs[i] = new GC(images[i]);
 	}
-
+	
 	PerformanceMeter meter = createMeter("not disposed");
 	meter.start();
-	for (int i = 0; i < count; i++) {
+	for (int i = 0; i < COUNT; i++) {
 		gcs[i].dispose();	// dispose
 	}
 	meter.stop();
 
-    for (int i = 0; i < count; i++) {
+    for (int i = 0; i < COUNT; i++) {
     	images[i].dispose();
     }
 
@@ -255,7 +259,7 @@ public void test_dispose() {
 
 	meter = createMeter("disposed");
 	meter.start();
-	for (int i = 0; i < count; i++) {
+	for (int i = 0; i < COUNT; i++) {
 		gcs[i].dispose();	// dispose disposed
 	}
 	meter.stop();
@@ -264,6 +268,8 @@ public void test_dispose() {
 }
 
 public void test_drawArcIIIIII() {
+	final int COUNT = 200000;
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -285,6 +291,8 @@ public void test_drawArcIIIIII() {
 }
 
 public void test_drawFocusIIII() {
+	final int COUNT = 750000;
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -306,11 +314,13 @@ public void test_drawFocusIIII() {
 }
 
 public void test_drawImageLorg_eclipse_swt_graphics_ImageII() {
+	int count = 120000;
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
-	final int[][] coords = new int[COUNT][];
+	final int[][] coords = new int[count][];
 	int y = 0;
-	for (int i = 0; i < COUNT; i++) {
+	for (int i = 0; i < count; i++) {
 		int x = i % bounds.width;
 		coords[i] = new int[] {x,y};
 		if (x == 0) y += 3;
@@ -346,27 +356,31 @@ public void test_drawImageLorg_eclipse_swt_graphics_ImageII() {
 	try {
 		PerformanceMeter meter = createMeter("normal");
 		meter.start();
-		for (int i = 0; i < COUNT; i++) {
+		for (int i = 0; i < count; i++) {
 			gc.drawImage(imageNormal, coords[i][0], coords[i][1]);	// normal image
 		}
 		meter.stop();
 		
 		disposeMeter(meter);
 	
+		count /= 100;
+		
 		meter = createMeter("transparent");
 		Performance performance = Performance.getDefault();
-		performance.tagAsGlobalSummary(meter, "GC.drawImage() transparent * " + COUNT, Dimension.CPU_TIME);
+		performance.tagAsGlobalSummary(meter, "GC.drawImage() transparent * " + count, Dimension.CPU_TIME);
 		meter.start();
-		for (int i = 0; i < COUNT; i++) {
+		for (int i = 0; i < count; i++) {
 			gc.drawImage(imageTransparent, coords[i][0], coords[i][1]);	// transparent image
 		}
 		meter.stop();
 		
 		disposeMeter(meter);
 	
+		count *= 10;
+		
 		meter = createMeter("alpha");
 		meter.start();
-		for (int i = 0; i < COUNT; i++) {
+		for (int i = 0; i < count; i++) {
 			gc.drawImage(imageAlpha, coords[i][0], coords[i][1]);	// alpha image
 		}
 		meter.stop();
@@ -421,6 +435,8 @@ public void test_drawImageLorg_eclipse_swt_graphics_ImageIIIIIIII() {
 }
 
 public void test_drawLineIIII() {
+	final int COUNT = 750000;
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -442,6 +458,8 @@ public void test_drawLineIIII() {
 }
 
 public void test_drawOvalIIII() {
+	final int COUNT = 700000;
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -463,6 +481,8 @@ public void test_drawOvalIIII() {
 }
 
 public void test_drawPointII() {
+	final int COUNT = 1500000;
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -484,6 +504,8 @@ public void test_drawPointII() {
 }
 
 public void test_drawPolygon$I() {
+	final int COUNT = 750000;
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -505,6 +527,8 @@ public void test_drawPolygon$I() {
 }
 
 public void test_drawPolyline$I() {
+	final int COUNT = 550000;
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -526,6 +550,8 @@ public void test_drawPolyline$I() {
 }
 
 public void test_drawRectangleIIII() {
+	final int COUNT = 1200000;
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -547,6 +573,8 @@ public void test_drawRectangleIIII() {
 }
 
 public void test_drawRectangleLorg_eclipse_swt_graphics_Rectangle() {
+	final int COUNT = 1200000;
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final Rectangle[] coords = new Rectangle[COUNT];
@@ -568,6 +596,8 @@ public void test_drawRectangleLorg_eclipse_swt_graphics_Rectangle() {
 }
 
 public void test_drawRoundRectangleIIIIII() {
+	final int COUNT = 400000;
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -589,6 +619,9 @@ public void test_drawRoundRectangleIIIIII() {
 }
 
 public void test_drawStringLjava_lang_StringII() {
+	final int COUNT = 600000;
+	final String STRING = "test string";
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -602,7 +635,7 @@ public void test_drawStringLjava_lang_StringII() {
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
-		gc.drawString("test string", coords[i][0], coords[i][1]);				
+		gc.drawString(STRING, coords[i][0], coords[i][1]);				
 	}
 	meter.stop();
 	
@@ -610,6 +643,9 @@ public void test_drawStringLjava_lang_StringII() {
 }
 
 public void test_drawStringLjava_lang_StringIIZ() {
+	final int COUNT = 600000;
+	final String STRING = "test string";
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -625,7 +661,7 @@ public void test_drawStringLjava_lang_StringIIZ() {
 	performance.tagAsGlobalSummary(meter, "GC.drawString () transparent * " + COUNT, Dimension.CPU_TIME);
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
-		gc.drawString("test string", coords[i][0], coords[i][1], true);				
+		gc.drawString(STRING, coords[i][0], coords[i][1], true);				
 	}
 	meter.stop();
 	
@@ -634,7 +670,7 @@ public void test_drawStringLjava_lang_StringIIZ() {
 	meter = createMeter("not transparent");
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
-		gc.drawString("test string", coords[i][0], coords[i][1], false);				
+		gc.drawString(STRING, coords[i][0], coords[i][1], false);				
 	}
 	meter.stop();
 	
@@ -642,6 +678,9 @@ public void test_drawStringLjava_lang_StringIIZ() {
 }
 
 public void test_drawTextLjava_lang_StringII() {
+	final int COUNT = 100000;
+	final String STRING = "test string";
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -655,7 +694,7 @@ public void test_drawTextLjava_lang_StringII() {
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
-		gc.drawText("test string", coords[i][0], coords[i][1], true);				
+		gc.drawText(STRING, coords[i][0], coords[i][1], true);				
 	}
 	meter.stop();
 	
@@ -663,6 +702,9 @@ public void test_drawTextLjava_lang_StringII() {
 }
 
 public void test_drawTextLjava_lang_StringIII() {
+	final int COUNT = 130000;
+	final String STRING = "\t\r\na&bc&";
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -676,7 +718,7 @@ public void test_drawTextLjava_lang_StringIII() {
 	PerformanceMeter meter = createMeter("transparent");
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
-		gc.drawText("\t\r\na&bc&", coords[i][0], coords[i][1], SWT.DRAW_TRANSPARENT);				
+		gc.drawText(STRING, coords[i][0], coords[i][1], SWT.DRAW_TRANSPARENT);				
 	}
 	meter.stop();
 	
@@ -685,7 +727,7 @@ public void test_drawTextLjava_lang_StringIII() {
 	meter = createMeter("delimiter");
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
-		gc.drawText("\t\r\na&bc&", coords[i][0], coords[i][1], SWT.DRAW_DELIMITER);				
+		gc.drawText(STRING, coords[i][0], coords[i][1], SWT.DRAW_DELIMITER);				
 	}
 	meter.stop();
 	
@@ -694,7 +736,7 @@ public void test_drawTextLjava_lang_StringIII() {
 	meter = createMeter("mnemonic");
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
-		gc.drawText("\t\r\na&bc&", coords[i][0], coords[i][1], SWT.DRAW_MNEMONIC);				
+		gc.drawText(STRING, coords[i][0], coords[i][1], SWT.DRAW_MNEMONIC);				
 	}
 	meter.stop();
 	
@@ -703,7 +745,7 @@ public void test_drawTextLjava_lang_StringIII() {
 	meter = createMeter("tab");
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
-		gc.drawText("\t\r\na&bc&", coords[i][0], coords[i][1], SWT.DRAW_TAB);				
+		gc.drawText(STRING, coords[i][0], coords[i][1], SWT.DRAW_TAB);				
 	}
 	meter.stop();
 	
@@ -712,7 +754,7 @@ public void test_drawTextLjava_lang_StringIII() {
 	meter = createMeter("no flags");
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
-		gc.drawText("\t\r\na&bc&", coords[i][0], coords[i][1], SWT.NONE);				
+		gc.drawText(STRING, coords[i][0], coords[i][1], SWT.NONE);				
 	}
 	meter.stop();
 	
@@ -720,6 +762,8 @@ public void test_drawTextLjava_lang_StringIII() {
 }
 
 public void test_drawTextLjava_lang_StringIIZ() {
+	final int COUNT = 120000;
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -750,6 +794,8 @@ public void test_drawTextLjava_lang_StringIIZ() {
 }
 
 public void test_equalsLjava_lang_Object() {
+	final int COUNT = 500000000;
+	
 	GC gc1 = new GC(display);
 	
 	PerformanceMeter meter = createMeter("equal");
@@ -780,6 +826,8 @@ public void test_equalsLjava_lang_Object() {
 }
 
 public void test_fillArcIIIIII() {
+	final int COUNT = 200000;
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -801,6 +849,8 @@ public void test_fillArcIIIIII() {
 }
 
 public void test_fillGradientRectangleIIIIZ() {
+	final int COUNT = 500000;
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -831,6 +881,8 @@ public void test_fillGradientRectangleIIIIZ() {
 }
 
 public void test_fillOvalIIII() {
+	final int COUNT = 750000;
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -852,6 +904,8 @@ public void test_fillOvalIIII() {
 }
 
 public void test_fillPolygon$I() {
+	final int COUNT = 700000;
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -873,6 +927,8 @@ public void test_fillPolygon$I() {
 }
 
 public void test_fillRectangleIIII() {
+	final int COUNT = 2000000;	// 3000000 caises OOM
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -894,6 +950,8 @@ public void test_fillRectangleIIII() {
 }
 
 public void test_fillRectangleLorg_eclipse_swt_graphics_Rectangle() {
+	final int COUNT = 2000000;	// 3000000 causes OOM
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final Rectangle[] coords = new Rectangle[COUNT];
@@ -915,6 +973,8 @@ public void test_fillRectangleLorg_eclipse_swt_graphics_Rectangle() {
 }
 
 public void test_fillRoundRectangleIIIIII() {
+	final int COUNT = 400000;
+	
 	// precompute points
 	Rectangle bounds = gc.getClipping();
 	final int[][] coords = new int[COUNT][];
@@ -936,6 +996,8 @@ public void test_fillRoundRectangleIIIIII() {
 }
 
 public void test_getAdvanceWidthC() {
+	final int COUNT = 2200000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -947,6 +1009,8 @@ public void test_getAdvanceWidthC() {
 }
 
 public void test_getBackground() {
+	final int COUNT = 15000000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -958,10 +1022,13 @@ public void test_getBackground() {
 }
 
 public void test_getCharWidthC() {
+	final int COUNT = 700000;
+	final char CHAR = 'a';
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
-		gc.getCharWidth('a');
+		gc.getCharWidth(CHAR);
 	}
 	meter.stop();
 	
@@ -969,6 +1036,8 @@ public void test_getCharWidthC() {
 }
 
 public void test_getClipping() {
+	final int COUNT = 1200000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -980,20 +1049,21 @@ public void test_getClipping() {
 }
 
 public void test_getClippingLorg_eclipse_swt_graphics_Region() {
-	final int count = COUNT / 10;
-	Region[] regions = new Region[count];
-	for (int i = 0; i < count; i++) {
+	final int COUNT = 4000;	// 5000 causes No More Handles
+	
+	Region[] regions = new Region[COUNT];
+	for (int i = 0; i < COUNT; i++) {
 		regions[i] = new Region(display);
 	}
 	
 	PerformanceMeter meter = createMeter();
 	meter.start();
-	for (int i = 0; i < count; i++) {
+	for (int i = 0; i < COUNT; i++) {
 		gc.getClipping(regions[i]);
 	}
 	meter.stop();
 	
-	for (int i = 0; i < count; i++) {
+	for (int i = 0; i < COUNT; i++) {
 		regions[i].dispose();
 	}
 	
@@ -1001,6 +1071,8 @@ public void test_getClippingLorg_eclipse_swt_graphics_Region() {
 }
 
 public void test_getFont() {
+	final int COUNT = 2000000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -1012,6 +1084,8 @@ public void test_getFont() {
 }
 
 public void test_getFontMetrics() {
+	final int COUNT = 1500000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -1023,6 +1097,8 @@ public void test_getFontMetrics() {
 }
 
 public void test_getForeground() {
+	final int COUNT = 15000000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -1034,6 +1110,8 @@ public void test_getForeground() {
 }
 
 public void test_getLineStyle() {
+	final int COUNT = 1200000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -1045,6 +1123,8 @@ public void test_getLineStyle() {
 }
 
 public void test_getLineWidth() {
+	final int COUNT = 1200000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -1056,6 +1136,8 @@ public void test_getLineWidth() {
 }
 
 public void test_getStyle() {
+	final int COUNT = 250000000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -1067,6 +1149,8 @@ public void test_getStyle() {
 }
 
 public void test_getXORMode() {
+	final int COUNT = 25000000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -1078,6 +1162,8 @@ public void test_getXORMode() {
 }
 
 public void test_hashCode() {
+	final int COUNT = 500000000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -1089,6 +1175,8 @@ public void test_hashCode() {
 }
 
 public void test_isClipped() {
+	final int COUNT = 1000000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -1100,6 +1188,8 @@ public void test_isClipped() {
 }
 
 public void test_isDisposed() {
+	final int COUNT = 500000000;
+	
 	GC gc = new GC(display);
 	
 	PerformanceMeter meter = createMeter("not disposed");
@@ -1124,6 +1214,8 @@ public void test_isDisposed() {
 }
 
 public void test_setBackgroundLorg_eclipse_swt_graphics_Color() {
+	final int COUNT = 22000000;
+	
 	final Color color = display.getSystemColor(SWT.COLOR_RED);
 	PerformanceMeter meter = createMeter();
 	meter.start();
@@ -1179,12 +1271,11 @@ public void test_setClippingLorg_eclipse_swt_graphics_Region() {
 
 public void test_setFontLorg_eclipse_swt_graphics_Font() {
 	// TODO
-	gc.setFont(shell.getDisplay().getSystemFont());
-	Font font = gc.getFont();
-	assertTrue(font.equals(shell.getDisplay().getSystemFont()));
 }
 
 public void test_setForegroundLorg_eclipse_swt_graphics_Color() {
+	final int COUNT = 25000000;
+	
 	final Color color = display.getSystemColor(SWT.COLOR_RED);
 	PerformanceMeter meter = createMeter();
 	meter.start();
@@ -1197,6 +1288,8 @@ public void test_setForegroundLorg_eclipse_swt_graphics_Color() {
 }
 
 public void test_setLineStyleI() {
+	final int COUNT = 450000;
+	
 	// precompute the styles
 	final int[] styles = new int[COUNT];
 	for (int i = 0; i < COUNT; i++) {
@@ -1220,6 +1313,8 @@ public void test_setLineStyleI() {
 }
 
 public void test_setLineWidthI() {
+	final int COUNT = 400000;
+	
 	// precompute the widths
 	final int[] widths = new int[COUNT];
 	for (int i = 0; i < COUNT; i++) {
@@ -1237,6 +1332,8 @@ public void test_setLineWidthI() {
 }
 
 public void test_setXORModeZ() {
+	final int COUNT = 25000000;
+	
 	// precompute the values
 	final boolean[] values = new boolean[COUNT];
 	for (int i = 0; i < COUNT; i++) {
@@ -1254,30 +1351,39 @@ public void test_setXORModeZ() {
 }
 
 public void test_stringExtentLjava_lang_String() {
+	final int COUNT = 1500000;
+	final String STRING = "test \t\nstring";
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
-		gc.stringExtent("test \t\nstring");
+		gc.stringExtent(STRING);
 	}
 	meter.stop();
 	disposeMeter(meter);
 }
 
 public void test_textExtentLjava_lang_String() {
+	final int COUNT = 200000;
+	final String STRING = "test \t\nstring";
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
-		gc.textExtent("test \t\nstring");
+		gc.textExtent(STRING);
 	}
 	meter.stop();
 	disposeMeter(meter);
 }
 
 public void test_textExtentLjava_lang_StringI() {
+	final int COUNT = 300000;
+	final String STRING = "\t\r\na&bc&";
+	
 	PerformanceMeter meter = createMeter("transparent");
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
-		gc.textExtent("\t\r\na&bc&", SWT.DRAW_TRANSPARENT);				
+		gc.textExtent(STRING, SWT.DRAW_TRANSPARENT);				
 	}
 	meter.stop();
 	
@@ -1286,7 +1392,7 @@ public void test_textExtentLjava_lang_StringI() {
 	meter = createMeter("delimiter");
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
-		gc.textExtent("\t\r\na&bc&", SWT.DRAW_DELIMITER);				
+		gc.textExtent(STRING, SWT.DRAW_DELIMITER);				
 	}
 	meter.stop();
 	
@@ -1320,14 +1426,6 @@ public void test_textExtentLjava_lang_StringI() {
 	disposeMeter(meter);
 }
 
-public void test_win32_newILorg_eclipse_swt_graphics_GCData() {
-	// do not test - Windows only
-}
-
-public void test_win32_newLorg_eclipse_swt_graphics_DrawableLorg_eclipse_swt_graphics_GCData() {
-	// do not test - Windows only
-}
-
 public static Test suite() {
 	TestSuite suite = new TestSuite();
 	java.util.Vector methodNames = methodNames();
@@ -1396,8 +1494,6 @@ public static java.util.Vector methodNames() {
 	methodNames.addElement("test_stringExtentLjava_lang_String");
 	methodNames.addElement("test_textExtentLjava_lang_String");
 	methodNames.addElement("test_textExtentLjava_lang_StringI");
-	methodNames.addElement("test_win32_newILorg_eclipse_swt_graphics_GCData");
-	methodNames.addElement("test_win32_newLorg_eclipse_swt_graphics_DrawableLorg_eclipse_swt_graphics_GCData");
 	return methodNames;
 }
 protected void runTest() throws Throwable {
@@ -1458,8 +1554,6 @@ protected void runTest() throws Throwable {
 	else if (getName().equals("test_stringExtentLjava_lang_String")) test_stringExtentLjava_lang_String();
 	else if (getName().equals("test_textExtentLjava_lang_String")) test_textExtentLjava_lang_String();
 	else if (getName().equals("test_textExtentLjava_lang_StringI")) test_textExtentLjava_lang_StringI();
-	else if (getName().equals("test_win32_newILorg_eclipse_swt_graphics_GCData")) test_win32_newILorg_eclipse_swt_graphics_GCData();
-	else if (getName().equals("test_win32_newLorg_eclipse_swt_graphics_DrawableLorg_eclipse_swt_graphics_GCData")) test_win32_newLorg_eclipse_swt_graphics_DrawableLorg_eclipse_swt_graphics_GCData();
 }
 
 /* custom */
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Image.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Image.java
index a379141a4f..312e5895a1 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Image.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Image.java
@@ -27,7 +27,6 @@ import org.eclipse.test.performance.PerformanceMeter;
  * @see org.eclipse.swt.graphics.Image
  */
 public class Test_org_eclipse_swt_graphics_Image extends SwtPerformanceTestCase {
-	static final int COUNT = 1000;
 
 public Test_org_eclipse_swt_graphics_Image(String name) {
 	super(name);
@@ -43,6 +42,8 @@ protected void setUp() throws Exception {
 }
 
 public void test_ConstructorLorg_eclipse_swt_graphics_DeviceII() {
+	final int COUNT = 7000;	// 8000 causes No More Handles error
+	
 	Image[] images = new Image[COUNT];
 	
 	PerformanceMeter meter = createMeter();
@@ -60,6 +61,7 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceII() {
 }
 
 public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageI() {
+	final int COUNT = 5000;
 	String name = getPath(imageFilenames[0] + "." + imageFormats[0]);
 	FileInputStream inStream = null;
 	try {
@@ -119,6 +121,8 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_gra
 }
 
 public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_Rectangle() {
+	final int COUNT = 5000;
+	
 	Image[] images = new Image[COUNT];
 	Rectangle rectangle = new Rectangle(0, 0, 100, 100);
 	
@@ -137,6 +141,8 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_gra
 }
 
 public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageData() {
+	final int COUNT = 7000;	// 8000 causes No More Handles error
+	
 	String name = getPath(imageFilenames[0] + "." + imageFormats[0]);
 	FileInputStream inStream = null;
 	try {
@@ -167,6 +173,8 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_gra
 }
 
 public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageDataLorg_eclipse_swt_graphics_ImageData() {
+	final int COUNT = 4000;	// 5000 causes an error
+	
 	Image[] images = new Image[COUNT];
 	String name = getPath(imageFilenames[0] + "." + imageFormats[0]);
 	FileInputStream inStream = null;
@@ -202,9 +210,11 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_io_InputStream
 }
 
 public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_String() {
+	final int COUNT = 2000;
+	
 	int numFileNames = imageFilenames.length;
 	int numFormats = imageFormats.length;
-	for (int k=0; k<numFileNames; k++) {
+	for (int k = 0; k < numFileNames; k++) {
 		String fileName = imageFilenames[k];
 		for (int i=0; i<numFormats; i++) {
 			String format = imageFormats[i];
@@ -228,6 +238,8 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_String()
 }
 
 public void test_dispose() {
+	final int COUNT = 7000;	// 8000 causes No More Handles error
+	
 	Image[] images = new Image [COUNT];
 	for (int i = 0; i < COUNT; i++) {
 		images[i] = new Image(display, 100, 100);
@@ -253,6 +265,8 @@ public void test_dispose() {
 }
 
 public void test_equalsLjava_lang_Object() {
+	final int COUNT = 70000000;
+	
 	ImageData imageData = new ImageData(10, 10, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)}));
 	Image image1 = new Image(display, imageData);
 	Image image2 = new Image(display, imageData);
@@ -286,6 +300,8 @@ public void test_equalsLjava_lang_Object() {
 }
 
 public void test_getBackground() {
+	final int COUNT = 60000000;
+	
 	Image image = new Image(display, 100, 100);
 	image.setBackground(display.getSystemColor(SWT.COLOR_GREEN));
 	
@@ -302,6 +318,8 @@ public void test_getBackground() {
 }
 
 public void test_getBounds() {
+	final int COUNT = 1200000;
+	
 	Image image = new Image(display, 10, 20);
 	
 	PerformanceMeter meter = createMeter();
@@ -317,6 +335,8 @@ public void test_getBounds() {
 }
 
 public void test_getImageData() {
+	final int COUNT = 50000;
+	
 	ImageData imageData = new ImageData(10, 10, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)}));
 	Image image = new Image(display, imageData);
 	
@@ -333,6 +353,8 @@ public void test_getImageData() {
 }
 
 public void test_hashCode() {
+	final int COUNT = 700000000;
+	
 	ImageData imageData = new ImageData(10, 10, 1, new PaletteData(new RGB[] {new RGB(0, 0, 0)}));
 	Image image = new Image(display, imageData);
 	
@@ -348,19 +370,9 @@ public void test_hashCode() {
 	disposeMeter(meter);
 }
 
-public void test_internal_new_GCLorg_eclipse_swt_graphics_GCData() {
-	// javadoc states:
-	// <b>IMPORTANT:</b> This method is <em>not</em> part of the public
-	// API for <code>Image</code>
-}
-
-public void test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData() {
-	// javadoc states:
-	// <b>IMPORTANT:</b> This method is <em>not</em> part of the public
-	// API for <code>Image</code>
-}
-
 public void test_isDisposed() {
+	final int COUNT = 500000000;
+	
 	Image image = new Image(display, 10, 10);
 	
 	PerformanceMeter meter = createMeter("not disposed");
@@ -385,6 +397,8 @@ public void test_isDisposed() {
 }
 
 public void test_setBackgroundLorg_eclipse_swt_graphics_Color() {
+	final int COUNT = 70000000;
+	
 	Image image = new Image(display, 100, 100);
 	Color color1 = display.getSystemColor(SWT.COLOR_GREEN);
 	Color color2 = display.getSystemColor(SWT.COLOR_RED);
@@ -402,10 +416,6 @@ public void test_setBackgroundLorg_eclipse_swt_graphics_Color() {
 	disposeMeter(meter);
 }
 
-public void test_win32_newLorg_eclipse_swt_graphics_DeviceII() {
-	// do not test - Windows only
-}
-
 public static Test suite() {
 	TestSuite suite = new TestSuite();
 	java.util.Vector methodNames = methodNames();
@@ -430,11 +440,8 @@ public static java.util.Vector methodNames() {
 	methodNames.addElement("test_getBounds");
 	methodNames.addElement("test_getImageData");
 	methodNames.addElement("test_hashCode");
-	methodNames.addElement("test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData");
-	methodNames.addElement("test_internal_new_GCLorg_eclipse_swt_graphics_GCData");
 	methodNames.addElement("test_isDisposed");
 	methodNames.addElement("test_setBackgroundLorg_eclipse_swt_graphics_Color");
-	methodNames.addElement("test_win32_newLorg_eclipse_swt_graphics_DeviceII");
 	return methodNames;
 }
 protected void runTest() throws Throwable {
@@ -451,11 +458,8 @@ protected void runTest() throws Throwable {
 	else if (getName().equals("test_getBounds")) test_getBounds();
 	else if (getName().equals("test_getImageData")) test_getImageData();
 	else if (getName().equals("test_hashCode")) test_hashCode();
-	else if (getName().equals("test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData")) test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData();
-	else if (getName().equals("test_internal_new_GCLorg_eclipse_swt_graphics_GCData")) test_internal_new_GCLorg_eclipse_swt_graphics_GCData();
 	else if (getName().equals("test_isDisposed")) test_isDisposed();
 	else if (getName().equals("test_setBackgroundLorg_eclipse_swt_graphics_Color")) test_setBackgroundLorg_eclipse_swt_graphics_Color();
-	else if (getName().equals("test_win32_newLorg_eclipse_swt_graphics_DeviceII")) test_win32_newLorg_eclipse_swt_graphics_DeviceII();
 }
 /* custom */
 Display display;
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_ImageData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_ImageData.java
index 05340c3d2b..0015fe2783 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_ImageData.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_ImageData.java
@@ -26,7 +26,6 @@ import junit.textui.*;
  * @see org.eclipse.swt.graphics.ImageData
  */
 public class Test_org_eclipse_swt_graphics_ImageData extends SwtPerformanceTestCase {
-	static final int COUNT = 1000;
 
 public Test_org_eclipse_swt_graphics_ImageData(String name) {
 	super(name);
@@ -42,12 +41,15 @@ protected void setUp() throws Exception {
 }
 
 public void test_ConstructorIIILorg_eclipse_swt_graphics_PaletteData() {
+	int count = 500000;
+	
 	int[] validDepths = {1, 2, 4, 8, 16, 24, 32};
 	PaletteData paletteData = new PaletteData(new RGB[] {new RGB(0, 0, 0)});
 	for (int i = 0; i < validDepths.length; i++) {
+		if (validDepths[i] % 8 == 0) count /= 2;
 		PerformanceMeter meter = createMeter("" + validDepths[i]);
 		meter.start();
-		for (int j = 0; j < COUNT; j++) {
+		for (int j = 0; j < count; j++) {
 			new ImageData(100, 100, validDepths[i], paletteData);
 		}
 		meter.stop();
@@ -56,6 +58,8 @@ public void test_ConstructorIIILorg_eclipse_swt_graphics_PaletteData() {
 }
 
 public void test_ConstructorIIILorg_eclipse_swt_graphics_PaletteDataI$B() {
+	final int COUNT = 7000000;
+	
 	PaletteData paletteData = new PaletteData(new RGB[] {new RGB(0, 0, 0)});
 	byte[] data = new byte[] {};
 	int[] validDepths = {1, 2, 4, 8, 16, 24, 32};
@@ -76,6 +80,8 @@ public void test_ConstructorLjava_io_InputStream() {
 }
 
 public void test_ConstructorLjava_lang_String() {
+	final int COUNT = 2500;
+	
 	// j2se and j2me(cdc) can load from a filename but, j2me(cldc) throws an exception
 	if (isJ2ME()) return;
 
@@ -100,6 +106,8 @@ public void test_ConstructorLjava_lang_String() {
 }
 
 public void test_clone() {
+	final int COUNT = 1500000;
+	
 	String name = getPath(imageFilenames[0] + "." + imageFormats[0]); 
 	FileInputStream inStream = null;
 	try {
@@ -126,6 +134,8 @@ public void test_clone() {
 }
 
 public void test_getAlphaII() {
+	final int COUNT = 60000000;
+	
 	imageData.setAlpha(0, 0, 0xAA);
 	
 	PerformanceMeter meter = createMeter();
@@ -139,6 +149,8 @@ public void test_getAlphaII() {
 }
 
 public void test_getAlphasIII$BI() {
+	final int COUNT = 14000000;
+	
 	byte value = (byte)0xAA;
 	byte[] values = new byte[] {value, (byte) (value+1), (byte) (value+2), (byte) (value+3), (byte) (value+4)};
 	byte[] alphaData = new byte[20];
@@ -155,6 +167,8 @@ public void test_getAlphasIII$BI() {
 }
 
 public void test_getPixelII() {
+	final int COUNT = 50000000;
+	
 	imageData.setPixel(0, 0, 0xAA);
 
 	PerformanceMeter meter = createMeter();
@@ -168,6 +182,8 @@ public void test_getPixelII() {
 }
 
 public void test_getPixelsIII$BI() {
+	final int COUNT = 14000000;
+	
 	byte[] pixelData = new byte[20];
 	PaletteData paletteData = new PaletteData(0xFF0000, 0xFF00, 0xFF);
 	imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 8, paletteData);
@@ -183,6 +199,8 @@ public void test_getPixelsIII$BI() {
 }
 
 public void test_getPixelsIII$II() {
+	final int COUNT = 10000000;
+	
 	int[] pixelData = new int[20];
 	PaletteData paletteData = new PaletteData(0xFF0000, 0xFF00, 0xFF);
 	imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 32, paletteData);
@@ -198,6 +216,8 @@ public void test_getPixelsIII$II() {
 }
 
 public void test_getRGBs() {
+	final int COUNT = 400000000;
+	
 	RGB[] rgbs = new RGB[]{new RGB(0, 0, 0), new RGB(255, 255, 255)};
 	imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 8, new PaletteData(rgbs));
 	
@@ -212,6 +232,8 @@ public void test_getRGBs() {
 }
 
 public void test_getTransparencyMask() {
+	final int COUNT = 200000;
+	
 	String name = getPath(transparentImageFilenames[0]);
 	FileInputStream inStream = null;
 	try {
@@ -239,6 +261,8 @@ public void test_getTransparencyMask() {
 }
 
 public void test_getTransparencyType() {
+	final int COUNT = 300000000;
+	
 	FileInputStream inStream = null;
 	String name = getPath(imageFilenames[0] + '.' + imageFormats[imageFormats.length-1]);
 	try {
@@ -265,17 +289,9 @@ public void test_getTransparencyType() {
 	disposeMeter(meter);
 }
 
-public void test_internal_newIIILorg_eclipse_swt_graphics_PaletteDataI$BI$B$BIIIIIII() {
-	// do not test internal API
-	// javadoc states:
-	// <b>IMPORTANT:</b> This method is <em>not</em> part of the public
-	// API for <code>ImageData</code>. It is marked public only so that it
-	// can be shared within the packages provided by SWT. It is subject
-	// to change without notice, and should never be called from
-	// application code.
-}
-
 public void test_scaledToII() {
+	final int COUNT = 100000;
+	
 	int imageDimension = 8;
 	RGB[] rgbs = new RGB[]{new RGB(0, 0, 0), new RGB(255, 255, 255)};
 	byte[] pixelData = new byte[(imageDimension*imageDimension) / 8];
@@ -294,6 +310,8 @@ public void test_scaledToII() {
 }
 
 public void test_setAlphaIII() {
+	final int COUNT = 80000000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -305,6 +323,8 @@ public void test_setAlphaIII() {
 }
 
 public void test_setAlphasIII$BI() {
+	final int COUNT = 15000000;
+	
 	byte value = (byte) 0xAA;
 	int OFFSET = 1;
 	byte[] alphaData = new byte[20];
@@ -323,6 +343,8 @@ public void test_setAlphasIII$BI() {
 }
 
 public void test_setPixelIII() {
+	final int COUNT = 50000000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -334,6 +356,8 @@ public void test_setPixelIII() {
 }
 
 public void test_setPixelsIII$BI() {
+	final int COUNT = 22000000;
+	
 	int OFFSET = 1;
 	byte[] values = new byte[]{0x1, 0x2, 0x3, 0xF, (byte)0xFF};
 	imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 8, new PaletteData(0xFF0000, 0xFF00, 0xFF));	
@@ -349,6 +373,8 @@ public void test_setPixelsIII$BI() {
 }
 
 public void test_setPixelsIII$II() {
+	final int COUNT = 20000000;
+	
 	int OFFSET = 1;
 	imageData = new ImageData(IMAGE_DIMENSION, IMAGE_DIMENSION, 32, new PaletteData(0xFF000000, 0xFF00, 0xFF));
 	int[] values = new int[]{0, 0xFF, 0xFFAA, 0xFF00AA00};
@@ -388,7 +414,6 @@ public static java.util.Vector methodNames() {
 	methodNames.addElement("test_getRGBs");
 	methodNames.addElement("test_getTransparencyMask");
 	methodNames.addElement("test_getTransparencyType");
-	methodNames.addElement("test_internal_newIIILorg_eclipse_swt_graphics_PaletteDataI$BI$B$BIIIIIII");
 	methodNames.addElement("test_scaledToII");
 	methodNames.addElement("test_setAlphaIII");
 	methodNames.addElement("test_setAlphasIII$BI");
@@ -411,7 +436,6 @@ protected void runTest() throws Throwable {
 	else if (getName().equals("test_getRGBs")) test_getRGBs();
 	else if (getName().equals("test_getTransparencyMask")) test_getTransparencyMask();
 	else if (getName().equals("test_getTransparencyType")) test_getTransparencyType();
-	else if (getName().equals("test_internal_newIIILorg_eclipse_swt_graphics_PaletteDataI$BI$B$BIIIIIII")) test_internal_newIIILorg_eclipse_swt_graphics_PaletteDataI$BI$B$BIIIIIII();
 	else if (getName().equals("test_scaledToII")) test_scaledToII();
 	else if (getName().equals("test_setAlphaIII")) test_setAlphaIII();
 	else if (getName().equals("test_setAlphasIII$BI")) test_setAlphasIII$BI();
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_ImageLoader.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_ImageLoader.java
index d547f332da..ffe55306bd 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_ImageLoader.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_ImageLoader.java
@@ -16,7 +16,6 @@ import java.io.*;
 import junit.framework.*;
 import junit.textui.*;
 
-import org.eclipse.swt.*;
 import org.eclipse.swt.graphics.*;
 import org.eclipse.test.performance.PerformanceMeter;
 
@@ -26,7 +25,6 @@ import org.eclipse.test.performance.PerformanceMeter;
  * @see org.eclipse.swt.graphics.ImageLoader
  */
 public class Test_org_eclipse_swt_graphics_ImageLoader extends SwtPerformanceTestCase {
-	static final int COUNT = 1000;
 
 public Test_org_eclipse_swt_graphics_ImageLoader(String name) {
 	super(name);
@@ -40,11 +38,61 @@ public void test_Constructor() {
 	ImageLoader loader = new ImageLoader();
 }
 
+public void test_addImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener() {
+	final int COUNT = 5000000;	// 6000000 causes OOM error
+	
+	ImageLoader loader = new ImageLoader();
+	ImageLoaderListener loaderListener = new ImageLoaderListener() {
+		public void imageDataLoaded(ImageLoaderEvent e) {
+		};
+	};
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		loader.addImageLoaderListener(loaderListener);
+	}
+	meter.stop();
+	
+	disposeMeter(meter);
+}
+
+public void test_hasListeners() {
+	final int COUNT = 400000000;
+	
+	ImageLoader loader = new ImageLoader();
+	
+	PerformanceMeter meter = createMeter("no listeners");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		loader.hasListeners();	// no listeners
+	}
+	meter.stop();
+	
+	disposeMeter(meter);
+	
+	loader.addImageLoaderListener(new ImageLoaderListener() {
+		public void imageDataLoaded(ImageLoaderEvent e) {
+		};
+	});
+	
+	meter = createMeter("has listeners");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		loader.hasListeners();	// has listener
+	}
+	meter.stop();
+	
+	disposeMeter(meter);
+}
+
 public void test_loadLjava_io_InputStream() {
 	// TODO
 }
 
 public void test_loadLjava_lang_String() {
+	final int COUNT = 2500;
+	
 	// j2se and j2me(cdc) can load from a filename but, j2me(cldc) throws an exception
 	if (isJ2ME()) return;
 
@@ -62,19 +110,41 @@ public void test_loadLjava_lang_String() {
 }
 
 public void test_notifyListenersLorg_eclipse_swt_graphics_ImageLoaderEvent() {
+	final int COUNT = 16000000;
+	
 	ImageLoader loader = new ImageLoader();
 	ImageLoaderEvent event = new ImageLoaderEvent(loader, null, 0, true);
+	loader.addImageLoaderListener(
+		new ImageLoaderListener() {
+			public void imageDataLoaded(ImageLoaderEvent e) {}
+	});
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
 	for (int i = 0; i < COUNT; i++) {
-		loader.addImageLoaderListener(
-			new ImageLoaderListener() {
-				public void imageDataLoaded(ImageLoaderEvent e) {}
-			});
+		loader.notifyListeners(event);
+	}
+	meter.stop();
+	
+	disposeMeter(meter);
+}
+
+public void test_removeImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener() {
+	final int COUNT = 50000;
+	
+	ImageLoader loader = new ImageLoader();
+	ImageLoaderListener[] listeners = new ImageLoaderListener[COUNT];
+	for (int i = 0; i < COUNT; i++) {
+		listeners[i] = new ImageLoaderListener() {
+			public void imageDataLoaded(ImageLoaderEvent e) {}
+		};
+		loader.addImageLoaderListener(listeners[i]);
 	}
 	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
-		loader.notifyListeners(event);
+		loader.removeImageLoaderListener(listeners[i]);
 	}
 	meter.stop();
 	
@@ -82,6 +152,8 @@ public void test_notifyListenersLorg_eclipse_swt_graphics_ImageLoaderEvent() {
 }
 
 public void test_saveLjava_io_OutputStreamI() {
+	final int COUNT = 30000;
+	
 	ImageLoader loader = new ImageLoader();
 	boolean jpgSupported = false;
 	for (int i=0; i<imageFormats.length; i++) {
@@ -134,60 +206,63 @@ public void test_saveLjava_io_OutputStreamI() {
 }
 
 public void test_saveLjava_lang_StringI() {
-	// j2se and j2me(cdc) can load from a filename but, j2me(cldc) throws an exception
-	if (isJ2ME()) return;
-
-	ImageLoader loader = new ImageLoader();
-	String name = getPath(imageFilenames[0] + "." + imageFormats[0]);
-	InputStream inStream = null;
-	try {
-		inStream = new FileInputStream(name);
-	} catch (FileNotFoundException e) {
-		e.printStackTrace();
-	}	
-	loader.load(inStream);
-	try {
-		inStream.close();
-	} catch (IOException e2) {
-		e2.printStackTrace();
-	}
-
-	OutputStream outStream = new ByteArrayOutputStream();
-	
-	try {
-		PerformanceMeter meter = createMeter("gif");
-		meter.start();
-		for (int i = 0; i < COUNT; i++) {
-			loader.save(outStream, SWT.IMAGE_GIF);
-		}
-		meter.stop();
-		
-		disposeMeter(meter);
-	
-		meter = createMeter("ico");
-		meter.start();
-		for (int i = 0; i < COUNT; i++) {
-			loader.save(outStream, SWT.IMAGE_ICO);
-		}
-		meter.stop();
-		
-		disposeMeter(meter);
-		
-		meter = createMeter("jpg");
-		meter.start();
-		for (int i = 0; i < COUNT; i++) {
-			loader.save(outStream, SWT.IMAGE_JPEG);
-		}
-		meter.stop();
-		
-		disposeMeter(meter);
-	} finally {
-		try {
-			outStream.close();
-		} catch (IOException e1) {
-			e1.printStackTrace();
-		}
-	}
+	// TODO
+//	final int COUNT = 10000;
+//	
+//	// j2se and j2me(cdc) can load from a filename but, j2me(cldc) throws an exception
+//	if (isJ2ME()) return;
+//
+//	ImageLoader loader = new ImageLoader();
+//	String name = getPath(imageFilenames[0] + "." + imageFormats[0]);
+//	InputStream inStream = null;
+//	try {
+//		inStream = new FileInputStream(name);
+//	} catch (FileNotFoundException e) {
+//		e.printStackTrace();
+//	}	
+//	loader.load(inStream);
+//	try {
+//		inStream.close();
+//	} catch (IOException e2) {
+//		e2.printStackTrace();
+//	}
+//
+//	OutputStream outStream = new ByteArrayOutputStream();
+//	
+//	try {
+//		PerformanceMeter meter = createMeter("gif");
+//		meter.start();
+//		for (int i = 0; i < COUNT; i++) {
+//			loader.save(outStream, SWT.IMAGE_GIF);
+//		}
+//		meter.stop();
+//		
+//		disposeMeter(meter);
+//	
+//		meter = createMeter("ico");
+//		meter.start();
+//		for (int i = 0; i < COUNT; i++) {
+//			loader.save(outStream, SWT.IMAGE_ICO);
+//		}
+//		meter.stop();
+//		
+//		disposeMeter(meter);
+//		
+//		meter = createMeter("jpg");
+//		meter.start();
+//		for (int i = 0; i < COUNT; i++) {
+//			loader.save(outStream, SWT.IMAGE_JPEG);
+//		}
+//		meter.stop();
+//		
+//		disposeMeter(meter);
+//	} finally {
+//		try {
+//			outStream.close();
+//		} catch (IOException e1) {
+//			e1.printStackTrace();
+//		}
+//	}
 }
 
 public static Test suite() {
@@ -202,18 +277,24 @@ public static Test suite() {
 public static java.util.Vector methodNames() {
 	java.util.Vector methodNames = new java.util.Vector();
 	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_addImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener");
+	methodNames.addElement("test_hasListeners");
 	methodNames.addElement("test_loadLjava_io_InputStream");
 	methodNames.addElement("test_loadLjava_lang_String");
 	methodNames.addElement("test_notifyListenersLorg_eclipse_swt_graphics_ImageLoaderEvent");
+	methodNames.addElement("test_removeImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener");
 	methodNames.addElement("test_saveLjava_io_OutputStreamI");
 	methodNames.addElement("test_saveLjava_lang_StringI");
 	return methodNames;
 }
 protected void runTest() throws Throwable {
 	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_addImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener")) test_addImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener();
+	else if (getName().equals("test_hasListeners")) test_hasListeners();
 	else if (getName().equals("test_loadLjava_io_InputStream")) test_loadLjava_io_InputStream();
 	else if (getName().equals("test_loadLjava_lang_String")) test_loadLjava_lang_String();
 	else if (getName().equals("test_notifyListenersLorg_eclipse_swt_graphics_ImageLoaderEvent")) test_notifyListenersLorg_eclipse_swt_graphics_ImageLoaderEvent();
+	else if (getName().equals("test_removeImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener")) test_removeImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener();
 	else if (getName().equals("test_saveLjava_io_OutputStreamI")) test_saveLjava_io_OutputStreamI();
 	else if (getName().equals("test_saveLjava_lang_StringI")) test_saveLjava_lang_StringI();
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_ImageLoaderEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_ImageLoaderEvent.java
index 2d559555eb..7f0e81dd38 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_ImageLoaderEvent.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_ImageLoaderEvent.java
@@ -23,7 +23,6 @@ import org.eclipse.test.performance.PerformanceMeter;
  * @see org.eclipse.swt.graphics.ImageLoaderEvent
  */
 public class Test_org_eclipse_swt_graphics_ImageLoaderEvent extends SwtPerformanceTestCase {
-	static final int COUNT = 1000;
 
 public Test_org_eclipse_swt_graphics_ImageLoaderEvent(String name) {
 	super(name);
@@ -34,6 +33,8 @@ public static void main(String[] args) {
 }
 
 public void test_ConstructorLorg_eclipse_swt_graphics_ImageLoaderLorg_eclipse_swt_graphics_ImageDataIZ() {
+	final int COUNT = 30000000;
+	
 	ImageLoader loader = new ImageLoader();
 	
 	PerformanceMeter meter = createMeter();
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_PaletteData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_PaletteData.java
index fb52e3cc29..3fefe1dff0 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_PaletteData.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_PaletteData.java
@@ -23,7 +23,6 @@ import junit.textui.*;
  * @see org.eclipse.swt.graphics.PaletteData
  */
 public class Test_org_eclipse_swt_graphics_PaletteData extends SwtPerformanceTestCase {
-	static final int COUNT = 1000;
 
 public Test_org_eclipse_swt_graphics_PaletteData(String name) {
 	super(name);
@@ -34,6 +33,8 @@ public static void main(String[] args) {
 }
 
 public void test_Constructor$Lorg_eclipse_swt_graphics_RGB() {
+	final int COUNT = 25000000;
+	
 	RGB[] rgb = new RGB[] {new RGB(0, 0, 0), new RGB(255, 255, 255)};
 	
 	PerformanceMeter meter = createMeter();
@@ -47,6 +48,8 @@ public void test_Constructor$Lorg_eclipse_swt_graphics_RGB() {
 }
 
 public void test_ConstructorIII() {
+	final int COUNT = 6000000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -58,6 +61,8 @@ public void test_ConstructorIII() {
 }
 
 public void test_getPixelLorg_eclipse_swt_graphics_RGB() {
+	final int COUNT = 50000000;
+	
 	RGB rgb = new RGB(0x32, 0x64, 0x96);
 	PaletteData data = new PaletteData(0xff0000, 0x00ff00, 0x0000ff);
 	
@@ -72,6 +77,8 @@ public void test_getPixelLorg_eclipse_swt_graphics_RGB() {
 }
 
 public void test_getRGBI() {
+	final int COUNT = 15000000;
+	
 	RGB rgb = new RGB(0x32, 0x64, 0x96);
 	PaletteData data = new PaletteData(0xff0000, 0x00ff00, 0x0000ff);
 	
@@ -86,6 +93,8 @@ public void test_getRGBI() {
 }
 
 public void test_getRGBs() {
+	final int COUNT = 700000000;
+	
 	RGB rgb = new RGB(0x32, 0x64, 0x96);
 	PaletteData data = new PaletteData(0xff0000, 0x00ff00, 0x0000ff);
 	
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Point.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Point.java
index 5554ed5686..cc33a48a23 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Point.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Point.java
@@ -23,7 +23,6 @@ import junit.textui.*;
  * @see org.eclipse.swt.graphics.Point
  */
 public class Test_org_eclipse_swt_graphics_Point extends SwtPerformanceTestCase {
-	static final int COUNT = 10000;
 
 public Test_org_eclipse_swt_graphics_Point(String name) {
 	super(name);
@@ -34,6 +33,8 @@ public static void main(String[] args) {
 }
 
 public void test_ConstructorII() {
+	final int COUNT = 60000000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -45,6 +46,8 @@ public void test_ConstructorII() {
 }
 
 public void test_equalsLjava_lang_Object() {
+	final int COUNT = 70000000;
+	
 	Point p1 = new Point (5, 3);
 	Point p2 = new Point (5, 3);
 	Point p3 = new Point (4, 6);
@@ -69,6 +72,8 @@ public void test_equalsLjava_lang_Object() {
 }
 
 public void test_hashCode() {
+	final int COUNT = 500000000;
+	
 	Point point = new Point(5, 5);
 	
 	PerformanceMeter meter = createMeter();
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_RGB.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_RGB.java
index fea7cc211d..d6f7d95606 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_RGB.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_RGB.java
@@ -21,7 +21,6 @@ import org.eclipse.test.performance.PerformanceMeter;
  * @see org.eclipse.swt.graphics.RGB
  */
 public class Test_org_eclipse_swt_graphics_RGB extends SwtPerformanceTestCase {
-	static final int COUNT = 10000;
 
 public Test_org_eclipse_swt_graphics_RGB(String name) {
 	super(name);
@@ -32,6 +31,8 @@ public static void main(String[] args) {
 }
 
 public void test_ConstructorIII() {
+	final int COUNT = 25000000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -43,6 +44,8 @@ public void test_ConstructorIII() {
 }
 
 public void test_equalsLjava_lang_Object() {
+	final int COUNT = 25000000;
+	
 	RGB rgb1 = new RGB (0, 128, 255);
 	RGB rgb2 = new RGB (0, 128, 255);
 	
@@ -68,6 +71,8 @@ public void test_equalsLjava_lang_Object() {
 }
 
 public void test_hashCode() {
+	final int COUNT = 400000000;
+	
 	RGB rgb = new RGB (0, 128, 255);
 	
 	PerformanceMeter meter = createMeter();
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Rectangle.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Rectangle.java
index 04e8177929..f663a716d2 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Rectangle.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Rectangle.java
@@ -22,7 +22,6 @@ import org.eclipse.test.performance.PerformanceMeter;
  * @see org.eclipse.swt.graphics.Rectangle
  */
 public class Test_org_eclipse_swt_graphics_Rectangle extends SwtPerformanceTestCase {
-	static final int COUNT = 10000;
 
 public Test_org_eclipse_swt_graphics_Rectangle(String name) {
 	super(name);
@@ -33,6 +32,8 @@ public static void main(String[] args) {
 }
 
 public void test_ConstructorIIII() {
+	final int COUNT = 40000000;
+	
 	PerformanceMeter meter = createMeter();
 	meter.start();
 	for (int i = 0; i < COUNT; i++) {
@@ -53,6 +54,8 @@ public void test_ConstructorIIII() {
  * </ul>
  */
 public void test_addLorg_eclipse_swt_graphics_Rectangle() {
+	final int COUNT = 60000000;
+	
 	Rectangle r1 = new Rectangle(1, 2, 3, 4);
 	Rectangle r2 = new Rectangle(3, 3, 2, 2);
 
@@ -71,6 +74,8 @@ public void test_addLorg_eclipse_swt_graphics_Rectangle() {
  * arguments is inside the area specified by the receiver.
  */
 public void test_containsII() {
+	final int COUNT = 60000000;
+	
 	Rectangle r = new Rectangle(1, 2, 3, 4);
 
 	PerformanceMeter meter = createMeter("contains");
@@ -101,6 +106,8 @@ public void test_containsII() {
  * </ul>
  */
 public void test_containsLorg_eclipse_swt_graphics_Point() {
+	final int COUNT = 60000000;
+	
 	Rectangle rect = new Rectangle(1, 2, 3, 4);
 	Point p1 = new Point(2, 3);
 	Point p2 = new Point(9, 10);
@@ -125,6 +132,8 @@ public void test_containsLorg_eclipse_swt_graphics_Point() {
 }
 
 public void test_equalsLjava_lang_Object() {
+	final int COUNT = 60000000;
+	
 	Rectangle r1 = new Rectangle(5, 4, 3, 2);
 	Rectangle r2 = new Rectangle(5, 4, 3, 2);
 	
@@ -150,6 +159,8 @@ public void test_equalsLjava_lang_Object() {
 }
 
 public void test_hashCode() {
+	final int COUNT = 400000000;
+	
 	Rectangle rect = new Rectangle(5, 4, 3, 2);
 	PerformanceMeter meter = createMeter();
 	meter.start();
@@ -162,6 +173,8 @@ public void test_hashCode() {
 }
 
 public void test_intersectLorg_eclipse_swt_graphics_Rectangle() {
+	final int COUNT = 50000000;
+	
 	Rectangle r1 = new Rectangle(10, 10, 50, 50);
 	Rectangle r2 = new Rectangle(20, 20, 20, 20);
 	
@@ -187,6 +200,8 @@ public void test_intersectLorg_eclipse_swt_graphics_Rectangle() {
 }
 
 public void test_intersectionLorg_eclipse_swt_graphics_Rectangle() {
+	final int COUNT = 25000000;
+	
 	Rectangle r1 = new Rectangle(10, 10, 50, 50);
 	Rectangle r2 = new Rectangle(20, 20, 20, 20);
 	
@@ -212,6 +227,8 @@ public void test_intersectionLorg_eclipse_swt_graphics_Rectangle() {
 }
 
 public void test_intersectsIIII() {
+	final int COUNT = 60000000;
+	
 	Rectangle rect = new Rectangle(10, 10, 50, 50);
 	
 	PerformanceMeter meter = createMeter("intersect");
@@ -234,6 +251,8 @@ public void test_intersectsIIII() {
 }
 
 public void test_intersectsLorg_eclipse_swt_graphics_Rectangle() {
+	final int COUNT = 40000000;
+	
 	Rectangle r1 = new Rectangle(10, 10, 50, 50);
 	Rectangle r2 = new Rectangle(20, 20, 20, 20);
 	
@@ -259,6 +278,8 @@ public void test_intersectsLorg_eclipse_swt_graphics_Rectangle() {
 }
 
 public void test_isEmpty() {
+	final int COUNT = 500000000;
+	
 	Rectangle rect = new Rectangle (10, 10, 0, 0);
 	
 	PerformanceMeter meter = createMeter("empty");
@@ -283,6 +304,8 @@ public void test_isEmpty() {
 }
 
 public void test_unionLorg_eclipse_swt_graphics_Rectangle() {
+	final int COUNT = 30000000;
+	
 	Rectangle r1 = new Rectangle(10, 10, 50, 50);
 	Rectangle r2 = new Rectangle(20, 20, 20, 20);
 	
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Region.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Region.java
index aec66577a8..4f2746db53 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Region.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Region.java
@@ -23,7 +23,6 @@ import org.eclipse.test.performance.PerformanceMeter;
  * @see org.eclipse.swt.graphics.Region
  */
 public class Test_org_eclipse_swt_graphics_Region extends SwtPerformanceTestCase {
-	static final int COUNT = 1000;
 
 public Test_org_eclipse_swt_graphics_Region(String name) {
 	super(name);
@@ -39,6 +38,7 @@ protected void setUp() throws Exception {
 }
 
 public void test_Constructor() {
+	final int COUNT = 9000;	// 10000 causes No More Handles error
 	Region[] regions = new Region [COUNT];
 	
 	PerformanceMeter meter = createMeter();
@@ -47,15 +47,17 @@ public void test_Constructor() {
 		regions[i] = new Region ();
 	}
 	meter.stop();
-	
+
 	for (int i = 0; i < COUNT; i++) {
 		regions[i].dispose();
 	}
-	
+
 	disposeMeter(meter);
 }
 
 public void test_ConstructorLorg_eclipse_swt_graphics_Device() {
+	final int COUNT = 9000;	// 10000 causes No More Handles error
+	
 	Region[] regions = new Region [COUNT];
 	
 	PerformanceMeter meter = createMeter();
@@ -73,6 +75,8 @@ public void test_ConstructorLorg_eclipse_swt_graphics_Device() {
 }
 
 public void test_add$I() {
+	final int COUNT = 250000;
+	
 	Region region = new Region(display);
 	int[][] toAdd = new int[COUNT][];
 	for (int i = 0; i < COUNT; i++) {
@@ -92,6 +96,8 @@ public void test_add$I() {
 }
 
 public void test_addLorg_eclipse_swt_graphics_Rectangle() {
+	final int COUNT = 4000;
+	
 	Region region = new Region(display);
 	Rectangle[] toAdd = new Rectangle[COUNT];
 	for (int i = 0; i < COUNT; i++) {
@@ -111,6 +117,8 @@ public void test_addLorg_eclipse_swt_graphics_Rectangle() {
 }
 
 public void test_addLorg_eclipse_swt_graphics_Region() {
+	final int COUNT = 4000;
+	
 	Region region = new Region(display);
 	Region[] regions = new Region[COUNT];
 	for (int i = 0; i < COUNT; i++) {
@@ -135,6 +143,8 @@ public void test_addLorg_eclipse_swt_graphics_Region() {
 }
 
 public void test_containsII() {
+	final int COUNT = 25000000;
+	
 	Region region = new Region (display);
 	region.add(new Rectangle (30,30,30,30));
 	
@@ -165,6 +175,8 @@ public void test_containsII() {
 }
 
 public void test_containsLorg_eclipse_swt_graphics_Point() {
+	final int COUNT = 20000000;
+	
 	Region region = new Region (display);
 	Point point = new Point (20,20);
 	region.add(new Rectangle (30,30,30,30));
@@ -196,6 +208,8 @@ public void test_containsLorg_eclipse_swt_graphics_Point() {
 }
 
 public void test_dispose() {
+	final int COUNT = 9000;	// 10000 causes No More Handles error
+	
 	Region[] regions = new Region [COUNT];
 	for (int i = 0; i < COUNT; i++) {
 		regions[i] = new Region(display);
@@ -222,6 +236,8 @@ public void test_dispose() {
 }
 
 public void test_equalsLjava_lang_Object() {
+	final int COUNT = 50000000;
+	
 	//	Currently, Regions are only "equal" if they have the same handle.
 	//	This is so that identical objects are properly hashed.
 	//	We are considering adding a new method that will compare Regions for the same area.
@@ -260,6 +276,8 @@ public void test_equalsLjava_lang_Object() {
 }
 
 public void test_getBounds() {
+	final int COUNT = 4500000;
+	
 	Region region = new Region(display);
 	region.add(new Rectangle(10,10,20,20));
 
@@ -276,6 +294,8 @@ public void test_getBounds() {
 }
 
 public void test_hashCode() {
+	final int COUNT = 700000000;
+	
 	Region region = new Region(display);
 	region.add(new Rectangle(10,10,20,20));
 
@@ -292,6 +312,8 @@ public void test_hashCode() {
 }
 
 public void test_intersectLorg_eclipse_swt_graphics_Rectangle() {
+	final int COUNT = 2000000;
+	
 	Region region = new Region(display);
 	region.add(new Rectangle(10,10,20,20));
 	Rectangle rect = new Rectangle(0,0,5,5);
@@ -324,6 +346,8 @@ public void test_intersectLorg_eclipse_swt_graphics_Rectangle() {
 }
 
 public void test_intersectLorg_eclipse_swt_graphics_Region() {
+	final int COUNT = 12000000;
+	
 	Region region1 = new Region(display);
 	region1.add(new Rectangle(10,10,20,20));
 	Region region2 = new Region(display);
@@ -359,6 +383,8 @@ public void test_intersectLorg_eclipse_swt_graphics_Region() {
 }
 
 public void test_intersectsIIII() {
+	final int COUNT = 2500000;
+	
 	Region region = new Region(display);
 	region.add(new Rectangle(10,10,20,20));
 	
@@ -389,6 +415,8 @@ public void test_intersectsIIII() {
 }
 
 public void test_intersectsLorg_eclipse_swt_graphics_Rectangle() {
+	final int COUNT = 2500000;
+	
 	Region region = new Region(display);
 	region.add(new Rectangle(10,10,20,20));
 	Rectangle rect = new Rectangle (0,0,5,5);
@@ -421,6 +449,8 @@ public void test_intersectsLorg_eclipse_swt_graphics_Rectangle() {
 }
 
 public void test_isDisposed() {
+	final int COUNT = 500000000;
+	
 	Region region = new Region(display);
 	region.add(new Rectangle(10,10,10,10));
 	
@@ -446,6 +476,8 @@ public void test_isDisposed() {
 }
 
 public void test_isEmpty() {
+	final int COUNT = 5000000;
+	
 	Region region = new Region (display);
 	
 	PerformanceMeter meter = createMeter("empty");
@@ -472,6 +504,8 @@ public void test_isEmpty() {
 }
 
 public void test_subtract$I() {
+	final int COUNT = 250000;
+	
 	Region region = new Region(display);
 	region.add(new Rectangle(0,0,COUNT * 2, COUNT * 2));
 	int[][] toSubtract = new int[COUNT][];
@@ -492,6 +526,8 @@ public void test_subtract$I() {
 }
 
 public void test_subtractLorg_eclipse_swt_graphics_Rectangle() {
+	final int COUNT = 3000;
+	
 	Region region = new Region(display);
 	region.add(new Rectangle(0,0,COUNT * 2, COUNT * 2));
 	Rectangle[] toSubtract = new Rectangle[COUNT];
@@ -512,6 +548,8 @@ public void test_subtractLorg_eclipse_swt_graphics_Rectangle() {
 }
 
 public void test_subtractLorg_eclipse_swt_graphics_Region() {
+	final int COUNT = 3000;
+	
 	Region region = new Region(display);
 	region.add(new Rectangle(0, 0, COUNT*2, COUNT*2));
 	Region[] regions = new Region[COUNT];
@@ -536,9 +574,6 @@ public void test_subtractLorg_eclipse_swt_graphics_Region() {
 	disposeMeter(meter);
 }
 
-public void test_win32_newLorg_eclipse_swt_graphics_DeviceI() {
-}
-
 public static Test suite() {
 	TestSuite suite = new TestSuite();
 	java.util.Vector methodNames = methodNames();
@@ -570,7 +605,6 @@ public static java.util.Vector methodNames() {
 	methodNames.addElement("test_subtract$I");
 	methodNames.addElement("test_subtractLorg_eclipse_swt_graphics_Rectangle");
 	methodNames.addElement("test_subtractLorg_eclipse_swt_graphics_Region");
-	methodNames.addElement("test_win32_newLorg_eclipse_swt_graphics_DeviceI");
 	return methodNames;
 }
 protected void runTest() throws Throwable {
@@ -594,7 +628,6 @@ protected void runTest() throws Throwable {
 	else if (getName().equals("test_subtract$I")) test_subtract$I();
 	else if (getName().equals("test_subtractLorg_eclipse_swt_graphics_Rectangle")) test_subtractLorg_eclipse_swt_graphics_Rectangle();
 	else if (getName().equals("test_subtractLorg_eclipse_swt_graphics_Region")) test_subtractLorg_eclipse_swt_graphics_Region();
-	else if (getName().equals("test_win32_newLorg_eclipse_swt_graphics_DeviceI")) test_win32_newLorg_eclipse_swt_graphics_DeviceI();
 }
 
 /* custom */
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Button.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Button.java
new file mode 100644
index 0000000000..2c59685ed2
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Button.java
@@ -0,0 +1,114 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.tests.junit.performance;
+
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Performance Test Suite for class org.eclipse.swt.widgets.Button
+ *
+ * @see org.eclipse.swt.widgets.Button
+ */
+public class Test_org_eclipse_swt_widgets_Button extends Test_org_eclipse_swt_widgets_Control {
+
+Button button;
+
+public Test_org_eclipse_swt_widgets_Button(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	button = new Button(shell, SWT.PUSH);
+	setWidget(button);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+}
+
+public void test_getAlignment() {
+}
+
+public void test_getImage() {
+}
+
+public void test_getSelection() {
+}
+
+public void test_getText() {
+}
+
+public void test_setAlignmentI() {
+}
+
+public void test_setFocus() {
+}
+
+public void test_setImageLorg_eclipse_swt_graphics_Image() {
+}
+
+public void test_setSelectionZ() {
+}
+
+public void test_setTextLjava_lang_String() {
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Button((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_getAlignment");
+	methodNames.addElement("test_getImage");
+	methodNames.addElement("test_getSelection");
+	methodNames.addElement("test_getText");
+	methodNames.addElement("test_setAlignmentI");
+	methodNames.addElement("test_setFocus");
+	methodNames.addElement("test_setImageLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setSelectionZ");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Control.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_getAlignment")) test_getAlignment();
+	else if (getName().equals("test_getImage")) test_getImage();
+	else if (getName().equals("test_getSelection")) test_getSelection();
+	else if (getName().equals("test_getText")) test_getText();
+	else if (getName().equals("test_setAlignmentI")) test_setAlignmentI();
+	else if (getName().equals("test_setFocus")) test_setFocus();
+	else if (getName().equals("test_setImageLorg_eclipse_swt_graphics_Image")) test_setImageLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setSelectionZ")) test_setSelectionZ();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Control.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Control.java
new file mode 100644
index 0000000000..d53dc4834c
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Control.java
@@ -0,0 +1,1384 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.tests.junit.performance;
+
+import junit.framework.*;
+import junit.textui.*;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.*;
+import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.test.performance.*;
+
+/**
+ * Automated Performance Test Suite for class org.eclipse.swt.widgets.Control
+ *
+ * @see org.eclipse.swt.widgets.Control
+ */
+public class Test_org_eclipse_swt_widgets_Control extends Test_org_eclipse_swt_widgets_Widget {
+
+public Test_org_eclipse_swt_widgets_Control(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	// abstract class
+}
+
+public void test_addControlListenerLorg_eclipse_swt_events_ControlListener() {
+	final int COUNT = 7500;
+	
+	ControlListener[] listeners = new ControlListener[COUNT];
+	for (int i = 0; i < COUNT; i++) {
+		listeners[i] = new ControlAdapter() {}; 
+	}
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.addControlListener(listeners[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_addFocusListenerLorg_eclipse_swt_events_FocusListener() {
+	final int COUNT = 7500;
+	
+	FocusListener[] listeners = new FocusListener[COUNT];
+	for (int i = 0; i < COUNT; i++) {
+		listeners[i] = new FocusAdapter() {}; 
+	}
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.addFocusListener(listeners[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_addHelpListenerLorg_eclipse_swt_events_HelpListener() {
+	final int COUNT = 14000;
+	
+	HelpListener[] listeners = new HelpListener[COUNT];
+	for (int i = 0; i < COUNT; i++) {
+		listeners[i] = new HelpListener() {
+			public void helpRequested(HelpEvent e) {} 
+		};
+	}
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.addHelpListener(listeners[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_addKeyListenerLorg_eclipse_swt_events_KeyListener() {
+	final int COUNT = 7500;
+	
+	KeyListener[] listeners = new KeyListener[COUNT];
+	for (int i = 0; i < COUNT; i++) {
+		listeners[i] = new KeyAdapter() {}; 
+	}
+
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.addKeyListener(listeners[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_addMouseListenerLorg_eclipse_swt_events_MouseListener() {
+	final int COUNT = 5000;
+	
+	MouseListener[] listeners = new MouseListener[COUNT];
+	for (int i = 0; i < COUNT; i++) {
+		listeners[i] = new MouseAdapter() {}; 
+	}
+
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.addMouseListener(listeners[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_addMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener() {
+	final int COUNT = 14000;
+	
+	MouseMoveListener[] listeners = new MouseMoveListener[COUNT];
+	for (int i = 0; i < COUNT; i++) {
+		listeners[i] = new MouseMoveListener() {
+			public void mouseMove(MouseEvent e) {}
+		};
+	}
+
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.addMouseMoveListener(listeners[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_addMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener() {
+	final int COUNT = 5000;
+	
+	MouseTrackListener[] listeners = new MouseTrackListener[COUNT];
+	for (int i = 0; i < COUNT; i++) {
+		listeners[i] = new MouseTrackAdapter() {}; 
+	}
+
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.addMouseTrackListener(listeners[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_addPaintListenerLorg_eclipse_swt_events_PaintListener() {
+	final int COUNT = 14000;
+	
+	PaintListener[] listeners = new PaintListener[COUNT];
+	for (int i = 0; i < COUNT; i++) {
+		listeners[i] = new PaintListener() {
+			public void paintControl(PaintEvent e) {}
+		}; 
+	}
+
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.addPaintListener(listeners[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_addTraverseListenerLorg_eclipse_swt_events_TraverseListener() {
+	final int COUNT = 14000;
+	
+	TraverseListener[] listeners = new TraverseListener[COUNT];
+	for (int i = 0; i < COUNT; i++) {
+		listeners[i] = new TraverseListener() {
+			public void keyTraversed(TraverseEvent e) {
+			}
+		}; 
+	}
+
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.addTraverseListener(listeners[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_computeSizeII() {
+	final int COUNT = 90000;
+	PerformanceMeter meter = createMeter("preferred size");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+	}
+	meter.stop();
+	disposeMeter(meter);
+
+	Point size = control.getSize();
+	size.x *= 2;
+	size.y *= 2;
+	
+	meter = createMeter("specify width");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.computeSize(size.x, SWT.DEFAULT);
+	}
+	meter.stop();
+	disposeMeter(meter);
+
+	meter = createMeter("specify height");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.computeSize(SWT.DEFAULT, size.y);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_computeSizeIIZ() {
+	final int COUNT = 90000;
+	
+	PerformanceMeter meter = createMeter("preferred size");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
+	}
+	meter.stop();
+	disposeMeter(meter);
+
+	Point size = control.getSize();
+	size.x *= 2;
+	size.y *= 2;
+	
+	meter = createMeter("specify width");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.computeSize(size.x, SWT.DEFAULT, false);
+	}
+	meter.stop();
+	disposeMeter(meter);
+
+	meter = createMeter("specify height");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.computeSize(SWT.DEFAULT, size.y, false);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_forceFocus() {
+	final int COUNT = 2000000;
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.forceFocus();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_getAccessible() {
+	final int COUNT = 50000000;
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.getAccessible();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_getBackground() {
+	final int COUNT = 20000000;
+	
+	control.setBackground(control.getDisplay().getSystemColor(SWT.COLOR_RED));
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.getBackground();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_getBorderWidth() {
+	final int COUNT = 4500000;
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.getBorderWidth();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_getBounds() {
+	final int COUNT = 1500000;
+	
+	control.setBounds(10,20,30,40);
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.getBounds();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_getEnabled() {
+	final int COUNT = 20000000;
+	
+	control.setEnabled(true);
+	
+	PerformanceMeter meter = createMeter("enabled");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.getEnabled();
+	}
+	meter.stop();
+	disposeMeter(meter);
+	
+	control.setEnabled(false);
+
+	meter = createMeter("disabled");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.getEnabled();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_getFont() {
+	final int COUNT = 800000;
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.getFont();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_getForeground() {
+	final int COUNT = 20000000;
+	
+	control.setForeground(control.getDisplay().getSystemColor(SWT.COLOR_RED));
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.getForeground();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_getLocation() {
+	final int COUNT = 1500000;
+	
+	control.setBounds(10,20,30,40);
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.getLocation();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_getMenu() {
+	final int COUNT = 50000000;
+	
+	PerformanceMeter meter = createMeter("no menu");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.getMenu();
+	}
+	meter.stop();
+	disposeMeter(meter);
+
+	Menu menu = new Menu(control.getShell());
+	control.setMenu(menu);
+	
+	meter = createMeter("menu");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.getMenu();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_getMonitor() {
+	final int COUNT = 1200000;
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.getMonitor();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_getParent() {
+	final int COUNT = 50000000;
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.getParent();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_getShell() {
+	final int COUNT = 30000000;
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.getShell();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_getSize() {
+	final int COUNT = 2500000;
+	
+	control.setBounds(10,20,30,40);
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.getSize();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_getToolTipText() {
+	final int COUNT = 50000000;
+	
+	control.setToolTipText("Tool tip text");
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.getToolTipText();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_getVisible() {
+	final int COUNT = 9000000;
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.getVisible();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_isEnabled() {
+	final int COUNT = 8000000;
+	
+	control.setEnabled(true);
+	
+	PerformanceMeter meter = createMeter("enabled");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.isEnabled();
+	}
+	meter.stop();
+	disposeMeter(meter);
+	
+	control.setEnabled(false);
+	
+	meter = createMeter("disabled");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.isEnabled();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_isFocusControl() {
+	final int COUNT = 2000000;
+	
+	control.getParent().setFocus();
+	
+	PerformanceMeter meter = createMeter("not focused");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.isFocusControl();
+	}
+	meter.stop();
+	disposeMeter(meter);
+
+	control.setFocus();
+	
+	meter = createMeter("focused");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.isFocusControl();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_isReparentable() {
+	final int COUNT = 45000000;
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.isReparentable();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_isVisible() {
+	final int COUNT = 9000000;
+	
+	control.getShell().setVisible(false);
+	
+	PerformanceMeter meter = createMeter("not visible");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.isVisible();
+	}
+	meter.stop();
+	disposeMeter(meter);
+	
+	control.getShell().setVisible(true);
+	control.setVisible(true);
+
+	meter = createMeter("visible");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.isVisible();
+	}
+	meter.stop();
+	disposeMeter(meter);
+	
+	control.getShell().setVisible(false);
+}
+
+public void test_moveAboveLorg_eclipse_swt_widgets_Control() {
+	final int COUNT = 600000;
+	
+	Button button = new Button(shell, SWT.PUSH);
+	
+	Control[] controls = new Control[COUNT];
+	for (int i = 0; i < COUNT; i += 4) {
+		controls[i] = button;
+		controls[i+1] = null;
+		controls[i+2] = button;
+		controls[i+3] = control;
+	}
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.moveAbove(controls[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+	
+	button.dispose();
+}
+
+public void test_moveBelowLorg_eclipse_swt_widgets_Control() {
+	final int COUNT = 250000;
+	
+	Button button = new Button(shell, SWT.PUSH);
+	
+	Control[] controls = new Control[COUNT];
+	for (int i = 0; i < COUNT; i += 4) {
+		controls[i] = button;
+		controls[i+1] = null;
+		controls[i+2] = button;
+		controls[i+3] = control;
+	}
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.moveBelow(controls[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+	
+	button.dispose();
+}
+
+public void test_pack() {
+	final int COUNT = 12000;
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.pack();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_packZ() {
+	final int COUNT = 12000;
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.pack(false);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_redraw() {
+	final int COUNT = 10000000;
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.redraw();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_redrawIIIIZ() {
+	final int COUNT = 40000000;
+	
+	Rectangle bounds = control.getBounds();
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.redraw(bounds.x, bounds.y, bounds.width, bounds.height, true);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_removeControlListenerLorg_eclipse_swt_events_ControlListener() {
+	// tested in test_addControlListenerLorg_eclipse_swt_events_ControlListener
+}
+
+public void test_removeFocusListenerLorg_eclipse_swt_events_FocusListener() {
+	// tested in test_addFocusListenerLorg_eclipse_swt_events_FocusListener
+}
+
+public void test_removeHelpListenerLorg_eclipse_swt_events_HelpListener() {
+	// tested in test_addHelpListenerLorg_eclipse_swt_events_HelpListener
+}
+
+public void test_removeKeyListenerLorg_eclipse_swt_events_KeyListener() {
+	// tested in test_addKeyListenerLorg_eclipse_swt_events_KeyListener
+}
+
+public void test_removeMouseListenerLorg_eclipse_swt_events_MouseListener() {
+	// tested in test_addMouseListenerLorg_eclipse_swt_events_MouseListener
+}
+
+public void test_removeMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener() {
+	// tested in test_addMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener
+}
+
+public void test_removeMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener() {
+	// tested in test_addMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener
+}
+
+public void test_removePaintListenerLorg_eclipse_swt_events_PaintListener() {
+	// tested in test_addPaintListenerLorg_eclipse_swt_events_PaintListener
+}
+
+public void test_removeTraverseListenerLorg_eclipse_swt_events_TraverseListener() {
+	// tested in test_addTraverseListenerLorg_eclipse_swt_events_TraverseListener
+}
+
+public void test_setBackgroundLorg_eclipse_swt_graphics_Color() {
+	final int COUNT = 2000000;
+	
+	Color red = control.getDisplay().getSystemColor(SWT.COLOR_RED);
+	Color blue = control.getDisplay().getSystemColor(SWT.COLOR_BLUE);
+	Color[] colors = new Color[COUNT];
+	for (int i = 0; i < COUNT; i += 4) {
+		colors[i] = red;
+		colors[i+1] = blue;
+		colors[i+2] = null;
+		colors[i+3] = blue;
+	}
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.setBackground(colors[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_setBoundsIIII() {
+	final int COUNT = 12000;
+	
+	int[] xs = new int[COUNT];
+	int[] ys = new int[COUNT];
+	int[] widths = new int[COUNT];
+	int[] heights = new int[COUNT];
+	for (int i = 0; i < COUNT; i += 2) {
+		xs[i] = 10;			xs[i+1] = 40;
+		ys[i] = 20;			ys[i+1] = 30;
+		widths[i] = 30;		widths[i+1] = 20;
+		heights[i] = 40;	heights[i+1] = 10;
+	}
+
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.setBounds(xs[i], ys[i], widths[i], heights[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_setBoundsLorg_eclipse_swt_graphics_Rectangle() {
+	final int COUNT = 12000;
+	
+	Rectangle[] rectangles = new Rectangle[COUNT];
+	Rectangle rectangle1 = new Rectangle(0,5,10,15);
+	Rectangle rectangle2 = new Rectangle(10,15,110,115);
+	for (int i = 0; i < COUNT; i += 2) {
+		rectangles[i] = rectangle1;
+		rectangles[i+1] = rectangle2;
+	}
+
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.setBounds(rectangles[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_setCaptureZ() {
+	final int COUNT = 33000;
+	
+	boolean[] capture = new boolean [COUNT];
+	for (int i = 0; i < COUNT; i += 2) {
+		capture[i] = true;
+		capture[i+1] = false;
+	}
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.setCapture(capture[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_setCursorLorg_eclipse_swt_graphics_Cursor() {
+	final int COUNT = 250000;
+	
+	Cursor hand = control.getDisplay().getSystemCursor(SWT.CURSOR_HAND);
+	Cursor size = control.getDisplay().getSystemCursor(SWT.CURSOR_SIZEALL);
+	Cursor[] cursors = new Cursor[COUNT];
+	for (int i = 0; i < COUNT; i += 4) {
+		cursors[i] = hand;
+		cursors[i+1] = size;
+		cursors[i+2] = null;
+		cursors[i+3] = size;
+	}
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.setCursor(cursors[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_setEnabledZ() {
+	final int COUNT = 200000;
+	
+	boolean[] capture = new boolean [COUNT];
+	for (int i = 0; i < COUNT; i += 2) {
+		capture[i] = true;
+		capture[i+1] = false;
+	}
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.setEnabled(capture[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_setFocus() {
+	final int COUNT = 10000;
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.setFocus();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_setFontLorg_eclipse_swt_graphics_Font() {
+	final int COUNT = 800000;
+	
+	Font font1 = control.getFont();
+	FontData[] data = font1.getFontData();
+	data[0].height += 2;
+	Font font2 = new Font(control.getDisplay(), data);
+	Font[] fonts = new Font[COUNT];
+	for (int i = 0; i < COUNT; i += 4) {
+		fonts[i] = font1;
+		fonts[i+1] = null;
+		fonts[i+2] = font1;
+		fonts[i+3] = font2;
+	}
+
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.setFont(fonts[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+
+	font2.dispose();
+}
+
+public void test_setForegroundLorg_eclipse_swt_graphics_Color() {
+	final int COUNT = 2000000;
+	
+	Color red = control.getDisplay().getSystemColor(SWT.COLOR_RED);
+	Color blue = control.getDisplay().getSystemColor(SWT.COLOR_BLUE);
+	Color[] colors = new Color[COUNT];
+	for (int i = 0; i < COUNT; i += 4) {
+		colors[i] = red;
+		colors[i+1] = blue;
+		colors[i+2] = null;
+		colors[i+3] = blue;
+	}
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.setForeground(colors[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_setLocationII() {
+	final int COUNT = 13000;
+	
+	int[] xs = new int[COUNT];
+	int[] ys = new int[COUNT];
+	for (int i = 0; i < COUNT; i += 2) {
+		xs[i] = 10;			xs[i+1] = 40;
+		ys[i] = 20;			ys[i+1] = 30;
+	}
+
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.setLocation(xs[i], ys[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_setLocationLorg_eclipse_swt_graphics_Point() {
+	final int COUNT = 13000;
+	
+	Point[] points = new Point[COUNT];
+	Point point1 = new Point(0,5);
+	Point point2 = new Point(10,15);
+	for (int i = 0; i < COUNT; i += 2) {
+		points[i] = point1;
+		points[i + 1] = point2;
+	}
+
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.setLocation(points[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_setMenuLorg_eclipse_swt_widgets_Menu () {
+	final int COUNT = 15000000;
+	
+	Menu menu1 = new Menu(control);
+	new MenuItem(menu1, SWT.NONE).setText("item1");
+	Menu menu2 = new Menu(control);
+	new MenuItem(menu2, SWT.NONE).setText("item2");
+	Menu[] menus = new Menu[COUNT];
+	for (int i = 0; i < COUNT; i += 4) {
+		menus[i] = menu1;
+		menus[i+1] = null;
+		menus[i+2] = menu1;
+		menus[i+3] = menu2;
+	}
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.setMenu(menus[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_setRedrawZ() {
+	final int COUNT = 12000000;
+	
+	boolean[] capture = new boolean [COUNT];
+	for (int i = 0; i < COUNT; i += 2) {
+		capture[i] = true;
+		capture[i+1] = false;
+	}
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.setRedraw(capture[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_setSizeII() {
+	final int COUNT = 13000;
+	
+	int[] widths = new int[COUNT];
+	int[] heights = new int[COUNT];
+	for (int i = 0; i < COUNT; i += 2) {
+		widths[i] = 30;		widths[i+1] = 20;
+		heights[i] = 40;	heights[i+1] = 10;
+	}
+
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.setSize(widths[i], heights[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_setSizeLorg_eclipse_swt_graphics_Point() {
+	final int COUNT = 13000;
+	
+	Point[] points = new Point[COUNT];
+	Point point1 = new Point(20,15);
+	Point point2 = new Point(10,35);
+	for (int i = 0; i < COUNT; i += 2) {
+		points[i] = point1;
+		points[i + 1] = point2;
+	}
+
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.setSize(points[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_setToolTipTextLjava_lang_String() {
+	final int COUNT = 100000;
+	
+	String[] strings = new String[COUNT];
+	for (int i = 0; i < COUNT; i += 4) {
+		strings[0] = "tool tip 1";
+		strings[1] = null;
+		strings[2] = "";
+		strings[3] = "the second tool tip";
+	}
+
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.setToolTipText(strings[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_setVisibleZ() {
+	final int COUNT = 200000;
+	
+	boolean[] capture = new boolean [COUNT];
+	for (int i = 0; i < COUNT; i += 2) {
+		capture[i] = true;
+		capture[i+1] = false;
+	}
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.setVisible(capture[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_toControlII() {
+	final int COUNT = 4000000;
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.toControl(20, 30);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_toControlLorg_eclipse_swt_graphics_Point() {
+	final int COUNT = 2500000;
+	
+	Point point = new Point(10,20);
+	Point[] points = new Point[COUNT];
+	for (int i = 0; i < COUNT; i++) {
+		points[i] = point;
+	}
+
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.toControl(points[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_toDisplayII() {
+	final int COUNT = 4000000;
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.toDisplay(20, 30);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_toDisplayLorg_eclipse_swt_graphics_Point() {
+	final int COUNT = 4000000;
+	
+	Point point = new Point(10,20);
+	Point[] points = new Point[COUNT];
+	for (int i = 0; i < COUNT; i++) {
+		points[i] = point;
+	}
+
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.toDisplay(points[i]);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_traverseI() {
+	final int COUNT = 3000000;
+	
+	PerformanceMeter meter = createMeter("TRAVERSE_ARROW_NEXT");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.traverse(SWT.TRAVERSE_ARROW_NEXT);
+	}
+	meter.stop();
+	disposeMeter(meter);
+	
+	meter = createMeter("TRAVERSE_ARROW_PREVIOUS");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.traverse(SWT.TRAVERSE_ARROW_PREVIOUS);
+	}
+	meter.stop();
+	disposeMeter(meter);
+	
+	meter = createMeter("TRAVERSE_ESCAPE");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.traverse(SWT.TRAVERSE_ESCAPE);
+	}
+	meter.stop();
+	disposeMeter(meter);
+	
+	meter = createMeter("TRAVERSE_MNEMONIC");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.traverse(SWT.TRAVERSE_MNEMONIC);
+	}
+	meter.stop();
+	disposeMeter(meter);
+	
+	meter = createMeter("TRAVERSE_NONE");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.traverse(SWT.TRAVERSE_NONE);
+	}
+	meter.stop();
+	disposeMeter(meter);
+	
+	meter = createMeter("TRAVERSE_PAGE_NEXT");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.traverse(SWT.TRAVERSE_PAGE_NEXT);
+	}
+	meter.stop();
+	disposeMeter(meter);
+	
+	meter = createMeter("TRAVERSE_PAGE_PREVIOUS");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.traverse(SWT.TRAVERSE_PAGE_PREVIOUS);
+	}
+	meter.stop();
+	disposeMeter(meter);
+	
+	meter = createMeter("TRAVERSE_RETURN");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.traverse(SWT.TRAVERSE_RETURN);
+	}
+	meter.stop();
+	disposeMeter(meter);
+
+	meter = createMeter("TRAVERSE_TAB_NEXT");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.traverse(SWT.TRAVERSE_TAB_NEXT);
+	}
+	meter.stop();
+	disposeMeter(meter);
+
+	meter = createMeter("TRAVERSE_TAB_PREVIOUS");
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.traverse(SWT.TRAVERSE_TAB_PREVIOUS);
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public void test_update() {
+	final int COUNT = 2000000;
+	
+	PerformanceMeter meter = createMeter();
+	meter.start();
+	for (int i = 0; i < COUNT; i++) {
+		control.update();
+	}
+	meter.stop();
+	disposeMeter(meter);
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Control((String)e.nextElement()));
+	}
+	return suite;
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_addControlListenerLorg_eclipse_swt_events_ControlListener");
+	methodNames.addElement("test_addFocusListenerLorg_eclipse_swt_events_FocusListener");
+	methodNames.addElement("test_addHelpListenerLorg_eclipse_swt_events_HelpListener");
+	methodNames.addElement("test_addKeyListenerLorg_eclipse_swt_events_KeyListener");
+	methodNames.addElement("test_addMouseListenerLorg_eclipse_swt_events_MouseListener");
+	methodNames.addElement("test_addMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener");
+	methodNames.addElement("test_addMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener");
+	methodNames.addElement("test_addPaintListenerLorg_eclipse_swt_events_PaintListener");
+	methodNames.addElement("test_addTraverseListenerLorg_eclipse_swt_events_TraverseListener");
+	methodNames.addElement("test_computeSizeII");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_forceFocus");
+	methodNames.addElement("test_getAccessible");
+	methodNames.addElement("test_getBackground");
+	methodNames.addElement("test_getBorderWidth");
+	methodNames.addElement("test_getBounds");
+	methodNames.addElement("test_getEnabled");
+	methodNames.addElement("test_getFont");
+	methodNames.addElement("test_getForeground");
+	methodNames.addElement("test_getLocation");
+	methodNames.addElement("test_getMenu");
+	methodNames.addElement("test_getMonitor");
+	methodNames.addElement("test_getParent");
+	methodNames.addElement("test_getShell");
+	methodNames.addElement("test_getSize");
+	methodNames.addElement("test_getToolTipText");
+	methodNames.addElement("test_getVisible");
+	methodNames.addElement("test_isEnabled");
+	methodNames.addElement("test_isFocusControl");
+	methodNames.addElement("test_isReparentable");
+	methodNames.addElement("test_isVisible");
+	methodNames.addElement("test_moveAboveLorg_eclipse_swt_widgets_Control");
+	methodNames.addElement("test_moveBelowLorg_eclipse_swt_widgets_Control");
+	methodNames.addElement("test_pack");
+	methodNames.addElement("test_packZ");
+	methodNames.addElement("test_redraw");
+	methodNames.addElement("test_redrawIIIIZ");
+	methodNames.addElement("test_removeControlListenerLorg_eclipse_swt_events_ControlListener");
+	methodNames.addElement("test_removeFocusListenerLorg_eclipse_swt_events_FocusListener");
+	methodNames.addElement("test_removeHelpListenerLorg_eclipse_swt_events_HelpListener");
+	methodNames.addElement("test_removeKeyListenerLorg_eclipse_swt_events_KeyListener");
+	methodNames.addElement("test_removeMouseListenerLorg_eclipse_swt_events_MouseListener");
+	methodNames.addElement("test_removeMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener");
+	methodNames.addElement("test_removeMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener");
+	methodNames.addElement("test_removePaintListenerLorg_eclipse_swt_events_PaintListener");
+	methodNames.addElement("test_removeTraverseListenerLorg_eclipse_swt_events_TraverseListener");
+	methodNames.addElement("test_setBackgroundLorg_eclipse_swt_graphics_Color");
+	methodNames.addElement("test_setBoundsIIII");
+	methodNames.addElement("test_setBoundsLorg_eclipse_swt_graphics_Rectangle");
+	methodNames.addElement("test_setCaptureZ");
+	methodNames.addElement("test_setCursorLorg_eclipse_swt_graphics_Cursor");
+	methodNames.addElement("test_setEnabledZ");
+	methodNames.addElement("test_setFocus");
+	methodNames.addElement("test_setFontLorg_eclipse_swt_graphics_Font");
+	methodNames.addElement("test_setForegroundLorg_eclipse_swt_graphics_Color");
+	methodNames.addElement("test_setLocationII");
+	methodNames.addElement("test_setLocationLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_setMenuLorg_eclipse_swt_widgets_Menu");
+	methodNames.addElement("test_setRedrawZ");
+	methodNames.addElement("test_setSizeII");
+	methodNames.addElement("test_setSizeLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_setToolTipTextLjava_lang_String");
+	methodNames.addElement("test_setVisibleZ");
+	methodNames.addElement("test_toControlII");
+	methodNames.addElement("test_toControlLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_toDisplayII");
+	methodNames.addElement("test_toDisplayLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_traverseI");
+	methodNames.addElement("test_update");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Widget.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_addControlListenerLorg_eclipse_swt_events_ControlListener")) test_addControlListenerLorg_eclipse_swt_events_ControlListener();
+	else if (getName().equals("test_addFocusListenerLorg_eclipse_swt_events_FocusListener")) test_addFocusListenerLorg_eclipse_swt_events_FocusListener();
+	else if (getName().equals("test_addHelpListenerLorg_eclipse_swt_events_HelpListener")) test_addHelpListenerLorg_eclipse_swt_events_HelpListener();
+	else if (getName().equals("test_addKeyListenerLorg_eclipse_swt_events_KeyListener")) test_addKeyListenerLorg_eclipse_swt_events_KeyListener();
+	else if (getName().equals("test_addMouseListenerLorg_eclipse_swt_events_MouseListener")) test_addMouseListenerLorg_eclipse_swt_events_MouseListener();
+	else if (getName().equals("test_addMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener")) test_addMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener();
+	else if (getName().equals("test_addMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener")) test_addMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener();
+	else if (getName().equals("test_addPaintListenerLorg_eclipse_swt_events_PaintListener")) test_addPaintListenerLorg_eclipse_swt_events_PaintListener();
+	else if (getName().equals("test_addTraverseListenerLorg_eclipse_swt_events_TraverseListener")) test_addTraverseListenerLorg_eclipse_swt_events_TraverseListener();
+	else if (getName().equals("test_computeSizeII")) test_computeSizeII();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_forceFocus")) test_forceFocus();
+	else if (getName().equals("test_getAccessible")) test_getAccessible();
+	else if (getName().equals("test_getBackground")) test_getBackground();
+	else if (getName().equals("test_getBorderWidth")) test_getBorderWidth();
+	else if (getName().equals("test_getBounds")) test_getBounds();
+	else if (getName().equals("test_getEnabled")) test_getEnabled();
+	else if (getName().equals("test_getFont")) test_getFont();
+	else if (getName().equals("test_getForeground")) test_getForeground();
+	else if (getName().equals("test_getLocation")) test_getLocation();
+	else if (getName().equals("test_getMenu")) test_getMenu();
+	else if (getName().equals("test_getMonitor")) test_getMonitor();
+	else if (getName().equals("test_getParent")) test_getParent();
+	else if (getName().equals("test_getShell")) test_getShell();
+	else if (getName().equals("test_getSize")) test_getSize();
+	else if (getName().equals("test_getToolTipText")) test_getToolTipText();
+	else if (getName().equals("test_getVisible")) test_getVisible();
+	else if (getName().equals("test_isEnabled")) test_isEnabled();
+	else if (getName().equals("test_isFocusControl")) test_isFocusControl();
+	else if (getName().equals("test_isReparentable")) test_isReparentable();
+	else if (getName().equals("test_isVisible")) test_isVisible();
+	else if (getName().equals("test_moveAboveLorg_eclipse_swt_widgets_Control")) test_moveAboveLorg_eclipse_swt_widgets_Control();
+	else if (getName().equals("test_moveBelowLorg_eclipse_swt_widgets_Control")) test_moveBelowLorg_eclipse_swt_widgets_Control();
+	else if (getName().equals("test_pack")) test_pack();
+	else if (getName().equals("test_packZ")) test_packZ();
+	else if (getName().equals("test_redraw")) test_redraw();
+	else if (getName().equals("test_redrawIIIIZ")) test_redrawIIIIZ();
+	else if (getName().equals("test_removeControlListenerLorg_eclipse_swt_events_ControlListener")) test_removeControlListenerLorg_eclipse_swt_events_ControlListener();
+	else if (getName().equals("test_removeFocusListenerLorg_eclipse_swt_events_FocusListener")) test_removeFocusListenerLorg_eclipse_swt_events_FocusListener();
+	else if (getName().equals("test_removeHelpListenerLorg_eclipse_swt_events_HelpListener")) test_removeHelpListenerLorg_eclipse_swt_events_HelpListener();
+	else if (getName().equals("test_removeKeyListenerLorg_eclipse_swt_events_KeyListener")) test_removeKeyListenerLorg_eclipse_swt_events_KeyListener();
+	else if (getName().equals("test_removeMouseListenerLorg_eclipse_swt_events_MouseListener")) test_removeMouseListenerLorg_eclipse_swt_events_MouseListener();
+	else if (getName().equals("test_removeMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener")) test_removeMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener();
+	else if (getName().equals("test_removeMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener")) test_removeMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener();
+	else if (getName().equals("test_removePaintListenerLorg_eclipse_swt_events_PaintListener")) test_removePaintListenerLorg_eclipse_swt_events_PaintListener();
+	else if (getName().equals("test_removeTraverseListenerLorg_eclipse_swt_events_TraverseListener")) test_removeTraverseListenerLorg_eclipse_swt_events_TraverseListener();
+	else if (getName().equals("test_setBackgroundLorg_eclipse_swt_graphics_Color")) test_setBackgroundLorg_eclipse_swt_graphics_Color();
+	else if (getName().equals("test_setBoundsIIII")) test_setBoundsIIII();
+	else if (getName().equals("test_setBoundsLorg_eclipse_swt_graphics_Rectangle")) test_setBoundsLorg_eclipse_swt_graphics_Rectangle();
+	else if (getName().equals("test_setCaptureZ")) test_setCaptureZ();
+	else if (getName().equals("test_setCursorLorg_eclipse_swt_graphics_Cursor")) test_setCursorLorg_eclipse_swt_graphics_Cursor();
+	else if (getName().equals("test_setEnabledZ")) test_setEnabledZ();
+	else if (getName().equals("test_setFocus")) test_setFocus();
+	else if (getName().equals("test_setFontLorg_eclipse_swt_graphics_Font")) test_setFontLorg_eclipse_swt_graphics_Font();
+	else if (getName().equals("test_setForegroundLorg_eclipse_swt_graphics_Color")) test_setForegroundLorg_eclipse_swt_graphics_Color();
+	else if (getName().equals("test_setLocationII")) test_setLocationII();
+	else if (getName().equals("test_setLocationLorg_eclipse_swt_graphics_Point")) test_setLocationLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_setMenuLorg_eclipse_swt_widgets_Menu")) test_setMenuLorg_eclipse_swt_widgets_Menu();
+	else if (getName().equals("test_setRedrawZ")) test_setRedrawZ();
+	else if (getName().equals("test_setSizeII")) test_setSizeII();
+	else if (getName().equals("test_setSizeLorg_eclipse_swt_graphics_Point")) test_setSizeLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_setToolTipTextLjava_lang_String")) test_setToolTipTextLjava_lang_String();
+	else if (getName().equals("test_setVisibleZ")) test_setVisibleZ();
+	else if (getName().equals("test_toControlII")) test_toControlII();
+	else if (getName().equals("test_toControlLorg_eclipse_swt_graphics_Point")) test_toControlLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_toDisplayII")) test_toDisplayII();
+	else if (getName().equals("test_toDisplayLorg_eclipse_swt_graphics_Point")) test_toDisplayLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_traverseI")) test_traverseI();
+	else if (getName().equals("test_update")) test_update();
+	else super.runTest();
+}
+
+/* custom */
+	Control control;
+	boolean eventOccurred;
+
+protected void setWidget(Widget w) {
+	control = (Control)w;
+	super.setWidget(w);
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Widget.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Widget.java
new file mode 100644
index 0000000000..6f9471b7d2
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Widget.java
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.tests.junit.performance;
+
+import junit.framework.*;
+import junit.textui.*;
+import org.eclipse.swt.widgets.*;
+
+/**
+ * Automated Performance Test Suite for class org.eclipse.swt.widgets.Widget
+ *
+ * @see org.eclipse.swt.widgets.Widget
+ */
+public class Test_org_eclipse_swt_widgets_Widget extends SwtPerformanceTestCase {
+
+public Test_org_eclipse_swt_widgets_Widget(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	shell = new Shell();
+}
+
+protected void tearDown() {
+	if (widget != null) {
+		assertEquals(false, widget.isDisposed());
+	}
+	assertEquals(false, shell.isDisposed());
+	shell.dispose();
+	if (widget != null) {
+		assertTrue(widget.isDisposed());
+	}
+	assertTrue(shell.isDisposed());
+}
+
+public void test_dispose() {
+}
+
+public void test_getDisplay() {
+}
+
+public void test_getStyle() {
+}
+
+public void test_isDisposed() {
+}
+
+public void test_notifyListenersILorg_eclipse_swt_widgets_Event() {
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Widget((String)e.nextElement()));
+	}
+	return suite;
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_dispose");
+	methodNames.addElement("test_getDisplay");
+	methodNames.addElement("test_getStyle");
+	methodNames.addElement("test_isDisposed");
+	methodNames.addElement("test_notifyListenersILorg_eclipse_swt_widgets_Event");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_dispose")) test_dispose();
+	else if (getName().equals("test_getDisplay")) test_getDisplay();
+	else if (getName().equals("test_getStyle")) test_getStyle();
+	else if (getName().equals("test_isDisposed")) test_isDisposed();
+	else if (getName().equals("test_notifyListenersILorg_eclipse_swt_widgets_Event")) test_notifyListenersILorg_eclipse_swt_widgets_Event();
+}
+
+/* custom */
+public Shell shell;
+private Widget widget;
+
+protected void setWidget(Widget w) {
+	widget = w;
+}
+}