Merge remote-tracking branch 'origin/123-rename-drawing-classes' into…

… 123-merge
hpi-swa-teaching · Aug 5, 2022 · 03e1892 · 03e1892
2 parents 7cda7ff + b2ad630
commit 03e1892
Show file tree

Hide file tree

Showing 430 changed files with 486 additions and 511 deletions.
diff --git a/packages/BaselineOfSketchMorph2.package/.squot-contents b/packages/BaselineOfSketchMorph2.package/.squot-contents
@@ -2,4 +2,4 @@ SquotTrackedObjectMetadata {
 	#objectClassName : #PackageInfo,
 	#objectsReplacedByNames : true,
 	#serializer : #SquotCypressCodeSerializer
-}
+}
diff --git a/packages/SketchMorph2-Core.package/M2Backend.class/instance/activeLayerChanged.st b/packages/SketchMorph2-Core.package/M2Backend.class/instance/activeLayerChanged.st
@@ -1,3 +1,3 @@
 updating
 activeLayerChanged
-	self activeFormChanged
+	self activeFormChanged
diff --git a/packages/SketchMorph2-Core.package/M2Backend.class/instance/context..st b/packages/SketchMorph2-Core.package/M2Backend.class/instance/context..st
@@ -1,3 +1,3 @@
 accessing
-context: anM2DrawingContext
-	context := anM2DrawingContext
+context: anM2Context
+	context := anM2Context
diff --git a/packages/SketchMorph2-Core.package/M2Canvas.class/class/defaultBackgroundColor.st b/packages/SketchMorph2-Core.package/M2Canvas.class/class/defaultBackgroundColor.st
@@ -1,3 +1,3 @@
 defaults
 defaultBackgroundColor
-	^ Color white
+	^ Color white
diff --git a/...etchMorph2-Core.package/M2Canvas.class/class/newWithBackendClass.viewportClass.extent..st b/...etchMorph2-Core.package/M2Canvas.class/class/newWithBackendClass.viewportClass.extent..st
@@ -2,7 +2,7 @@ instance creation
 newWithBackendClass: aBackendClass viewportClass: aViewPortClass extent: aPoint
 	| canvas context backend viewPort |
 	canvas := self basicNew.
-	context := M2DrawingContext new.
+	context := M2Context new.
 	backend := aBackendClass basicNew.
 	viewPort := aViewPortClass basicNew.
 	context

diff --git a/packages/SketchMorph2-Core.package/M2Canvas.class/instance/context..st b/packages/SketchMorph2-Core.package/M2Canvas.class/instance/context..st
@@ -1,3 +1,3 @@
 accessing
-context: anM2DrawingContext
-	context := anM2DrawingContext
+context: anM2Context
+	context := anM2Context
diff --git a/packages/SketchMorph2-Core.package/M2Canvas.class/instance/createBackgroundMorph.st b/packages/SketchMorph2-Core.package/M2Canvas.class/instance/createBackgroundMorph.st
@@ -4,4 +4,4 @@ createBackgroundMorph
 		color: self class defaultBackgroundColor;
 		borderWidth: 0;
 		extent: self getExtent;
-		yourself
+		yourself
diff --git a/packages/SketchMorph2-Core.package/M2Canvas.class/methodProperties.json b/packages/SketchMorph2-Core.package/M2Canvas.class/methodProperties.json
@@ -3,7 +3,7 @@
 		"defaultBackgroundColor" : "SW 6/14/2022 19:26",
 		"defaultExtent" : "md 6/17/2022 16:04",
 		"newWithBackendClass:viewportClass:" : "md 6/17/2022 16:11",
