Merge branch 'feature-interactiveSearch' into dev (#41)

hpi-swa-teaching · Jun 21, 2021 · 405c9e3 · 405c9e3
2 parents 67e9747 + f4fddb4
commit 405c9e3
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 8 deletions.
diff --git a/packages/MorphicAPIExplorer-Core.package/MEXMethod.class/instance/category..st b/packages/MorphicAPIExplorer-Core.package/MEXMethod.class/instance/category..st
@@ -0,0 +1,4 @@
+accessing
+category: anObject
+
+	category := anObject
diff --git a/packages/MorphicAPIExplorer-Core.package/MEXMethod.class/instance/category.st b/packages/MorphicAPIExplorer-Core.package/MEXMethod.class/instance/category.st
@@ -0,0 +1,4 @@
+accessing
+category
+
+	^ category
diff --git a/packages/MorphicAPIExplorer-Core.package/MEXMethod.class/instance/initialize.st b/packages/MorphicAPIExplorer-Core.package/MEXMethod.class/instance/initialize.st
@@ -9,4 +9,5 @@ initialize
 		parameters: OrderedCollection new;
 		dependencies: OrderedCollection new;
 		isSelected: false;
-		isActiveDependee: false
+		isActiveDependee: false;
+		category: MEXCategory new
diff --git a/packages/MorphicAPIExplorer-Core.package/MEXMethod.class/methodProperties.json b/packages/MorphicAPIExplorer-Core.package/MEXMethod.class/methodProperties.json
@@ -16,6 +16,8 @@
 		"initialize" : "PM 5/19/2021 18:22",
 		"isActiveDependee" : "SC 6/2/2021 21:35",
 		"isActiveDependee:" : "SC 6/2/2021 21:34",
+		"category" : "PC 6/10/2021 11:39",
+		"category:" : "PC 6/10/2021 11:39",
 		"isSelected" : "FFN 5/20/2019 16:09",
 		"isSelected:" : "FFN 6/19/2019 16:22",
 		"name" : "FFN 6/5/2019 22:53",

diff --git a/packages/MorphicAPIExplorer-Core.package/MEXMethod.class/properties.json b/packages/MorphicAPIExplorer-Core.package/MEXMethod.class/properties.json
@@ -11,7 +11,8 @@
 		"subMethods",
 		"parameters",
 		"dependencies",
-		"isActiveDependee" ],
+		"isActiveDependee",
+		"category" ],
 	"name" : "MEXMethod",
 	"pools" : [
 		 ],

diff --git a/...rer-Core.package/MEXPluggableMultiSelectionTreeMorph.class/instance/highlightSelection.st b/...rer-Core.package/MEXPluggableMultiSelectionTreeMorph.class/instance/highlightSelection.st
@@ -1,4 +1,5 @@
 drawing
 highlightSelection
 
-	self selectedMorphs do: [:aSelectedMorph | aSelectedMorph highlight]
+	self selectedMorphs do: [:aSelectedMorph | aSelectedMorph highlight]
+
diff --git a/packages/MorphicAPIExplorer-Core.package/MEXToolOverView.class/instance/buildSearchList..st b/packages/MorphicAPIExplorer-Core.package/MEXToolOverView.class/instance/buildSearchList..st
@@ -7,6 +7,7 @@ buildSearchList: aBuilder
 		model: self;
 		roots: #categories;
 		nodeClass: MEXListItemWrapper;
