refactoring: Add null-object-pattern for card & fix red tests

hpi-swa-teaching · Jul 31, 2022 · e238095 · e238095
1 parent f9f4b90
commit e238095
Show file tree

Hide file tree

Showing 118 changed files with 481 additions and 216 deletions.
diff --git a/Squello-Core.package/SPBAbstractCard.class/README.md b/Squello-Core.package/SPBAbstractCard.class/README.md
diff --git a/Squello-Core.package/SPBAbstractCard.class/instance/addAssignee..st b/Squello-Core.package/SPBAbstractCard.class/instance/addAssignee..st
@@ -0,0 +1,4 @@
+updating-remote
+addAssignee: anSPBAssignee
+
+	self subclassResponsibility.
diff --git a/Squello-Core.package/SPBAbstractCard.class/instance/addAssigneeLocal..st b/Squello-Core.package/SPBAbstractCard.class/instance/addAssigneeLocal..st
@@ -0,0 +1,4 @@
+updating-local
+addAssigneeLocal: anSPBAssignee
+
+	self subclassResponsibility.
diff --git a/Squello-Core.package/SPBAbstractCard.class/instance/addLabel..st b/Squello-Core.package/SPBAbstractCard.class/instance/addLabel..st
@@ -0,0 +1,4 @@
+updating-remote
+addLabel: anSPBLabel
+
+	self subclassResponsibility.
diff --git a/Squello-Core.package/SPBAbstractCard.class/instance/addLabelLocal..st b/Squello-Core.package/SPBAbstractCard.class/instance/addLabelLocal..st
@@ -0,0 +1,4 @@
+updating-local
+addLabelLocal: anSPBLabel
+
+	self subclassResponsibility.
diff --git a/Squello-Core.package/SPBAbstractCard.class/instance/assignees.st b/Squello-Core.package/SPBAbstractCard.class/instance/assignees.st
@@ -0,0 +1,4 @@
+accessing
+assignees
+
+	self subclassResponsibility.
diff --git a/Squello-Core.package/SPBAbstractCard.class/instance/description.st b/Squello-Core.package/SPBAbstractCard.class/instance/description.st
@@ -0,0 +1,4 @@
+accessing
+description
+
+	self subclassResponsibility.
diff --git a/Squello-Core.package/SPBAbstractCard.class/instance/initialize.st b/Squello-Core.package/SPBAbstractCard.class/instance/initialize.st
@@ -0,0 +1,5 @@
+initialization
+initialize
+
+	super initialize.
+	self color: Color gray.
diff --git a/Squello-Core.package/SPBAbstractCard.class/instance/isRealCard.st b/Squello-Core.package/SPBAbstractCard.class/instance/isRealCard.st
@@ -0,0 +1,4 @@
+testing
+isRealCard
+
+	^ false.
diff --git a/Squello-Core.package/SPBAbstractCard.class/instance/labels.st b/Squello-Core.package/SPBAbstractCard.class/instance/labels.st
@@ -0,0 +1,4 @@
+accessing
+labels
+
+	self subclassResponsibility.
diff --git a/Squello-Core.package/SPBAbstractCard.class/instance/removeAssignee..st b/Squello-Core.package/SPBAbstractCard.class/instance/removeAssignee..st
@@ -0,0 +1,4 @@
+updating-remote
+removeAssignee: anSPBAssignee
+
+	self subclassResponsibility.
diff --git a/Squello-Core.package/SPBAbstractCard.class/instance/removeAssigneeLocal..st b/Squello-Core.package/SPBAbstractCard.class/instance/removeAssigneeLocal..st
@@ -0,0 +1,4 @@
+updating-local
+removeAssigneeLocal: anSPBAssignee
+
+	self subclassResponsibility.
diff --git a/Squello-Core.package/SPBAbstractCard.class/instance/removeLabel..st b/Squello-Core.package/SPBAbstractCard.class/instance/removeLabel..st
@@ -0,0 +1,4 @@
+updating-remote
+removeLabel: anSPBLabel
+
+	self subclassResponsibility.
diff --git a/Squello-Core.package/SPBAbstractCard.class/instance/removeLabelLocal..st b/Squello-Core.package/SPBAbstractCard.class/instance/removeLabelLocal..st
@@ -0,0 +1,4 @@
+updating-local
+removeLabelLocal: anSPBLabel
+
+	self subclassResponsibility.
diff --git a/Squello-Core.package/SPBAbstractCard.class/instance/title.st b/Squello-Core.package/SPBAbstractCard.class/instance/title.st
@@ -0,0 +1,4 @@
+accessing
+title
+
+	self subclassResponsibility.
diff --git a/Squello-Core.package/SPBAbstractCard.class/instance/updateDescription..st b/Squello-Core.package/SPBAbstractCard.class/instance/updateDescription..st
@@ -0,0 +1,4 @@
+updating-remote
+updateDescription: aString
+
+	self subclassResponsibility.
diff --git a/Squello-Core.package/SPBAbstractCard.class/instance/updateTitle..st b/Squello-Core.package/SPBAbstractCard.class/instance/updateTitle..st
@@ -0,0 +1,4 @@
+updating-remote
+updateTitle: aString
+
+	self subclassResponsibility.
diff --git a/Squello-Core.package/SPBAbstractCard.class/methodProperties.json b/Squello-Core.package/SPBAbstractCard.class/methodProperties.json
@@ -0,0 +1,20 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"addAssignee:" : "lo 7/31/2022 17:03",
+		"addAssigneeLocal:" : "lo 7/31/2022 17:03",
+		"addLabel:" : "lo 7/31/2022 17:04",
+		"addLabelLocal:" : "lo 7/31/2022 17:04",
+		"assignees" : "lo 7/31/2022 16:04",
+		"description" : "lo 7/31/2022 16:06",
+		"initialize" : "lo 7/31/2022 16:02",
+		"isRealCard" : "lo 7/31/2022 17:03",
+		"labels" : "lo 7/31/2022 16:06",
+		"removeAssignee:" : "lo 7/31/2022 17:04",
+		"removeAssigneeLocal:" : "lo 7/31/2022 17:04",
+		"removeLabel:" : "lo 7/31/2022 17:04",
+		"removeLabelLocal:" : "lo 7/31/2022 17:04",
+		"title" : "lo 7/31/2022 16:06",
+		"updateDescription:" : "lo 7/31/2022 17:04",
+		"updateTitle:" : "lo 7/31/2022 17:04" } }
diff --git a/Squello-Core.package/SPBAbstractCard.class/properties.json b/Squello-Core.package/SPBAbstractCard.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "Squello-Core",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		 ],
+	"name" : "SPBAbstractCard",
+	"pools" : [
+		 ],
+	"super" : "Morph",
+	"type" : "normal" }
diff --git a/Squello-Core.package/SPBBoard.class/instance/activeCard..st b/Squello-Core.package/SPBBoard.class/instance/activeCard..st
@@ -1,4 +1,4 @@
 accessing