-		"newWithBackendClass:viewportClass:extent:" : "md 7/11/2022 17:38",
+		"newWithBackendClass:viewportClass:extent:" : "kbr 8/5/2022 17:25",
 		"newWithDefaults" : "md 6/17/2022 16:07",
 		"newWithExtent:" : "md 6/17/2022 16:10" },
 	"instance" : {

diff --git a/....package/M2DrawingContext.class/README.md → ...h2-Core.package/M2Context.class/README.md b/....package/M2DrawingContext.class/README.md → ...h2-Core.package/M2Context.class/README.md
@@ -1,3 +1,3 @@
-An M2DrawingContext stores the current state and modus (#pen - #geometric) to adapt behaviour depending on current tool.
+An M2Context stores the current state and modus (#pen - #geometric) to adapt behaviour depending on current tool.
 When the geometric mode is selected the geometric form is specified by currentGeometricForm (#circle, #rectangle).
 It ensures that the state of viewPort and backend is synchronized.
diff --git a/...wingContext.class/instance/activeTool..st → ...e/M2Context.class/instance/activeTool..st b/...wingContext.class/instance/activeTool..st → ...e/M2Context.class/instance/activeTool..st
diff --git a/...awingContext.class/instance/activeTool.st → ...ge/M2Context.class/instance/activeTool.st b/...awingContext.class/instance/activeTool.st → ...ge/M2Context.class/instance/activeTool.st
diff --git a/...DrawingContext.class/instance/backend..st → ...kage/M2Context.class/instance/backend..st b/...DrawingContext.class/instance/backend..st → ...kage/M2Context.class/instance/backend..st
diff --git a/...2DrawingContext.class/instance/backend.st → ...ckage/M2Context.class/instance/backend.st b/...2DrawingContext.class/instance/backend.st → ...ckage/M2Context.class/instance/backend.st
diff --git a/...ontext.class/instance/backgroundColor..st → ...ontext.class/instance/backgroundColor..st b/...ontext.class/instance/backgroundColor..st → ...ontext.class/instance/backgroundColor..st
diff --git a/...Context.class/instance/backgroundColor.st → ...Context.class/instance/backgroundColor.st b/...Context.class/instance/backgroundColor.st → ...Context.class/instance/backgroundColor.st
diff --git a/...awingContext.class/instance/brushSize..st → ...ge/M2Context.class/instance/brushSize..st b/...awingContext.class/instance/brushSize..st → ...ge/M2Context.class/instance/brushSize..st
diff --git a/...rawingContext.class/instance/brushSize.st → ...age/M2Context.class/instance/brushSize.st b/...rawingContext.class/instance/brushSize.st → ...age/M2Context.class/instance/brushSize.st
diff --git a/...xt.class/instance/cachedTool.ifAbsent..st → ...xt.class/instance/cachedTool.ifAbsent..st b/...xt.class/instance/cachedTool.ifAbsent..st → ...xt.class/instance/cachedTool.ifAbsent..st
diff --git a/...class/instance/cachedTool.ifAbsentPut..st → ...class/instance/cachedTool.ifAbsentPut..st b/...class/instance/cachedTool.ifAbsentPut..st → ...class/instance/cachedTool.ifAbsentPut..st
diff --git a/...Context.class/instance/cachedTool.put..st → ...Context.class/instance/cachedTool.put..st b/...Context.class/instance/cachedTool.put..st → ...Context.class/instance/cachedTool.put..st
diff --git a/...wingContext.class/instance/cachedTools.st → ...e/M2Context.class/instance/cachedTools.st b/...wingContext.class/instance/cachedTools.st → ...e/M2Context.class/instance/cachedTools.st
diff --git a/...2DrawingContext.class/instance/canvas..st → ...ckage/M2Context.class/instance/canvas..st b/...2DrawingContext.class/instance/canvas..st → ...ckage/M2Context.class/instance/canvas..st
diff --git a/...M2DrawingContext.class/instance/canvas.st → ...ackage/M2Context.class/instance/canvas.st b/...M2DrawingContext.class/instance/canvas.st → ...ackage/M2Context.class/instance/canvas.st
diff --git a/...gContext.class/instance/clipboardForm..st → ...2Context.class/instance/clipboardForm..st b/...gContext.class/instance/clipboardForm..st → ...2Context.class/instance/clipboardForm..st
diff --git a/...ngContext.class/instance/clipboardForm.st → ...M2Context.class/instance/clipboardForm.st b/...ngContext.class/instance/clipboardForm.st → ...M2Context.class/instance/clipboardForm.st
diff --git a/...ngContext.class/instance/currentColor..st → ...M2Context.class/instance/currentColor..st b/...ngContext.class/instance/currentColor..st → ...M2Context.class/instance/currentColor..st
diff --git a/...ingContext.class/instance/currentColor.st → .../M2Context.class/instance/currentColor.st b/...ingContext.class/instance/currentColor.st → .../M2Context.class/instance/currentColor.st
diff --git a/...ingContext.class/instance/currentState.st → .../M2Context.class/instance/currentState.st b/...ingContext.class/instance/currentState.st → .../M2Context.class/instance/currentState.st
diff --git a/...ntext.class/instance/defaultActiveTool.st → ...ntext.class/instance/defaultActiveTool.st b/...ntext.class/instance/defaultActiveTool.st → ...ntext.class/instance/defaultActiveTool.st
diff --git a/....class/instance/defaultBackgroundColor.st → ....class/instance/defaultBackgroundColor.st b/....class/instance/defaultBackgroundColor.st → ....class/instance/defaultBackgroundColor.st
diff --git a/...ontext.class/instance/defaultBrushSize.st → ...ontext.class/instance/defaultBrushSize.st b/...ontext.class/instance/defaultBrushSize.st → ...ontext.class/instance/defaultBrushSize.st
diff --git a/...text.class/instance/defaultCachedTools.st → ...text.class/instance/defaultCachedTools.st b/...text.class/instance/defaultCachedTools.st → ...text.class/instance/defaultCachedTools.st
diff --git a/...ext.class/instance/defaultCurrentColor.st → ...ext.class/instance/defaultCurrentColor.st b/...ext.class/instance/defaultCurrentColor.st → ...ext.class/instance/defaultCurrentColor.st
diff --git a/...ingContext.class/instance/defaultDepth.st → .../M2Context.class/instance/defaultDepth.st b/...ingContext.class/instance/defaultDepth.st → .../M2Context.class/instance/defaultDepth.st
diff --git a/...ntext.class/instance/defaultEraserSize.st → ...ntext.class/instance/defaultEraserSize.st b/...ntext.class/instance/defaultEraserSize.st → ...ntext.class/instance/defaultEraserSize.st
diff --git a/...ntext.class/instance/defaultPencilSize.st → ...ntext.class/instance/defaultPencilSize.st b/...ntext.class/instance/defaultPencilSize.st → ...ntext.class/instance/defaultPencilSize.st
diff --git a/...wingContext.class/instance/eraserSize..st → ...e/M2Context.class/instance/eraserSize..st b/...wingContext.class/instance/eraserSize..st → ...e/M2Context.class/instance/eraserSize..st
diff --git a/...awingContext.class/instance/eraserSize.st → ...ge/M2Context.class/instance/eraserSize.st b/...awingContext.class/instance/eraserSize.st → ...ge/M2Context.class/instance/eraserSize.st
diff --git a/...ontext.class/instance/hasClipboardForm.st → ...ontext.class/instance/hasClipboardForm.st b/...ontext.class/instance/hasClipboardForm.st → ...ontext.class/instance/hasClipboardForm.st
diff --git a/...class/instance/isFillingGeometricForm..st → ...class/instance/isFillingGeometricForm..st b/...class/instance/isFillingGeometricForm..st → ...class/instance/isFillingGeometricForm..st
diff --git a/....class/instance/isFillingGeometricForm.st → ....class/instance/isFillingGeometricForm.st b/....class/instance/isFillingGeometricForm.st → ....class/instance/isFillingGeometricForm.st
diff --git a/...ngContext.class/instance/morphicMonet..st → ...M2Context.class/instance/morphicMonet..st b/...ngContext.class/instance/morphicMonet..st → ...M2Context.class/instance/morphicMonet..st
diff --git a/...ingContext.class/instance/morphicMonet.st → .../M2Context.class/instance/morphicMonet.st b/...ingContext.class/instance/morphicMonet.st → .../M2Context.class/instance/morphicMonet.st
diff --git a/...wingContext.class/instance/pencilSize..st → ...e/M2Context.class/instance/pencilSize..st b/...wingContext.class/instance/pencilSize..st → ...e/M2Context.class/instance/pencilSize..st
diff --git a/...awingContext.class/instance/pencilSize.st → ...ge/M2Context.class/instance/pencilSize.st b/...awingContext.class/instance/pencilSize.st → ...ge/M2Context.class/instance/pencilSize.st
diff --git a/...text.class/instance/rectangleBrushSize.st → ...text.class/instance/rectangleBrushSize.st b/...text.class/instance/rectangleBrushSize.st → ...text.class/instance/rectangleBrushSize.st
diff --git a/...ngContext.class/instance/restoreState..st → ...M2Context.class/instance/restoreState..st b/...ngContext.class/instance/restoreState..st → ...M2Context.class/instance/restoreState..st
diff --git a/...lass/instance/setBrushAndEraserSizeTo..st → ...lass/instance/setBrushAndEraserSizeTo..st b/...lass/instance/setBrushAndEraserSizeTo..st → ...lass/instance/setBrushAndEraserSizeTo..st
diff --git a/...class/instance/toggleFillGeometricForm.st → ...class/instance/toggleFillGeometricForm.st b/...class/instance/toggleFillGeometricForm.st → ...class/instance/toggleFillGeometricForm.st
diff --git a/...rawingContext.class/instance/viewPort..st → ...age/M2Context.class/instance/viewPort..st b/...rawingContext.class/instance/viewPort..st → ...age/M2Context.class/instance/viewPort..st
diff --git a/...DrawingContext.class/instance/viewPort.st → ...kage/M2Context.class/instance/viewPort.st b/...DrawingContext.class/instance/viewPort.st → ...kage/M2Context.class/instance/viewPort.st
diff --git a/...rawingContext.class/methodProperties.json → ...age/M2Context.class/methodProperties.json b/...rawingContext.class/methodProperties.json → ...age/M2Context.class/methodProperties.json
diff --git a/...ge/M2DrawingContext.class/properties.json → ...e.package/M2Context.class/properties.json b/...ge/M2DrawingContext.class/properties.json → ...e.package/M2Context.class/properties.json
@@ -19,7 +19,7 @@
 		"pencilSize",
 		"morphicMonet",
 		"clipboardForm" ],
-	"name" : "M2DrawingContext",
+	"name" : "M2Context",
 	"pools" : [
 		 ],
 	"super" : "Object",

diff --git a/packages/SketchMorph2-Core.package/M2ViewPort.class/instance/context..st b/packages/SketchMorph2-Core.package/M2ViewPort.class/instance/context..st
@@ -1,3 +1,3 @@
 accessing
-context: anM2DrawingContext
-	context := anM2DrawingContext
+context: anM2Context
+	context := anM2Context
diff --git a/packages/SketchMorph2-Core.package/M2ViewPort.class/instance/generateImageStack.st b/packages/SketchMorph2-Core.package/M2ViewPort.class/instance/generateImageStack.st
@@ -1,5 +1,5 @@
 updating
 generateImageStack
 	self imageStack: (self backend layerStack layers
-		select: [ :layer | layer isVisible ] 
-		thenCollect: [ :layer | self generateLayer: layer ])
+		select: [:layer | layer isVisible]
+		thenCollect: [:layer | self generateLayer: layer])
diff --git a/packages/SketchMorph2-Core.package/M2ViewPort.class/instance/generateLayer..st b/packages/SketchMorph2-Core.package/M2ViewPort.class/instance/generateLayer..st
@@ -6,4 +6,4 @@ generateLayer: anM2Layer
 	flex
 		scale: self scalar;
 	 	position: 0 @ 0.
-	^ flex
+	^ flex
diff --git a/packages/SketchMorph2-Core.package/M2ViewPort.class/instance/zoomBy..st b/packages/SketchMorph2-Core.package/M2ViewPort.class/instance/zoomBy..st
@@ -4,4 +4,4 @@ zoomBy: aNumber
 		ifTrue: [^ self].
 	self scalar: self scalar + aNumber;
 		changed;
-		refresh
+		refresh
diff --git a/packages/SketchMorph2-Core.package/M2ViewPort.class/instance/zoomIn.st b/packages/SketchMorph2-Core.package/M2ViewPort.class/instance/zoomIn.st
@@ -1,5 +1,3 @@
 zooming
 zoomIn
 	self zoomBy: self zoomStep
-
-
diff --git a/packages/SketchMorph2-Core.package/M2ViewPort.class/methodProperties.json b/packages/SketchMorph2-Core.package/M2ViewPort.class/methodProperties.json
@@ -10,7 +10,7 @@
 		"currentCursor" : "md 7/31/2022 19:29",
 		"currentCursor:" : "CS 6/28/2021 21:19",
 		"defaultScalar" : "mFr 6/25/2021 15:18",
-		"generateImageStack" : "SW 8/5/2022 13:26",
+		"generateImageStack" : "kbr 8/5/2022 19:36",
 		"generateLayer:" : "AG 8/4/2022 13:34",
 		"getBackendPointFor:" : "ms 8/2/2022 16:36",
 		"getBackendRectangleFor:" : "md 7/18/2022 21:50",
@@ -29,7 +29,7 @@
 		"stopTool" : "md 8/2/2022 14:57",
 		"zoomBy:" : "SW 6/14/2022 19:14",
 		"zoomDefault" : "md 6/17/2022 17:09",
-		"zoomIn" : "AG 6/12/2022 22:30",
+		"zoomIn" : "kbr 8/5/2022 19:15",
 		"zoomMax" : "CS 6/28/2021 21:41",
 		"zoomMin" : "CS 8/5/2021 20:30",
 		"zoomOut" : "K.P. 6/26/2021 16:11",

diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/layerEditPanel..st b/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/layerEditPanel..st
@@ -1,3 +1,3 @@
 accessing
 layerEditPanel: aPluggablePanelMorph
-	layerEditPanel := aPluggablePanelMorph
+	layerEditPanel := aPluggablePanelMorph
diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/layerEditPanel.st b/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/layerEditPanel.st
@@ -1,3 +1,3 @@
 accessing
 layerEditPanel
-	^ layerEditPanel
+	^ layerEditPanel
diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/layerPanel..st b/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/layerPanel..st
@@ -1,3 +1,3 @@
 accessing
 layerPanel: aPluggablePanelMorph
-	layerPanel := aPluggablePanelMorph
+	layerPanel := aPluggablePanelMorph
diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/layerPanel.st b/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/layerPanel.st
@@ -1,3 +1,3 @@
 accessing
 layerPanel
-	^ layerPanel
+	^ layerPanel
diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/loadMenu.st b/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/loadMenu.st
@@ -8,5 +8,3 @@ loadMenu
 		submenu beSticky.
 		self menuPanel addMorph: submenu].
 	self activateDefaultItem
-
-
diff --git a/packages/SketchMorph2-Layers.package/.squot-contents b/packages/SketchMorph2-Layers.package/.squot-contents
@@ -2,4 +2,4 @@ SquotTrackedObjectMetadata {
 	#objectClassName : #PackageInfo,
 	#objectsReplacedByNames : true,
 	#serializer : #SquotCypressCodeSerializer
-}
+}
diff --git a/packages/SketchMorph2-Layers.package/M2ActiveLayerStack.class/instance/currentLayerStack.st b/packages/SketchMorph2-Layers.package/M2ActiveLayerStack.class/instance/currentLayerStack.st
@@ -1,3 +1,3 @@
 accessing
 currentLayerStack