+		setSelected: #changeToCategoryOf:;
 		label: #name;
 		frame: (LayoutFrame new
 			leftFraction: 0;

diff --git a/...ges/MorphicAPIExplorer-Core.package/MEXToolOverView.class/instance/changeToCategoryOf..st b/...ges/MorphicAPIExplorer-Core.package/MEXToolOverView.class/instance/changeToCategoryOf..st
@@ -0,0 +1,5 @@
+accessing
+changeToCategoryOf: aSearchItem
+
+	(aSearchItem isKindOf: MEXCategory) ifTrue: [self changeToExplorationViewFor: aSearchItem].
+	(aSearchItem isKindOf: MEXMethod) ifTrue: [self changeToExplorationViewFor: aSearchItem category]
diff --git a/packages/MorphicAPIExplorer-Core.package/MEXToolOverView.class/instance/initialize.st b/packages/MorphicAPIExplorer-Core.package/MEXToolOverView.class/instance/initialize.st
@@ -3,7 +3,10 @@ initialize
 
 	super initialize.
 	self categories: self class categories.
+	self categories do: [:aCategory |  
+  		(aCategory methodList 
+		gather: [:aMethod | {aMethod} , aMethod subMethods])
+		do: [:method | method category: aCategory]].
 	self defaultMorphs: Dictionary new.
 	self standardMorphs do: 
-		[:each | defaultMorphs add: each -> OrderedCollection new]
-
+		[:aMorph | defaultMorphs add: aMorph -> OrderedCollection new]
diff --git a/packages/MorphicAPIExplorer-Core.package/MEXToolOverView.class/methodProperties.json b/packages/MorphicAPIExplorer-Core.package/MEXToolOverView.class/methodProperties.json
@@ -17,13 +17,14 @@
 	"instance" : {
 		"buildChildrenWith:" : "TB 6/1/2021 17:33",
 		"buildSearchButton:" : "TB 6/1/2021 17:36",
-		"buildSearchList:" : "TB 6/1/2021 18:07",
+		"buildSearchList:" : "TB 6/21/2021 18:27",
 		"categories" : "jb 5/1/2019 11:32",
 		"categories:" : "jb 5/1/2019 11:33",
-		"changeToExplorationViewFor:" : "KT 6/7/2021 10:48",
+		"changeToCategoryOf:" : "TB 6/21/2021 18:27",
+		"changeToExplorationViewFor:" : "KT 6/10/2021 11:38",
 		"defaultMorphs" : "SH 5/17/2021 11:30",
 		"defaultMorphs:" : "SH 5/27/2021 10:14",
-		"initialize" : "KT 6/7/2021 10:48",
+		"initialize" : "TB 6/21/2021 18:29",
 		"specFrameAt:for:" : "jb 7/24/2019 14:24",
 		"specFrameFor:in:in:" : "TB 6/1/2021 17:07",
 		"specSizePerRowFor:" : "TB 6/1/2021 17:06",

diff --git a/...plorer-Tests.package/MEXOverViewTests.class/instance/testAssigningCategoryToSubMethods.st b/...plorer-Tests.package/MEXOverViewTests.class/instance/testAssigningCategoryToSubMethods.st
@@ -0,0 +1,6 @@
+tests
+testAssigningCategoryToSubMethods
+
+    overView categories do: [:each | 
+        each methodList do: [:method | self assert: (method category notEmpty).
+            method subMethods do: [:sub | self assert: (sub category notEmpty)]]]
diff --git a/packages/MorphicAPIExplorer-Tests.package/MEXOverViewTests.class/methodProperties.json b/packages/MorphicAPIExplorer-Tests.package/MEXOverViewTests.class/methodProperties.json
@@ -5,6 +5,7 @@
 		"getEmptyCollectionOfOverViewChildren" : "lk 7/24/2019 16:28",
 		"setEmptyOverViewCategories" : "lk 7/24/2019 16:27",
 		"setUp" : "lk 7/24/2019 16:51",
+		"testAssigningCategoryToSubMethods" : "PC 6/10/2021 12:28",
 		"testBuildChildrenWithReturnsEmptyCollectionForZeroCategories" : "KT 6/3/2021 18:37",
 		"testSpecFrameAtForReturnsFullSizedLayoutFrameForOneCategoryAndOneRow" : "KT 6/3/2021 19:34",
 		"testSpecSizePerRowForReturnsFullSizeForOneCategoryAndOneRow" : "KT 6/3/2021 19:32",