Bug 283742 [CSS][UI] Get rid of swt fragment
Had to change test to deal with ETabFolder explicitly
diff --git a/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF
index 65fb751..f213e23 100644
--- a/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF
@@ -18,6 +18,7 @@
org.eclipse.e4.core.services;bundle-version="0.9.0",
org.eclipse.e4.ui.workbench;bundle-version="0.9.0",
org.junit;bundle-version="3.8.2",
- org.eclipse.e4.ui.workbench.swt;bundle-version="0.9.0"
+ org.eclipse.e4.ui.workbench.swt;bundle-version="0.9.0",
+ org.eclipse.e4.ui.widgets;bundle-version="0.9.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MWindowTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MWindowTest.java
index e3bd3a3..0b14c19 100644
--- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MWindowTest.java
+++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MWindowTest.java
@@ -29,13 +29,13 @@
import org.eclipse.e4.ui.model.application.MWindow;
import org.eclipse.e4.ui.services.IServiceConstants;
import org.eclipse.e4.ui.tests.Activator;
+import org.eclipse.e4.ui.widgets.ETabFolder;
import org.eclipse.e4.workbench.ui.internal.ReflectionContributionFactory;
import org.eclipse.e4.workbench.ui.internal.Workbench;
import org.eclipse.e4.workbench.ui.renderers.AbstractPartRenderer;
import org.eclipse.e4.workbench.ui.renderers.PartRenderingEngine;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@@ -120,8 +120,8 @@
public void run() {
IEclipseContext context = getAppContext();
Workbench.initializeContext(context, window);
- PartRenderingEngine renderer = new PartRenderingEngine(getCFactory(),
- context);
+ PartRenderingEngine renderer = new PartRenderingEngine(
+ getCFactory(), context);
Workbench.initializeRenderer(RegistryFactory
.getRegistry(), renderer, appContext,
getCFactory());
@@ -143,8 +143,8 @@
public void run() {
IEclipseContext context = getAppContext();
Workbench.initializeContext(context, window);
- PartRenderingEngine renderer = new PartRenderingEngine(getCFactory(),
- context);
+ PartRenderingEngine renderer = new PartRenderingEngine(
+ getCFactory(), context);
Workbench.initializeRenderer(RegistryFactory
.getRegistry(), renderer, appContext,
getCFactory());
@@ -164,7 +164,7 @@
// CTabFolder so can implement margins
Composite marginHolder = (Composite) sashChildren[0];
assertEquals(1, marginHolder.getChildren().length);
- CTabFolder folder = (CTabFolder) marginHolder
+ ETabFolder folder = (ETabFolder) marginHolder
.getChildren()[0];
assertEquals(1, folder.getItemCount());
@@ -184,8 +184,8 @@
public void run() {
IEclipseContext context = getAppContext();
Workbench.initializeContext(context, window);
- PartRenderingEngine renderer = new PartRenderingEngine(getCFactory(),
- context);
+ PartRenderingEngine renderer = new PartRenderingEngine(
+ getCFactory(), context);
Workbench.initializeRenderer(RegistryFactory
.getRegistry(), renderer, appContext,
getCFactory());
@@ -239,8 +239,8 @@
public void run() {
IEclipseContext context = getAppContext();
Workbench.initializeContext(context, window);
- PartRenderingEngine renderer = new PartRenderingEngine(getCFactory(),
- context);
+ PartRenderingEngine renderer = new PartRenderingEngine(
+ getCFactory(), context);
Workbench.initializeRenderer(RegistryFactory
.getRegistry(), renderer, appContext,
getCFactory());