-	^ currentLayerStack
+	^ currentLayerStack
diff --git a/packages/SketchMorph2-Layers.package/M2ActiveLayerStack.class/instance/perform..st b/packages/SketchMorph2-Layers.package/M2ActiveLayerStack.class/instance/perform..st
@@ -2,4 +2,4 @@ message handling
 perform: selector
 	^ [super perform: selector]
 		on: MessageNotUnderstood
-		do: [:sig | sig resume: (self currentLayerStack perform: selector)]
+		do: [:sig | sig resume: (self currentLayerStack perform: selector)]
diff --git a/packages/SketchMorph2-Layers.package/M2ActiveLayerStack.class/instance/perform.with..st b/packages/SketchMorph2-Layers.package/M2ActiveLayerStack.class/instance/perform.with..st
@@ -2,4 +2,4 @@ message handling
 perform: aSymbol with: anObject
 	^ [super perform: aSymbol with: anObject]
 		on: MessageNotUnderstood
-		do: [:sig | sig resume: (self currentLayerStack perform: aSymbol with: anObject)]
+		do: [:sig | sig resume: (self currentLayerStack perform: aSymbol with: anObject)]
diff --git a/packages/SketchMorph2-Layers.package/M2ActiveLayerStack.class/instance/update..st b/packages/SketchMorph2-Layers.package/M2ActiveLayerStack.class/instance/update..st
@@ -3,4 +3,3 @@ update: anAspect
 	anAspect = #layerStack
 		ifTrue: [self currentLayerStack: self backend layerStack]
 		ifFalse: [self changed: anAspect]
