hpi-swa-teaching · LeonMatthes · Oct 19, 2018 · Aug 14, 2018 · Aug 14, 2018 · Aug 14, 2018
diff --git a/...s/BaselineOfMorphicTutorial.package/BaselineOfMorphicTutorial.class/instance/baseline..st b/...s/BaselineOfMorphicTutorial.package/BaselineOfMorphicTutorial.class/instance/baseline..st
@@ -4,14 +4,14 @@ baseline: spec
 	spec
 		for: #'common'
 		do: [
+			spec package: 'VB-Regex' with: [
+				spec repository: 'http://www.squeaksource.com/Regex'].
+
 			spec
-				baseline: 'Widgets' with: 
-					[ spec repository: 'github://hpi-swa/widgets:master/repository' ];
-				yourself.
-			spec
-
-				package: 'MorphicTutorial-Core' with: [spec requires: #('Widgets')];
-				package: 'MorphicTutorial-Lectures';
+				package: 'MorphicTutorial-Lectures' with: [
+					(Smalltalk version = 'Squeak5.0')
+						ifTrue: [spec requires: #('VB-Regex')]];
+				package: 'MorphicTutorial-Core' with: [spec requires: #('MorphicTutorial-Lectures')];
 				package: 'MorphicTutorial-TestMocks' with: [spec requires: #('MorphicTutorial-Core' 'MorphicTutorial-Lectures' )];
 				package: 'MorphicTutorial-Tests' with: [spec requires: #('MorphicTutorial-Core' 'MorphicTutorial-Lectures' )];
 				yourself.

diff --git a/...s/BaselineOfMorphicTutorial.package/BaselineOfMorphicTutorial.class/methodProperties.json b/...s/BaselineOfMorphicTutorial.package/BaselineOfMorphicTutorial.class/methodProperties.json
@@ -2,4 +2,4 @@
 	"class" : {
 		 },
 	"instance" : {
-		"baseline:" : "js 5/21/2018 19:30" } }
+		"baseline:" : "LM 10/19/2018 13:26" } }
diff --git a/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/aboutToStyle..st b/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/aboutToStyle..st
@@ -0,0 +1,5 @@
+style
+aboutToStyle: aStyler
+
+	aStyler parseAMethod: self selectedLecture simulateWorkspace not.
+	^ self selectedLecture simulateWorkspace not
diff --git a/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/buildContextBarWith..st b/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/buildContextBarWith..st
@@ -1,10 +1,9 @@
 building
 buildContextBarWith: aBuilder
 
-	^ aBuilder pluggableTextSpec new
+	^ aBuilder pluggableCodePaneSpec new
 		model: self;
 		getText: #contextBarContent;
-		color: #contextBarColor;
 		readOnly: true;
 		indicateUnacceptedChanges: false;
 		frame: (LayoutFrame new

diff --git a/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/buildDescriptionBoxWith..st b/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/buildDescriptionBoxWith..st
@@ -8,6 +8,6 @@ buildDescriptionBoxWith: aBuilder
 		indicateUnacceptedChanges: false;
 		frame: (LayoutFrame new
 			leftFraction: 0;
-			topFraction: 0.67;
+			topFraction: 0.45;
 			rightFraction: 0.33;
 			bottomFraction: 1)
diff --git a/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/buildLectureListWith..st b/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/buildLectureListWith..st
@@ -12,4 +12,4 @@ buildLectureListWith: aBuilder
 			leftFraction: 0;
 			topFraction: 0;
 			rightFraction: 0.33;
-			bottomFraction: 0.67)
+			bottomFraction: 0.45)
diff --git a/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/categoryList.st b/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/categoryList.st
@@ -2,5 +2,5 @@ editor and playground
 categoryList
 
 	"We have to cache the list here, so that the TreeView will not fold the whole tree while updating the green/red-icons"
-	categoryList ifNil: [categoryList := MotuLectureCategory allCategories].
+	categoryList ifNil: [categoryList := MotuLecture lectureCategories].
 	^ categoryList
diff --git a/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/codeEditor.st b/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/codeEditor.st
@@ -1,5 +1,5 @@
 accessing
 codeEditor
 
-	codeEditor ifNil: [self codeEditor: MotuEditor new].
+	codeEditor ifNil: [self codeEditor: (MotuEditor new actionOnSave: [self evaluateCode])].
 	^ codeEditor
diff --git a/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/contextBarColor.st b/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/contextBarColor.st
diff --git a/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/contextBarContent.st b/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/contextBarContent.st
@@ -2,11 +2,5 @@ content
 contextBarContent
 
 	^ self selectedLecture simulateWorkspace
-		ifTrue: [ ^ 'Workspace' ]
-		ifFalse: [ ^ ('<b><a href="code://', 
-				self selectedLecture lectureMethod methodClass name asString,
-				'">', self selectedLecture lectureMethod methodClass name asString,
-				'</a></b>'
-			) asHtmlText,
-			(Text string: ' >> ' attribute: (TextEmphasis bold)),
-			(Text string: self selectedLecture lectureMethod selector asString attribute: (TextEmphasis bold))] 
+		ifTrue: [ ^ self contextBarWorkspaceContent ]
+		ifFalse: [ ^ self selectedLecture methodName ]
diff --git a/...ges/MorphicTutorial-Core.package/MotuBrowser.class/instance/contextBarWorkspaceContent.st b/...ges/MorphicTutorial-Core.package/MotuBrowser.class/instance/contextBarWorkspaceContent.st
@@ -0,0 +1,11 @@
+content
+contextBarWorkspaceContent
+
+	| content |
+	content := 'Workspace'.
+	self selectedLecture parameterNames 
+		ifNotEmpty: [:parameters |
+			content := content, ', provided parameters: '.
+			parameters do: [:each |
+				content := content, each, ' ']].
+	^ content
diff --git a/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/initialize.st b/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/initialize.st
@@ -4,4 +4,4 @@ initialize
 	super initialize.
 	self playground: MotuPlayground new.
 	self selectedLecture: nil.
-	self showSolution: false
+	self showSolution: false.
diff --git a/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/readyToEvaluateCode.st b/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/readyToEvaluateCode.st
@@ -1,3 +1,3 @@
 state
 readyToEvaluateCode
-	^ self selectedLecture enableEvaluation and: [ self showSolution not]
+	^ self selectedLecture enableEvaluation and: [self showSolution not]
diff --git a/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/selectedLecture..st b/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/selectedLecture..st
@@ -1,7 +1,7 @@
 accessing
 selectedLecture: anObject
 
-	(anObject isKindOf: MotuLectureCategory) ifTrue: [^ self ].
+	anObject isBehavior ifTrue: [^ self ].
 
 	selectedLecture  ifNotNil: [selectedLecture removeDependent: self].
 	selectedLecture := anObject ifNil: [ MotuNilLecture new ].

diff --git a/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/windowColorToUse.st b/packages/MorphicTutorial-Core.package/MotuBrowser.class/instance/windowColorToUse.st
@@ -1,3 +1,3 @@
 style
 windowColorToUse 
-	^ Color veryVeryLightGray
+	^ Color green muchDarker darker
diff --git a/packages/MorphicTutorial-Core.package/MotuBrowser.class/methodProperties.json b/packages/MorphicTutorial-Core.package/MotuBrowser.class/methodProperties.json
@@ -4,44 +4,45 @@
 		"defaultLabel" : "ps 7/22/2018 23:19",
 		"open" : "ps 7/22/2018 23:19" },
 	"instance" : {
+		"aboutToStyle:" : "LM 9/1/2018 12:39",
 		"buildCodeEditorWith:" : "js 6/27/2018 13:43",
 		"buildCodeStatusBarWith:" : "js 6/16/2018 10:30",
-		"buildContextBarWith:" : "js 6/16/2018 10:32",
-		"buildDescriptionBoxWith:" : "till-later 5/2/2018 21:06",
+		"buildContextBarWith:" : "LM 9/1/2018 12:48",
+		"buildDescriptionBoxWith:" : "LM 9/10/2018 16:41",
 		"buildEvaluateButtonWith:" : "js 7/9/2018 11:54",
-		"buildLectureListWith:" : "ps 6/9/2018 19:35",
+		"buildLectureListWith:" : "LM 9/10/2018 16:41",
 		"buildPlaygroundPanelWith:" : "js 6/16/2018 10:30",
 		"buildResetLectureButtonWith:" : "js 7/9/2018 11:54",
 		"buildSolutionToggleButtonWith:" : "js 7/9/2018 11:32",
 		"buildWith:" : "js 7/9/2018 11:32",
-		"categoryList" : "ps 7/21/2018 10:21",
+		"categoryList" : "je 9/6/2018 11:33",
 		"closeAllAutoCompletionMorphs" : "hks 7/24/2018 16:46",
-		"codeEditor" : "hks 5/22/2018 14:48",
+		"codeEditor" : "JE 10/16/2018 16:49",
 		"codeEditor:" : "ps 7/21/2018 10:22",
 		"codeStatusBarColor" : "ps 7/21/2018 10:22",
 		"codeStatusBarContent" : "ps 7/21/2018 10:22",
 		"codeStatusBarContentStyled" : "ps 7/21/2018 10:23",
 		"codeStatusBarHeight" : "hks 6/11/2018 15:26",
 		"codeStatusBarTextColor" : "ps 7/21/2018 10:26",
-		"contextBarColor" : "ps 7/21/2018 10:26",
-		"contextBarContent" : "hks 6/18/2018 15:29",
+		"contextBarContent" : "LM 9/1/2018 12:22",
+		"contextBarWorkspaceContent" : "LM 9/1/2018 12:40",
 		"descriptionBoxContent" : "ps 7/21/2018 10:26",
 		"evaluateButtonHeight" : "hks 6/11/2018 15:26",
 		"evaluateCode" : "ps 7/22/2018 23:09",
-		"initialize" : "js 7/9/2018 11:42",
+		"initialize" : "LM 10/18/2018 15:21",
 		"isSelectedLecturePassed" : "js 7/9/2018 11:36",
 		"labelString" : "ps 7/21/2018 10:25",
 		"open" : "ps 7/21/2018 10:24",
 		"playground" : "ps 7/21/2018 10:23",
 		"playground:" : "ps 7/21/2018 10:23",
 		"playgroundInCollection" : "ps 7/21/2018 10:24",
-		"readyToEvaluateCode" : "ps 7/22/2018 23:17",
+		"readyToEvaluateCode" : "je 9/5/2018 15:52",
 		"resetSelectedLecture" : "ps 7/21/2018 10:26",
 		"selectedLecture" : "ps 7/21/2018 10:24",
-		"selectedLecture:" : "js 7/9/2018 11:44",
+		"selectedLecture:" : "je 9/7/2018 15:25",
 		"showSolution" : "js 7/9/2018 11:41",
 		"showSolution:" : "ps 7/21/2018 10:24",
 		"solutionButtonLabel" : "ps 7/21/2018 10:26",
 		"toggleSolution" : "ps 7/21/2018 10:27",
-		"update:" : "ps 7/21/2018 10:24",
-		"windowColorToUse" : "js 7/2/2018 14:48" } }
+		"update:" : "je 9/7/2018 16:37",
+		"windowColorToUse" : "LM 8/29/2018 12:22" } }
diff --git a/packages/MorphicTutorial-Core.package/MotuEditor.class/instance/actionOnSave..st b/packages/MorphicTutorial-Core.package/MotuEditor.class/instance/actionOnSave..st
@@ -0,0 +1,3 @@
+accessing
+actionOnSave: anObject
+	actionOnSave := anObject
diff --git a/packages/MorphicTutorial-Core.package/MotuEditor.class/instance/actionOnSave.st b/packages/MorphicTutorial-Core.package/MotuEditor.class/instance/actionOnSave.st
@@ -0,0 +1,3 @@
+accessing
+actionOnSave
+	^ actionOnSave
diff --git a/packages/MorphicTutorial-Core.package/MotuEditor.class/instance/activeLecture..st b/packages/MorphicTutorial-Core.package/MotuEditor.class/instance/activeLecture..st
@@ -2,4 +2,6 @@ accessing
 activeLecture: aLecture
 
 	activeLecture := aLecture.
