Use a ChangeListItemBuilder to fill the changeList and to determine c…

…ategories and descriptions
hpi-swa-teaching · Jun 17, 2021 · 57ae6a7 · 57ae6a7
1 parent 1223a5b
commit 57ae6a7
Show file tree

Hide file tree

Showing 73 changed files with 168 additions and 237 deletions.
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/class/getChangeListItemsFrom..st b/packages/ChangesReloaded-Core.package/CRBrowser.class/class/getChangeListItemsFrom..st
@@ -3,4 +3,4 @@ getChangeListItemsFrom: anOrderedCollectionOfChangeRecords
 
 	^ (anOrderedCollectionOfChangeRecords 
 		reject: [:each | each isMisc])
-		collect: [:each | CRChangeListItem new changeRecord: each]
+		collect: [:each | CRChangeListItemBuilder newChangeListItemWith: each]
diff --git a/...s/ChangesReloaded-Core.package/CRBrowser.class/instance/initializeChangeListItemsWith..st b/...s/ChangesReloaded-Core.package/CRBrowser.class/instance/initializeChangeListItemsWith..st
@@ -6,5 +6,5 @@ initializeChangeListItemsWith: aMultiByteFileStream
 	changeRecords := self class getChangeRecordsMissingInImageFrom: self usedChangeFile.
 	self
 		changeListItems: (self class getChangeListItemsFrom: changeRecords);
-		removeAllChangeListItemsWithEmptyDescription;
+		removeAllNonPersistentDoIts;
 		pickAllChangeListItems