-
diff --git a/packages/SketchMorph2-Layers.package/M2ActiveLayerStack.class/methodProperties.json b/packages/SketchMorph2-Layers.package/M2ActiveLayerStack.class/methodProperties.json
@@ -10,4 +10,4 @@
 		"initialize" : "md 6/11/2022 23:28",
 		"perform:" : "ms 6/17/2022 17:01",
 		"perform:with:" : "AG 8/4/2022 13:04",
-		"update:" : "md 6/11/2022 21:41" } }
+		"update:" : "kbr 8/5/2022 19:16" } }
diff --git a/packages/SketchMorph2-Layers.package/M2Layer.class/instance/boundingBox.st b/packages/SketchMorph2-Layers.package/M2Layer.class/instance/boundingBox.st
@@ -1,3 +1,3 @@
 accessing
 boundingBox
-	^ self form boundingBox
+	^ self form boundingBox
diff --git a/packages/SketchMorph2-Layers.package/M2Layer.class/instance/defaultName.st b/packages/SketchMorph2-Layers.package/M2Layer.class/instance/defaultName.st
@@ -1,3 +1,3 @@
 defaults
 defaultName
-	^ 'unnamed layer'
+	^ 'unnamed layer'
diff --git a/packages/SketchMorph2-Layers.package/M2Layer.class/instance/defaultVisible.st b/packages/SketchMorph2-Layers.package/M2Layer.class/instance/defaultVisible.st
@@ -1,3 +1,3 @@
 defaults
 defaultVisible
