Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoracuccuru2013-04-17 12:19:00 -0400
committeracuccuru2013-04-17 12:19:00 -0400
commit5367f0bf4f1d5e6e948bda7d00f0c428f17f7511 (patch)
treee2d9aeecd478cc8704eaab80fe27554d3e98e464 /sandbox
parent6862db2d7ead8de84c392596b7de97282f479a01 (diff)
downloadorg.eclipse.papyrus-5367f0bf4f1d5e6e948bda7d00f0c428f17f7511.tar.gz
org.eclipse.papyrus-5367f0bf4f1d5e6e948bda7d00f0c428f17f7511.tar.xz
org.eclipse.papyrus-5367f0bf4f1d5e6e948bda7d00f0c428f17f7511.zip
405703: [Moka] fUML: executions do not properly terminate, either in debug or run mode
https://bugs.eclipse.org/bugs/show_bug.cgi?id=405703
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF4
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/Activator.classbin0 -> 986 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardLibraryRegistry.classbin0 -> 8904 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardServicesRegistry.classbin0 -> 1975 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/And.classbin0 -> 2905 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Implies.classbin0 -> 2921 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Not.classbin0 -> 2852 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Or.classbin0 -> 2901 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/ToBoolean.classbin0 -> 2901 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/ToString.classbin0 -> 2891 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Xor.classbin0 -> 2895 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Abs.classbin0 -> 2884 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Add.classbin0 -> 2887 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Div.classbin0 -> 2889 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Greater.classbin0 -> 3034 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/GreaterOrEqual.classbin0 -> 3056 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Lower.classbin0 -> 3028 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/LowerOrEqual.classbin0 -> 3050 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Max.classbin0 -> 2935 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Min.classbin0 -> 2935 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Minus.classbin0 -> 2893 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Mod.classbin0 -> 2889 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Neg.classbin0 -> 2839 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Times.classbin0 -> 2893 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToInteger.classbin0 -> 2899 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToString.classbin0 -> 2889 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToUnlimitedNatural.classbin0 -> 2902 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardInputChannelImpl$ReadLineExecution.classbin0 -> 3611 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardInputChannelImpl.classbin0 -> 1473 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardOutputChannelImpl$Write.classbin0 -> 3031 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardOutputChannelImpl$WriteLineExecution.classbin0 -> 3084 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardOutputChannelImpl.classbin0 -> 1610 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListConcat.classbin0 -> 2109 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListGet.classbin0 -> 2364 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListSize.classbin0 -> 2851 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Concat.classbin0 -> 2811 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Size.classbin0 -> 2963 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Substring.classbin0 -> 3170 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Greater.classbin0 -> 3077 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/GreaterOrEqual.classbin0 -> 3104 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Lower.classbin0 -> 3070 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/LowerOrEqual.classbin0 -> 3098 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Max.classbin0 -> 2999 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Min.classbin0 -> 3038 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToInteger.classbin0 -> 2955 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToString.classbin0 -> 2976 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToUnlimitedNatural.classbin0 -> 3233 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardLibraryRegistry.java2
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngineForMoka$1.classbin1511 -> 1511 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngineForMoka.classbin7505 -> 7630 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/ActivityEdgeInstance.classbin4287 -> 4606 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/debug/ControlDelegate.classbin7912 -> 7637 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/debug/Debug.classbin542 -> 434 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/ActivityEdgeInstance.java4
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngine.java8
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngineForMoka.java5
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/debug/ControlDelegate.java230
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/debug/Debug.java2
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/FUMLPresentationUtils.java128
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaStackFrame_from_ActivityEdgeInstance.java38
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaStackFrame_from_ActivityNodeActivation.java35
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaStackFrame_from_UMLModelElement.java79
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaValue_for_fUML.java46
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaValue_from_FeatureValue.java90
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaValue_from_Value.java64
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaVariable_for_fUML.java26
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaVariable_from_ContextObject.java36
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaVariable_from_FeatureValue.java41
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaVariable_from_Value.java35
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF3
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/Activator.classbin0 -> 914 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/decoration/BreakpointDecoration.classbin0 -> 4022 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/MokaAbstractHandler.classbin0 -> 1729 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointActivationHandler.classbin0 -> 2781 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointHandler.classbin0 -> 2968 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/MokaLaunchConfigurationTabGroup.classbin0 -> 1027 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$1.classbin0 -> 931 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$2.classbin0 -> 2752 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$3.classbin0 -> 930 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$4.classbin0 -> 3091 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$5.classbin0 -> 919 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab.classbin0 -> 8064 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/preferences/MokaPreferencePage.classbin0 -> 2280 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils$1.classbin0 -> 2311 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils$OpenDiagramCommand.classbin0 -> 1425 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils.classbin0 -> 10083 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/DebugMarkerMappingToPseudoSelector.classbin0 -> 1373 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/IPresentation.classbin0 -> 267 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/MokaDebugModelPresentation.classbin0 -> 5627 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$1.classbin0 -> 1565 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$2.classbin0 -> 1288 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$3.classbin0 -> 1717 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView.classbin0 -> 3750 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointActivationHandler.java3
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointHandler.java5
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab.java3
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils.java13
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/debug/MokaBreakpoint.classbin5678 -> 5653 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/debug/MokaDebugTarget$EventDispatchJob.classbin1842 -> 1842 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/debug/MokaDebugTarget.classbin16194 -> 16387 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/launch/MokaLaunchDelegate.classbin7561 -> 7631 bytes
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/debug/MokaBreakpoint.java2
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/debug/MokaDebugTarget.java17
-rw-r--r--sandbox/Moka/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/launch/MokaLaunchDelegate.java2
104 files changed, 808 insertions, 113 deletions
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
index 5dd94f03808..6a3ba6d6a2e 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
@@ -12,6 +12,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.uml2.uml;bundle-version="4.1.0",
org.eclipse.papyrus.uml.extensionpoints;bundle-version="0.10.0",
org.eclipse.emf;bundle-version="2.6.0",
- org.eclipse.papyrus.moka;bundle-version="0.10.0"
+ org.eclipse.papyrus.moka;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.core;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/Activator.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/Activator.class
new file mode 100644
index 00000000000..430d9635706
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/Activator.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardLibraryRegistry.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardLibraryRegistry.class
new file mode 100644
index 00000000000..288cca140da
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardLibraryRegistry.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardServicesRegistry.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardServicesRegistry.class
new file mode 100644
index 00000000000..1d751ea48bd
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardServicesRegistry.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/And.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/And.class
new file mode 100644
index 00000000000..e7e6b9a03b2
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/And.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Implies.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Implies.class
new file mode 100644
index 00000000000..84907f177c8
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Implies.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Not.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Not.class
new file mode 100644
index 00000000000..e4bc1ae7940
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Not.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Or.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Or.class
new file mode 100644
index 00000000000..11aa4fd3e82
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Or.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/ToBoolean.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/ToBoolean.class
new file mode 100644
index 00000000000..c85012074d7
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/ToBoolean.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/ToString.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/ToString.class
new file mode 100644
index 00000000000..dd2f0de4d28
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/ToString.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Xor.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Xor.class
new file mode 100644
index 00000000000..417bf447f7e
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/boolean_/Xor.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Abs.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Abs.class
new file mode 100644
index 00000000000..97bd2b4e373
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Abs.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Add.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Add.class
new file mode 100644
index 00000000000..51e680ce88b
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Add.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Div.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Div.class
new file mode 100644
index 00000000000..03e72a5bf1a
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Div.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Greater.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Greater.class
new file mode 100644
index 00000000000..77cd83da009
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Greater.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/GreaterOrEqual.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/GreaterOrEqual.class
new file mode 100644
index 00000000000..9fc261041ac
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/GreaterOrEqual.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Lower.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Lower.class
new file mode 100644
index 00000000000..753ef4aa681
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Lower.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/LowerOrEqual.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/LowerOrEqual.class
new file mode 100644
index 00000000000..cdea62a0d0a
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/LowerOrEqual.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Max.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Max.class
new file mode 100644
index 00000000000..4cedcb80f8d
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Max.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Min.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Min.class
new file mode 100644
index 00000000000..3f39f639b4d
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Min.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Minus.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Minus.class
new file mode 100644
index 00000000000..c9f57e3ee39
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Minus.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Mod.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Mod.class
new file mode 100644
index 00000000000..9c2227ebafb
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Mod.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Neg.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Neg.class
new file mode 100644
index 00000000000..ce2ebb1da35
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Neg.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Times.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Times.class
new file mode 100644
index 00000000000..4c69b0449e4
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/Times.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToInteger.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToInteger.class
new file mode 100644
index 00000000000..8c6f5250751
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToInteger.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToString.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToString.class
new file mode 100644
index 00000000000..15a9f1419ab
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToString.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToUnlimitedNatural.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToUnlimitedNatural.class
new file mode 100644
index 00000000000..1d1fc6ce401
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/integer/ToUnlimitedNatural.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardInputChannelImpl$ReadLineExecution.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardInputChannelImpl$ReadLineExecution.class
new file mode 100644
index 00000000000..73f84d2e50e
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardInputChannelImpl$ReadLineExecution.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardInputChannelImpl.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardInputChannelImpl.class
new file mode 100644
index 00000000000..6cebc9921e1
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardInputChannelImpl.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardOutputChannelImpl$Write.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardOutputChannelImpl$Write.class
new file mode 100644
index 00000000000..74baea65035
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardOutputChannelImpl$Write.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardOutputChannelImpl$WriteLineExecution.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardOutputChannelImpl$WriteLineExecution.class
new file mode 100644
index 00000000000..1ff9f352f67
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardOutputChannelImpl$WriteLineExecution.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardOutputChannelImpl.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardOutputChannelImpl.class
new file mode 100644
index 00000000000..b25d6414be8
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/io/StandardOutputChannelImpl.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListConcat.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListConcat.class
new file mode 100644
index 00000000000..c20f005d150
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListConcat.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListGet.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListGet.class
new file mode 100644
index 00000000000..fd8f03c5db8
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListGet.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListSize.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListSize.class
new file mode 100644
index 00000000000..ed0d0382b71
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/list/ListSize.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Concat.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Concat.class
new file mode 100644
index 00000000000..14608d1e102
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Concat.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Size.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Size.class
new file mode 100644
index 00000000000..653b83dea00
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Size.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Substring.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Substring.class
new file mode 100644
index 00000000000..12f081a34e8
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/string/Substring.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Greater.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Greater.class
new file mode 100644
index 00000000000..0f1df18e7d6
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Greater.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/GreaterOrEqual.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/GreaterOrEqual.class
new file mode 100644
index 00000000000..1d2d269f45f
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/GreaterOrEqual.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Lower.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Lower.class
new file mode 100644
index 00000000000..2543d00a8da
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Lower.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/LowerOrEqual.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/LowerOrEqual.class
new file mode 100644
index 00000000000..4a534b0be32
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/LowerOrEqual.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Max.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Max.class
new file mode 100644
index 00000000000..6f4c546640c
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Max.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Min.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Min.class
new file mode 100644
index 00000000000..5ed14019aa5
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/Min.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToInteger.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToInteger.class
new file mode 100644
index 00000000000..fb84957d7ed
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToInteger.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToString.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToString.class
new file mode 100644
index 00000000000..70adc891174
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToString.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToUnlimitedNatural.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToUnlimitedNatural.class
new file mode 100644
index 00000000000..6ca62cbef8a
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/bin/org/eclipse/papyrus/moka/fuml/standardlibrary/library/unlimitednatural/ToUnlimitedNatural.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardLibraryRegistry.java b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardLibraryRegistry.java
index 1e33e2d378f..a4f7afd3d12 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardLibraryRegistry.java
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/src/org/eclipse/papyrus/moka/fuml/standardlibrary/StandardLibraryRegistry.java
@@ -120,7 +120,7 @@ public class StandardLibraryRegistry extends AbstractOpaqueBehaviorExecutionRegi
// ListConcat
this.registerOpaqueBehaviorExecution(new org.eclipse.papyrus.moka.fuml.standardlibrary.library.list.ListConcat(), "FoundationalModelLibrary::PrimitiveBehaviors::ListFunctions::ListConcat");
} catch (Exception e) {
- e.printStackTrace();
+ org.eclipse.papyrus.infra.core.Activator.log.error(e);
}
}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngineForMoka$1.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngineForMoka$1.class
index 3522f66e25f..76ec5da7973 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngineForMoka$1.class
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngineForMoka$1.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngineForMoka.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngineForMoka.class
index a11f76f8362..fde49ef41bd 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngineForMoka.class
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngineForMoka.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/ActivityEdgeInstance.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/ActivityEdgeInstance.class
index 79d81a353d6..fea8a916968 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/ActivityEdgeInstance.class
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/ActivityEdgeInstance.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/debug/ControlDelegate.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/debug/ControlDelegate.class
index 1766130986f..0a79b2e8ea7 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/debug/ControlDelegate.class
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/debug/ControlDelegate.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/debug/Debug.class b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/debug/Debug.class
index 0c10915e1ef..91a7bd35352 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/debug/Debug.class
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/bin/org/eclipse/papyrus/moka/fuml/debug/Debug.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/ActivityEdgeInstance.java b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/ActivityEdgeInstance.java
index b6d701991c5..a4effaace84 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/ActivityEdgeInstance.java
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/Activities/IntermediateActivities/ActivityEdgeInstance.java
@@ -16,6 +16,7 @@ package org.eclipse.papyrus.moka.fuml.Semantics.Activities.IntermediateActivitie
import java.util.ArrayList;
import java.util.List;
+import org.eclipse.papyrus.moka.fuml.FUMLExecutionEngine;
import org.eclipse.uml2.uml.ActivityEdge;
public class ActivityEdgeInstance {
@@ -59,6 +60,9 @@ public class ActivityEdgeInstance {
offer.offeredTokens.add(token);
}
this.offers.add(offer);
+ if (! FUMLExecutionEngine.eInstance.getControlDelegate().control(this)) { // Added for connection with the debug API
+ return ;
+ }
this.target.receiveOffer();
}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngine.java b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngine.java
index b86c2d2c697..66cfcc0c372 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngine.java
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngine.java
@@ -173,6 +173,14 @@ public abstract class FUMLExecutionEngine extends AbstractExecutionEngine {
SafeRunner.run(runnable);
}
+ /**
+ * Returns the ControlDelegate object associated with this engine.
+ * This object can be used by fUML visitors as a kind of control manager,
+ * which is charge of managing debug specific aspects (e.g., suspension,
+ * termination, animation, etc.)
+ *
+ * @return The ControlDelegate object associated with this engine
+ */
public abstract ControlDelegate getControlDelegate() ;
}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngineForMoka.java b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngineForMoka.java
index b250f3f5657..c3f0d641343 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngineForMoka.java
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/FUMLExecutionEngineForMoka.java
@@ -23,6 +23,7 @@ import org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel.UnlimitedNaturalVa
import org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel.Value;
import org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.BasicBehaviors.ParameterValue;
import org.eclipse.papyrus.moka.fuml.debug.ControlDelegate;
+import org.eclipse.papyrus.moka.fuml.presentation.FUMLPresentationUtils;
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.Parameter;
import org.eclipse.uml2.uml.ParameterDirectionKind;
@@ -43,6 +44,7 @@ public class FUMLExecutionEngineForMoka extends FUMLExecutionEngine {
main = (Behavior)eObjectToExecute ;
this.debugTarget = debugTarget ;
this.debugTarget.setName("FUML Execution Engine") ;
+ FUMLPresentationUtils.init(eObjectToExecute) ;
FUMLExecutionEngine.eInstance = this ;
}
}
@@ -123,6 +125,9 @@ public class FUMLExecutionEngineForMoka extends FUMLExecutionEngine {
}
}
+ /* (non-Javadoc)
+ * @see org.eclipse.papyrus.moka.fuml.FUMLExecutionEngine#getControlDelegate()
+ */
public ControlDelegate getControlDelegate() {
if (this.controlDelegate == null)
this.controlDelegate = new ControlDelegate(this) ;
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 64a80b13cc9..9c615bdc405 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
@@ -1,7 +1,9 @@
package org.eclipse.papyrus.moka.fuml.debug;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.eclipse.debug.core.DebugEvent;
import org.eclipse.debug.core.ILaunchManager;
@@ -17,45 +19,95 @@ import org.eclipse.papyrus.moka.communication.request.iterminate.Terminate_Reque
import org.eclipse.papyrus.moka.debug.MokaBreakpoint;
import org.eclipse.papyrus.moka.debug.MokaStackFrame;
import org.eclipse.papyrus.moka.debug.MokaThread;
-import org.eclipse.papyrus.moka.debug.MokaVariable;
import org.eclipse.papyrus.moka.engine.AbstractExecutionEngine;
import org.eclipse.papyrus.moka.fuml.Semantics.Activities.IntermediateActivities.ActivityEdgeInstance;
import org.eclipse.papyrus.moka.fuml.Semantics.Activities.IntermediateActivities.ActivityNodeActivation;
+import org.eclipse.papyrus.moka.fuml.presentation.FUMLPresentationUtils;
import org.eclipse.papyrus.moka.ui.presentation.AnimationUtils;
-import org.eclipse.uml2.uml.Action;
import org.eclipse.uml2.uml.ActivityEdge;
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.InputPin;
import org.eclipse.uml2.uml.Pin;
public class ControlDelegate {
/**
- *
+ * The execution engine associated with this ControlDelegate object
*/
protected AbstractExecutionEngine engine ;
-
+
+ /**
+ * The list of threads implied by current execution
+ */
protected List<MokaThread> threads ;
+ /**
+ * Determines if execution is suspended
+ */
protected boolean suspended = false ;
+ /**
+ * The reason for suspending execution
+ */
+ protected int reasonForSuspending = -1 ;
+
+ /**
+ * The reason for resuming execution
+ */
+ protected int reasonForResuming = -1 ;
+
+ /**
+ * The execution mode (i.e., Debug or Run)
+ */
protected String mode ;
+ /**
+ * Semantic elements associated with a breakpoint
+ */
+ protected Set<EObject> elementsWithBreakpoints ;
+
public ControlDelegate(AbstractExecutionEngine engine) {
this.engine = engine ;
this.mode = this.engine.getDebugTarget().getLaunch().getLaunchMode() ;
+ this.elementsWithBreakpoints = new HashSet<EObject>() ;
}
+ /**
+ * Manages addition of a breakpoint in the course of execution
+ *
+ * @param breakpoint The added breakpoint
+ */
public void addBreakpoint(MokaBreakpoint breakpoint) {
- // TODO Auto-generated method stub
+ EObject modelElement = breakpoint.getModelElement() ;
+ if (modelElement != null) {
+ if (modelElement.eIsProxy())
+ modelElement = AnimationUtils.resolve(modelElement) ;
+ this.elementsWithBreakpoints.add(modelElement) ;
+ }
}
+ /**
+ * Manages removal of a breakpoint in the course of execution
+ *
+ * @param breakpoint The removed breakpoint
+ */
public void removeBreakpoint(MokaBreakpoint breakpoint) {
- // TODO Auto-generated method stub
+ EObject modelElement = breakpoint.getModelElement() ;
+ if (modelElement != null) {
+ if (modelElement.eIsProxy())
+ modelElement = AnimationUtils.resolve(modelElement) ;
+ this.elementsWithBreakpoints.remove(modelElement) ;
+ }
}
+ /**
+ * Manages resuming of execution
+ *
+ * @param request The request underlying this resume
+ */
public void resume(Resume_Request request) {
this.suspended = false ;
+ this.reasonForResuming = request.getResumeDetail() ;
+ if (reasonForResuming != DebugEvent.CLIENT_REQUEST)
+ reasonForResuming = DebugEvent.STEP_OVER ;
this.getThreads()[0].setSuspended(false) ;
synchronized (this) {
notify() ;
@@ -63,17 +115,45 @@ public class ControlDelegate {
}
}
+ /**
+ * Manages suspension of execution
+ *
+ * @param request The request underlying this suspension
+ */
+ public void suspend(Suspend_Request request) {
+ this.suspended = true ;
+ this.reasonForSuspending = DebugEvent.CLIENT_REQUEST ;
+ }
+
+ /**
+ * Manages termination of execution
+ *
+ * @param request The request underlying this termination
+ */
+ public void terminate(Terminate_Request request) {
+ engine.setIsTerminated(true) ;
+ synchronized (this) {
+ notify() ;
+ }
+ }
+
+ /**
+ * Return the stack of the given thread
+ *
+ * @param thread The thread from which a stack has to be retrieved
+ * @return The stack of the given thread
+ */
public IStackFrame[] getStackFrames(IThread thread) {
// Never called in this implementation
// When the debug is notified, threads are already constructed with appropriate stack frames.
return null;
}
-
- public void suspend(Suspend_Request request) {
- this.suspended = true ;
- this.getThreads()[0].setSuspended(true) ;
- }
-
+
+ /**
+ * Returns the threads underlying this execution
+ *
+ * @return The threads underlying this execution
+ */
public MokaThread[] getThreads() {
if (this.threads == null) {
this.threads = new ArrayList<MokaThread>() ;
@@ -108,22 +188,26 @@ public class ControlDelegate {
}
else {
Activator.log.error(new Exception("Unexpected element in ControlDelegate::control")) ;
+ this.engine.setIsTerminated(true) ;
+ return false ;
}
// Manages animation
- if (object instanceof ActivityNodeActivation && semanticElement != null && MokaConstants.MOKA_AUTOMATIC_ANIMATION && this.mode.equals(ILaunchManager.DEBUG_MODE)) {
- this.animate((ActivityNodeActivation)object, (ActivityNode)semanticElement) ;
+ //if (object instanceof ActivityNodeActivation && semanticElement != null && MokaConstants.MOKA_AUTOMATIC_ANIMATION && this.mode.equals(ILaunchManager.DEBUG_MODE)) {
+ // this.animate((ActivityNodeActivation)object, (ActivityNode)semanticElement) ;
+ //}
+ if (semanticElement != null && MokaConstants.MOKA_AUTOMATIC_ANIMATION && this.mode.equals(ILaunchManager.DEBUG_MODE)) {
+ //this.animate((ActivityNodeActivation)object, (ActivityNode)semanticElement) ;
+ this.animate(semanticElement) ;
}
-
- if (this.suspended) {
+
+ if (this.suspended) { /* Client request*/
try {
synchronized (this) {
- this.getThreads() ; // To make sure that this.threads is not empty
+ this.getThreads() ; // To make sure that this.threads is neither null nor empty
MokaThread mainThread = this.threads.get(0) ;
- MokaStackFrame stackFrame = new MokaStackFrame(this.engine.getDebugTarget()) ;
- stackFrame.setName(semanticElement.toString()) ;
- stackFrame.setModelElement(semanticElement) ;
- stackFrame.setVariables(new MokaVariable[]{}) ;
+ mainThread.setSuspended(true) ;
+ MokaStackFrame stackFrame = FUMLPresentationUtils.getMokaStackFrame(object) ;
stackFrame.setThread(mainThread) ;
mainThread.setStackFrames(new IStackFrame[]{stackFrame}) ;
Suspend_Event suspendEvent = new Suspend_Event(mainThread, DebugEvent.CLIENT_REQUEST, this.getThreads()) ;
@@ -131,86 +215,54 @@ public class ControlDelegate {
wait() ;
}
} catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ Activator.log.error(e) ;
+ }
+ }
+ else { // Tries to check if a breakpoint applies
+ if (this.elementsWithBreakpoints.contains(semanticElement) || this.reasonForResuming == DebugEvent.STEP_OVER) {
+ if ((object instanceof ActivityNodeActivation && ((ActivityNodeActivation)object).group != null) ||
+ (object instanceof ActivityEdgeInstance && ((ActivityEdgeInstance)object).group != null)) {
+ try {
+ synchronized (this) {
+ this.getThreads() ; // To make sure that this.threads is neither null nor empty
+ MokaThread mainThread = this.threads.get(0) ;
+ mainThread.setSuspended(true) ;
+ MokaStackFrame stackFrame = FUMLPresentationUtils.getMokaStackFrame(object) ;
+ stackFrame.setThread(mainThread) ;
+ mainThread.setStackFrames(new IStackFrame[]{stackFrame}) ;
+ Suspend_Event suspendEvent = new Suspend_Event(mainThread, DebugEvent.BREAKPOINT, this.getThreads()) ;
+ engine.sendEvent(suspendEvent) ;
+ wait() ;
+ }
+ } catch (InterruptedException e) {
+ Activator.log.error(e) ;
+ }
+ }
}
}
-
return !this.engine.isTerminated() ;
}
- protected void animate(ActivityNodeActivation activation, ActivityNode node) {
- if (node instanceof Pin)
- return ;
+ protected void animate(EObject element) {
try {
- // Simulates, in the animation, instantaneous consumption
- // on all input pins and production on all output pins
-
- // Retrieves all incoming edges for node and for its input pins
- List<ActivityEdge> allEdges = new ArrayList<ActivityEdge>() ;
- allEdges.addAll(node.getIncomings()) ;
- if (node instanceof Action) {
- for (InputPin input : ((Action)node).getInputs()) {
- allEdges.addAll(input.getIncomings()) ;
- }
- }
-
- // From all edges, retrieves all source output pins
- List<Pin> previousOutputs = new ArrayList<Pin>() ;
- for (ActivityEdge edge : allEdges) {
- ActivityNode source = edge.getSource() ;
- if (source instanceof Pin) {
- previousOutputs.add((Pin)source) ;
- }
- }
-
- // animate all previous outputs "simultaneously"
- for (Pin output : previousOutputs) {
- AnimationUtils.getInstance().addAnimationMarker(output) ;
- }
- if (! previousOutputs.isEmpty())
- Thread.sleep(MokaConstants.MOKA_ANIMATION_DELAY) ;
- for (Pin output : previousOutputs) {
- AnimationUtils.getInstance().removeAnimationMarker(output) ;
- }
-
- // animate all input edges simultaneously
-// for (ActivityEdge edge : allEdges) {
-// AnimationUtils.getInstance().addAnimationMarker(edge) ;
-// }
-// if (! allEdges.isEmpty())
-// Thread.sleep(MokaConstants.MOKA_ANIMATION_DELAY) ;
-// for (ActivityEdge edge : allEdges) {
-// AnimationUtils.getInstance().removeAnimationMarker(edge) ;
-// }
-
- // animate inputs
- if (node instanceof Action) {
- for (InputPin input : ((Action)node).getInputs()) {
- AnimationUtils.getInstance().addAnimationMarker(input) ;
- }
- if (!((Action)node).getInputs().isEmpty())
+ // If the element is an activity edge,
+ // Also animates the source, in the case where it is a pin
+ if (element instanceof ActivityEdge) {
+ ActivityEdge edge = (ActivityEdge)element ;
+ if (edge.getSource() instanceof Pin) {
+ AnimationUtils.getInstance().addAnimationMarker(edge.getSource()) ;
Thread.sleep(MokaConstants.MOKA_ANIMATION_DELAY) ;
- for (InputPin input : ((Action)node).getInputs()) {
- AnimationUtils.getInstance().removeAnimationMarker(input) ;
+ AnimationUtils.getInstance().removeAnimationMarker(edge.getSource()) ;
}
}
-
- // animate node
- AnimationUtils.getInstance().addAnimationMarker(node) ;
+ // Animates the element
+ AnimationUtils.getInstance().addAnimationMarker(element) ;
Thread.sleep(MokaConstants.MOKA_ANIMATION_DELAY) ;
- AnimationUtils.getInstance().removeAnimationMarker(node) ;
-
+ AnimationUtils.getInstance().removeAnimationMarker(element) ;
} catch (InterruptedException e) {
Activator.log.error(e) ;
}
}
- public void terminate(Terminate_Request request) {
- engine.setIsTerminated(true) ;
- synchronized (this) {
- notify() ;
- }
- }
}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/debug/Debug.java b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/debug/Debug.java
index 7fdc5f8469f..2473430b0d5 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/debug/Debug.java
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/debug/Debug.java
@@ -16,7 +16,7 @@ package org.eclipse.papyrus.moka.fuml.debug;
public class Debug {
public static void println(String message) {
- System.err.println(message) ;
+ //System.err.println(message) ;
//FIXME Bug 404555: [Moka] Pollution of the console with debug messages
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=404555
}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/FUMLPresentationUtils.java b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/FUMLPresentationUtils.java
new file mode 100644
index 00000000000..d3d2e3661d9
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/FUMLPresentationUtils.java
@@ -0,0 +1,128 @@
+package org.eclipse.papyrus.moka.fuml.presentation;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.papyrus.infra.core.Activator;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;
+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
+import org.eclipse.papyrus.moka.debug.MokaStackFrame;
+import org.eclipse.papyrus.moka.fuml.Semantics.Activities.IntermediateActivities.ActivityEdgeInstance;
+import org.eclipse.papyrus.moka.fuml.Semantics.Activities.IntermediateActivities.ActivityNodeActivation;
+import org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel.FeatureValue;
+import org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel.Object_;
+import org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel.Reference;
+import org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel.Value;
+import org.eclipse.papyrus.moka.launch.EditorUtils;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.uml2.uml.Behavior;
+import org.eclipse.uml2.uml.StructuralFeature;
+
+public class FUMLPresentationUtils {
+
+ protected static ServicesRegistry servicesRegistry ;
+
+ protected static ILabelProvider labelProvider ;
+
+ protected static EObject contextEObject ;
+
+ public static void init(EObject eObject) {
+ contextEObject = eObject ;
+ labelProvider = null ;
+ servicesRegistry = null ;
+ }
+
+ public static Image getImage(Object element) {
+ try {
+ if (element instanceof EObject && ((EObject)element).eIsProxy()) {
+ labelProvider = null ;
+ servicesRegistry = null ;
+ }
+ if (labelProvider == null) {
+ if (servicesRegistry == null) {
+ if (contextEObject.eIsProxy()) {
+ IEditorPart part = EditorUtils.getEditorPart(contextEObject) ;
+ ServicesRegistry servicesRegistry = (ServicesRegistry)part.getAdapter(ServicesRegistry.class);
+ ResourceSet resourceSet = null ;
+ try {
+ resourceSet = servicesRegistry.getService(ModelSet.class) ;
+ } catch (ServiceException e1) {
+ resourceSet = new ResourceSetImpl() ;
+ Activator.log.error(e1);
+ }
+ contextEObject = (Behavior) EcoreUtil.resolve(contextEObject, resourceSet) ;
+ }
+ else {
+ servicesRegistry = ServiceUtilsForResource.getInstance().getServiceRegistry(contextEObject.eResource());
+ }
+ }
+ LabelProviderService labelProviderService = servicesRegistry.getService(LabelProviderService.class);
+ labelProvider = labelProviderService.getLabelProvider() ;
+ labelProvider.getImage(element) ;
+ }
+ return labelProvider.getImage(element) ;
+ }
+ catch (Exception e) {
+ Activator.log.error(e) ;
+ return null ;
+ }
+ }
+
+ public static MokaStackFrame getMokaStackFrame(Object baseElement) {
+ if (baseElement instanceof ActivityNodeActivation)
+ return getMokaStackFrame((ActivityNodeActivation)baseElement) ;
+ else if (baseElement instanceof ActivityEdgeInstance) {
+ return getMokaStackFrame((ActivityEdgeInstance)baseElement) ;
+ }
+ else {
+ Activator.log.error(new Exception("Unexpected base element for construction of a MokaStackFrame")) ;
+ return null ;
+ }
+ }
+
+ public static MokaStackFrame getMokaStackFrame(ActivityNodeActivation activityNodeActivation) {
+ return new MokaStackFrame_from_ActivityNodeActivation(activityNodeActivation) ;
+ }
+
+ public static MokaStackFrame getMokaStackFrame(ActivityEdgeInstance activityEdgeInstance) {
+ return new MokaStackFrame_from_ActivityEdgeInstance(activityEdgeInstance) ;
+ }
+
+ public static String getValueString(Value value) {
+ if (value == null)
+ return "null" ;
+ if (value instanceof Object_ || value instanceof Reference) {
+ String className = value.getClass().getSimpleName() ;
+ String id = "" + value.hashCode() ;
+ return className + " (id=" + id + ")" ;
+ }
+ return value.toString() ;
+ }
+
+ public static String getValueString(FeatureValue featureValue) {
+ StructuralFeature f = featureValue.feature ;
+ String valueString = "" ;
+ if (isCollection(featureValue)) {
+ valueString += f.getType() != null ? f.getType().getName() : "any" ;
+ valueString += "[] (size=" + featureValue.values.size();
+ valueString += (")") ;
+ }
+ else {
+ Value value = featureValue.values.size() == 1 ? featureValue.values.get(0) : null ;
+ return getValueString(value) ;
+ }
+ return valueString ;
+ }
+
+ public static boolean isCollection(FeatureValue featureValue) {
+ return featureValue.feature.getUpper() == -1 ||
+ featureValue.feature.getUpper() > 1 ||
+ featureValue.values.size() > 1 ;
+ }
+}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaStackFrame_from_ActivityEdgeInstance.java b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaStackFrame_from_ActivityEdgeInstance.java
new file mode 100644
index 00000000000..5bf762260cf
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaStackFrame_from_ActivityEdgeInstance.java
@@ -0,0 +1,38 @@
+package org.eclipse.papyrus.moka.fuml.presentation;
+
+import org.eclipse.papyrus.moka.fuml.Semantics.Activities.IntermediateActivities.ActivityEdgeInstance;
+import org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel.Object_;
+
+public class MokaStackFrame_from_ActivityEdgeInstance extends MokaStackFrame_from_UMLModelElement {
+
+ protected ActivityEdgeInstance activityEdgeInstance ;
+
+ public MokaStackFrame_from_ActivityEdgeInstance(ActivityEdgeInstance activityEdgeInstance) {
+ super(activityEdgeInstance.edge);
+ this.activityEdgeInstance = activityEdgeInstance ;
+ }
+
+ ///////////////////////////////
+ // Presentation
+ ///////////////////////////////
+
+ public String getLabel() {
+ String activityName = activityEdgeInstance.edge.getActivity().getName() ;
+ String nodeName = activityEdgeInstance.edge.getName() ;
+ if (nodeName == null || nodeName.length() == 0)
+ nodeName = "Anonymous edge" ;
+ return activityName + "(" + nodeName + ")" ;
+ }
+
+ ///////////////////////////////
+ // Debug
+ ///////////////////////////////
+
+ @Override
+ protected Object_ getContextObject() {
+ return activityEdgeInstance.group.getActivityExecution().context ;
+ }
+
+
+
+}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaStackFrame_from_ActivityNodeActivation.java b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaStackFrame_from_ActivityNodeActivation.java
new file mode 100644
index 00000000000..992e67dd69c
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaStackFrame_from_ActivityNodeActivation.java
@@ -0,0 +1,35 @@
+package org.eclipse.papyrus.moka.fuml.presentation;
+
+import org.eclipse.papyrus.moka.fuml.Semantics.Activities.IntermediateActivities.ActivityNodeActivation;
+import org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel.Object_;
+
+public class MokaStackFrame_from_ActivityNodeActivation extends MokaStackFrame_from_UMLModelElement {
+
+ protected ActivityNodeActivation activityNodeActivation ;
+
+ public MokaStackFrame_from_ActivityNodeActivation(ActivityNodeActivation activityNodeActivation) {
+ super(activityNodeActivation.node);
+ this.activityNodeActivation = activityNodeActivation ;
+ }
+
+ ///////////////////////////////
+ // Presentation
+ ///////////////////////////////
+
+ public String getLabel() {
+ String activityName = activityNodeActivation.getActivityExecution().getBehavior().getName() ;
+ String nodeName = activityNodeActivation.node.getName() ;
+ if (nodeName == null || nodeName.length() == 0)
+ nodeName = "Anonymous node" ;
+ return activityName + "(" + nodeName + ")" ;
+ }
+
+ ///////////////////////////////
+ // Debug
+ ///////////////////////////////
+
+ @Override
+ protected Object_ getContextObject() {
+ return activityNodeActivation.getExecutionContext() ;
+ }
+}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaStackFrame_from_UMLModelElement.java b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaStackFrame_from_UMLModelElement.java
new file mode 100644
index 00000000000..98b3701e9d2
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaStackFrame_from_UMLModelElement.java
@@ -0,0 +1,79 @@
+package org.eclipse.papyrus.moka.fuml.presentation;
+
+import org.eclipse.debug.core.DebugException;
+import org.eclipse.debug.core.model.IVariable;
+import org.eclipse.papyrus.moka.debug.MokaStackFrame;
+import org.eclipse.papyrus.moka.fuml.FUMLExecutionEngine;
+import org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel.Object_;
+import org.eclipse.papyrus.moka.ui.presentation.IPresentation;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.uml2.uml.Element;
+
+public abstract class MokaStackFrame_from_UMLModelElement extends MokaStackFrame implements IPresentation {
+
+ public MokaStackFrame_from_UMLModelElement(Element modelElement) {
+ super(FUMLExecutionEngine.eInstance.getDebugTarget());
+ this.modelElement = modelElement ;
+ }
+
+ ///////////////////////////////
+ // Presentation
+ ///////////////////////////////
+
+ /* (non-Javadoc)
+ * @see org.eclipse.papyrus.moka.ui.presentation.IPresentation#getLabel()
+ */
+ abstract public String getLabel() ;
+
+ /* (non-Javadoc)
+ * @see org.eclipse.papyrus.moka.ui.presentation.IPresentation#getDetails()
+ */
+ public String getDetails() {
+ // Not used
+ return "";
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.papyrus.moka.ui.presentation.IPresentation#getImage()
+ */
+ public Image getImage() {
+ return FUMLPresentationUtils.getImage(modelElement) ;
+ }
+
+ ///////////////////////////////
+ // Debug
+ ///////////////////////////////
+
+ /* (non-Javadoc)
+ * @see org.eclipse.papyrus.moka.debug.MokaStackFrame#hasVariables()
+ */
+ @Override
+ public boolean hasVariables() throws DebugException {
+ return true ;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.papyrus.moka.debug.MokaStackFrame#getVariables()
+ */
+ @Override
+ public IVariable[] getVariables() throws DebugException {
+ Object_ contextObject = this.getContextObject() ;
+ IVariable[] variables ;
+ if (contextObject == null) {
+ variables = new IVariable[]{};
+ }
+ else {
+ MokaVariable_from_ContextObject var = new MokaVariable_from_ContextObject(contextObject) ;
+ variables = new IVariable[]{var} ;
+ }
+ return variables ;
+ }
+
+ /**
+ * Returns the context fUML Object_ for this stack frame
+ *
+ * @return the context fUML Object_ for this stack frame
+ */
+ protected abstract Object_ getContextObject() ;
+
+}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaValue_for_fUML.java b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaValue_for_fUML.java
new file mode 100644
index 00000000000..3631611c43b
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaValue_for_fUML.java
@@ -0,0 +1,46 @@
+package org.eclipse.papyrus.moka.fuml.presentation;
+
+import org.eclipse.debug.core.DebugException;
+import org.eclipse.debug.core.model.IVariable;
+import org.eclipse.papyrus.moka.debug.MokaValue;
+import org.eclipse.papyrus.moka.fuml.FUMLExecutionEngine;
+import org.eclipse.papyrus.moka.ui.presentation.IPresentation;
+import org.eclipse.swt.graphics.Image;
+
+public abstract class MokaValue_for_fUML extends MokaValue implements IPresentation {
+
+ public MokaValue_for_fUML() {
+ super(FUMLExecutionEngine.eInstance.getDebugTarget());
+ }
+
+ //////////////////////////////////
+ // Presentation
+ //////////////////////////////////
+
+ public String getLabel() {
+ // Not used
+ return "";
+ }
+
+ public abstract String getDetails() ;
+
+ public Image getImage() {
+ // Not used
+ return null ;
+ }
+
+ //////////////////////////////////
+ // Debug
+ //////////////////////////////////
+
+ @Override
+ public IVariable[] getVariables() throws DebugException {
+ return new IVariable[]{};
+ }
+
+ @Override
+ public boolean hasVariables() throws DebugException {
+ return false ;
+ }
+
+}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaValue_from_FeatureValue.java b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaValue_from_FeatureValue.java
new file mode 100644
index 00000000000..26f0fef998d
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaValue_from_FeatureValue.java
@@ -0,0 +1,90 @@
+package org.eclipse.papyrus.moka.fuml.presentation;
+
+import java.util.List;
+
+import org.eclipse.debug.core.DebugException;
+import org.eclipse.debug.core.model.IVariable;
+import org.eclipse.papyrus.moka.debug.MokaVariable;
+import org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel.FeatureValue;
+import org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel.Value;
+
+public class MokaValue_from_FeatureValue extends MokaValue_for_fUML {
+
+ protected FeatureValue featureValue ;
+
+ protected IVariable[] variables ;
+
+ public MokaValue_from_FeatureValue(FeatureValue featureValue) {
+ super() ;
+ this.featureValue = featureValue ;
+ }
+
+ ////////////////////////
+ // Presentation
+ ////////////////////////
+
+ @Override
+ public String getDetails() {
+ return computeDetails() ;
+ }
+
+ ////////////////////////
+ // Debug
+ ////////////////////////
+
+ @Override
+ public String getValueString() throws DebugException {
+ String valueString = null;
+ if (FUMLPresentationUtils.isCollection(featureValue)) {
+ valueString = FUMLPresentationUtils.getValueString(featureValue) ;
+ }
+ else {
+ valueString = computeDetails() ;
+ }
+ return valueString ;
+ }
+
+ @Override
+ public IVariable[] getVariables() throws DebugException {
+ if (variables == null) {
+ if (featureValue.values.isEmpty()) {
+ variables = new IVariable[]{} ;
+ }
+ else {
+ variables = new IVariable[featureValue.values.size()] ;
+ for (int i = 0 ; i < variables.length ; i++) {
+ MokaVariable valueVariable = new MokaVariable_from_Value(featureValue.values.get(i)) ;
+ valueVariable.setName("[" + (i + 1) + "]") ;
+ variables[i] = valueVariable ;
+ }
+ }
+ }
+ return variables ;
+ }
+
+ @Override
+ public boolean hasVariables() throws DebugException {
+ return this.getVariables().length > 0 && FUMLPresentationUtils.isCollection(featureValue);
+ }
+
+ protected String computeDetails() {
+ String valueString = FUMLPresentationUtils.isCollection(featureValue) ? "{ " : "" ;
+ List<Value> values = featureValue.values ;
+ boolean first = true ;
+ if (values.isEmpty() && !FUMLPresentationUtils.isCollection(featureValue))
+ return "null" ;
+ for (Value v : values) {
+ if (first) {
+ valueString += v.toString() ;
+ first = false ;
+ }
+ else {
+ valueString += ", " ;
+ valueString += v.toString() ;
+ }
+ }
+ valueString += FUMLPresentationUtils.isCollection(featureValue) ? " }" : "";
+ return valueString ;
+ }
+
+}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaValue_from_Value.java b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaValue_from_Value.java
new file mode 100644
index 00000000000..3feabd65fe1
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaValue_from_Value.java
@@ -0,0 +1,64 @@
+package org.eclipse.papyrus.moka.fuml.presentation;
+
+import org.eclipse.debug.core.DebugException;
+import org.eclipse.debug.core.model.IVariable;
+import org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel.CompoundValue;
+import org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel.Value;
+
+public class MokaValue_from_Value extends MokaValue_for_fUML {
+
+ protected Value value ;
+
+ protected IVariable[] variables ;
+
+ public MokaValue_from_Value(Value value) {
+ super();
+ this.value = value ;
+ }
+
+ //////////////////////////////////
+ // Presentation
+ //////////////////////////////////
+
+ public String getDetails() {
+ return value.toString();
+ }
+
+ //////////////////////////////////
+ // Debug
+ //////////////////////////////////
+
+ @Override
+ public String getValueString() throws DebugException {
+ return FUMLPresentationUtils.getValueString(value) ;
+ }
+
+ @Override
+ public IVariable[] getVariables() throws DebugException {
+ if (variables == null) {
+ if (! (value instanceof CompoundValue)) {
+ variables = new IVariable[]{} ;
+ }
+ else if (((CompoundValue)value).featureValues.isEmpty()) {
+ variables = new IVariable[]{} ;
+ }
+ else {
+ CompoundValue compound = (CompoundValue)value ;
+ variables = new IVariable[compound.featureValues.size()] ;
+ for (int i = 0 ; i < variables.length ; i++) {
+ IVariable featureValueVariable = new MokaVariable_from_FeatureValue(compound.featureValues.get(i)) ;
+ variables[i] = featureValueVariable ;
+ }
+ }
+ }
+ return variables;
+ }
+
+ @Override
+ public boolean hasVariables() throws DebugException {
+ return getVariables().length > 0;
+ }
+
+
+
+}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaVariable_for_fUML.java b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaVariable_for_fUML.java
new file mode 100644
index 00000000000..d575d61acdc
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaVariable_for_fUML.java
@@ -0,0 +1,26 @@
+package org.eclipse.papyrus.moka.fuml.presentation;
+
+import org.eclipse.papyrus.moka.debug.MokaVariable;
+import org.eclipse.papyrus.moka.fuml.FUMLExecutionEngine;
+import org.eclipse.papyrus.moka.ui.presentation.IPresentation;
+import org.eclipse.swt.graphics.Image;
+
+public abstract class MokaVariable_for_fUML extends MokaVariable implements IPresentation {
+
+ public MokaVariable_for_fUML() {
+ super(FUMLExecutionEngine.eInstance.getDebugTarget());
+ }
+
+ public String getLabel() {
+ // Not used
+ return "";
+ }
+
+ public String getDetails() {
+ // Not used
+ return "";
+ }
+
+ public abstract Image getImage() ;
+
+}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaVariable_from_ContextObject.java b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaVariable_from_ContextObject.java
new file mode 100644
index 00000000000..c43fd08f938
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaVariable_from_ContextObject.java
@@ -0,0 +1,36 @@
+package org.eclipse.papyrus.moka.fuml.presentation;
+
+import org.eclipse.debug.core.DebugException;
+import org.eclipse.debug.core.model.IValue;
+import org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel.Object_;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.uml2.uml.UMLPackage;
+
+public class MokaVariable_from_ContextObject extends MokaVariable_for_fUML {
+
+ protected Object_ contextObject ;
+
+ public MokaVariable_from_ContextObject(Object_ contextObject) {
+ super();
+ this.name = "context" ;
+ this.contextObject = contextObject ;
+ }
+
+ //////////////////////////////////
+ // Presentation
+ //////////////////////////////////
+
+ public Image getImage() {
+ // not used for variables
+ return FUMLPresentationUtils.getImage(UMLPackage.eINSTANCE.getInstanceSpecification()) ;
+ }
+
+ //////////////////////////////////
+ // Debug
+ //////////////////////////////////
+ @Override
+ public IValue getValue() throws DebugException {
+ return new MokaValue_from_Value(contextObject) ;
+ }
+
+}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaVariable_from_FeatureValue.java b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaVariable_from_FeatureValue.java
new file mode 100644
index 00000000000..3892d00c5b2
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaVariable_from_FeatureValue.java
@@ -0,0 +1,41 @@
+package org.eclipse.papyrus.moka.fuml.presentation;
+
+import org.eclipse.debug.core.DebugException;
+import org.eclipse.debug.core.model.IValue;
+import org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel.FeatureValue;
+import org.eclipse.swt.graphics.Image;
+
+public class MokaVariable_from_FeatureValue extends MokaVariable_for_fUML {
+
+ protected FeatureValue featureValue ;
+
+ protected IValue value ;
+
+ public MokaVariable_from_FeatureValue(FeatureValue featureValue) {
+ super() ;
+ this.featureValue = featureValue ;
+ this.name = featureValue.feature.getName() ;
+ }
+
+ ////////////////////////
+ // Presentation
+ ////////////////////////
+
+ @Override
+ public Image getImage() {
+ return FUMLPresentationUtils.getImage(featureValue.feature);
+ }
+
+ ////////////////////////
+ // Debug
+ ////////////////////////
+
+ @Override
+ public IValue getValue() throws DebugException {
+ if (this.value == null) {
+ this.value = new MokaValue_from_FeatureValue(featureValue) ;
+ }
+ return this.value;
+ }
+
+}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaVariable_from_Value.java b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaVariable_from_Value.java
new file mode 100644
index 00000000000..babf3293afc
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/src/org/eclipse/papyrus/moka/fuml/presentation/MokaVariable_from_Value.java
@@ -0,0 +1,35 @@
+package org.eclipse.papyrus.moka.fuml.presentation;
+
+import org.eclipse.debug.core.DebugException;
+import org.eclipse.debug.core.model.IValue;
+import org.eclipse.papyrus.moka.fuml.Semantics.Classes.Kernel.Value;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.uml2.uml.UMLPackage;
+
+public class MokaVariable_from_Value extends MokaVariable_for_fUML {
+
+ protected Value value ;
+
+ public MokaVariable_from_Value(Value value) {
+ super();
+ this.value = value ;
+ }
+
+ //////////////////////////////////
+ // Presentation
+ //////////////////////////////////
+
+ public Image getImage() {
+ // not used for variables
+ return FUMLPresentationUtils.getImage(UMLPackage.eINSTANCE.getInstanceSpecification()) ;
+ }
+
+ //////////////////////////////////
+ // Debug
+ //////////////////////////////////
+ @Override
+ public IValue getValue() throws DebugException {
+ return new MokaValue_from_Value(value) ;
+ }
+
+}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF b/sandbox/Moka/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF
index a4c7a8faf69..50f2792074d 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/META-INF/MANIFEST.MF
@@ -24,7 +24,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="0.10.0",
org.eclipse.e4.ui.css.core;bundle-version="0.10.100",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.services.markerlistener;bundle-version="0.10.0"
+ org.eclipse.papyrus.infra.services.markerlistener;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.papyrus.moka.ui.presentation
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/Activator.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/Activator.class
new file mode 100644
index 00000000000..d1f6ca908a2
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/Activator.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/decoration/BreakpointDecoration.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/decoration/BreakpointDecoration.class
new file mode 100644
index 00000000000..58e1d343171
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/decoration/BreakpointDecoration.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/MokaAbstractHandler.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/MokaAbstractHandler.class
new file mode 100644
index 00000000000..99d5d0c9ae6
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/MokaAbstractHandler.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointActivationHandler.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointActivationHandler.class
new file mode 100644
index 00000000000..fbc2ea025c0
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointActivationHandler.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointHandler.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointHandler.class
new file mode 100644
index 00000000000..9eab3449b57
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointHandler.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/MokaLaunchConfigurationTabGroup.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/MokaLaunchConfigurationTabGroup.class
new file mode 100644
index 00000000000..8e6c1411e66
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/MokaLaunchConfigurationTabGroup.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$1.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$1.class
new file mode 100644
index 00000000000..50fc07028fd
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$1.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$2.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$2.class
new file mode 100644
index 00000000000..736ceec6408
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$2.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$3.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$3.class
new file mode 100644
index 00000000000..4c8d6925567
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$3.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$4.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$4.class
new file mode 100644
index 00000000000..381e8b9d320
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$4.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$5.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$5.class
new file mode 100644
index 00000000000..98401f6b8c5
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab$5.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab.class
new file mode 100644
index 00000000000..4cd5a2f6dce
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/preferences/MokaPreferencePage.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/preferences/MokaPreferencePage.class
new file mode 100644
index 00000000000..a90502bbeeb
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/preferences/MokaPreferencePage.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils$1.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils$1.class
new file mode 100644
index 00000000000..4c84ecf3eeb
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils$1.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils$OpenDiagramCommand.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils$OpenDiagramCommand.class
new file mode 100644
index 00000000000..d8da36cc932
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils$OpenDiagramCommand.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils.class
new file mode 100644
index 00000000000..2d53323bebd
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/DebugMarkerMappingToPseudoSelector.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/DebugMarkerMappingToPseudoSelector.class
new file mode 100644
index 00000000000..808065b9e74
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/DebugMarkerMappingToPseudoSelector.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/IPresentation.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/IPresentation.class
new file mode 100644
index 00000000000..9ca365ab927
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/IPresentation.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/MokaDebugModelPresentation.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/MokaDebugModelPresentation.class
new file mode 100644
index 00000000000..b5fd9f400b0
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/presentation/MokaDebugModelPresentation.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$1.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$1.class
new file mode 100644
index 00000000000..ad11bfbb1be
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$1.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$2.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$2.class
new file mode 100644
index 00000000000..d50be211b29
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$2.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$3.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$3.class
new file mode 100644
index 00000000000..9c0d1f00162
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView$3.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView.class b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView.class
new file mode 100644
index 00000000000..527110579a0
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/bin/org/eclipse/papyrus/moka/ui/views/MokaAnimationView.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointActivationHandler.java b/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointActivationHandler.java
index 350d911d167..b14ebc3ee81 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointActivationHandler.java
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointActivationHandler.java
@@ -22,6 +22,7 @@ import org.eclipse.debug.core.IBreakpointManager;
import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.infra.core.Activator;
import org.eclipse.papyrus.moka.MokaConstants;
import org.eclipse.papyrus.moka.debug.MokaBreakpoint;
@@ -55,7 +56,7 @@ public class ToggleBreakpointActivationHandler extends MokaAbstractHandler imple
alreadyDefinedBreakpoint.setEnabled(enabledOrDisabled) ;
DebugPlugin.getDefault().getBreakpointManager().fireBreakpointChanged(alreadyDefinedBreakpoint) ;
} catch (CoreException e) {
- e.printStackTrace();
+ Activator.log.error(e);
}
}
return null;
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointHandler.java b/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointHandler.java
index 58465be61d5..e240c75016c 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointHandler.java
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/breakpoint/handlers/ToggleBreakpointHandler.java
@@ -23,6 +23,7 @@ import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EValidator;
import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.infra.core.Activator;
import org.eclipse.papyrus.moka.MokaConstants;
import org.eclipse.papyrus.moka.debug.MokaBreakpoint;
@@ -48,7 +49,7 @@ public class ToggleBreakpointHandler extends MokaAbstractHandler implements IHan
try {
eObjectOfBreakpointUri = (String)breakpoint.getMarker().getAttribute(EValidator.URI_ATTRIBUTE);
} catch (CoreException e) {
- e.printStackTrace();
+ Activator.log.error(e);
}
if (eObjectOfBreakpointUri.equals(selectedElementURI)) {
alreadyDefinedBreakpoint = breakpoint ;
@@ -64,7 +65,7 @@ public class ToggleBreakpointHandler extends MokaAbstractHandler implements IHan
breakpointManager.addBreakpoint(breakpoint) ;
}
} catch (CoreException e) {
- e.printStackTrace();
+ Activator.log.error(e);
}
return null;
}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab.java b/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab.java
index 3dbf8c3c6fb..a4027ebfb8e 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab.java
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/launch/SelectEObjectTab.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.papyrus.infra.core.Activator;
import org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider;
import org.eclipse.papyrus.infra.emf.providers.strategy.SemanticEMFContentProvider;
import org.eclipse.papyrus.infra.widgets.editors.TreeSelectorDialog;
@@ -221,7 +222,7 @@ public class SelectEObjectTab extends AbstractLaunchConfigurationTab {
String init_args = configuration.getAttribute(MokaLaunchDelegate.ARGS_ATTRIBUTE_NAME, "") ;
argsText.setText(init_args) ;
} catch (CoreException e) {
- e.printStackTrace();
+ Activator.log.error(e);
}
}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils.java b/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils.java
index 83a17b0c403..9121de60682 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils.java
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.ui/src/org/eclipse/papyrus/moka/ui/presentation/AnimationUtils.java
@@ -38,6 +38,7 @@ import org.eclipse.gef.RootEditPart;
import org.eclipse.gef.ui.parts.GraphicalEditor;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.Activator;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;
import org.eclipse.papyrus.infra.core.services.ServiceException;
@@ -176,10 +177,10 @@ public class AnimationUtils {
}
});
} catch (Exception e) {
- e.printStackTrace() ;
+ Activator.log.error(e) ;
}
} catch (ServiceException e1) {
- e1.printStackTrace();
+ Activator.log.error(e1);
}
}
@@ -212,7 +213,7 @@ public class AnimationUtils {
eObjectToSuspendedMarker.put(semanticElement, PapyrusMarkerAdapter.wrap(semanticElement.eResource(), marker)) ;
}
} catch (CoreException ce) {
- ce.printStackTrace() ;
+ Activator.log.error(ce) ;
}
}
@@ -227,7 +228,7 @@ public class AnimationUtils {
try {
stackFrameMarker.delete() ;
} catch (CoreException e) {
- e.printStackTrace();
+ Activator.log.error(e);
}
}
eObjectToSuspendedMarker.clear() ;
@@ -259,7 +260,7 @@ public class AnimationUtils {
eObjectToAnimationMarker.put(semanticElement, PapyrusMarkerAdapter.wrap(semanticElement.eResource(), marker)) ;
}
} catch (CoreException ce) {
- ce.printStackTrace() ;
+ Activator.log.error(ce) ;
}
}
@@ -277,7 +278,7 @@ public class AnimationUtils {
stackFrameMarker.delete() ;
eObjectToAnimationMarker.remove(semanticElement) ;
} catch (CoreException e) {
- e.printStackTrace();
+ Activator.log.error(e) ;
}
}
}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/debug/MokaBreakpoint.class b/sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/debug/MokaBreakpoint.class
index e2d8d8f8b1e..97717283cb3 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/debug/MokaBreakpoint.class
+++ b/sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/debug/MokaBreakpoint.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/debug/MokaDebugTarget$EventDispatchJob.class b/sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/debug/MokaDebugTarget$EventDispatchJob.class
index baf844f9fde..cf5238db7e8 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/debug/MokaDebugTarget$EventDispatchJob.class
+++ b/sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/debug/MokaDebugTarget$EventDispatchJob.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/debug/MokaDebugTarget.class b/sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/debug/MokaDebugTarget.class
index 11e0b403024..d6b8daae03c 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/debug/MokaDebugTarget.class
+++ b/sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/debug/MokaDebugTarget.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/launch/MokaLaunchDelegate.class b/sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/launch/MokaLaunchDelegate.class
index 9bcb50fdc36..1d50f6b3621 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/launch/MokaLaunchDelegate.class
+++ b/sandbox/Moka/org.eclipse.papyrus.moka/bin/org/eclipse/papyrus/moka/launch/MokaLaunchDelegate.class
Binary files differ
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/debug/MokaBreakpoint.java b/sandbox/Moka/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/debug/MokaBreakpoint.java
index 0510dbdbc8c..e9986b8109d 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/debug/MokaBreakpoint.java
+++ b/sandbox/Moka/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/debug/MokaBreakpoint.java
@@ -92,7 +92,7 @@ public class MokaBreakpoint extends Breakpoint {
this.setPersisted(true) ;
}
} catch (CoreException ce) {
- ce.printStackTrace() ;
+ Activator.log.error(ce) ;
}
}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/debug/MokaDebugTarget.java b/sandbox/Moka/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/debug/MokaDebugTarget.java
index 8cbccde7c36..29428833d5c 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/debug/MokaDebugTarget.java
+++ b/sandbox/Moka/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/debug/MokaDebugTarget.java
@@ -40,6 +40,7 @@ import org.eclipse.debug.core.model.IRegisterGroup;
import org.eclipse.debug.core.model.IStackFrame;
import org.eclipse.debug.core.model.IThread;
import org.eclipse.debug.core.model.IValue;
+import org.eclipse.papyrus.infra.core.Activator;
import org.eclipse.papyrus.moka.MokaConstants;
import org.eclipse.papyrus.moka.communication.Marshaller;
import org.eclipse.papyrus.moka.communication.event.Start_Event;
@@ -231,11 +232,11 @@ public class MokaDebugTarget extends MokaDebugElement implements IDebugTarget {
@SuppressWarnings("unused")
String ack = replyReader.readLine() ;
} catch (IOException e) {
- e.printStackTrace();
+ Activator.log.error(e);
}
}
} catch (CoreException e) {
- e.printStackTrace() ;
+ Activator.log.error(e) ;
}
}
}
@@ -254,9 +255,9 @@ public class MokaDebugTarget extends MokaDebugElement implements IDebugTarget {
@SuppressWarnings("unused")
String ack = replyReader.readLine() ;
} catch (CoreException e) {
- e.printStackTrace() ;
+ Activator.log.error(e) ;
} catch (IOException e) {
- e.printStackTrace();
+ Activator.log.error(e);
}
}
}
@@ -273,7 +274,7 @@ public class MokaDebugTarget extends MokaDebugElement implements IDebugTarget {
this.breakpointRemoved(breakpoint, delta);
}
} catch (CoreException e) {
- e.printStackTrace() ;
+ Activator.log.error(e) ;
}
}
}
@@ -307,9 +308,9 @@ public class MokaDebugTarget extends MokaDebugElement implements IDebugTarget {
String ack = replyReader.readLine() ;
this.isDisconnected = true ;
} catch (CoreException e) {
- e.printStackTrace() ;
+ Activator.log.error(e) ;
} catch (IOException e) {
- e.printStackTrace();
+ Activator.log.error(e);
}
}
@@ -594,7 +595,7 @@ public class MokaDebugTarget extends MokaDebugElement implements IDebugTarget {
resume();
this.isStarted = true ;
} catch (DebugException e) {
- e.printStackTrace() ;
+ Activator.log.error(e) ;
}
}
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/launch/MokaLaunchDelegate.java b/sandbox/Moka/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/launch/MokaLaunchDelegate.java
index a68112161aa..3afb03f9463 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/launch/MokaLaunchDelegate.java
+++ b/sandbox/Moka/org.eclipse.papyrus.moka/src/org/eclipse/papyrus/moka/launch/MokaLaunchDelegate.java
@@ -99,7 +99,7 @@ public class MokaLaunchDelegate extends LaunchConfigurationDelegate implements I
resourceSet = servicesRegistry.getService(ModelSet.class) ;
} catch (ServiceException e1) {
resourceSet = new ResourceSetImpl() ;
- e1.printStackTrace();
+ org.eclipse.papyrus.infra.core.Activator.log.error(e1);
}
// from the arguments, retrieves the EObject to be executed

Back to the top