diff --git a/...ded-Core.package/CRBrowser.class/instance/removeAllChangeListItemsWithEmptyDescription.st b/...ded-Core.package/CRBrowser.class/instance/removeAllChangeListItemsWithEmptyDescription.st
diff --git a/...ages/ChangesReloaded-Core.package/CRBrowser.class/instance/removeAllNonPersistentDoIts.st b/...ages/ChangesReloaded-Core.package/CRBrowser.class/instance/removeAllNonPersistentDoIts.st
@@ -0,0 +1,5 @@
+initialize-release
+removeAllNonPersistentDoIts
+
+	self changeListItems: 
+		(self changeListItems reject: [:each | each category = #nonPersistentDoIt])
diff --git a/...eloaded-Core.package/CRBrowser.class/instance/togglePickStatusOfSelectedChangeListItem.st b/...eloaded-Core.package/CRBrowser.class/instance/togglePickStatusOfSelectedChangeListItem.st
@@ -3,5 +3,5 @@ togglePickStatusOfSelectedChangeListItem
 
 	self hasSelectedChangeListItem ifFalse: [^ self].
 
-	self selectedChangeListItem togglePickStatus.
+	self selectedChangeListItem toggleIsPicked.
 	self updateAfterPick
diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json
@@ -4,7 +4,7 @@
 		"defaultBrowserHeight" : "SV 8/7/2020 12:58",
 		"defaultBrowserWidth" : "SV 8/7/2020 12:58",
 		"extent" : "SV 8/7/2020 15:37",
-		"getChangeListItemsFrom:" : "abd 6/11/2021 14:36",
+		"getChangeListItemsFrom:" : "abd 6/17/2021 11:57",
 		"getChangeRecordsMissingInImageFrom:" : "abd 6/1/2021 17:26",
 		"newWith:" : "uh 6/21/2020 21:32",
 		"numberOfBytesToLoadChangesFrom" : "gf 5/20/2020 10:43",
@@ -23,7 +23,7 @@
 		"buildUpperButtonPanelSpecWith:" : "anonym-HPI 5/28/2021 20:24",
 		"buildWith:" : "anonym-HPI 5/28/2021 20:44",
 		"buttonHeight" : "gf 7/11/2020 20:48",
-		"changeDescriptions" : "anonym-HPI 6/14/2021 16:19",
+		"changeDescriptions" : "abd 6/17/2021 10:30",
 		"changeListFrame" : "mg 8/6/2020 12:28",
 		"changeListItems" : "gf 7/10/2020 12:13",
 		"changeListItems:" : "gf 7/15/2020 10:40",
@@ -36,7 +36,7 @@
 		"hasSelectedChangeListItem" : "SV 7/13/2020 16:15",
 		"hasSelectedMethodChangeListItem" : "JA 5/20/2021 17:16",
 		"hasValidChangeListSelectionIndex" : "gf 7/10/2020 12:33",
-		"initializeChangeListItemsWith:" : "anonym-HPI 6/14/2021 17:09",
+		"initializeChangeListItemsWith:" : "abd 6/17/2021 12:05",
 		"initializeWith:" : "gf 7/25/2020 21:01",
 		"isLoadButtonEnabled" : "mg 8/6/2020 11:27",
 		"isPickButtonEnabled" : "gf 7/25/2020 20:09",
@@ -52,14 +52,14 @@
 		"priorSourceOrNil" : "JA 5/20/2021 22:49",
 		"refreshChangeList" : "gf 7/10/2020 12:22",
 		"removeAllChangeListItemsExcept:" : "SV 8/5/2020 22:13",
-		"removeAllChangeListItemsWithEmptyDescription" : "anonym-HPI 6/14/2021 17:11",
+		"removeAllNonPersistentDoIts" : "abd 6/17/2021 12:10",
 		"repaintChangeListSelection" : "SV 6/27/2020 19:48",
 		"selectNextChangeListItem" : "mg 8/6/2020 11:23",
 		"selectedChangeListItem" : "gf 7/10/2020 12:48",
 		"selectedClass" : "JA 5/20/2021 22:50",
 		"selectedMessageName" : "JA 5/20/2021 22:50",
 		"switchToDetailedView" : "mg 8/6/2020 11:24",
-		"togglePickStatusOfSelectedChangeListItem" : "mg 8/7/2020 22:33",
+		"togglePickStatusOfSelectedChangeListItem" : "abd 6/17/2021 13:03",
 		"updateAfterChangeListChange" : "8/7/2020 22:50:03",
 		"updateAfterChangeSelection" : "SV 7/13/2020 16:17",
 		"updateAfterLoadingChanges" : "JA 6/11/2021 10:38",

diff --git a/...es/ChangesReloaded-Core.package/CRChangeListItem.class/instance/addUnpickedAttributes..st b/...es/ChangesReloaded-Core.package/CRChangeListItem.class/instance/addUnpickedAttributes..st
diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/category..st b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/category..st
@@ -0,0 +1,4 @@
+accessing
+category: anObject
+
+	category := anObject
diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/category.st b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/category.st
@@ -0,0 +1,4 @@
+accessing
+category
+
+	^ category
diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/description..st b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/description..st
@@ -0,0 +1,4 @@
+accessing
+description: anObject
+
+	description := anObject
diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/description.st b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/description.st
@@ -1,7 +1,4 @@
 accessing
 description
 
-	| plainDescription |	
-	plainDescription := (CRChangeRecordDescriber descriptionFor: self) asText.
-	self isPicked ifFalse: [self addUnpickedAttributes: plainDescription].
-	^ plainDescription
+	^ description
diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/initialize.st b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/initialize.st
diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/isPicked..st b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/isPicked..st
@@ -1,4 +1,5 @@
 accessing
 isPicked: aBoolean
 
-	isPicked := aBoolean
+	isPicked := aBoolean.
+	self refreshDescriptionAppearance
diff --git a/...ngesReloaded-Core.package/CRChangeListItem.class/instance/refreshDescriptionAppearance.st b/...ngesReloaded-Core.package/CRChangeListItem.class/instance/refreshDescriptionAppearance.st
@@ -0,0 +1,6 @@
+text-attributes
+refreshDescriptionAppearance
+
+	self isPicked 
+		ifTrue: [self showDescriptionAsPicked]
+		ifFalse: [self showDescriptionAsUnpicked]
diff --git a/...s/ChangesReloaded-Core.package/CRChangeListItem.class/instance/showDescriptionAsPicked.st b/...s/ChangesReloaded-Core.package/CRChangeListItem.class/instance/showDescriptionAsPicked.st
@@ -0,0 +1,4 @@
+text-attributes
+showDescriptionAsPicked
+
+	self unpickedAttributes do: [:attribute | self description removeAttribute: attribute]
diff --git a/...ChangesReloaded-Core.package/CRChangeListItem.class/instance/showDescriptionAsUnpicked.st b/...ChangesReloaded-Core.package/CRChangeListItem.class/instance/showDescriptionAsUnpicked.st
@@ -0,0 +1,4 @@
+text-attributes
+showDescriptionAsUnpicked
+
+	self unpickedAttributes do: [:attribute | self description addAttribute: attribute]
diff --git a/...stItem.class/instance/togglePickStatus.st → ...ListItem.class/instance/toggleIsPicked.st b/...stItem.class/instance/togglePickStatus.st → ...ListItem.class/instance/toggleIsPicked.st
@@ -1,4 +1,4 @@
 actions
-togglePickStatus
+toggleIsPicked
 
 	self isPicked: self isPicked not
diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/unpickedAttributes.st b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/instance/unpickedAttributes.st
@@ -0,0 +1,4 @@
+text-attributes
+unpickedAttributes
+
+	^ {TextEmphasis italic. TextEmphasis struckOut}
diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/methodProperties.json
@@ -3,15 +3,20 @@
 		"newWithRecord:" : "uh 7/2/2020 16:02" },
 	"instance" : {
 		"=" : "mg 8/7/2020 22:55",
-		"addUnpickedAttributes:" : "TS 5/20/2021 11:12",
+		"category" : "abd 6/17/2021 10:23",
+		"category:" : "abd 6/17/2021 12:57",
 		"changeRecord" : "SV 5/29/2020 22:13",
-		"changeRecord:" : "SV 5/29/2020 22:14",
-		"description" : "anonym-HPI 6/14/2021 16:02",
+		"changeRecord:" : "abd 6/17/2021 11:57",
+		"description" : "abd 6/17/2021 11:25",
+		"description:" : "abd 6/17/2021 13:02",
 		"doesNotUnderstand:" : "gf 6/15/2020 23:22",
 		"hash" : "SV 8/7/2020 22:07",
-		"initialize" : "gf 7/15/2020 10:48",
 		"isPicked" : "SV 7/13/2020 16:05",
-		"isPicked:" : "SV 7/13/2020 16:05",
+		"isPicked:" : "abd 6/17/2021 11:41",
 		"pick" : "gf 7/15/2020 10:45",
-		"togglePickStatus" : "mg 8/7/2020 22:33",
-		"unpick" : "gf 7/15/2020 10:45" } }
+		"refreshDescriptionAppearance" : "abd 6/17/2021 11:43",
+		"showDescriptionAsPicked" : "abd 6/17/2021 13:03",
+		"showDescriptionAsUnpicked" : "abd 6/17/2021 13:03",
+		"toggleIsPicked" : "abd 6/17/2021 13:03",
+		"unpick" : "gf 7/15/2020 10:45",
+		"unpickedAttributes" : "abd 6/17/2021 12:57" } }
diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItem.class/properties.json b/packages/ChangesReloaded-Core.package/CRChangeListItem.class/properties.json
@@ -7,7 +7,9 @@
 	"commentStamp" : "SV 8/7/2020 23:43",
 	"instvars" : [
 		"changeRecord",
-		"isPicked" ],
+		"isPicked",
+		"category",
+		"description" ],
 	"name" : "CRChangeListItem",
 	"pools" : [
 		 ],

