Skip to main content
summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorChristoph Keimel2015-04-30 07:58:11 -0400
committerThomas Schindl2015-04-30 15:20:59 -0400
commitd71f738e8d838df0cc0140280050fe140518544c (patch)
tree1379a391f65c4c91196e9808c00b29dede5afd29 /demos
parentb0e7d1924c50dbb3e4f196e8a975dc05bfa73915 (diff)
downloadorg.eclipse.efxclipse-d71f738e8d838df0cc0140280050fe140518544c.tar.gz
org.eclipse.efxclipse-d71f738e8d838df0cc0140280050fe140518544c.tar.xz
org.eclipse.efxclipse-d71f738e8d838df0cc0140280050fe140518544c.zip
Bug 465924 - [demo] Update Contacts Demo to e(fx)clipse 2.0
Signed-off-by: Christoph Keimel <c.keimel@emsw.de> Change-Id: I061a1192c0f9fad713f52e1243ed59954769984e
Diffstat (limited to 'demos')
-rwxr-xr-xdemos/org.eclipse.fx.demo.contacts.app/META-INF/MANIFEST.MF39
-rw-r--r--demos/org.eclipse.fx.demo.contacts.app/OSGI-INF/themeBlue.xml14
-rw-r--r--demos/org.eclipse.fx.demo.contacts.app/OSGI-INF/themeBright.xml14
-rw-r--r--demos/org.eclipse.fx.demo.contacts.app/OSGI-INF/themeDark.xml14
-rwxr-xr-xdemos/org.eclipse.fx.demo.contacts.app/build.properties35
-rwxr-xr-xdemos/org.eclipse.fx.demo.contacts.app/contacts.product209
-rw-r--r--demos/org.eclipse.fx.demo.contacts.app/contacts.product.launch68
-rw-r--r--demos/org.eclipse.fx.demo.contacts.app/contacts_workspace.product.launch68
-rwxr-xr-xdemos/org.eclipse.fx.demo.contacts.app/plugin.xml20
-rwxr-xr-xdemos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/processors/AbstractThemeProcessor.java3
-rw-r--r--demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/theme/BlueTheme.java9
-rw-r--r--demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/theme/BrightTheme.java9
-rw-r--r--demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/theme/DarkTheme.java9
13 files changed, 272 insertions, 239 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 e8d9a953c..24b7c9032 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
@@ -6,7 +6,6 @@ Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.fx.ui.workbench.fx,
- javax.inject;bundle-version="1.0.0",
org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
org.eclipse.e4.core.services;bundle-version="0.9.1",
org.eclipse.e4.core.di;bundle-version="0.9.0",
@@ -26,41 +25,17 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.fx.demo.contacts;bundle-version="1.0.0",
org.eclipse.fx.demo.contacts.edit;bundle-version="1.0.0",
org.eclipse.fx.emf.databinding;bundle-version="0.9.0",
- org.eclipse.fx.emf.edit.ui;bundle-version="0.9.0"
-Import-Package: javafx.animation;version="2.0.0",
- javafx.application;version="2.0.0",
- javafx.beans;version="2.0.0",
- javafx.beans.binding;version="2.0.0",
- javafx.beans.property;version="2.0.0",
- javafx.beans.value;version="2.0.0",
- javafx.collections;version="2.0.0",
- javafx.concurrent;version="2.0.0",
- javafx.embed.swing;version="2.0.0",
- javafx.event;version="2.0.0",
- javafx.fxml;version="2.0.0",
- javafx.geometry;version="2.0.0",
- javafx.scene;version="2.0.0",
- javafx.scene.chart;version="2.0.0",
- javafx.scene.control;version="2.0.0",
- javafx.scene.control.cell;version="2.0.0",
- javafx.scene.effect;version="2.0.0",
- javafx.scene.image;version="2.0.0",
- javafx.scene.input;version="2.0.0",
- javafx.scene.layout;version="2.0.0",
- javafx.scene.media;version="2.0.0",
- javafx.scene.paint;version="2.0.0",
- javafx.scene.shape;version="2.0.0",
- javafx.scene.text;version="2.0.0",
- javafx.scene.transform;version="2.0.0",
- javafx.scene.web;version="2.0.0",
- javafx.stage;version="2.0.0",
- javafx.util;version="2.0.0",
- javax.annotation;version="1.0.0"
+ org.eclipse.fx.emf.edit.ui;bundle-version="0.9.0",
+ org.eclipse.fx.ui.theme
+Import-Package: javax.inject
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse.org
Bundle-Activator: org.eclipse.fx.demo.contacts.BundleActivatorImpl
Bundle-Localization: plugin
-Service-Component: OSGI-INF/component.xml
+Service-Component: OSGI-INF/component.xml,
+ OSGI-INF/themeDark.xml,
+ OSGI-INF/themeBright.xml,
+ OSGI-INF/themeBlue.xml
Export-Package: org.eclipse.fx.demo.contacts,
org.eclipse.fx.demo.contacts.handlers,
org.eclipse.fx.demo.contacts.model,
diff --git a/demos/org.eclipse.fx.demo.contacts.app/OSGI-INF/themeBlue.xml b/demos/org.eclipse.fx.demo.contacts.app/OSGI-INF/themeBlue.xml
new file mode 100644
index 000000000..506e9b73f
--- /dev/null
+++ b/demos/org.eclipse.fx.demo.contacts.app/OSGI-INF/themeBlue.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.fx.demo.contacts.theme.blue">
+ <implementation class="org.eclipse.fx.demo.contacts.theme.BlueTheme"/>
+ <service>
+ <provide interface="org.eclipse.fx.ui.services.theme.Theme"/>
+ </service>
+ <reference
+ bind="registerStylesheet"
+ cardinality="0..n"
+ interface="org.eclipse.fx.ui.services.theme.Stylesheet"
+ name="Stylesheet"
+ policy="dynamic"
+ unbind="unregisterStylesheet"/>
+</scr:component>
diff --git a/demos/org.eclipse.fx.demo.contacts.app/OSGI-INF/themeBright.xml b/demos/org.eclipse.fx.demo.contacts.app/OSGI-INF/themeBright.xml
new file mode 100644
index 000000000..f86418b25
--- /dev/null
+++ b/demos/org.eclipse.fx.demo.contacts.app/OSGI-INF/themeBright.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.fx.demo.contacts.theme.bright">
+ <implementation class="org.eclipse.fx.demo.contacts.theme.BrightTheme"/>
+ <service>
+ <provide interface="org.eclipse.fx.ui.services.theme.Theme"/>
+ </service>
+ <reference
+ bind="registerStylesheet"
+ cardinality="0..n"
+ interface="org.eclipse.fx.ui.services.theme.Stylesheet"
+ name="Stylesheet"
+ policy="dynamic"
+ unbind="unregisterStylesheet"/>
+</scr:component>
diff --git a/demos/org.eclipse.fx.demo.contacts.app/OSGI-INF/themeDark.xml b/demos/org.eclipse.fx.demo.contacts.app/OSGI-INF/themeDark.xml
new file mode 100644
index 000000000..300f0ad44
--- /dev/null
+++ b/demos/org.eclipse.fx.demo.contacts.app/OSGI-INF/themeDark.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.fx.demo.contacts.theme.dark">
+ <implementation class="org.eclipse.fx.demo.contacts.theme.DarkTheme"/>
+ <service>
+ <provide interface="org.eclipse.fx.ui.services.theme.Theme"/>
+ </service>
+ <reference
+ bind="registerStylesheet"
+ cardinality="0..n"
+ interface="org.eclipse.fx.ui.services.theme.Stylesheet"
+ name="Stylesheet"
+ policy="dynamic"
+ unbind="unregisterStylesheet"/>
+</scr:component> \ No newline at end of file
diff --git a/demos/org.eclipse.fx.demo.contacts.app/build.properties b/demos/org.eclipse.fx.demo.contacts.app/build.properties
index 6827a4f3e..5a6a0e28d 100755
--- a/demos/org.eclipse.fx.demo.contacts.app/build.properties
+++ b/demos/org.eclipse.fx.demo.contacts.app/build.properties
@@ -1,17 +1,18 @@
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- images/,\
- icons/,\
- images/,\
- Application.e4xmi,\
- css/,\
- splash.bmp,\
- plugin_customization.ini,\
- vcards/,\
- plugin_ru.properties,\
- plugin.properties,\
- OSGI-INF/component.xml,\
- OSGI-INF/component.xml
-source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.xml,\
+ images/,\
+ icons/,\
+ images/,\
+ Application.e4xmi,\
+ css/,\
+ splash.bmp,\
+ plugin_customization.ini,\
+ vcards/,\
+ plugin_ru.properties,\
+ plugin.properties,\
+ OSGI-INF/component.xml,\
+ OSGI-INF/component.xml,\
+ OSGI-INF/themeDark.xml
+source.. = src/
diff --git a/demos/org.eclipse.fx.demo.contacts.app/contacts.product b/demos/org.eclipse.fx.demo.contacts.app/contacts.product
index 403cd19bc..62f43baf5 100755
--- a/demos/org.eclipse.fx.demo.contacts.app/contacts.product
+++ b/demos/org.eclipse.fx.demo.contacts.app/contacts.product
@@ -1,102 +1,107 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="E4 Contacs Demo" uid="org.eclipse.e4.demo.contacts.product" id="org.eclipse.fx.demo.contacts.app.product" application="org.eclipse.fx.ui.workbench.fx.application" version="1.0.0" useFeatures="false" includeLaunchers="true">
-
- <configIni use="default">
- </configIni>
-
- <launcherArgs>
- <vmArgs>-Dosgi.framework.extensions=org.eclipse.fx.osgi</vmArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
- </launcherArgs>
-
- <windowImages/>
-
- <splash
- location="org.eclipse.e4.demo.contacts"
- startupProgressRect="5,275,445,15"
- startupMessageRect="7,252,445,20"
- startupForegroundColor="FFFFFF" />
- <launcher>
- <solaris/>
- <win useIco="false">
- <bmp/>
- </win>
- </launcher>
-
- <vm>
- </vm>
-
- <plugins>
- <plugin id="com.ibm.icu"/>
- <plugin id="javax.annotation"/>
- <plugin id="javax.inject"/>
- <plugin id="javax.servlet"/>
- <plugin id="javax.xml"/>
- <plugin id="org.eclipse.ant.core"/>
- <plugin id="org.eclipse.core.commands"/>
- <plugin id="org.eclipse.core.contenttype"/>
- <plugin id="org.eclipse.core.databinding"/>
- <plugin id="org.eclipse.core.databinding.beans"/>
- <plugin id="org.eclipse.core.databinding.observable"/>
- <plugin id="org.eclipse.core.databinding.property"/>
- <plugin id="org.eclipse.core.expressions"/>
- <plugin id="org.eclipse.core.filesystem"/>
- <plugin id="org.eclipse.core.jobs"/>
- <plugin id="org.eclipse.core.resources"/>
- <plugin id="org.eclipse.core.runtime"/>
- <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
- <plugin id="org.eclipse.core.variables"/>
- <plugin id="org.eclipse.e4.core.commands"/>
- <plugin id="org.eclipse.e4.core.contexts"/>
- <plugin id="org.eclipse.e4.core.di"/>
- <plugin id="org.eclipse.e4.core.di.extensions"/>
- <plugin id="org.eclipse.e4.core.services"/>
- <plugin id="org.eclipse.e4.ui.di"/>
- <plugin id="org.eclipse.e4.ui.model.workbench"/>
- <plugin id="org.eclipse.e4.ui.services"/>
- <plugin id="org.eclipse.e4.ui.workbench"/>
- <plugin id="org.eclipse.emf.common"/>
- <plugin id="org.eclipse.emf.ecore"/>
- <plugin id="org.eclipse.emf.ecore.change"/>
- <plugin id="org.eclipse.emf.ecore.xmi"/>
- <plugin id="org.eclipse.emf.edit"/>
- <plugin id="org.eclipse.equinox.app"/>
- <plugin id="org.eclipse.equinox.common"/>
- <plugin id="org.eclipse.equinox.concurrent"/>
- <plugin id="org.eclipse.equinox.ds"/>
- <plugin id="org.eclipse.equinox.event"/>
- <plugin id="org.eclipse.equinox.preferences"/>
- <plugin id="org.eclipse.equinox.registry"/>
- <plugin id="org.eclipse.equinox.util"/>
- <plugin id="org.eclipse.fx.core"/>
- <plugin id="org.eclipse.fx.core.databinding"/>
- <plugin id="org.eclipse.fx.demo.contacts"/>
- <plugin id="org.eclipse.fx.demo.contacts.app"/>
- <plugin id="org.eclipse.fx.demo.contacts.edit"/>
- <plugin id="org.eclipse.fx.emf.databinding"/>
- <plugin id="org.eclipse.fx.emf.edit.ui"/>
- <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.databinding"/>
- <plugin id="org.eclipse.fx.ui.di"/>
- <plugin id="org.eclipse.fx.ui.dialogs"/>
- <plugin id="org.eclipse.fx.ui.keybindings"/>
- <plugin id="org.eclipse.fx.ui.keybindings.e4"/>
- <plugin id="org.eclipse.fx.ui.keybindings.generic"/>
- <plugin id="org.eclipse.fx.ui.panes"/>
- <plugin id="org.eclipse.fx.ui.services"/>
- <plugin id="org.eclipse.fx.ui.theme"/>
- <plugin id="org.eclipse.fx.ui.workbench.base"/>
- <plugin id="org.eclipse.fx.ui.workbench.fx"/>
- <plugin id="org.eclipse.fx.ui.workbench.fx.controls"/>
- <plugin id="org.eclipse.fx.ui.workbench.renderers.base"/>
- <plugin id="org.eclipse.fx.ui.workbench.renderers.fx"/>
- <plugin id="org.eclipse.osgi"/>
- <plugin id="org.eclipse.osgi.services"/>
- </plugins>
-
-
-</product>
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="E4 Contacs Demo" uid="org.eclipse.e4.demo.contacts.product" id="org.eclipse.fx.demo.contacts.app.product" application="org.eclipse.fx.ui.workbench.fx.application" version="1.0.0" useFeatures="false" includeLaunchers="true">
+
+ <configIni use="default">
+ </configIni>
+
+ <launcherArgs>
+ <vmArgs>-Dorg.osgi.framework.bundle.parent=ext
+ </vmArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+ </vmArgsMac>
+ </launcherArgs>
+
+ <windowImages/>
+
+ <splash
+ location="org.eclipse.e4.demo.contacts"
+ startupProgressRect="5,275,445,15"
+ startupMessageRect="7,252,445,20"
+ startupForegroundColor="FFFFFF" />
+ <launcher>
+ <solaris/>
+ <win useIco="false">
+ <bmp/>
+ </win>
+ </launcher>
+
+ <vm>
+ <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>
+ </vm>
+
+ <plugins>
+ <plugin id="com.ibm.icu"/>
+ <plugin id="javax.annotation"/>
+ <plugin id="javax.inject"/>
+ <plugin id="javax.xml"/>
+ <plugin id="org.apache.commons.lang"/>
+ <plugin id="org.eclipse.core.commands"/>
+ <plugin id="org.eclipse.core.contenttype"/>
+ <plugin id="org.eclipse.core.databinding"/>
+ <plugin id="org.eclipse.core.databinding.beans"/>
+ <plugin id="org.eclipse.core.databinding.observable"/>
+ <plugin id="org.eclipse.core.databinding.property"/>
+ <plugin id="org.eclipse.core.expressions"/>
+ <plugin id="org.eclipse.core.filesystem"/>
+ <plugin id="org.eclipse.core.jobs"/>
+ <plugin id="org.eclipse.core.resources"/>
+ <plugin id="org.eclipse.core.runtime"/>
+ <plugin id="org.eclipse.core.variables"/>
+ <plugin id="org.eclipse.e4.core.commands"/>
+ <plugin id="org.eclipse.e4.core.contexts"/>
+ <plugin id="org.eclipse.e4.core.di"/>
+ <plugin id="org.eclipse.e4.core.di.extensions"/>
+ <plugin id="org.eclipse.e4.core.services"/>
+ <plugin id="org.eclipse.e4.ui.di"/>
+ <plugin id="org.eclipse.e4.ui.model.workbench"/>
+ <plugin id="org.eclipse.e4.ui.services"/>
+ <plugin id="org.eclipse.e4.ui.workbench"/>
+ <plugin id="org.eclipse.emf.common"/>
+ <plugin id="org.eclipse.emf.ecore"/>
+ <plugin id="org.eclipse.emf.ecore.change"/>
+ <plugin id="org.eclipse.emf.ecore.xmi"/>
+ <plugin id="org.eclipse.emf.edit"/>
+ <plugin id="org.eclipse.equinox.app"/>
+ <plugin id="org.eclipse.equinox.common"/>
+ <plugin id="org.eclipse.equinox.concurrent"/>
+ <plugin id="org.eclipse.equinox.ds"/>
+ <plugin id="org.eclipse.equinox.event"/>
+ <plugin id="org.eclipse.equinox.preferences"/>
+ <plugin id="org.eclipse.equinox.registry"/>
+ <plugin id="org.eclipse.equinox.util"/>
+ <plugin id="org.eclipse.fx.core"/>
+ <plugin id="org.eclipse.fx.core.databinding"/>
+ <plugin id="org.eclipse.fx.core.di"/>
+ <plugin id="org.eclipse.fx.core.di.context"/>
+ <plugin id="org.eclipse.fx.core.fxml"/>
+ <plugin id="org.eclipse.fx.demo.contacts"/>
+ <plugin id="org.eclipse.fx.demo.contacts.app"/>
+ <plugin id="org.eclipse.fx.demo.contacts.edit"/>
+ <plugin id="org.eclipse.fx.emf.databinding"/>
+ <plugin id="org.eclipse.fx.emf.edit.ui"/>
+ <plugin id="org.eclipse.fx.osgi.util"/>
+ <plugin id="org.eclipse.fx.ui.animation"/>
+ <plugin id="org.eclipse.fx.ui.controls"/>
+ <plugin id="org.eclipse.fx.ui.databinding"/>
+ <plugin id="org.eclipse.fx.ui.di"/>
+ <plugin id="org.eclipse.fx.ui.dialogs"/>
+ <plugin id="org.eclipse.fx.ui.keybindings"/>
+ <plugin id="org.eclipse.fx.ui.keybindings.e4"/>
+ <plugin id="org.eclipse.fx.ui.keybindings.generic"/>
+ <plugin id="org.eclipse.fx.ui.panes"/>
+ <plugin id="org.eclipse.fx.ui.services"/>
+ <plugin id="org.eclipse.fx.ui.theme"/>
+ <plugin id="org.eclipse.fx.ui.workbench.base"/>
+ <plugin id="org.eclipse.fx.ui.workbench.fx"/>
+ <plugin id="org.eclipse.fx.ui.workbench.renderers.base"/>
+ <plugin id="org.eclipse.fx.ui.workbench.renderers.fx"/>
+ <plugin id="org.eclipse.fx.ui.workbench.services"/>
+ <plugin id="org.eclipse.osgi"/>
+ <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
+ <plugin id="org.eclipse.osgi.services"/>
+ </plugins>
+
+
+</product>
diff --git a/demos/org.eclipse.fx.demo.contacts.app/contacts.product.launch b/demos/org.eclipse.fx.demo.contacts.app/contacts.product.launch
index 8e1a7933d..0feac4026 100644
--- a/demos/org.eclipse.fx.demo.contacts.app/contacts.product.launch
+++ b/demos/org.eclipse.fx.demo.contacts.app/contacts.product.launch
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.fx.ui.workbench.fx.application"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/contacts.product"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="/tmp/runtime-contacts.product"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -nosplash"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.framework.extensions=org.eclipse.fx.osgi"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<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.apache.commons.lang@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@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.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.core.databinding@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.emf.databinding@default:default,org.eclipse.fx.emf.edit.ui@default:default,org.eclipse.fx.javafx@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.osgi@default:false,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.lifecycle@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,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.demo.contacts.app@default:default,org.eclipse.fx.demo.contacts.edit@default:default,org.eclipse.fx.demo.contacts@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.fx.ui.workbench.fx.application"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="false"/>
+<booleanAttribute key="automaticValidate" value="true"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/contacts.product"/>
+<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="/tmp/runtime-contacts.product"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value=" -Dorg.osgi.framework.bundle.parent=ext"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<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="org.eclipse.core.expressions@default:default,org.eclipse.osgi@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.databinding.beans@default:default,javax.annotation@default:default,org.eclipse.equinox.event@default:default,org.eclipse.osgi.compatibility.state@default:default,com.ibm.icu@default:default,org.eclipse.e4.core.di.extensions@default:default,org.apache.commons.lang@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.variables@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.equinox.ds@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.resources@default:default,org.eclipse.equinox.util@default:default,javax.inject@default:default,javax.xml@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.common@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.databinding@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.core.runtime@default:default,org.eclipse.core.contenttype@default:default,"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.ui.databinding@default:default,org.eclipse.fx.core.di.context@default:default,org.eclipse.fx.demo.contacts.app@default:default,org.eclipse.fx.core.di@default:default,org.eclipse.fx.ui.panes@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.ui.theme@default:default,org.eclipse.fx.core.fxml@default:default,org.eclipse.fx.ui.dialogs@default:default,org.eclipse.fx.emf.edit.ui@default:default,org.eclipse.fx.ui.workbench.services@default:default,org.eclipse.fx.ui.workbench.base@default:default,org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.demo.contacts.edit@default:default,org.eclipse.fx.ui.controls@default:default,org.eclipse.fx.ui.keybindings.e4@default:default,org.eclipse.fx.ui.workbench.fx@default:default,org.eclipse.fx.ui.workbench.renderers.base@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.di@default:default,org.eclipse.fx.ui.services@default:default,org.eclipse.fx.ui.keybindings@default:default,org.eclipse.fx.demo.contacts@default:default,org.eclipse.fx.ui.keybindings.generic@default:default,org.eclipse.fx.emf.databinding@default:default,org.eclipse.fx.ui.animation@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"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="true"/>
+<booleanAttribute key="usefeatures" value="false"/>
+</launchConfiguration>
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 bc0162bcf..9262c21f4 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
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.fx.ui.workbench.fx.application"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/contacts_workspace.product"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-contacts.product"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-consoleLog -nosplash"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.framework.extensions=org.eclipse.fx.osgi -Dprism.forcepowerof2=true"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<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.apache.commons.lang@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.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.macosx@default:false,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,org.eclipse.team.core@default:default,org.hamcrest.core@default:default,org.junit@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.core.fxml@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.demo.contacts.app@default:default,org.eclipse.fx.demo.contacts.edit.tests@default:false,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.osgi@default:false,org.eclipse.fx.ui.controls@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.lifecycle@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@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"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.fx.ui.workbench.fx.application"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="false"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/contacts_workspace.product"/>
+<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../runtime-contacts.product"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value=" -Dorg.osgi.framework.bundle.parent=ext"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<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="org.eclipse.core.expressions@default:default,org.eclipse.osgi@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.databinding.beans@default:default,javax.annotation@default:default,org.eclipse.equinox.event@default:default,org.eclipse.osgi.compatibility.state@default:default,com.ibm.icu@default:default,org.eclipse.e4.core.di.extensions@default:default,org.apache.commons.lang@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.variables@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.equinox.ds@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.resources@default:default,org.eclipse.equinox.util@default:default,javax.inject@default:default,javax.xml@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.common@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.databinding@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.core.runtime@default:default,org.eclipse.core.contenttype@default:default,"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.fx.ui.databinding@default:default,org.eclipse.fx.core.di.context@default:default,org.eclipse.fx.demo.contacts.app@default:default,org.eclipse.fx.core.di@default:default,org.eclipse.fx.ui.panes@default:default,org.eclipse.fx.core@default:default,org.eclipse.fx.ui.theme@default:default,org.eclipse.fx.core.fxml@default:default,org.eclipse.fx.ui.dialogs@default:default,org.eclipse.fx.emf.edit.ui@default:default,org.eclipse.fx.ui.workbench.services@default:default,org.eclipse.fx.ui.workbench.base@default:default,org.eclipse.fx.core.databinding@default:default,org.eclipse.fx.demo.contacts.edit@default:default,org.eclipse.fx.ui.controls@default:default,org.eclipse.fx.ui.keybindings.e4@default:default,org.eclipse.fx.ui.workbench.fx@default:default,org.eclipse.fx.ui.workbench.renderers.base@default:default,org.eclipse.fx.osgi.util@default:default,org.eclipse.fx.ui.di@default:default,org.eclipse.fx.ui.services@default:default,org.eclipse.fx.ui.keybindings@default:default,org.eclipse.fx.demo.contacts@default:default,org.eclipse.fx.ui.keybindings.generic@default:default,org.eclipse.fx.emf.databinding@default:default,org.eclipse.fx.ui.animation@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"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="true"/>
+<booleanAttribute key="usefeatures" value="false"/>
+</launchConfiguration>
diff --git a/demos/org.eclipse.fx.demo.contacts.app/plugin.xml b/demos/org.eclipse.fx.demo.contacts.app/plugin.xml
index a7f112faa..1059d9513 100755
--- a/demos/org.eclipse.fx.demo.contacts.app/plugin.xml
+++ b/demos/org.eclipse.fx.demo.contacts.app/plugin.xml
@@ -21,7 +21,7 @@
</property>
<property
name="cssTheme"
- value="themes.dark">
+ value="dark">
</property>
<property
name="startupForegroundColor"
@@ -37,24 +37,6 @@
</property>
</product>
</extension>
- <extension
- point="org.eclipse.fx.ui.theme">
- <theme
- basestylesheet="css/dark.css"
- id="themes.dark"
- name="Dark Gradient">
- </theme>
- <theme
- basestylesheet="css/bright.css"
- id="themes.bright"
- name="Bright Gradient">
- </theme>
- <theme
- basestylesheet="css/blue.css"
- id="themes.blue"
- name="Blue Gradient">
- </theme>
- </extension>
<extension
id="modelContribution"
point="org.eclipse.e4.workbench.model">
diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/processors/AbstractThemeProcessor.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/processors/AbstractThemeProcessor.java
index 4d0595526..a5831a6c2 100755
--- a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/processors/AbstractThemeProcessor.java
+++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/processors/AbstractThemeProcessor.java
@@ -12,6 +12,7 @@
******************************************************************************/
package org.eclipse.fx.demo.contacts.processors;
+import java.util.Collection;
import java.util.List;
import org.eclipse.core.runtime.IConfigurationElement;
@@ -47,7 +48,7 @@ public abstract class AbstractThemeProcessor {
ServiceReference reference = context.getServiceReference(ThemeManager.class.getName());
ThemeManager themeManager = (ThemeManager) context.getService(reference);
- List<Theme> themes = themeManager.getAvailableThemes();
+ Collection<Theme> themes = themeManager.getAvailableThemes().values();
if (themes.size() > 0) {
MApplication application = getApplication();
diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/theme/BlueTheme.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/theme/BlueTheme.java
new file mode 100644
index 000000000..802e7daa3
--- /dev/null
+++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/theme/BlueTheme.java
@@ -0,0 +1,9 @@
+package org.eclipse.fx.demo.contacts.theme;
+
+import org.eclipse.fx.ui.theme.AbstractTheme;
+
+public class BlueTheme extends AbstractTheme {
+ public BlueTheme() {
+ super("blue", "Blue Theme", BlueTheme.class.getClassLoader().getResource("css/blue.css"));
+ }
+}
diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/theme/BrightTheme.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/theme/BrightTheme.java
new file mode 100644
index 000000000..672f18edf
--- /dev/null
+++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/theme/BrightTheme.java
@@ -0,0 +1,9 @@
+package org.eclipse.fx.demo.contacts.theme;
+
+import org.eclipse.fx.ui.theme.AbstractTheme;
+
+public class BrightTheme extends AbstractTheme {
+ public BrightTheme() {
+ super("bright", "Bright Theme", BrightTheme.class.getClassLoader().getResource("css/bright.css"));
+ }
+}
diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/theme/DarkTheme.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/theme/DarkTheme.java
new file mode 100644
index 000000000..ddb959c96
--- /dev/null
+++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/theme/DarkTheme.java
@@ -0,0 +1,9 @@
+package org.eclipse.fx.demo.contacts.theme;
+
+import org.eclipse.fx.ui.theme.AbstractTheme;
+
+public class DarkTheme extends AbstractTheme {
+ public DarkTheme() {
+ super("dark", "Dark Theme", DarkTheme.class.getClassLoader().getResource("css/dark.css"));
+ }
+}

Back to the top