Merge branch 'feature/DeleteMorphFromWorld' into refactoring/catchNoM…

…orphError

packages/AnimationsEditor-Core.package/AnimationsEditorPropertyAnimated.class/instance/initialize.st

@@ -5,8 +5,4 @@ initialize
 	super initialize.
 	self isActivated: false.
 	self addStartFrame.
-	self process: [
-                 [ 1 seconds asDelay wait.
-                   self targetMorph isInWorld ifFalse: [self animationsEditor deleteMorph: self process.]. 
-                 ] repeat.
-               ] fork.
+	self startStepping.

packages/AnimationsEditor-Core.package/AnimationsEditorPropertyAnimated.class/instance/shouldGetStepsFrom..st

@@ -0,0 +1,4 @@
+stepping
+shouldGetStepsFrom: aPasteUpMorph
+
+	^ true

packages/AnimationsEditor-Core.package/AnimationsEditorPropertyAnimated.class/instance/startStepping.st

@@ -0,0 +1,10 @@
+stepping
+startStepping
+
+	self currentWorld
+		startStepping: self
+		at: Time millisecondClockValue
+		selector: #step
+		arguments: nil
+		stepTime: self stepTime.
+	self changed: #stepping.

packages/AnimationsEditor-Core.package/AnimationsEditorPropertyAnimated.class/instance/step.st

@@ -0,0 +1,4 @@
+stepping
+step
+
+	self targetMorph isInWorld ifFalse: [self animationsEditor deleteMorph. self stopStepping]. 

packages/AnimationsEditor-Core.package/AnimationsEditorPropertyAnimated.class/instance/stepTime.st

@@ -0,0 +1,4 @@
+stepping
+stepTime
+
+	^ 200.

packages/AnimationsEditor-Core.package/AnimationsEditorPropertyAnimated.class/instance/stopStepping.st

@@ -0,0 +1,5 @@
+stepping
+stopStepping
+
+	self currentWorld stopStepping: self.
+	self changed: #stepping.

packages/AnimationsEditor-Core.package/AnimationsEditorPropertyAnimated.class/methodProperties.json

@@ -27,18 +27,23 @@
 		"executeCompositeAnimation:" : "FH 8/1/2021 19:11",
 		"frame" : "MH 7/8/2021 11:08",
 		"frame:" : "MH 7/8/2021 11:10",
-		"initialize" : "NR 7/18/2022 18:30",
+		"initialize" : "ob 7/30/2022 13:41",
+		"isActivated" : "ob 6/26/2022 18:59",
+		"isActivated:" : "ob 6/26/2022 18:59",
 		"isFirstFrame" : "MH 7/8/2021 11:31",
 		"isKey:outOfBound:" : "MH 7/8/2021 11:36",
 		"isKeyframeExceptStartFrameExistent" : "FH 8/1/2021 19:11",
 		"messageKeyframeOutOfBounds" : "MH 7/8/2021 11:36",
 		"messageNotEnoughKeyframes" : "CL 7/29/2021 12:05",
 		"playAnimationWithStartEnd:" : "FH 8/1/2021 19:12",
-		"process" : "ob 7/12/2022 22:34",
-		"process:" : "ob 7/12/2022 22:34",
 		"resetTargetMorph" : "LW 7/9/2021 15:34",
 		"setAnimationProperty:" : "MH 7/8/2021 11:03",
 		"setStartValue" : "MH 7/8/2021 11:31",
+		"shouldGetStepsFrom:" : "ob 7/30/2022 13:26",
+		"startStepping" : "ob 7/30/2022 14:01",
+		"step" : "ob 7/30/2022 13:51",
+		"stepTime" : "ob 7/30/2022 13:53",
+		"stopStepping" : "ob 7/30/2022 13:40",
 		"targetDuration" : "MH 7/8/2021 11:10",
 		"targetDuration:" : "MH 7/8/2021 11:11",
 		"targetFrame" : "MH 7/8/2021 11:11",

packages/AnimationsEditor-Tests.package/AnimationsEditorPropertyAnimatedTest.class/instance/setUp.st

@@ -3,4 +3,4 @@ setUp
 	super setUp.
 	self morph: self morphClass new openInWorld.
 	self property: (self propertyClass on: self morph). 
-	self property process terminate.
+	self property stopStepping.

packages/AnimationsEditor-Tests.package/AnimationsEditorPropertyAnimatedTest.class/methodProperties.json

@@ -9,5 +9,5 @@
 		"property" : "MH 8/1/2021 18:28",
 		"property:" : "MH 8/1/2021 18:28",
 		"propertyClass" : "CL 7/29/2021 11:42",
-		"setUp" : "NR 7/18/2022 18:33",
+		"setUp" : "ob 7/30/2022 13:59",
 		"tearDown" : "LW 7/27/2021 11:53" } }

packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/morphIsDeleted.st

@@ -0,0 +1,4 @@
+support
+morphIsDeleted
+"replace with self animationsEditorInstance selectedTreeNoe isNil"
+	^self animationsEditorInstance propertyTreeMorph submorphs first submorphs size = 1.

packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/tearDown.st

@@ -3,10 +3,11 @@ tearDown
 	| targetMorph |
 
 	super tearDown.
+	self animationsEditorInstance propertyList first ifNotNil: [
 	targetMorph := (self animationsEditorInstance propertyList first) targetMorph.
 	targetMorph isFlexed
 		ifTrue: [targetMorph owner abandon]. "removes FlexShell"
-	targetMorph abandon. 
+	targetMorph abandon. ].
 	self animationsEditorInstance windowReference abandon.
 
 

packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/testMorphClosedInWorldTreeSpecUpdated.st

@@ -0,0 +1,20 @@
+testing
+testMorphClosedInWorldTreeSpecUpdated
+	|morph goalReached monitor producer finished|
+	morph:= Morph new.
+	morph openInWorld.
+
+	self animationsEditorInstance selectedTreeNode: (self animationsEditorInstance addTargetMorph: morph).
+	morph isFlexed
+		ifTrue: [morph owner abandon]. "removes FlexShell"
+
+	goalReached := false.
+	finished := Semaphore new.
+	monitor := Monitor new.
+	producer := [
+		[monitor critical:
+			[monitor waitUntil: [self morphIsDeleted].
+			monitor signal]]
+			whileFalse.
+			finished signal.
+		self assert: self animationsEditorInstance propertyTreeMorph submorphs first submorphs size = 1.].

packages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/methodProperties.json

@@ -4,10 +4,12 @@
 	"instance" : {
 		"animationsEditorInstance" : "MH 8/1/2021 18:39",
 		"animationsEditorInstance:" : "MH 8/1/2021 18:39",
-		"setUp" : "LW 6/27/2021 13:26",
-		"tearDown" : "Noel Bastubbe 6/22/2022 11:55",
+		"morphIsDeleted" : "NR 7/30/2022 16:23",
+		"setUp" : "NR 7/30/2022 15:15",
+		"tearDown" : "NR 7/30/2022 15:15",
 		"testGetDeepestMorph" : "MH 8/1/2021 18:40",
 		"testInstanceCreation" : "LW 6/27/2021 13:30",
+		"testMorphClosedInWorldTreeSpecUpdated" : "NR 7/30/2022 16:24",
 		"testPlayAnimations" : "Noel Bastubbe 6/22/2022 11:52",
 		"testSelectMorphByHand" : "MH 8/1/2021 18:40",
 		"testShowMessagePlayAnimation" : "Noel Bastubbe 6/22/2022 11:56",