Bug 266533 - Remove SWT-Dependency from ui.workbench:
* move SWT stuff back
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF
index 17614f7..b73612c 100644
--- a/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF
@@ -19,5 +19,4 @@
Export-Package: org.eclipse.e4.ui.workbench.swt,
org.eclipse.e4.ui.workbench.swt.internal,
org.eclipse.e4.ui.workbench.swt.internal.parts,
- org.eclipse.e4.ui.workbench.swt.modeling,
- org.eclipse.e4.ui.workbench.swt.util
+ org.eclipse.e4.ui.workbench.swt.modeling
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/WorkbenchApplication.java b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/WorkbenchApplication.java
index be4c1e6..216d28c 100644
--- a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/WorkbenchApplication.java
+++ b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/WorkbenchApplication.java
@@ -20,8 +20,9 @@
import org.eclipse.e4.core.services.context.IEclipseContext;
import org.eclipse.e4.core.services.context.spi.IContextConstants;
import org.eclipse.e4.ui.workbench.swt.Activator;
-import org.eclipse.e4.ui.workbench.swt.WorkbenchFactory;
import org.eclipse.e4.workbench.ui.IWorkbench;
+import org.eclipse.e4.workbench.ui.WorkbenchFactory;
+import org.eclipse.e4.workbench.ui.internal.Workbench;
import org.eclipse.emf.common.util.URI;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
diff --git a/bundles/org.eclipse.e4.ui.workbench/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench/META-INF/MANIFEST.MF
index c25dd6e..e2b11e1 100644
--- a/bundles/org.eclipse.e4.ui.workbench/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.ui.workbench/META-INF/MANIFEST.MF
@@ -20,5 +20,6 @@
org.eclipse.e4.workbench.ui,
org.eclipse.e4.workbench.ui.behaviors,
org.eclipse.e4.workbench.ui.internal;x-friends:="org.eclipse.e4.ui.workbench.fragment",
- org.eclipse.e4.workbench.ui.renderers
+ org.eclipse.e4.workbench.ui.renderers,
+ org.eclipse.e4.workbench.ui.utils
Bundle-Activator: org.eclipse.e4.workbench.ui.internal.Activator
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/WorkbenchFactory.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/workbench/ui/WorkbenchFactory.java
similarity index 90%
rename from bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/WorkbenchFactory.java
rename to bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/workbench/ui/WorkbenchFactory.java
index 6a43e5f..4d748df 100644
--- a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/WorkbenchFactory.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/workbench/ui/WorkbenchFactory.java
@@ -9,12 +9,11 @@
* Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
* Boris Bokowski, IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.e4.ui.workbench.swt;
+package org.eclipse.e4.workbench.ui;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.e4.core.services.context.IEclipseContext;
-import org.eclipse.e4.ui.workbench.swt.internal.Workbench;
-import org.eclipse.e4.workbench.ui.IWorkbench;
+import org.eclipse.e4.workbench.ui.internal.Workbench;
import org.eclipse.emf.common.util.URI;
import org.eclipse.osgi.service.datalocation.Location;
import org.osgi.service.packageadmin.PackageAdmin;
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/workbench/ui/internal/UIContextScheduler.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/workbench/ui/internal/UIContextScheduler.java
index 070f9d2..1b96e09 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/workbench/ui/internal/UIContextScheduler.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/workbench/ui/internal/UIContextScheduler.java
@@ -11,24 +11,24 @@
package org.eclipse.e4.workbench.ui.internal;
-import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.e4.core.services.context.IEclipseContext;
import org.eclipse.e4.core.services.context.spi.IEclipseContextScheduler;
import org.eclipse.e4.core.services.context.spi.IRunAndTrack;
+import org.eclipse.swt.widgets.Display;
public class UIContextScheduler implements IEclipseContextScheduler {
static final public IEclipseContextScheduler instance = new UIContextScheduler();
public void schedule(Runnable runnable) {
- Realm.getDefault().asyncExec(runnable);
+ Display.getDefault().asyncExec(runnable);
}
public boolean schedule(final IEclipseContext context,
final IRunAndTrack runnable, final String name,
final int eventType, final Object[] args) {
final boolean[] result = new boolean[1];
- Realm.getDefault().asyncExec(new Runnable() {
+ Display.getDefault().asyncExec(new Runnable() {
public void run() {
result[0] = runnable.notify(context, name, eventType, args);
}
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/Workbench.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/workbench/ui/internal/Workbench.java
similarity index 97%
rename from bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/Workbench.java
rename to bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/workbench/ui/internal/Workbench.java
index 6e440eb..f718519 100644
--- a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/Workbench.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/workbench/ui/internal/Workbench.java
@@ -9,7 +9,7 @@
* Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
* Boris Bokowski, IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.e4.ui.workbench.swt.internal;
+package org.eclipse.e4.workbench.ui.internal;
import java.io.File;
import java.io.IOException;
@@ -35,16 +35,12 @@
import org.eclipse.e4.ui.model.workbench.WorkbenchFactory;
import org.eclipse.e4.ui.model.workbench.WorkbenchPackage;
import org.eclipse.e4.ui.services.IServiceConstants;
-import org.eclipse.e4.ui.workbench.swt.util.ResourceUtility;
import org.eclipse.e4.workbench.ui.IExceptionHandler;
import org.eclipse.e4.workbench.ui.ILegacyHook;
import org.eclipse.e4.workbench.ui.IWorkbench;
-import org.eclipse.e4.workbench.ui.internal.ActiveChildOutputValue;
-import org.eclipse.e4.workbench.ui.internal.ExceptionHandler;
-import org.eclipse.e4.workbench.ui.internal.ReflectionContributionFactory;
-import org.eclipse.e4.workbench.ui.internal.UIContextScheduler;
import org.eclipse.e4.workbench.ui.renderers.PartFactory;
import org.eclipse.e4.workbench.ui.renderers.PartRenderer;
+import org.eclipse.e4.workbench.ui.utils.ResourceUtility;
import org.eclipse.emf.common.util.TreeIterator;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
@@ -60,7 +56,7 @@
import org.eclipse.swt.widgets.Shell;
import org.osgi.service.packageadmin.PackageAdmin;
-public class Workbench implements IWorkbench {
+public class Workbench implements IWorkbench {
public static final String ID = "org.eclipse.e4.workbench.fakedWBWindow"; //$NON-NLS-1$
private MApplication<MWorkbenchWindow> workbench;
private ResourceUtility resourceUtility;
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/util/ResourceUtility.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/workbench/ui/utils/ResourceUtility.java
similarity index 98%
rename from bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/util/ResourceUtility.java
rename to bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/workbench/ui/utils/ResourceUtility.java
index fba2aa9..7eedfc4 100644
--- a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/util/ResourceUtility.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/workbench/ui/utils/ResourceUtility.java
@@ -9,7 +9,7 @@
* Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
* Boris Bokowski, IBM Corporation - initial API and implementation
******************************************************************************/
-package org.eclipse.e4.ui.workbench.swt.util;
+package org.eclipse.e4.workbench.ui.utils;
import java.net.MalformedURLException;
import java.net.URL;
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 7e1ddb7..8c312e7 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
@@ -28,8 +28,8 @@
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.workbench.swt.internal.Workbench;
import org.eclipse.e4.workbench.ui.internal.ReflectionContributionFactory;
+import org.eclipse.e4.workbench.ui.internal.Workbench;
import org.eclipse.e4.workbench.ui.renderers.PartFactory;
import org.eclipse.e4.workbench.ui.renderers.PartRenderer;
import org.eclipse.jface.databinding.swt.SWTObservables;
diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/RunApplicationTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/RunApplicationTest.java
index e8a1e74..27b3868 100644
--- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/RunApplicationTest.java
+++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/RunApplicationTest.java
@@ -19,9 +19,9 @@
import org.eclipse.e4.core.services.context.IEclipseContext;
import org.eclipse.e4.core.services.context.spi.IContextConstants;
import org.eclipse.e4.ui.tests.Activator;
-import org.eclipse.e4.ui.workbench.swt.WorkbenchFactory;
import org.eclipse.e4.ui.workbench.swt.internal.WorkbenchStylingSupport;
import org.eclipse.e4.workbench.ui.IWorkbench;
+import org.eclipse.e4.workbench.ui.WorkbenchFactory;
import org.eclipse.emf.common.util.URI;
import org.eclipse.equinox.app.IApplicationContext;
import org.eclipse.jface.databinding.swt.SWTObservables;