-	^ true
+	^ true
diff --git a/packages/SketchMorph2-Layers.package/M2Layer.class/instance/icon.st b/packages/SketchMorph2-Layers.package/M2Layer.class/instance/icon.st
@@ -1,3 +1,3 @@
 accessing
 icon
-	^ self isVisible ifTrue: [ MorphicMonetIcons eyeIcon. ] ifFalse: [ MorphicMonetIcons eyeCloseIcon. ]
+	^ self isVisible ifTrue: [ MorphicMonetIcons eyeIcon. ] ifFalse: [ MorphicMonetIcons eyeCloseIcon. ]
diff --git a/packages/SketchMorph2-Layers.package/M2Layer.class/instance/isVisible..st b/packages/SketchMorph2-Layers.package/M2Layer.class/instance/isVisible..st
@@ -1,3 +1,3 @@
 accessing
 isVisible: aBoolean
-	isVisible := aBoolean
+	isVisible := aBoolean
diff --git a/packages/SketchMorph2-Layers.package/M2Layer.class/instance/isVisible.st b/packages/SketchMorph2-Layers.package/M2Layer.class/instance/isVisible.st
@@ -1,3 +1,3 @@
 accessing
 isVisible
-	^ isVisible ifNil: [isVisible := self defaultVisible]
+	^ isVisible ifNil: [isVisible := self defaultVisible]
diff --git a/packages/SketchMorph2-Layers.package/M2Layer.class/instance/name..st b/packages/SketchMorph2-Layers.package/M2Layer.class/instance/name..st
@@ -1,3 +1,3 @@
 accessing
 name: aString
