Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArun Thondapu2015-05-13 18:00:57 +0000
committerArun Thondapu2015-05-13 18:00:57 +0000
commit0fd3fce032a102d2e134150ed342fe71288d4a11 (patch)
tree7890f7ca873eafa4be2fc29b258bfaa8a95ebb1a
parent28eae5a124e699ec7aa8293ac7fa643d7d4191ce (diff)
downloadeclipse.platform.swt-0fd3fce032a102d2e134150ed342fe71288d4a11.tar.gz
eclipse.platform.swt-0fd3fce032a102d2e134150ed342fe71288d4a11.tar.xz
eclipse.platform.swt-0fd3fce032a102d2e134150ed342fe71288d4a11.zip
Revert "Misc changes"
-rw-r--r--bundles/org.eclipse.swt/.classpath_win32 (renamed from bundles/org.eclipse.swt/.classpath)0
-rw-r--r--examples/org.eclipse.swt.snippets/.classpath14
-rw-r--r--examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet900.java46
-rw-r--r--tests/org.eclipse.swt.tests/.classpath16
-rw-r--r--tests/org.eclipse.swt.tests/META-INF/MANIFEST.MF6
5 files changed, 19 insertions, 63 deletions
diff --git a/bundles/org.eclipse.swt/.classpath b/bundles/org.eclipse.swt/.classpath_win32
index 68a2d44fbb..68a2d44fbb 100644
--- a/bundles/org.eclipse.swt/.classpath
+++ b/bundles/org.eclipse.swt/.classpath_win32
diff --git a/examples/org.eclipse.swt.snippets/.classpath b/examples/org.eclipse.swt.snippets/.classpath
index f797f60925..ad32c83a78 100644
--- a/examples/org.eclipse.swt.snippets/.classpath
+++ b/examples/org.eclipse.swt.snippets/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry excluding="org/eclipse/swt/snippets/Snippet341.java|org/eclipse/swt/snippets/Snippet321.java|org/eclipse/swt/snippets/Snippet323.java|org/eclipse/swt/snippets/Snippet329.java|org/eclipse/swt/snippets/Snippet306.java|org/eclipse/swt/snippets/Snippet267.java|org/eclipse/swt/snippets/Snippet277.java|org/eclipse/swt/snippets/Snippet158.java|org/eclipse/swt/snippets/Snippet174.java|org/eclipse/swt/snippets/Snippet195.java|org/eclipse/swt/snippets/Snippet209.java" kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet900.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet900.java
deleted file mode 100644
index aadfb24067..0000000000
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet900.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2015 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/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.snippets;
-
-/*
- * SegmentListener example snippet: create tool bar (wrap on resize)
- *
- * For a list of all SWT example snippets see
- * http://www.eclipse.org/swt/snippets/
- */
-import org.eclipse.swt.*;
-import org.eclipse.swt.widgets.*;
-
-public class Snippet900 {
-
-public static void main (String [] args) {
- Display display = new Display ();
- final Shell shell = new Shell (display);
- final Button button = new Button(shell, SWT.PUSH);
- button.setText("def");
-
- button.addListener(SWT.Segments, new Listener() {
-
- @Override
- public void handleEvent(Event event) {
- button.setText("abc");
- }
-
- });
- button.pack();
- button.setLocation(10, 180);
- shell.open ();
- while (!shell.isDisposed ()) {
- if (!display.readAndDispatch ()) display.sleep ();
- }
- display.dispose ();
-}
-}
diff --git a/tests/org.eclipse.swt.tests/.classpath b/tests/org.eclipse.swt.tests/.classpath
index c1af5b8d15..ee4a970e39 100644
--- a/tests/org.eclipse.swt.tests/.classpath
+++ b/tests/org.eclipse.swt.tests/.classpath
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry excluding="org/eclipse/swt/tests/junit/performance/" kind="src" path="JUnit Tests"/>
- <classpathentry kind="src" path="data"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="JUnit Tests"/>
+ <classpathentry kind="src" path="data"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/org.eclipse.swt.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.swt.tests/META-INF/MANIFEST.MF
index 4842518882..fc8e8ef378 100644
--- a/tests/org.eclipse.swt.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.swt.tests/META-INF/MANIFEST.MF
@@ -6,8 +6,10 @@ Bundle-Version: 3.104.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.swt.tests.junit,
- org.eclipse.swt.tests.junit.browser
+ org.eclipse.swt.tests.junit.browser,
+ org.eclipse.swt.tests.junit.performance
Require-Bundle: org.junit,
- org.eclipse.swt
+ org.eclipse.swt,
+ org.eclipse.test.performance
Eclipse-BundleShape: dir
Bundle-RequiredExecutionEnvironment: J2SE-1.5

Back to the top