Skip to main content
summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorTom Schindl2013-05-28 08:41:41 -0400
committerTom Schindl2013-05-28 08:41:41 -0400
commit2f48d831703e3551a2c6bdf53125113809cb9b6c (patch)
tree3a1a34587512ebd46190b05a9cba2690b81fcd3b /demos
parent31b51636b7a0fb1a56052f7deeb5dcb3536b9491 (diff)
downloadorg.eclipse.efxclipse-2f48d831703e3551a2c6bdf53125113809cb9b6c.tar.gz
org.eclipse.efxclipse-2f48d831703e3551a2c6bdf53125113809cb9b6c.tar.xz
org.eclipse.efxclipse-2f48d831703e3551a2c6bdf53125113809cb9b6c.zip
Bug 408986 - Get rid of org.eclipse.fx.ui.application bundle
Diffstat (limited to 'demos')
-rwxr-xr-xdemos/org.eclipse.fx.demo.contacts.app/META-INF/MANIFEST.MF1
-rwxr-xr-xdemos/org.eclipse.fx.demo.contacts.app/contacts.product1
-rw-r--r--demos/org.eclipse.fx.demo.contacts.app/contacts_workspace.product.launch2
-rwxr-xr-xdemos/org.eclipse.fx.demo.e4/E4JFX.product1
-rw-r--r--demos/org.eclipse.fx.demo.e4/E4JFX_workspace.product.launch2
-rwxr-xr-xdemos/org.eclipse.fx.demo.fxgraph.osgi/FXML.product1
-rw-r--r--demos/org.eclipse.fx.demo.fxgraph.osgi/FXML_workbench.product.launch2
-rwxr-xr-xdemos/org.eclipse.fx.demo.fxgraph.osgi/META-INF/MANIFEST.MF1
-rwxr-xr-xdemos/org.eclipse.fx.demo.fxgraph.osgi/src/org/eclipse/fx/demo/fxgraph/osgi/Application.java2
-rwxr-xr-xdemos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product1
-rw-r--r--demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_workspace.launch2
-rwxr-xr-xdemos/org.eclipse.fx.demo.osgi.di/Di.product.product1
-rw-r--r--demos/org.eclipse.fx.demo.osgi.di/Di.product.product_workbench.launch2
-rwxr-xr-xdemos/org.eclipse.fx.demo.osgi/META-INF/MANIFEST.MF2
-rwxr-xr-xdemos/org.eclipse.fx.demo.osgi/OSGiApp.product1
-rw-r--r--demos/org.eclipse.fx.demo.osgi/OSGiApp.product_workbench.launch2
-rwxr-xr-xdemos/org.eclipse.fx.demo.osgi/src/org/eclipse/fx/demo/osgi/Application.java2
17 files changed, 9 insertions, 17 deletions
diff --git a/demos/org.eclipse.fx.demo.contacts.app/META-INF/MANIFEST.MF b/demos/org.eclipse.fx.demo.contacts.app/META-INF/MANIFEST.MF
index 6eaf39f84..e98a0ed7f 100755
--- a/demos/org.eclipse.fx.demo.contacts.app/META-INF/MANIFEST.MF
+++ b/demos/org.eclipse.fx.demo.contacts.app/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.fx.demo.contacts.app;singleton:=true
Bundle-Version: 0.9.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.fx.ui.application,
org.eclipse.fx.ui.workbench.fx,
javax.inject;bundle-version="1.0.0",
org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
diff --git a/demos/org.eclipse.fx.demo.contacts.app/contacts.product b/demos/org.eclipse.fx.demo.contacts.app/contacts.product
index 5b3be890c..403cd19bc 100755
--- a/demos/org.eclipse.fx.demo.contacts.app/contacts.product
+++ b/demos/org.eclipse.fx.demo.contacts.app/contacts.product
@@ -80,7 +80,6 @@
<plugin id="org.eclipse.fx.javafx"/>
<plugin id="org.eclipse.fx.osgi" fragment="true"/>
<plugin id="org.eclipse.fx.osgi.util"/>
- <plugin id="org.eclipse.fx.ui.application"/>
<plugin id="org.eclipse.fx.ui.databinding"/>
<plugin id="org.eclipse.fx.ui.di"/>
<plugin id="org.eclipse.fx.ui.dialogs"/>
diff --git a/demos/org.eclipse.fx.demo.contacts.app/contacts_workspace.product.launch b/demos/org.eclipse.fx.demo.contacts.app/contacts_workspace.product.launch
index 8c085ce11..5bd2420de 100644
--- a/demos/org.eclipse.fx.demo.contacts.app/contacts_workspace.product.launch
+++ b/demos/org.eclipse.fx.demo.contacts.app/contacts_workspace.product.launch
@@ -23,7 +23,7 @@
<stringAttribute key="product" value="org.eclipse.fx.demo.contacts.app.product"/>
<stringAttribute key="productFile" value="/org.eclipse.fx.demo.contacts.app/contacts.product"/>
<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.fx.javafx@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.contacts.app@default:default,org.eclipse.fx.demo.contacts.edit@default:default,org.eclipse.fx.demo.contacts@default:default,org.eclipse.fx.emf.databinding@default:default,org.eclipse.fx.emf.edit.ui@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.application@default:default,org.eclipse.fx.ui.databinding@default:default,org.eclipse.fx.ui.di@default:default,org.eclipse.fx.ui.dialogs@default:default,org.eclipse.fx.ui.keybindings.e4@default:default,org.eclipse.fx.ui.keybindings.generic@default:default,org.eclipse.fx.ui.keybindings@default:default,org.eclipse.fx.ui.panes@default:default,org.eclipse.fx.ui.services@default:default,org.eclipse.fx.ui.theme@default:default,org.eclipse.fx.ui.workbench.base@default:default,org.eclipse.fx.ui.workbench.fx.controls@default:default,org.eclipse.fx.ui.workbench.fx@default:default,org.eclipse.fx.ui.workbench.renderers.base@default:default,org.eclipse.fx.ui.workbench.renderers.fx@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.contacts.app@default:default,org.eclipse.fx.demo.contacts.edit@default:default,org.eclipse.fx.demo.contacts@default:default,org.eclipse.fx.emf.databinding@default:default,org.eclipse.fx.emf.edit.ui@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.databinding@default:default,org.eclipse.fx.ui.di@default:default,org.eclipse.fx.ui.dialogs@default:default,org.eclipse.fx.ui.keybindings.e4@default:default,org.eclipse.fx.ui.keybindings.generic@default:default,org.eclipse.fx.ui.keybindings@default:default,org.eclipse.fx.ui.panes@default:default,org.eclipse.fx.ui.services@default:default,org.eclipse.fx.ui.theme@default:default,org.eclipse.fx.ui.workbench.base@default:default,org.eclipse.fx.ui.workbench.fx.controls@default:default,org.eclipse.fx.ui.workbench.fx@default:default,org.eclipse.fx.ui.workbench.renderers.base@default:default,org.eclipse.fx.ui.workbench.renderers.fx@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/demos/org.eclipse.fx.demo.e4/E4JFX.product b/demos/org.eclipse.fx.demo.e4/E4JFX.product
index a01a5ec82..c13dc6930 100755
--- a/demos/org.eclipse.fx.demo.e4/E4JFX.product
+++ b/demos/org.eclipse.fx.demo.e4/E4JFX.product
@@ -70,7 +70,6 @@
<plugin id="org.eclipse.fx.javafx"/>
<plugin id="org.eclipse.fx.osgi" fragment="true"/>
<plugin id="org.eclipse.fx.osgi.util"/>
- <plugin id="org.eclipse.fx.ui.application"/>
<plugin id="org.eclipse.fx.ui.databinding"/>
<plugin id="org.eclipse.fx.ui.di"/>
<plugin id="org.eclipse.fx.ui.dialogs"/>
diff --git a/demos/org.eclipse.fx.demo.e4/E4JFX_workspace.product.launch b/demos/org.eclipse.fx.demo.e4/E4JFX_workspace.product.launch
index fafe84707..c6ebf62d3 100644
--- a/demos/org.eclipse.fx.demo.e4/E4JFX_workspace.product.launch
+++ b/demos/org.eclipse.fx.demo.e4/E4JFX_workspace.product.launch
@@ -23,7 +23,7 @@
<stringAttribute key="product" value="org.eclipse.fx.demo.e4.product"/>
<stringAttribute key="productFile" value="/org.eclipse.fx.demo.e4/E4JFX.product"/>
<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.fx.javafx@default:default,org.eclipse.fx.osgi@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.e4@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.application@default:default,org.eclipse.fx.ui.databinding@default:default,org.eclipse.fx.ui.di@default:default,org.eclipse.fx.ui.dialogs@default:default,org.eclipse.fx.ui.keybindings.e4@default:default,org.eclipse.fx.ui.keybindings.generic@default:default,org.eclipse.fx.ui.keybindings@default:default,org.eclipse.fx.ui.panes@default:default,org.eclipse.fx.ui.services@default:default,org.eclipse.fx.ui.theme@default:default,org.eclipse.fx.ui.workbench.base@default:default,org.eclipse.fx.ui.workbench.fx.controls@default:default,org.eclipse.fx.ui.workbench.fx@default:default,org.eclipse.fx.ui.workbench.renderers.base@default:default,org.eclipse.fx.ui.workbench.renderers.fx@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.e4@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.databinding@default:default,org.eclipse.fx.ui.di@default:default,org.eclipse.fx.ui.dialogs@default:default,org.eclipse.fx.ui.keybindings.e4@default:default,org.eclipse.fx.ui.keybindings.generic@default:default,org.eclipse.fx.ui.keybindings@default:default,org.eclipse.fx.ui.panes@default:default,org.eclipse.fx.ui.services@default:default,org.eclipse.fx.ui.theme@default:default,org.eclipse.fx.ui.workbench.base@default:default,org.eclipse.fx.ui.workbench.fx.controls@default:default,org.eclipse.fx.ui.workbench.fx@default:default,org.eclipse.fx.ui.workbench.renderers.base@default:default,org.eclipse.fx.ui.workbench.renderers.fx@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/demos/org.eclipse.fx.demo.fxgraph.osgi/FXML.product b/demos/org.eclipse.fx.demo.fxgraph.osgi/FXML.product
index 96f841965..cfb311814 100755
--- a/demos/org.eclipse.fx.demo.fxgraph.osgi/FXML.product
+++ b/demos/org.eclipse.fx.demo.fxgraph.osgi/FXML.product
@@ -46,7 +46,6 @@
<plugin id="org.eclipse.fx.javafx"/>
<plugin id="org.eclipse.fx.osgi" fragment="true"/>
<plugin id="org.eclipse.fx.osgi.util"/>
- <plugin id="org.eclipse.fx.ui.application"/>
<plugin id="org.eclipse.fx.ui.databinding"/>
<plugin id="org.eclipse.osgi"/>
<plugin id="org.eclipse.osgi.services"/>
diff --git a/demos/org.eclipse.fx.demo.fxgraph.osgi/FXML_workbench.product.launch b/demos/org.eclipse.fx.demo.fxgraph.osgi/FXML_workbench.product.launch
index dba9371b5..87e70d450 100644
--- a/demos/org.eclipse.fx.demo.fxgraph.osgi/FXML_workbench.product.launch
+++ b/demos/org.eclipse.fx.demo.fxgraph.osgi/FXML_workbench.product.launch
@@ -23,7 +23,7 @@
<stringAttribute key="product" value="org.eclipse.fx.demo.fxgraph.osgi.product"/>
<stringAttribute key="productFile" value="/org.eclipse.fx.demo.fxgraph.osgi/FXML.product"/>
<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.inject@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.fx.javafx@default:default,org.eclipse.fx.osgi@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.fxgraph.osgi@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.application@default:default,org.eclipse.fx.ui.databinding@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.fxgraph.osgi@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.databinding@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/demos/org.eclipse.fx.demo.fxgraph.osgi/META-INF/MANIFEST.MF b/demos/org.eclipse.fx.demo.fxgraph.osgi/META-INF/MANIFEST.MF
index 957a75713..3888cf603 100755
--- a/demos/org.eclipse.fx.demo.fxgraph.osgi/META-INF/MANIFEST.MF
+++ b/demos/org.eclipse.fx.demo.fxgraph.osgi/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.fx.demo.fxgraph.osgi; singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.fx.demo.fxgraph.osgi.Activator
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.fx.ui.application,
org.eclipse.fx.osgi.util
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: javafx.animation;version="2.0.0",
diff --git a/demos/org.eclipse.fx.demo.fxgraph.osgi/src/org/eclipse/fx/demo/fxgraph/osgi/Application.java b/demos/org.eclipse.fx.demo.fxgraph.osgi/src/org/eclipse/fx/demo/fxgraph/osgi/Application.java
index 596ad41f2..65944b9e3 100755
--- a/demos/org.eclipse.fx.demo.fxgraph.osgi/src/org/eclipse/fx/demo/fxgraph/osgi/Application.java
+++ b/demos/org.eclipse.fx.demo.fxgraph.osgi/src/org/eclipse/fx/demo/fxgraph/osgi/Application.java
@@ -7,8 +7,8 @@ import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
import org.eclipse.fx.demo.fxgraph.osgi.model.User;
import org.eclipse.fx.demo.fxgraph.osgi.security.Authenticator;
+import org.eclipse.fx.osgi.util.AbstractJFXApplication;
import org.eclipse.fx.osgi.util.OSGiFXMLLoader;
-import org.eclipse.fx.ui.application.AbstractJFXApplication;
import javafx.fxml.FXMLLoader;
import javafx.fxml.JavaFXBuilderFactory;
diff --git a/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product b/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product
index 90ae6d9f6..69cedddb8 100755
--- a/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product
+++ b/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product
@@ -59,7 +59,6 @@
<plugin id="org.eclipse.fx.osgi" fragment="true"/>
<plugin id="org.eclipse.fx.osgi.util"/>
<plugin id="org.eclipse.fx.ui.animation"/>
- <plugin id="org.eclipse.fx.ui.application"/>
<plugin id="org.eclipse.fx.ui.databinding"/>
<plugin id="org.eclipse.fx.ui.di"/>
<plugin id="org.eclipse.fx.ui.dialogs"/>
diff --git a/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_workspace.launch b/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_workspace.launch
index 2845025f7..5e848b69f 100644
--- a/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_workspace.launch
+++ b/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_workspace.launch
@@ -23,7 +23,7 @@
<stringAttribute key="product" value="org.eclipse.fx.demo.media.product"/>
<stringAttribute key="productFile" value="/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product"/>
<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.xml@default:default,org.apache.commons.logging@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.fx.javafx@default:default,org.eclipse.fx.osgi@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.media@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.animation@default:default,org.eclipse.fx.ui.application@default:default,org.eclipse.fx.ui.databinding@default:default,org.eclipse.fx.ui.di@default:default,org.eclipse.fx.ui.dialogs@default:default,org.eclipse.fx.ui.keybindings.e4@default:default,org.eclipse.fx.ui.keybindings.generic@default:default,org.eclipse.fx.ui.keybindings@default:default,org.eclipse.fx.ui.panes@default:default,org.eclipse.fx.ui.services@default:default,org.eclipse.fx.ui.theme@default:default,org.eclipse.fx.ui.workbench.base@default:default,org.eclipse.fx.ui.workbench.fx.controls@default:default,org.eclipse.fx.ui.workbench.fx@default:default,org.eclipse.fx.ui.workbench.renderers.base@default:default,org.eclipse.fx.ui.workbench.renderers.fx@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.media@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.animation@default:default,org.eclipse.fx.ui.databinding@default:default,org.eclipse.fx.ui.di@default:default,org.eclipse.fx.ui.dialogs@default:default,org.eclipse.fx.ui.keybindings.e4@default:default,org.eclipse.fx.ui.keybindings.generic@default:default,org.eclipse.fx.ui.keybindings@default:default,org.eclipse.fx.ui.panes@default:default,org.eclipse.fx.ui.services@default:default,org.eclipse.fx.ui.theme@default:default,org.eclipse.fx.ui.workbench.base@default:default,org.eclipse.fx.ui.workbench.fx.controls@default:default,org.eclipse.fx.ui.workbench.fx@default:default,org.eclipse.fx.ui.workbench.renderers.base@default:default,org.eclipse.fx.ui.workbench.renderers.fx@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/demos/org.eclipse.fx.demo.osgi.di/Di.product.product b/demos/org.eclipse.fx.demo.osgi.di/Di.product.product
index 460e6c6fc..62feea630 100755
--- a/demos/org.eclipse.fx.demo.osgi.di/Di.product.product
+++ b/demos/org.eclipse.fx.demo.osgi.di/Di.product.product
@@ -50,7 +50,6 @@
<plugin id="org.eclipse.fx.javafx"/>
<plugin id="org.eclipse.fx.osgi" fragment="true"/>
<plugin id="org.eclipse.fx.osgi.util"/>
- <plugin id="org.eclipse.fx.ui.application"/>
<plugin id="org.eclipse.fx.ui.databinding"/>
<plugin id="org.eclipse.fx.ui.di"/>
<plugin id="org.eclipse.osgi"/>
diff --git a/demos/org.eclipse.fx.demo.osgi.di/Di.product.product_workbench.launch b/demos/org.eclipse.fx.demo.osgi.di/Di.product.product_workbench.launch
index 1e63584b5..aeef606ed 100644
--- a/demos/org.eclipse.fx.demo.osgi.di/Di.product.product_workbench.launch
+++ b/demos/org.eclipse.fx.demo.osgi.di/Di.product.product_workbench.launch
@@ -23,7 +23,7 @@
<stringAttribute key="product" value="org.eclipse.fx.demo.osgi.di.product"/>
<stringAttribute key="productFile" value="/org.eclipse.fx.demo.osgi.di/Di.product.product"/>
<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.fx.javafx@default:default,org.eclipse.fx.osgi@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.osgi.di@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.application@default:default,org.eclipse.fx.ui.databinding@default:default,org.eclipse.fx.ui.di@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.osgi.di@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.databinding@default:default,org.eclipse.fx.ui.di@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/demos/org.eclipse.fx.demo.osgi/META-INF/MANIFEST.MF b/demos/org.eclipse.fx.demo.osgi/META-INF/MANIFEST.MF
index 0029d7bcb..a03838249 100755
--- a/demos/org.eclipse.fx.demo.osgi/META-INF/MANIFEST.MF
+++ b/demos/org.eclipse.fx.demo.osgi/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.fx.demo.osgi;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.fx.demo.osgi.Activator
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.fx.ui.application
+ org.eclipse.fx.osgi.util
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: javafx.animation;version="2.0.0",
diff --git a/demos/org.eclipse.fx.demo.osgi/OSGiApp.product b/demos/org.eclipse.fx.demo.osgi/OSGiApp.product
index 84b5c5772..9db1ca40d 100755
--- a/demos/org.eclipse.fx.demo.osgi/OSGiApp.product
+++ b/demos/org.eclipse.fx.demo.osgi/OSGiApp.product
@@ -44,7 +44,6 @@
<plugin id="org.eclipse.fx.demo.osgi"/>
<plugin id="org.eclipse.fx.javafx"/>
<plugin id="org.eclipse.fx.osgi" fragment="true"/>
- <plugin id="org.eclipse.fx.ui.application"/>
<plugin id="org.eclipse.fx.ui.databinding"/>
<plugin id="org.eclipse.osgi"/>
<plugin id="org.eclipse.osgi.services"/>
diff --git a/demos/org.eclipse.fx.demo.osgi/OSGiApp.product_workbench.launch b/demos/org.eclipse.fx.demo.osgi/OSGiApp.product_workbench.launch
index f4ace3cad..aed3642ae 100644
--- a/demos/org.eclipse.fx.demo.osgi/OSGiApp.product_workbench.launch
+++ b/demos/org.eclipse.fx.demo.osgi/OSGiApp.product_workbench.launch
@@ -23,7 +23,7 @@
<stringAttribute key="product" value="org.eclipse.fx.demo.osgi.product"/>
<stringAttribute key="productFile" value="/org.eclipse.fx.demo.osgi/OSGiApp.product"/>
<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.inject@default:default,javax.servlet@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.fx.javafx@default:default,org.eclipse.fx.osgi@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.osgi@default:default,org.eclipse.fx.ui.application@default:default,org.eclipse.fx.ui.databinding@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.osgi@default:default,org.eclipse.fx.ui.databinding@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/demos/org.eclipse.fx.demo.osgi/src/org/eclipse/fx/demo/osgi/Application.java b/demos/org.eclipse.fx.demo.osgi/src/org/eclipse/fx/demo/osgi/Application.java
index da7951baf..1035ca9f3 100755
--- a/demos/org.eclipse.fx.demo.osgi/src/org/eclipse/fx/demo/osgi/Application.java
+++ b/demos/org.eclipse.fx.demo.osgi/src/org/eclipse/fx/demo/osgi/Application.java
@@ -20,7 +20,7 @@ import javafx.stage.Stage;
import javafx.util.Duration;
import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.fx.ui.application.AbstractJFXApplication;
+import org.eclipse.fx.osgi.util.AbstractJFXApplication;
/**
* This class controls all aspects of the application's execution

Back to the top