-	name := aString
+	name := aString
diff --git a/packages/SketchMorph2-Layers.package/M2Layer.class/instance/name.st b/packages/SketchMorph2-Layers.package/M2Layer.class/instance/name.st
@@ -1,3 +1,3 @@
 accessing
 name
-	^ name ifNil: [name := self defaultName]
+	^ name ifNil: [name := self defaultName]
diff --git a/packages/SketchMorph2-Layers.package/M2Layer.class/instance/restore..st b/packages/SketchMorph2-Layers.package/M2Layer.class/instance/restore..st
@@ -6,4 +6,4 @@ restore: aForm
 		at: 0 @ 0
 		clippingBox: self boundingBox
 		rule: Form paint
-		fillColor: nil
+		fillColor: nil
diff --git a/packages/SketchMorph2-Layers.package/M2LayerStack.class/instance/addLayer.st b/packages/SketchMorph2-Layers.package/M2LayerStack.class/instance/addLayer.st
@@ -5,4 +5,4 @@ addLayer
 	self layers add: layer before: self activeLayer.
 	self changed: #layers.
 	self changed: #activeLayer.
-	^ layer
+	^ layer
diff --git a/packages/SketchMorph2-Layers.package/M2LayerStack.class/instance/layerIconAt..st b/packages/SketchMorph2-Layers.package/M2LayerStack.class/instance/layerIconAt..st
@@ -1,3 +1,3 @@
 accessing
 layerIconAt: anIndex
