Simplifies the WorldExample implementation by making use of the examp…

…le execution states. In the course of this repairs some inconsistencies with the suspend/resume buttons in example morphs.
hpi-swa-lab · Jan 13, 2023 · 8f84d3a · 8f84d3a
1 parent c72ca9c
commit 8f84d3a
Show file tree

Hide file tree

Showing 23 changed files with 47 additions and 59 deletions.
diff --git a/packages/Babylonian-Core.package/BPContinuousRunExample.class/README.md b/packages/Babylonian-Core.package/BPContinuousRunExample.class/README.md
diff --git a/packages/Babylonian-Core.package/BPContinuousRunExample.class/class/isAbstract.st b/packages/Babylonian-Core.package/BPContinuousRunExample.class/class/isAbstract.st
diff --git a/packages/Babylonian-Core.package/BPContinuousRunExample.class/instance/isTracing.st b/packages/Babylonian-Core.package/BPContinuousRunExample.class/instance/isTracing.st
diff --git a/packages/Babylonian-Core.package/BPContinuousRunExample.class/instance/startTracing.st b/packages/Babylonian-Core.package/BPContinuousRunExample.class/instance/startTracing.st
diff --git a/packages/Babylonian-Core.package/BPContinuousRunExample.class/instance/stopTracing.st b/packages/Babylonian-Core.package/BPContinuousRunExample.class/instance/stopTracing.st
diff --git a/packages/Babylonian-Core.package/BPContinuousRunExample.class/instance/toggleTracing.st b/packages/Babylonian-Core.package/BPContinuousRunExample.class/instance/toggleTracing.st
diff --git a/packages/Babylonian-Core.package/BPContinuousRunExample.class/methodProperties.json b/packages/Babylonian-Core.package/BPContinuousRunExample.class/methodProperties.json
diff --git a/packages/Babylonian-Core.package/BPContinuousRunExample.class/properties.json b/packages/Babylonian-Core.package/BPContinuousRunExample.class/properties.json
diff --git a/...class/instance/ensureTerminatedProcess.st → ...class/instance/ensureTerminatedProcess.st b/...class/instance/ensureTerminatedProcess.st → ...class/instance/ensureTerminatedProcess.st
diff --git a/packages/Babylonian-Core.package/BPWorldExampleReference.class/instance/resumeTracing.st b/packages/Babylonian-Core.package/BPWorldExampleReference.class/instance/resumeTracing.st
@@ -0,0 +1,6 @@
+tracing
+resumeTracing
+
+	self startTracing.
+
+
diff --git a/...inuousRunExample.class/instance/runOn..st → ...ExampleReference.class/instance/runOn..st b/...inuousRunExample.class/instance/runOn..st → ...ExampleReference.class/instance/runOn..st
diff --git a/...s/Babylonian-Core.package/BPWorldExampleReference.class/instance/suspendTracingProcess.st b/...s/Babylonian-Core.package/BPWorldExampleReference.class/instance/suspendTracingProcess.st
@@ -0,0 +1,6 @@
+tracing
+suspendTracingProcess
+
+	self stopTracing.
+
+
diff --git a/...tinuousRunExample.class/instance/trace.st → ...dExampleReference.class/instance/trace.st b/...tinuousRunExample.class/instance/trace.st → ...dExampleReference.class/instance/trace.st
diff --git a/...ample.class/instance/traceInBackground.st → ...rence.class/instance/traceInBackground.st b/...ample.class/instance/traceInBackground.st → ...rence.class/instance/traceInBackground.st
diff --git a/...s/Babylonian-Core.package/BPWorldExampleReference.class/instance/tracingIsStillRunning.st b/...s/Babylonian-Core.package/BPWorldExampleReference.class/instance/tracingIsStillRunning.st
@@ -0,0 +1,4 @@
+as yet unclassified
+tracingIsStillRunning
+
+	^ true
diff --git a/...bylonian-Core.package/BPWorldExampleReference.class/instance/tracingProcessIsSuspended.st b/...bylonian-Core.package/BPWorldExampleReference.class/instance/tracingProcessIsSuspended.st
@@ -0,0 +1,5 @@
+tracing
+tracingProcessIsSuspended
+
+	^ self isTracing not
+
diff --git a/packages/Babylonian-Core.package/BPWorldExampleReference.class/methodProperties.json b/packages/Babylonian-Core.package/BPWorldExampleReference.class/methodProperties.json
@@ -3,12 +3,20 @@
 		"bpExamplePragmaPrefix" : "pre 9/6/2022 11:14" },
 	"instance" : {
 		"asPragma" : "pre 9/6/2022 11:14",
+		"ensureTerminatedProcess" : "pre 1/13/2023 16:28",
 		"exampleName" : "pre 9/5/2022 14:52",
 		"initialize" : "pre 9/6/2022 10:14",
 		"initializeFromPragma:" : "pre 9/6/2022 10:29",
 		"isTracing" : "pre 9/6/2022 09:10",
 		"morphClass" : "pre 9/5/2022 14:52",
+		"resumeTracing" : "pre 1/13/2023 16:32",
+		"runOn:" : "pre 1/13/2023 16:28",
 		"startTracing" : "pre 9/6/2022 09:09",
 		"stopTracing" : "pre 9/6/2022 09:10",
+		"suspendTracingProcess" : "pre 1/13/2023 16:32",
+		"trace" : "pre 1/13/2023 16:29",
+		"traceInBackground" : "pre 1/13/2023 16:29",
+		"tracingIsStillRunning" : "pre 1/13/2023 16:36",
+		"tracingProcessIsSuspended" : "pre 1/13/2023 16:47",
 		"uniqueIdentifier" : "pre 9/5/2022 13:17",
 		"update:with:" : "pre 9/6/2022 10:16" } }