-	self code: aLecture codeToEdit.
+	"It is important that the parameters are set before the code is changed"
+	self parameters: aLecture parameterNames.
+	self code: aLecture codeToEdit
diff --git a/packages/MorphicTutorial-Core.package/MotuEditor.class/instance/buildCodePaneWith..st b/packages/MorphicTutorial-Core.package/MotuEditor.class/instance/buildCodePaneWith..st
@@ -0,0 +1,7 @@
+building
+buildCodePaneWith: builder
+
+	^ (super buildCodePaneWith: builder)
+		stylerClass: MotuTextStyler;
+		setText: #evaluateAndSaveText:notifying:;
+		yourself
diff --git a/.../MorphicTutorial-Core.package/MotuEditor.class/instance/evaluateAndSaveText.notifying..st b/.../MorphicTutorial-Core.package/MotuEditor.class/instance/evaluateAndSaveText.notifying..st
@@ -0,0 +1,7 @@
+as yet unclassified
+evaluateAndSaveText: aText notifying: aController
+
+	self code: aText.
+	self actionOnSave value
+
+
diff --git a/packages/MorphicTutorial-Core.package/MotuEditor.class/instance/evaluateExpression..st b/packages/MorphicTutorial-Core.package/MotuEditor.class/instance/evaluateExpression..st
@@ -0,0 +1,5 @@
+as yet unclassified
+evaluateExpression: aString
+
+	UIManager default inform: 'Please use the "Evaluate code" button to test your code'.
+	^ nil
diff --git a/packages/MorphicTutorial-Core.package/MotuEditor.class/instance/initialize.st b/packages/MorphicTutorial-Core.package/MotuEditor.class/instance/initialize.st
@@ -0,0 +1,4 @@
+initialize-release
+initialize
+
+	self parameters: OrderedCollection new
diff --git a/packages/MorphicTutorial-Core.package/MotuEditor.class/instance/parameters..st b/packages/MorphicTutorial-Core.package/MotuEditor.class/instance/parameters..st
@@ -0,0 +1,4 @@
+accessing
+parameters: anObject
+
+	parameters := anObject.
diff --git a/packages/MorphicTutorial-Core.package/MotuEditor.class/instance/parameters.st b/packages/MorphicTutorial-Core.package/MotuEditor.class/instance/parameters.st
@@ -0,0 +1,4 @@
+accessing
+parameters
+
+	^ parameters
diff --git a/packages/MorphicTutorial-Core.package/MotuEditor.class/methodProperties.json b/packages/MorphicTutorial-Core.package/MotuEditor.class/methodProperties.json
@@ -3,11 +3,19 @@
 		 },
 	"instance" : {
 		"aboutToStyle:" : "js 6/27/2018 13:12",
-		"accept" : "ps 7/21/2018 10:15",
+		"accept" : "JE 10/16/2018 16:52",
+		"actionOnSave" : "JE 10/16/2018 16:48",
+		"actionOnSave:" : "JE 10/16/2018 16:48",
 		"activeLecture" : "js 5/22/2018 17:09",
-		"activeLecture:" : "ps 7/22/2018 23:10",
+		"activeLecture:" : "LM 9/1/2018 12:02",
+		"buildCodePaneWith:" : "JE 10/16/2018 16:51",
 		"code" : "ps 7/22/2018 23:09",
 		"code:" : "ps 7/22/2018 23:10",
+		"evaluateAndSaveText:notifying:" : "JE 10/16/2018 18:06",
+		"evaluateExpression:" : "LM 9/6/2018 11:21",
+		"initialize" : "LM 9/1/2018 12:01",
+		"parameters" : "LM 9/1/2018 11:54",
+		"parameters:" : "LM 9/1/2018 11:54",
 		"showSolutionCode" : "hks 7/24/2018 17:04",
 		"showUserCode" : "hks 7/24/2018 17:04",
 		"wantsAnnotationPane" : "ps 7/21/2018 10:16",

diff --git a/packages/MorphicTutorial-Core.package/MotuEditor.class/properties.json b/packages/MorphicTutorial-Core.package/MotuEditor.class/properties.json
@@ -6,7 +6,9 @@
 		 ],
 	"commentStamp" : "",
 	"instvars" : [
-		"activeLecture" ],
+		"activeLecture",
+		"parameters",
+		"actionOnSave" ],
 	"name" : "MotuEditor",
 	"pools" : [
 		 ],

