Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2014-06-25 18:51:06 -0400
committerTom Schindl2014-06-25 18:51:06 -0400
commitd0d965d544177b4035526ccdefda101dd8fc0dd2 (patch)
tree7e111c784bffdc9f7a7f0d5c89d9d248d80cc333 /testcases
parent310eeafedae92b2a95470e4e1c61ecb1272825f7 (diff)
downloadorg.eclipse.efxclipse-d0d965d544177b4035526ccdefda101dd8fc0dd2.tar.gz
org.eclipse.efxclipse-d0d965d544177b4035526ccdefda101dd8fc0dd2.tar.xz
org.eclipse.efxclipse-d0d965d544177b4035526ccdefda101dd8fc0dd2.zip
Bug 438200 - Make ToolItem loop check optional
Diffstat (limited to 'testcases')
-rwxr-xr-xtestcases/org.eclipse.fx.testcases.e4/META-INF/MANIFEST.MF3
-rwxr-xr-xtestcases/org.eclipse.fx.testcases.e4/plugin.xml4
-rwxr-xr-xtestcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/Handler0.java4
-rwxr-xr-xtestcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/Handler1.java6
4 files changed, 14 insertions, 3 deletions
diff --git a/testcases/org.eclipse.fx.testcases.e4/META-INF/MANIFEST.MF b/testcases/org.eclipse.fx.testcases.e4/META-INF/MANIFEST.MF
index df4da2e7d..c82c332a0 100755
--- a/testcases/org.eclipse.fx.testcases.e4/META-INF/MANIFEST.MF
+++ b/testcases/org.eclipse.fx.testcases.e4/META-INF/MANIFEST.MF
@@ -32,7 +32,8 @@ Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="0.10.1",
org.eclipse.fx.ui.modelviewer;bundle-version="1.0.0",
org.eclipse.osgi.services;bundle-version="3.3.100",
org.eclipse.fx.core;bundle-version="1.0.0",
- org.eclipse.fx.core.fxml;bundle-version="1.0.0"
+ org.eclipse.fx.core.fxml;bundle-version="1.0.0",
+ org.eclipse.fx.core.di;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Import-Package: javafx.animation;version="2.0.0",
javafx.application;version="2.0.0",
diff --git a/testcases/org.eclipse.fx.testcases.e4/plugin.xml b/testcases/org.eclipse.fx.testcases.e4/plugin.xml
index a0b1462e6..aa6df0d9d 100755
--- a/testcases/org.eclipse.fx.testcases.e4/plugin.xml
+++ b/testcases/org.eclipse.fx.testcases.e4/plugin.xml
@@ -23,6 +23,10 @@
name="lifeCycleURI"
value="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.lifecycle.ApplicationLifecycle">
</property>
+ <property
+ name="efx_TOOLITEM_TIMER_dummy"
+ value="400">
+ </property>
</product>
</extension>
<extension
diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/Handler0.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/Handler0.java
index 7b5858140..1fb8cfd2c 100755
--- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/Handler0.java
+++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/Handler0.java
@@ -6,6 +6,7 @@ import org.eclipse.e4.core.di.annotations.CanExecute;
import org.eclipse.e4.core.di.annotations.Execute;
import org.eclipse.e4.core.di.annotations.Optional;
import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.fx.core.di.ScopedObjectFactory;
@SuppressWarnings("restriction")
public class Handler0 {
@@ -23,7 +24,8 @@ public class Handler0 {
} else {
v = Integer.valueOf(v.intValue()+1);
}
- application.getContext().set("test", v);
+ application.getContext().get(ScopedObjectFactory.class).put("test", v);
+// application.getContext().set("test", v);
}
}
diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/Handler1.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/Handler1.java
index 6945dec2d..0e1fe518b 100755
--- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/Handler1.java
+++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/Handler1.java
@@ -1,12 +1,15 @@
package org.eclipse.fx.testcases.e4.handlers;
import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.core.services.events.IEventBroker;
import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.workbench.UIEvents;
+import org.eclipse.fx.core.di.ScopedObjectFactory;
@SuppressWarnings("restriction")
public class Handler1 {
@Execute
- public void execute(MApplication application) {
+ public void execute(MApplication application, IEventBroker broker) {
System.err.println("Executing H1");
Integer v = (Integer) application.getContext().get("test_2");
if( v == null ) {
@@ -15,6 +18,7 @@ public class Handler1 {
v = Integer.valueOf(v.intValue()+1);
}
application.getContext().set("test_2", v);
+ broker.send(UIEvents.REQUEST_ENABLEMENT_UPDATE_TOPIC, UIEvents.ALL_ELEMENT_ID);
}
}

Back to the top