diff --git a/packages/Babylonian-Core.package/BPWorldExampleReference.class/properties.json b/packages/Babylonian-Core.package/BPWorldExampleReference.class/properties.json
@@ -10,5 +10,5 @@
 	"name" : "BPWorldExampleReference",
 	"pools" : [
 		 ],
-	"super" : "BPContinuousRunExample",
+	"super" : "BPExample",
 	"type" : "normal" }
diff --git a/...ges/Babylonian-Core.package/BPWorldExampleState.class/instance/installUIProcessTracing.st b/...ges/Babylonian-Core.package/BPWorldExampleState.class/instance/installUIProcessTracing.st
@@ -5,5 +5,6 @@ installUIProcessTracing
 	tracer := BPTracer forExample: self.
 	BPActiveTracer uiProcessTracer: tracer.
 	trace := tracer intermediateTrace.
+	trace hasTraceCompleted: false.
 	self changed: #worldExampleTrace with: trace.
 	Project current addDeferredUIMessage: [#bpInstrumented activateLayerInCurrentProcess].
diff --git a/packages/Babylonian-Core.package/BPWorldExampleState.class/methodProperties.json b/packages/Babylonian-Core.package/BPWorldExampleState.class/methodProperties.json
@@ -9,7 +9,7 @@
 		"clearTrace" : "pre 11/16/2022 16:26",
 		"exampleName" : "pre 9/5/2022 14:52",
 		"initialize" : "pre 9/6/2022 09:09",
-		"installUIProcessTracing" : "pre 9/6/2022 10:17",
+		"installUIProcessTracing" : "pre 1/13/2023 16:58",
 		"isTracing" : "pre 9/6/2022 09:10",
 		"morphClass" : "pre 9/5/2022 14:52",
 		"removeUIProcessTracing" : "pre 9/5/2022 13:35",

diff --git a/packages/Babylonian-UI.package/BPExampleMorph.class/instance/ensureLoaderIcon.st b/packages/Babylonian-UI.package/BPExampleMorph.class/instance/ensureLoaderIcon.st
@@ -2,6 +2,10 @@ private - ui
 ensureLoaderIcon
 
 	| loaderIconHolder |
-	(loaderIconHolder := self submorphNamed: #loaderIconHolder) submorphs ifEmpty: [
+	loaderIconHolder := self submorphNamed: #loaderIconHolder.
+	(loaderIconHolder submorphNamed: #resumeTrace) ifNotNil: [self ensureNoLoaderIcon]. 	
+	loaderIconHolder submorphs ifEmpty: [
 		loaderIconHolder addMorphBack: 
-			((BPIcons loaderIcon scaledToSize: self iconSize) asMorph name: #loader)].
+			((BPIcons loaderIcon scaledToSize: self iconSize) asMorph 
+				name: #loader;
+				on: #click send: #suspendTracingProcess to: self example)].
diff --git a/packages/Babylonian-UI.package/BPExampleMorph.class/instance/ensureResumeTracingIcon.st b/packages/Babylonian-UI.package/BPExampleMorph.class/instance/ensureResumeTracingIcon.st
@@ -2,9 +2,11 @@ private - ui
 ensureResumeTracingIcon
 
 	| loaderIconHolder |
-	(loaderIconHolder := self submorphNamed: #loaderIconHolder).
+	loaderIconHolder := self submorphNamed: #loaderIconHolder.
 	(loaderIconHolder submorphNamed: #loader) ifNotNil: [self ensureNoLoaderIcon].
-	loaderIconHolder submorphs ifEmpty: [loaderIconHolder addMorphBack: 
-		((BPIcons playIcon scaledToSize: self iconSize) asMorph
-			balloonText: 'Example execution timed out with given delay. Click here to resume.';
-			on: #click send: #resumeTracing to: self example)]
+	loaderIconHolder submorphs ifEmpty: [
+		loaderIconHolder addMorphBack: 
+			((BPIcons playIcon scaledToSize: self iconSize) asMorph
+				name: #resumeTrace;
+				balloonText: 'Example execution timed out with given delay. Click here to resume.';
+				on: #click send: #resumeTracing to: self example)]
diff --git a/packages/Babylonian-UI.package/BPExampleMorph.class/methodProperties.json b/packages/Babylonian-UI.package/BPExampleMorph.class/methodProperties.json
@@ -20,9 +20,9 @@
 		"containedMethod" : "jb 12/6/2021 18:23",
 		"debugMenuItemClicked" : "pre 7/20/2022 17:58",
 		"deleteAllAnnotationsClicked" : "lu 2/22/2022 01:32",
-		"ensureLoaderIcon" : "joabe 9/28/2022 22:37",
+		"ensureLoaderIcon" : "pre 1/13/2023 16:57",
 		"ensureNoLoaderIcon" : "jb 12/7/2020 18:58",
-		"ensureResumeTracingIcon" : "joabe 9/29/2022 00:32",
+		"ensureResumeTracingIcon" : "pre 1/13/2023 16:56",
 		"example" : "pre 9/30/2020 10:34",
 		"example:" : "jb 12/7/2020 18:58",
 		"expand" : "pre 7/19/2022 15:29",