diff --git a/...orphicTutorial-Core.package/MotuLectureCategoryListItemWrapper.class/instance/asString.st b/...orphicTutorial-Core.package/MotuLectureCategoryListItemWrapper.class/instance/asString.st
@@ -1,3 +1,3 @@
-as yet unclassified
+accessing
 asString
-	^ self item name
+	^ self item categoryName
diff --git a/...orphicTutorial-Core.package/MotuLectureCategoryListItemWrapper.class/instance/contents.st b/...orphicTutorial-Core.package/MotuLectureCategoryListItemWrapper.class/instance/contents.st
@@ -1,4 +1,4 @@
-as yet unclassified
+accessing
 contents
-	^ self item lectures collect: [ :each | 
-		MotuLectureListItemWrapper with: (each instance) model: self model parent: self]
+	^ self item sublectures collect: [ :each | 
+		MotuLectureListItemWrapper with: each instance model: self model parent: self]
diff --git a/...hicTutorial-Core.package/MotuLectureCategoryListItemWrapper.class/instance/hasContents.st b/...hicTutorial-Core.package/MotuLectureCategoryListItemWrapper.class/instance/hasContents.st
@@ -1,3 +1,3 @@
-as yet unclassified
+accessing
 hasContents
 	^ true
diff --git a/...rphicTutorial-Core.package/MotuLectureCategoryListItemWrapper.class/methodProperties.json b/...rphicTutorial-Core.package/MotuLectureCategoryListItemWrapper.class/methodProperties.json
@@ -2,6 +2,6 @@
 	"class" : {
 		 },
 	"instance" : {
-		"asString" : "ps 7/22/2018 23:12",
-		"contents" : "ps 7/22/2018 23:12",
+		"asString" : "je 9/7/2018 14:57",
+		"contents" : "je 9/7/2018 16:57",
 		"hasContents" : "ps 7/22/2018 23:12" } }
