diff options
| author | Tom Schindl | 2013-04-15 08:00:32 +0000 |
|---|---|---|
| committer | Tom Schindl | 2013-04-15 08:00:32 +0000 |
| commit | 4c49ed54a364a3b507eff3f7530542587812a497 (patch) | |
| tree | 1a76721c471c094162cfa54e0b6899f9ce509304 /bundles/runtime/org.eclipse.fx.ui.di | |
| parent | fb9c45a2a306c534d8f996368739c72a63d22eb7 (diff) | |
| download | org.eclipse.efxclipse-4c49ed54a364a3b507eff3f7530542587812a497.tar.gz org.eclipse.efxclipse-4c49ed54a364a3b507eff3f7530542587812a497.tar.xz org.eclipse.efxclipse-4c49ed54a364a3b507eff3f7530542587812a497.zip | |
moved to ui space
Diffstat (limited to 'bundles/runtime/org.eclipse.fx.ui.di')
| -rwxr-xr-x | bundles/runtime/org.eclipse.fx.ui.di/META-INF/MANIFEST.MF | 2 | ||||
| -rwxr-xr-x | bundles/runtime/org.eclipse.fx.ui.di/src/org/eclipse/fx/ui/di/DIApplication.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bundles/runtime/org.eclipse.fx.ui.di/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.di/META-INF/MANIFEST.MF index c2cb0e039..6b06e1da2 100755 --- a/bundles/runtime/org.eclipse.fx.ui.di/META-INF/MANIFEST.MF +++ b/bundles/runtime/org.eclipse.fx.ui.di/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.e4.core.contexts;bundle-version="0.9.0", org.eclipse.e4.core.di;bundle-version="0.9.0", org.eclipse.fx.osgi.util, - org.eclipse.fx.application;bundle-version="0.8.1", + org.eclipse.fx.ui.application;bundle-version="0.8.1", org.eclipse.fx.core;bundle-version="0.8.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: javafx.animation;version="2.0.0", diff --git a/bundles/runtime/org.eclipse.fx.ui.di/src/org/eclipse/fx/ui/di/DIApplication.java b/bundles/runtime/org.eclipse.fx.ui.di/src/org/eclipse/fx/ui/di/DIApplication.java index 993817a60..153162d39 100755 --- a/bundles/runtime/org.eclipse.fx.ui.di/src/org/eclipse/fx/ui/di/DIApplication.java +++ b/bundles/runtime/org.eclipse.fx.ui.di/src/org/eclipse/fx/ui/di/DIApplication.java @@ -22,8 +22,8 @@ import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.EclipseContextFactory; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.equinox.app.IApplicationContext; -import org.eclipse.fx.application.AbstractJFXApplication; import org.eclipse.fx.osgi.util.LoggerCreator; +import org.eclipse.fx.ui.application.AbstractJFXApplication; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; @@ -60,6 +60,7 @@ public class DIApplication extends AbstractJFXApplication implements IExecutable } } + @SuppressWarnings("unchecked") public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException { bundleName = config.getContributor().getName(); |