diff --git a/...e/CRChangeRecordDescriber.class/README.md → ...e/CRChangeListItemBuilder.class/README.md b/...e/CRChangeRecordDescriber.class/README.md → ...e/CRChangeListItemBuilder.class/README.md
diff --git a/...esReloaded-Core.package/CRChangeListItemBuilder.class/class/categoryAndDescriptionFor..st b/...esReloaded-Core.package/CRChangeListItemBuilder.class/class/categoryAndDescriptionFor..st
@@ -0,0 +1,8 @@
+describing
+categoryAndDescriptionFor: aChangeListItem
+	aChangeListItem type caseOf: {
+		[#method] -> [^ {#method. self methodDescriptionFor: aChangeListItem}].
+		[#classComment] -> [^ {#classComment. self classCommentDescriptionFor: aChangeListItem}].
+		[#doIt] -> [^ self doItCategoryAndDescriptionFor: aChangeListItem].
+	}
+	"otherwise: [^ 'MISC should be removed ']"
diff --git a/...Reloaded-Core.package/CRChangeListItemBuilder.class/class/categoryRegexDescriptionList.st b/...Reloaded-Core.package/CRChangeListItemBuilder.class/class/categoryRegexDescriptionList.st
@@ -0,0 +1,17 @@
+regex & descriptions
+categoryRegexDescriptionList
+
+	^ {
+		{ #categoryCreated. '^([^ ]+) (class )?organization addCategory\: #(.+)$'. [:m | '#', (m subexpression: 4), ' in #', (m subexpression: 2)]}.
+		{ #categoryRemoved. '^([^ ]+) (class )?organization removeCategory\: #(.+)$'. [:m | '#', (m subexpression: 4), ' from #', (m subexpression: 2)]}.
+		{ #categoryRenamed. '^([^ ]+) (class )?organization renameCategory\: #(.+) toBe\: #(.+)$'. [:m | '#', (m subexpression: 4), ' -> #', (m subexpression: 5), ' in #', (m subexpression: 2)]}.
+		{ #class. '^[^ ]+ subclass\: #([\S]+).*category\: ''([^'']+)''$'. [:m | '#', (m subexpression: 2), ' in #', (m subexpression: 3)]}.
+		{ #classMoved. '^SystemOrganization classify\: #(.+) under\: #(.+)$'. [:m | '#', (m subexpression: 2), ' to #', (m subexpression: 3)]}.
+		{ #classRemoved. '^Smalltalk removeClassNamed\: #([^ ]+)$'. [:m | '#', (m subexpression: 2)]}.
+		{ #classRenamed. '^Smalltalk renameClassNamed\: #([^ ]+) as\: #([^ ]+)$'. [:m | '#', (m subexpression: 2), ' -> #', (m subexpression: 3)]}.
+		{ #methodRecategorized. '^([^ ]+) (class )?organization classify\: #(.+) under\: #(.+)$'. [:m | '#', (m subexpression: 4), ' to #', (m subexpression: 5)]}.
+		{ #methodRemoved. '^([^ ]+) (class )?removeSelector\: #([^ ]+)$'. [:m | '#', (m subexpression: 4), ' from #', (m subexpression: 2)]}.
+		{ #packageCreated. '^SystemOrganization addCategory\: #(.+)$'. [:m | '#', (m subexpression: 2)]}.
+		{ #packageRemoved. '^SystemOrganization removeSystemCategory\: #(.+)$'. [:m | '#', (m subexpression: 2)]}.
+		{ #packageRenamed. '^SystemOrganization renameCategory\: #(.+) toBe\: #(.+)$'. [:m | '#', (m subexpression: 2), ' -> #', (m subexpression: 3)]}.
+	}
diff --git a/...ordDescriber.class/class/changeString..st → ...tItemBuilder.class/class/changeString..st b/...ordDescriber.class/class/changeString..st → ...tItemBuilder.class/class/changeString..st
diff --git a/...cordDescriber.class/class/changeString.st → ...stItemBuilder.class/class/changeString.st b/...cordDescriber.class/class/changeString.st → ...stItemBuilder.class/class/changeString.st
diff --git a/...sReloaded-Core.package/CRChangeListItemBuilder.class/class/classCommentDescriptionFor..st b/...sReloaded-Core.package/CRChangeListItemBuilder.class/class/classCommentDescriptionFor..st
@@ -0,0 +1,4 @@
+describing
+classCommentDescriptionFor: aChangeListItem
+
+	^ aChangeListItem commentClass name , ' ',  aChangeListItem stamp
diff --git a/...loaded-Core.package/CRChangeListItemBuilder.class/class/doItCategoryAndDescriptionFor..st b/...loaded-Core.package/CRChangeListItemBuilder.class/class/doItCategoryAndDescriptionFor..st
@@ -0,0 +1,11 @@
+describing
+doItCategoryAndDescriptionFor: aChangeListItem 
+
+	self changeString: aChangeListItem string.
+	self categoryRegexDescriptionList
+		do: [:triple | self
+				if: triple second asRegex
+				matchesChangeString: [:matcher | ^ {triple first. triple third value: matcher}]].
+
+	"otherwise it's non persistent doits"
+	^ {#nonPersistentDoIt. aChangeListItem string}
diff --git a/...er.class/class/if.matchesChangeString..st → ...er.class/class/if.matchesChangeString..st b/...er.class/class/if.matchesChangeString..st → ...er.class/class/if.matchesChangeString..st
@@ -1,4 +1,4 @@
-main
+describing
 if: anMatcher matchesChangeString: aBlock
 
 	^ (anMatcher matches: self changeString) ifTrue: [^ aBlock value: anMatcher]
diff --git a/...ChangesReloaded-Core.package/CRChangeListItemBuilder.class/class/methodDescriptionFor..st b/...ChangesReloaded-Core.package/CRChangeListItemBuilder.class/class/methodDescriptionFor..st
@@ -0,0 +1,4 @@
+describing
+methodDescriptionFor: aChangeListItem
+
+	^ aChangeListItem methodClassName , ' ' , aChangeListItem methodSelector, ' ', aChangeListItem stamp
diff --git a/...hangesReloaded-Core.package/CRChangeListItemBuilder.class/class/newChangeListItemWith..st b/...hangesReloaded-Core.package/CRChangeListItemBuilder.class/class/newChangeListItemWith..st
@@ -0,0 +1,14 @@
+instance creation
+newChangeListItemWith: aChangeRecord
+
+	| changeListItem |
+
+	changeListItem := CRChangeListItem new changeRecord: aChangeRecord.
+	self setCategoryAndDescriptionOf: changeListItem.
+
+	^ changeListItem 
+			pick; 
+			yourself
+
+
+
diff --git a/...Reloaded-Core.package/CRChangeListItemBuilder.class/class/setCategoryAndDescriptionOf..st b/...Reloaded-Core.package/CRChangeListItemBuilder.class/class/setCategoryAndDescriptionOf..st
@@ -0,0 +1,7 @@
+instance creation
+setCategoryAndDescriptionOf: aChangeListItem
+
+	| categoryDescriptionTuple |	
+	categoryDescriptionTuple := (self categoryAndDescriptionFor: aChangeListItem).
+	aChangeListItem category: categoryDescriptionTuple first.
+	aChangeListItem description: (aChangeListItem category, ': ', categoryDescriptionTuple second) asText.
diff --git a/packages/ChangesReloaded-Core.package/CRChangeListItemBuilder.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRChangeListItemBuilder.class/methodProperties.json
@@ -0,0 +1,14 @@
+{
+	"class" : {
+		"categoryAndDescriptionFor:" : "abd 6/17/2021 12:51",
+		"categoryRegexDescriptionList" : "abd 6/17/2021 12:24",
+		"changeString" : "abd 6/8/2021 20:02",
+		"changeString:" : "abd 6/8/2021 19:58",
+		"classCommentDescriptionFor:" : "abd 6/17/2021 11:31",
+		"doItCategoryAndDescriptionFor:" : "abd 6/17/2021 12:51",
+		"if:matchesChangeString:" : "abd 6/17/2021 11:14",
+		"methodDescriptionFor:" : "abd 6/17/2021 11:31",
+		"newChangeListItemWith:" : "abd 6/17/2021 11:56",
+		"setCategoryAndDescriptionOf:" : "abd 6/17/2021 12:51" },
+	"instance" : {
+		 } }
diff --git a/...angeRecordDescriber.class/properties.json → ...angeListItemBuilder.class/properties.json b/...angeRecordDescriber.class/properties.json → ...angeListItemBuilder.class/properties.json
@@ -7,7 +7,7 @@
 	"commentStamp" : "abd 6/2/2021 08:52",
 	"instvars" : [
 		 ],
-	"name" : "CRChangeRecordDescriber",
+	"name" : "CRChangeListItemBuilder",
 	"pools" : [
 		 ],
 	"super" : "Object",

diff --git a/...eloaded-Core.package/CRChangeRecordDescriber.class/class/categoryCreatedDescriptionOf..st b/...eloaded-Core.package/CRChangeRecordDescriber.class/class/categoryCreatedDescriptionOf..st
diff --git a/.../ChangesReloaded-Core.package/CRChangeRecordDescriber.class/class/categoryCreatedRegex.st b/.../ChangesReloaded-Core.package/CRChangeRecordDescriber.class/class/categoryCreatedRegex.st
diff --git a/...eloaded-Core.package/CRChangeRecordDescriber.class/class/categoryRemovedDescriptionOf..st b/...eloaded-Core.package/CRChangeRecordDescriber.class/class/categoryRemovedDescriptionOf..st
diff --git a/.../ChangesReloaded-Core.package/CRChangeRecordDescriber.class/class/categoryRemovedRegex.st b/.../ChangesReloaded-Core.package/CRChangeRecordDescriber.class/class/categoryRemovedRegex.st
diff --git a/...eloaded-Core.package/CRChangeRecordDescriber.class/class/categoryRenamedDescriptionOf..st b/...eloaded-Core.package/CRChangeRecordDescriber.class/class/categoryRenamedDescriptionOf..st
diff --git a/.../ChangesReloaded-Core.package/CRChangeRecordDescriber.class/class/categoryRenamedRegex.st b/.../ChangesReloaded-Core.package/CRChangeRecordDescriber.class/class/categoryRenamedRegex.st
diff --git a/...sReloaded-Core.package/CRChangeRecordDescriber.class/class/classCommentDescriptionFor..st b/...sReloaded-Core.package/CRChangeRecordDescriber.class/class/classCommentDescriptionFor..st
diff --git a/...d-Core.package/CRChangeRecordDescriber.class/class/classCreatedOrChangedDescriptionOf..st b/...d-Core.package/CRChangeRecordDescriber.class/class/classCreatedOrChangedDescriptionOf..st
diff --git a/...esReloaded-Core.package/CRChangeRecordDescriber.class/class/classCreatedOrChangedRegex.st b/...esReloaded-Core.package/CRChangeRecordDescriber.class/class/classCreatedOrChangedRegex.st
diff --git a/...ngesReloaded-Core.package/CRChangeRecordDescriber.class/class/classMovedDescriptionOf..st b/...ngesReloaded-Core.package/CRChangeRecordDescriber.class/class/classMovedDescriptionOf..st
diff --git a/packages/ChangesReloaded-Core.package/CRChangeRecordDescriber.class/class/classMovedRegex.st b/packages/ChangesReloaded-Core.package/CRChangeRecordDescriber.class/class/classMovedRegex.st
diff --git a/...esReloaded-Core.package/CRChangeRecordDescriber.class/class/classRemovedDescriptionOf..st b/...esReloaded-Core.package/CRChangeRecordDescriber.class/class/classRemovedDescriptionOf..st
diff --git a/...ges/ChangesReloaded-Core.package/CRChangeRecordDescriber.class/class/classRemovedRegex.st b/...ges/ChangesReloaded-Core.package/CRChangeRecordDescriber.class/class/classRemovedRegex.st
diff --git a/...esReloaded-Core.package/CRChangeRecordDescriber.class/class/classRenamedDescriptionOf..st b/...esReloaded-Core.package/CRChangeRecordDescriber.class/class/classRenamedDescriptionOf..st