diff --git a/packages/MorphicTutorial-Core.package/MotuLectureListItemWrapper.class/instance/asString.st b/packages/MorphicTutorial-Core.package/MotuLectureListItemWrapper.class/instance/asString.st
@@ -1,3 +1,3 @@
-as yet unclassified
+accessing
 asString
 	^ self item lectureName
diff --git a/packages/MorphicTutorial-Core.package/MotuLectureListItemWrapper.class/instance/icon.st b/packages/MorphicTutorial-Core.package/MotuLectureListItemWrapper.class/instance/icon.st
@@ -1,9 +1,6 @@
-as yet unclassified
+accessing
 icon
-	|icon|
-
-	icon := self item passed
-		ifTrue: [#testGreen]
-		ifFalse: [#testRed].
 
-	^ ToolIcons iconNamed: icon
+	^ ToolIcons iconNamed: (self item passed
+		ifTrue: [#testGreen]
+		ifFalse: [#testRed])
diff --git a/...cTutorial-Core.package/MotuLectureListItemWrapper.class/instance/setItem.model.parent..st b/...cTutorial-Core.package/MotuLectureListItemWrapper.class/instance/setItem.model.parent..st
@@ -1,4 +1,4 @@
-as yet unclassified
+initialization
 setItem: aMotuLecture model: aModel parent: itemParent
 
 	self parent: itemParent.

diff --git a/packages/MorphicTutorial-Core.package/MotuLectureListItemWrapper.class/methodProperties.json b/packages/MorphicTutorial-Core.package/MotuLectureListItemWrapper.class/methodProperties.json
@@ -3,7 +3,7 @@
 		"with:model:parent:" : "hks 5/22/2018 14:34" },
 	"instance" : {
 		"asString" : "ps 7/22/2018 23:12",
-		"icon" : "ps 7/22/2018 23:12",
+		"icon" : "je 9/5/2018 15:46",
 		"parent" : "ps 7/22/2018 23:12",
 		"parent:" : "hks 5/22/2018 14:32",
 		"setItem:model:parent:" : "hks 7/24/2018 16:58" } }
diff --git a/...ore.package/MotuAssertion.class/README.md → ...l-Core.package/MotuParser.class/README.md b/...ore.package/MotuAssertion.class/README.md → ...l-Core.package/MotuParser.class/README.md
diff --git a/packages/MorphicTutorial-Core.package/MotuParser.class/instance/initialize.st b/packages/MorphicTutorial-Core.package/MotuParser.class/instance/initialize.st
@@ -0,0 +1,5 @@
+initialize-release
+initialize
+
+	super initialize.
+	self motuParameters: OrderedCollection new
diff --git a/packages/MorphicTutorial-Core.package/MotuParser.class/instance/motuParameters..st b/packages/MorphicTutorial-Core.package/MotuParser.class/instance/motuParameters..st
@@ -0,0 +1,4 @@
+accessing
+motuParameters: aCollection
+
+	motuParameters := aCollection
diff --git a/packages/MorphicTutorial-Core.package/MotuParser.class/instance/motuParameters.st b/packages/MorphicTutorial-Core.package/MotuParser.class/instance/motuParameters.st
@@ -0,0 +1,4 @@
+accessing
+motuParameters
+
+	^ motuParameters
diff --git a/packages/MorphicTutorial-Core.package/MotuParser.class/instance/parseMessagePattern.st b/packages/MorphicTutorial-Core.package/MotuParser.class/instance/parseMessagePattern.st
@@ -0,0 +1,5 @@
+parse
+parseMessagePattern
+	"The Morphic Tutorial always compiles code into a method, but because the header should not be modifiable, it is missing during parsing"
+	self motuParameters do: [:each |
+		self pushArgument: each]