-activeCard: anSPBCard
+activeCard: anSPBAbstractCard
 
-	activeCard := anSPBCard.
+	activeCard := anSPBAbstractCard.
diff --git a/Squello-Core.package/SPBBoard.class/instance/activeCard.st b/Squello-Core.package/SPBBoard.class/instance/activeCard.st
@@ -1,4 +1,4 @@
 accessing
 activeCard
 
-	^ activeCard.
+	^ activeCard ifNil: [activeCard := SPBNullCard new].
diff --git a/Squello-Core.package/SPBBoard.class/instance/activeCardAssigneeList.st b/Squello-Core.package/SPBBoard.class/instance/activeCardAssigneeList.st
@@ -1,8 +1,4 @@
 update sidebar
 activeCardAssigneeList
 
-	self activeCard
-		ifNil: [^ {}].
-	self activeCard assignees 
-		ifNil: [^ {#('---assigned---')}].
-	^ #('---assigned---') , self activeCard assignees.
+	^ self activeCardAssigneeListHeader , self activeCard assignees.
diff --git a/Squello-Core.package/SPBBoard.class/instance/activeCardAssigneeListHeader.st b/Squello-Core.package/SPBBoard.class/instance/activeCardAssigneeListHeader.st
@@ -0,0 +1,4 @@
+update sidebar
+activeCardAssigneeListHeader
+
+	^ #('---assigned---').
diff --git a/Squello-Core.package/SPBBoard.class/instance/activeCardDescription.st b/Squello-Core.package/SPBBoard.class/instance/activeCardDescription.st
@@ -1,6 +1,4 @@
 update sidebar
 activeCardDescription
 
-	self activeCard 
-		ifNil: [^ ''].
-	^ self activeCard description ifNil: [''].
+	^ self activeCard description.
diff --git a/Squello-Core.package/SPBBoard.class/instance/activeCardLabelList.st b/Squello-Core.package/SPBBoard.class/instance/activeCardLabelList.st
@@ -1,8 +1,4 @@
 update sidebar
 activeCardLabelList
 
-	self activeCard
-		ifNil: [^ {}].
-	self activeCard labels
-		ifNil: [^ {#('---used labels---')}].
-	^ #('---used labels---'), self activeCard labels.
+	^ self activeCardLabelListHeader, self activeCard labels.
diff --git a/Squello-Core.package/SPBBoard.class/instance/activeCardLabelListHeader.st b/Squello-Core.package/SPBBoard.class/instance/activeCardLabelListHeader.st
@@ -0,0 +1,4 @@
+update sidebar
+activeCardLabelListHeader
+
+	^ #('---used labels---').
diff --git a/Squello-Core.package/SPBBoard.class/instance/activeCardTitle.st b/Squello-Core.package/SPBBoard.class/instance/activeCardTitle.st
@@ -1,6 +1,4 @@
 update sidebar
 activeCardTitle
 
-	self activeCard 
-		ifNil: [^ ''].
-	^ self activeCard title ifNil: [''].
+	^ self activeCard title.
diff --git a/Squello-Core.package/SPBBoard.class/instance/assigneeSelected..st b/Squello-Core.package/SPBBoard.class/instance/assigneeSelected..st
@@ -1,7 +1,7 @@
 accessing
-assigneeSelected: anObject
+assigneeSelected: anSPBAssignee
 
-	(anObject isKindOf: SPBAssignee) 
+	(anSPBAssignee isKindOf: SPBAssignee) 
 		ifFalse: [^ self].
-	assigneeSelected := anObject.
+	assigneeSelected := anSPBAssignee.
 	self changed: #assigneeSelected.
diff --git a/Squello-Core.package/SPBBoard.class/instance/boardProvider..st b/Squello-Core.package/SPBBoard.class/instance/boardProvider..st
@@ -1,4 +1,4 @@
 accessing
-boardProvider: anObject
+boardProvider: anSPBGithubBoardProvider
 
-	boardProvider := anObject.
+	boardProvider := anSPBGithubBoardProvider.
diff --git a/Squello-Core.package/SPBBoard.class/instance/dropOnAssignees.at..st b/Squello-Core.package/SPBBoard.class/instance/dropOnAssignees.at..st
@@ -1,15 +1,10 @@
 drag and drop
 dropOnAssignees: anSPBAssignee at: index
 
-	| assignees |
-	assignees := self activeCard assignees.
 	(anSPBAssignee isKindOf: SPBAssignee)
 		ifFalse: [^ self inform: 'Can only drop assignees'].
-	(assignees
-		anySatisfy: [:each | each = anSPBAssignee])
-			ifTrue: [^ self].
-	self activeCard assignees add: anSPBAssignee.
-	self activeCard updateAssigneeCount.
-	self changed: #potentialAssigneesList.
-	self changed: #activeCardAssigneeList.
-	self boardProvider addAssignee: anSPBAssignee toCard: self activeCard.
+
+	self activeCard addAssignee: anSPBAssignee.
+	self 
+		changed: #potentialAssigneesList;
+		changed: #activeCardAssigneeList.
diff --git a/Squello-Core.package/SPBBoard.class/instance/dropOnLabels.at..st b/Squello-Core.package/SPBBoard.class/instance/dropOnLabels.at..st
@@ -1,15 +1,10 @@
 drag and drop
 dropOnLabels: anSPBLabel at: index
 
-	| labels |
-	labels := self activeCard labels.
 	(anSPBLabel isKindOf: SPBLabel)
 		ifFalse: [^ self inform: 'Can only drop labels'].
-	(labels
-		anySatisfy: [:each | each = anSPBLabel])
-			ifTrue: [^ self].
-	self activeCard labels add: anSPBLabel.
-	self activeCard updateLabelIcons.
-	self changed: #potentialLabelsList.
-	self changed: #activeCardLabelList.
-	self boardProvider addLabel: anSPBLabel toCard: self activeCard.
+
+	self activeCard addLabel: anSPBLabel.
+	self 
+		changed: #potentialLabelsList;
+		changed: #activeCardLabelList.
diff --git a/Squello-Core.package/SPBBoard.class/instance/dropOnPotentialAssignees.at..st b/Squello-Core.package/SPBBoard.class/instance/dropOnPotentialAssignees.at..st
@@ -3,9 +3,8 @@ dropOnPotentialAssignees: anSPBAssignee at: index
 
 	(anSPBAssignee isKindOf: SPBAssignee)
 		ifFalse: [^ self inform: 'Can only drop assignees'].
-	self activeCard assignees remove: anSPBAssignee
-		ifAbsent: [].
-	self activeCard updateAssigneeCount.
-	self changed: #potentialAssigneesList.
-	self changed: #activeCardAssigneeList.
-	self boardProvider deleteAssignee: anSPBAssignee fromCard: self activeCard.
+
+	self activeCard removeAssignee: anSPBAssignee.
+	self 
+		changed: #potentialAssigneesList;
+		changed: #activeCardAssigneeList.
diff --git a/Squello-Core.package/SPBBoard.class/instance/dropOnPotentialLabels.at..st b/Squello-Core.package/SPBBoard.class/instance/dropOnPotentialLabels.at..st
@@ -3,9 +3,8 @@ dropOnPotentialLabels: anSPBLabel at: index
 
 	(anSPBLabel isKindOf: SPBLabel)
 		ifFalse: [^ self inform: 'Can only drop labels'].
-	self activeCard labels remove: anSPBLabel
-		ifAbsent: [].
-	self activeCard updateLabelIcons.
-	self changed: #potentialLabelsList.
-	self changed: #activeCardLabelList.
-	self boardProvider deleteLabel: anSPBLabel fromCard: self activeCard.
+
+	self activeCard removeLabel: anSPBLabel.
+	self 
+		changed: #potentialLabelsList;
+		changed: #activeCardLabelList.
diff --git a/Squello-Core.package/SPBBoard.class/instance/labelSelected..st b/Squello-Core.package/SPBBoard.class/instance/labelSelected..st
@@ -1,7 +1,7 @@
 accessing
-labelSelected: anObject
+labelSelected: anSPBLabel
 
-	(anObject isKindOf: SPBLabel)
+	(anSPBLabel isKindOf: SPBLabel)
 		ifFalse: [^ self].
-	labelSelected := anObject.
+	labelSelected := anSPBLabel.
 	self changed: #labelSelected.
diff --git a/Squello-Core.package/SPBBoard.class/instance/potentialAssigneeSelected..st b/Squello-Core.package/SPBBoard.class/instance/potentialAssigneeSelected..st
@@ -1,7 +1,7 @@
 accessing
-potentialAssigneeSelected: anObject
+potentialAssigneeSelected: anSPBAssignee
 
-	(anObject isKindOf: SPBAssignee)
+	(anSPBAssignee isKindOf: SPBAssignee)
 		ifFalse: [^ self].
-	potentialAssigneeSelected := anObject.
+	potentialAssigneeSelected := anSPBAssignee.
 	self changed: #potentialAssigneeSelected.
diff --git a/Squello-Core.package/SPBBoard.class/instance/potentialAssigneesList.st b/Squello-Core.package/SPBBoard.class/instance/potentialAssigneesList.st
@@ -3,11 +3,11 @@ potentialAssigneesList
 
 	| potentialAssignees assignees |
 	potentialAssignees := self potentialAssignees deepCopy.
-	self activeCard
-		ifNil: [^ {}].
 	assignees := self activeCard assignees.
+	self activeCard isRealCard
+		ifFalse: [^ self potentialAssigneesListHeader].
 	potentialAssignees
-		ifNil: [^ {#('---unassigned---')}].
-	^ #('---unassigned---'), 
+		ifNil: [^ self potentialAssigneesListHeader].
+	^ self potentialAssigneesListHeader, 
 		potentialAssignees select: [:each | (assignees anySatisfy: [:elem | elem = each]) not].
 
diff --git a/Squello-Core.package/SPBBoard.class/instance/potentialAssigneesListHeader.st b/Squello-Core.package/SPBBoard.class/instance/potentialAssigneesListHeader.st
@@ -0,0 +1,4 @@
+update sidebar
+potentialAssigneesListHeader
+
+	^ #('---unassigned---').
diff --git a/Squello-Core.package/SPBBoard.class/instance/potentialLabelSelected..st b/Squello-Core.package/SPBBoard.class/instance/potentialLabelSelected..st
@@ -1,7 +1,7 @@
 accessing
-potentialLabelSelected: anObject
+potentialLabelSelected: anSPBLabel
 
-	(anObject isKindOf: SPBLabel)
+	(anSPBLabel isKindOf: SPBLabel)
 		ifFalse: [^ self].
-	potentialLabelSelected := anObject.
+	potentialLabelSelected := anSPBLabel.
 	self changed: #potentialLabelSelected.
diff --git a/Squello-Core.package/SPBBoard.class/instance/potentialLabelsList.st b/Squello-Core.package/SPBBoard.class/instance/potentialLabelsList.st
@@ -3,10 +3,10 @@ potentialLabelsList
 
 	| potentialLabels labels |
 	potentialLabels := self potentialLabels deepCopy.
-	self activeCard
-		ifNil: [^ {}].
 	labels := self activeCard labels.
+	self activeCard isRealCard 
+		ifFalse: [^ self potentialLabelsListHeader].
 	potentialLabels
-		ifNil: [^ {#('---not used labels---')}].
-	^ #('---not used labels---'), 
+		ifNil: [^ self potentialLabelsListHeader].
+	^ self potentialLabelsListHeader, 
 		potentialLabels select: [:each | (labels anySatisfy: [:elem | elem = each]) not].
diff --git a/Squello-Core.package/SPBBoard.class/instance/potentialLabelsListHeader.st b/Squello-Core.package/SPBBoard.class/instance/potentialLabelsListHeader.st
@@ -0,0 +1,4 @@
+update sidebar
+potentialLabelsListHeader
+
+	^ #('---not used labels---').