Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoracuccuru2013-04-25 05:59:55 -0400
committeracuccuru2013-04-25 05:59:55 -0400
commit59398dedd36f2b69bb431f10085af825ea052781 (patch)
treec1d3b63e5713cdf25eff323ab6105c1e6d39d578 /sandbox
parent0225ef80756900d2f55256a1f9356e4d43379290 (diff)
downloadorg.eclipse.papyrus-59398dedd36f2b69bb431f10085af825ea052781.tar.gz
org.eclipse.papyrus-59398dedd36f2b69bb431f10085af825ea052781.tar.xz
org.eclipse.papyrus-59398dedd36f2b69bb431f10085af825ea052781.zip
405391: [Moka] Moka shall provide an implementation of the fUML Execution Model
https://bugs.eclipse.org/bugs/show_bug.cgi?id=405391 Includes some additional conditionals to avoid waiting for an animation step if there is no graphical representation to animate
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/debug/ControlDelegate.java14
1 files changed, 8 insertions, 6 deletions
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/debug/ControlDelegate.java b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/debug/ControlDelegate.java
index b539d31fc8b..f1c9c577b26 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/debug/ControlDelegate.java
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/debug/ControlDelegate.java
@@ -250,17 +250,19 @@ public class ControlDelegate {
if (element instanceof ActivityEdge) {
ActivityEdge edge = (ActivityEdge)element ;
if (edge.getSource() instanceof Pin) {
- AnimationUtils.getInstance().addAnimationMarker(edge.getSource()) ;
- if (AnimationUtils.getInstance().diagramsExistFor(element)) {
+ if (AnimationUtils.getInstance().diagramsExistFor(edge.getSource())) {
+ AnimationUtils.getInstance().addAnimationMarker(edge.getSource()) ;
Thread.sleep(MokaConstants.MOKA_ANIMATION_DELAY) ;
+ AnimationUtils.getInstance().removeAnimationMarker(edge.getSource()) ;
}
- AnimationUtils.getInstance().removeAnimationMarker(edge.getSource()) ;
}
}
// Animates the element
- AnimationUtils.getInstance().addAnimationMarker(element) ;
- Thread.sleep(MokaConstants.MOKA_ANIMATION_DELAY) ;
- AnimationUtils.getInstance().removeAnimationMarker(element) ;
+ if (AnimationUtils.getInstance().diagramsExistFor(element)) {
+ AnimationUtils.getInstance().addAnimationMarker(element) ;
+ Thread.sleep(MokaConstants.MOKA_ANIMATION_DELAY) ;
+ AnimationUtils.getInstance().removeAnimationMarker(element) ;
+ }
} catch (InterruptedException e) {
Activator.log.error(e) ;
}

Back to the top