Skip to main content
summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorTom Schindl2014-05-30 10:37:13 -0400
committerTom Schindl2014-05-30 10:37:13 -0400
commit3987f88d9dbf57171f04a4bc7a5cf9e2fbff88e2 (patch)
tree9afbb3132dcf9489e7f1c3de004c96387b12b91e /demos
parentaf0aa23225199eb72ecb886739d725a8b4494542 (diff)
downloadorg.eclipse.efxclipse-3987f88d9dbf57171f04a4bc7a5cf9e2fbff88e2.tar.gz
org.eclipse.efxclipse-3987f88d9dbf57171f04a4bc7a5cf9e2fbff88e2.tar.xz
org.eclipse.efxclipse-3987f88d9dbf57171f04a4bc7a5cf9e2fbff88e2.zip
fixed API to call a finished runnable
Diffstat (limited to 'demos')
-rw-r--r--demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_target.launch6
-rwxr-xr-xdemos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/addon/PerspectiveAnimationAddon.java4
-rwxr-xr-xdemos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/ConfigurationPartControler.java2
3 files changed, 6 insertions, 6 deletions
diff --git a/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_target.launch b/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_target.launch
index 1c4f934d7..51f972a86 100644
--- a/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_target.launch
+++ b/demos/org.eclipse.fx.demo.media/org.eclipse.fx.demo.media.product_target.launch
@@ -15,15 +15,15 @@
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../runtime-org.eclipse.fx.demo.media.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.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 8 [1.8.0]"/>
<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"/>
<stringAttribute key="pde.version" value="3.3"/>
<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.lang@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@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.core.databinding@default:default,org.eclipse.fx.core@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.animation@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.media@default:default"/>
+<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.lang@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@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.core@default:default,org.eclipse.fx.javafx@default:default,org.eclipse.fx.osgi.util@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.fxml@default:default,org.eclipse.fx.demo.media@default:default,org.eclipse.fx.ui.animation@default:default,org.eclipse.fx.ui.controls@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"/>
diff --git a/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/addon/PerspectiveAnimationAddon.java b/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/addon/PerspectiveAnimationAddon.java
index 89fb28d29..4d7303634 100755
--- a/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/addon/PerspectiveAnimationAddon.java
+++ b/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/addon/PerspectiveAnimationAddon.java
@@ -71,8 +71,8 @@ public class PerspectiveAnimationAddon {
return new AnimationDelegate<BorderPane, Node>() {
@Override
- public void animate(BorderPane container, Node control) {
- animations.get(animation).animate(container, control);
+ public void animate(BorderPane container, Node control, Runnable r) {
+ animations.get(animation).animate(container, control, r);
}
};
}
diff --git a/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/ConfigurationPartControler.java b/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/ConfigurationPartControler.java
index c9ed8aade..7c31c564e 100755
--- a/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/ConfigurationPartControler.java
+++ b/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/ConfigurationPartControler.java
@@ -121,7 +121,7 @@ public class ConfigurationPartControler implements Initializable {
if(! "<NONE>".equals(newValue) ) {
CenterSwitchAnimation a = transitionService.getAnimations().get(newValue);
if( a != null ) {
- a.animate(switchPreview, switchPreview.getCenter() == view1 ? view2 : view1);
+ a.animate(switchPreview, switchPreview.getCenter() == view1 ? view2 : view1, null);
updateTransitionPreference(newValue);
} else {
updateTransitionPreference(null);

Back to the top