Skip to main content
summaryrefslogtreecommitdiffstats
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/org.eclipse.fx.demo.fxgraph.osgi
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/org.eclipse.fx.demo.fxgraph.osgi')
-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
4 files changed, 2 insertions, 4 deletions
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;

Back to the top