-	^ (self layers at: anIndex) icon
+	^ (self layers at: anIndex) icon
diff --git a/packages/SketchMorph2-Layers.package/M2LayerStack.class/instance/renameActiveLayer.st b/packages/SketchMorph2-Layers.package/M2LayerStack.class/instance/renameActiveLayer.st
@@ -4,4 +4,4 @@ renameActiveLayer
 	newName := UIManager default request: 'Enter new layer name:' initialAnswer: self activeLayer name.
 	newName isEmpty ifTrue: [^self].
 
-	self activeLayer name: newName
+	self activeLayer name: newName
diff --git a/...es/SketchMorph2-Layers.package/M2LayerStack.class/instance/replaceAllLayersWithSingle..st b/...es/SketchMorph2-Layers.package/M2LayerStack.class/instance/replaceAllLayersWithSingle..st
@@ -3,4 +3,4 @@ replaceAllLayersWithSingle: anM2Layer
 	self
 		layers: (OrderedCollection with: anM2Layer);
 		activeLayer: anM2Layer;
-		changed: #layers
+		changed: #layers
diff --git a/packages/SketchMorph2-MenuItems.package/M2ActionToolMenuItem.class/class/onClick..st b/packages/SketchMorph2-MenuItems.package/M2ActionToolMenuItem.class/class/onClick..st
@@ -1,6 +1,6 @@
 clicking
-onClick: anM2DrawingContext
+onClick: anM2Context
 	| previousTool |
-	previousTool :=	anM2DrawingContext activeTool.
-	super onClick: anM2DrawingContext.
-	anM2DrawingContext activeTool: previousTool
+	previousTool :=	anM2Context activeTool.
+	super onClick: anM2Context.
+	anM2Context activeTool: previousTool
diff --git a/...s/SketchMorph2-MenuItems.package/M2CheckBoxMenuItem.class/class/getMenuItemForContext..st b/...s/SketchMorph2-MenuItems.package/M2CheckBoxMenuItem.class/class/getMenuItemForContext..st
@@ -1,9 +1,9 @@
 instance creation
-getMenuItemForContext: anM2DrawingContext
+getMenuItemForContext: anM2Context
 	^ PluggableCheckBoxMorph new
 			actionSelector: self actionSelector;
 			label: self label;
 			valueSelector: self valueSelector;
-			model: (self target: anM2DrawingContext);
+			model: (self target: anM2Context);
 			installButton;
 			yourself
diff --git a/packages/SketchMorph2-MenuItems.package/M2CheckBoxMenuItem.class/class/target..st b/packages/SketchMorph2-MenuItems.package/M2CheckBoxMenuItem.class/class/target..st
@@ -1,3 +1,3 @@
 accessing
-target: anM2DrawingContext
+target: anM2Context
 	self subclassResponsibility
diff --git a/packages/SketchMorph2-MenuItems.package/M2FillArea.class/class/createTool.st b/packages/SketchMorph2-MenuItems.package/M2FillArea.class/class/createTool.st
@@ -1,3 +1,3 @@
 tool
 createTool
-	^ M2FillAreaTool new
+	^ M2FillAreaTool new
diff --git a/packages/SketchMorph2-MenuItems.package/M2FillArea.class/class/toolName.st b/packages/SketchMorph2-MenuItems.package/M2FillArea.class/class/toolName.st
@@ -1,3 +1,3 @@
 tool
 toolName
-	^ #fillArea
+	^ #fillArea
diff --git a/packages/SketchMorph2-MenuItems.package/M2FillGeometricForm.class/class/target..st b/packages/SketchMorph2-MenuItems.package/M2FillGeometricForm.class/class/target..st
@@ -1,3 +1,3 @@
 accessing
-target: anM2DrawingContext
-	^ anM2DrawingContext
+target: anM2Context
+	^ anM2Context
diff --git a/packages/SketchMorph2-MenuItems.package/M2FlipHorizontal.class/class/icon.st b/packages/SketchMorph2-MenuItems.package/M2FlipHorizontal.class/class/icon.st
@@ -1,3 +1,3 @@
 accessing
 icon
-	^ MorphicMonetIcons flipHorizontalIcon
+	^ MorphicMonetIcons flipHorizontalIcon
diff --git a/packages/SketchMorph2-MenuItems.package/M2FlipHorizontal.class/class/label.st b/packages/SketchMorph2-MenuItems.package/M2FlipHorizontal.class/class/label.st
@@ -1,3 +1,3 @@
 accessing
 label
