Update with the latest from HEAD.
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/SwtJunit.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/SwtJunit.java
index 1c20acb..9090757 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/SwtJunit.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/SwtJunit.java
@@ -1,15 +1,17 @@
/*******************************************************************************
- * 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
+ * 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 Eclipse Public License v1.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.swt.tests.junit.performance;
+import org.eclipse.swt.SWT;
+
/**
* Platform-specific constants used in SWT test cases.
@@ -17,14 +19,15 @@
public class SwtJunit {
public static final String testFontName;
- public final static boolean isWindows = System.getProperty("os.name").startsWith("Win");
+ public final static boolean isWindows = SWT.getPlatform().startsWith("win32");
+ public final static boolean isCarbon = SWT.getPlatform().startsWith("carbon");
+ public final static boolean isMotif = SWT.getPlatform().equals("motif");
+ public final static boolean isGTK = SWT.getPlatform().equals("gtk");
+ public final static boolean isPhoton = SWT.getPlatform().equals("photon");
public final static boolean isLinux = System.getProperty("os.name").equals("Linux");
public final static boolean isAIX = System.getProperty("os.name").equals("AIX");
public final static boolean isSolaris = System.getProperty("os.name").equals("Solaris") || System.getProperty("os.name").equals("SunOS");
public final static boolean isHPUX = System.getProperty("os.name").equals("HP-UX");
- public final static boolean isCarbon = System.getProperty("os.name").startsWith("Mac");
-
- public final static boolean isMotif = /*!isGTK &&*/ isLinux || isAIX || isSolaris || isHPUX;
static {
if (isMotif) {
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_situational.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_situational.java
index b65452a..728d17c 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_situational.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_situational.java
@@ -139,33 +139,48 @@
for(int i = 0; i < 10; i++) {
Composite c = new Composite(parent, SWT.BORDER);
- data = new GridData(SWT.FILL, SWT.FILL, false, false);
+ data = new GridData();
+ data.horizontalAlignment = GridData.FILL;
+ data.verticalAlignment = GridData.FILL;
c.setLayoutData(data);
c.setLayout(new GridLayout(2, false));
Composite c1 = new Composite(c, SWT.BORDER);
- data = new GridData(SWT.FILL, SWT.FILL, false, false);
+ data = new GridData();
+ data.horizontalAlignment = GridData.FILL;
+ data.verticalAlignment = GridData.FILL;
data.widthHint = data.heightHint = 2;
c1.setLayoutData(data);
Composite c2 = new Composite(c, SWT.BORDER);
- data = new GridData(SWT.FILL, SWT.FILL, false, false);
+ data = new GridData();
+ data.horizontalAlignment = GridData.FILL;
+ data.verticalAlignment = GridData.FILL;
data.widthHint = data.heightHint = 2;
c2.setLayoutData(data);
Composite c3 = new Composite(c, SWT.BORDER);
- data = new GridData(SWT.FILL, SWT.FILL, false, false);
+ data = new GridData();
+ data.horizontalAlignment = GridData.FILL;
+ data.verticalAlignment = GridData.FILL;
data.widthHint = data.heightHint = 2;
c3.setLayoutData(data);
Composite c4 = new Composite(c, SWT.BORDER);
- data = new GridData(SWT.FILL, SWT.FILL, false, false);
+ data = new GridData();
+ data.horizontalAlignment = GridData.FILL;
+ data.verticalAlignment = GridData.FILL;
c4.setLayoutData(data);
c4.setLayout(new GridLayout());
parent = c4;
}
changedLabel = new Label(parent, SWT.NONE);
- changedLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+ data = new GridData();
+ data.horizontalAlignment = GridData.FILL;
+ data.verticalAlignment = GridData.FILL;
+ data.grabExcessHorizontalSpace = true;
+ data.grabExcessVerticalSpace = true;
+ changedLabel.setLayoutData(data);
shell.open();
while(display.readAndDispatch());
@@ -226,7 +241,10 @@
Shell shell = new Shell(display);
shell.setLayout(new GridLayout());
Canvas c = new Canvas(shell, SWT.NONE);
- c.setLayoutData(new GridData(width, height));
+ GridData data = new GridData();
+ data.widthHint = width;
+ data.heightHint = height;
+ c.setLayoutData(data);
shell.pack();
shell.open();
while(display.readAndDispatch());
@@ -265,7 +283,10 @@
Shell shell = new Shell(display);
shell.setLayout(new GridLayout());
Canvas c = new Canvas(shell, SWT.NONE);
- c.setLayoutData(new GridData(width, height));
+ GridData data = new GridData();
+ data.widthHint = width;
+ data.heightHint = height;
+ c.setLayoutData(data);
shell.pack();
shell.open();
while(display.readAndDispatch());
@@ -308,7 +329,10 @@
Shell shell = new Shell(display);
shell.setLayout(new GridLayout());
Canvas c = new Canvas(shell, SWT.NONE);
- c.setLayoutData(new GridData(width, height));
+ GridData data = new GridData();
+ data.widthHint = width;
+ data.heightHint = height;
+ c.setLayoutData(data);
shell.pack();
shell.open();
while(display.readAndDispatch());