-	^ 'Flip Horizontal'
+	^ 'Flip Horizontal'
diff --git a/packages/SketchMorph2-MenuItems.package/M2FlipMenuItem.class/class/onClick..st b/packages/SketchMorph2-MenuItems.package/M2FlipMenuItem.class/class/onClick..st
@@ -1,11 +1,11 @@
 clicking
-onClick: anM2DrawingContext
+onClick: anM2Context
 	| selectTool |
-	selectTool := anM2DrawingContext
+	selectTool := anM2Context
 						cachedTool: #select
-						ifAbsent: [^ anM2DrawingContext morphicMonet clickMenuItemWith: M2SelectRectangle label].
+						ifAbsent: [^ anM2Context morphicMonet clickMenuItemWith: M2SelectRectangle label].
 	selectTool isShapeDrawn ifTrue: [
-			super onClick: anM2DrawingContext.
-			(self tool: anM2DrawingContext) mirrorUsing: selectTool.
-			anM2DrawingContext activeTool: selectTool.
+			super onClick: anM2Context.
+			(self tool: anM2Context) mirrorUsing: selectTool.
+			anM2Context activeTool: selectTool.
 			selectTool afterMirror]
diff --git a/packages/SketchMorph2-MenuItems.package/M2FlipVertical.class/class/icon.st b/packages/SketchMorph2-MenuItems.package/M2FlipVertical.class/class/icon.st
@@ -1,3 +1,3 @@
 accessing
 icon
-	^ MorphicMonetIcons flipVerticalIcon
+	^ MorphicMonetIcons flipVerticalIcon
diff --git a/packages/SketchMorph2-MenuItems.package/M2FlipVertical.class/class/label.st b/packages/SketchMorph2-MenuItems.package/M2FlipVertical.class/class/label.st
@@ -1,3 +1,3 @@
 accessing
 label
-	^ 'Flip Vertical'
+	^ 'Flip Vertical'
diff --git a/packages/SketchMorph2-MenuItems.package/M2IconMenuItem.class/class/getMenuItemForContext..st b/packages/SketchMorph2-MenuItems.package/M2IconMenuItem.class/class/getMenuItemForContext..st
@@ -1,8 +1,8 @@
 instance creation
-getMenuItemForContext: anM2DrawingContext
+getMenuItemForContext: anM2Context
 	^ M2MenuItemMorph new
 			contents: self label;
-			target: [self onClick: anM2DrawingContext];
+			target: [self onClick: anM2Context];
 			selector: #value;
 			icon: (self icon scaledToSize: self defaultIconSize);
 			isActivatable: self isActivatable;

diff --git a/packages/SketchMorph2-MenuItems.package/M2IconMenuItem.class/class/onClick..st b/packages/SketchMorph2-MenuItems.package/M2IconMenuItem.class/class/onClick..st
@@ -1,3 +1,3 @@
 clicking
-onClick: anM2DrawingContext
+onClick: anM2Context
 	self subclassResponsibility
diff --git a/packages/SketchMorph2-MenuItems.package/M2MenuItem.class/class/getMenuItemForContext..st b/packages/SketchMorph2-MenuItems.package/M2MenuItem.class/class/getMenuItemForContext..st
@@ -1,3 +1,3 @@
 instance creation
-getMenuItemForContext: anM2DrawingContext
+getMenuItemForContext: anM2Context
 	^ self subclassResponsibility
diff --git a/packages/SketchMorph2-MenuItems.package/M2Pipette.class/class/createTool.st b/packages/SketchMorph2-MenuItems.package/M2Pipette.class/class/createTool.st
@@ -1,3 +1,3 @@
 accessing
 createTool
-	^ M2PipetteTool new
+	^ M2PipetteTool new
diff --git a/packages/SketchMorph2-MenuItems.package/M2SelectToolMenuItem.class/class/onClick..st b/packages/SketchMorph2-MenuItems.package/M2SelectToolMenuItem.class/class/onClick..st
@@ -1,4 +1,4 @@
 clicking
-onClick: anM2DrawingContext
-	super onClick: anM2DrawingContext.
-	anM2DrawingContext cachedTool: #select put: (self tool: anM2DrawingContext)
+onClick: anM2Context
+	super onClick: anM2Context.
+	anM2Context cachedTool: #select put: (self tool: anM2Context)