moosetechnology · LABSARI · Sep 19, 2023 · Sep 18, 2023 · Sep 18, 2023 · Sep 18, 2023
diff --git a/src/MooseIDE-ButterflyMap/MiButterflyMapBrowser.class.st b/src/MooseIDE-ButterflyMap/MiButterflyMapBrowser.class.st
@@ -25,10 +25,7 @@ Controls:
 "
 Class {
 	#name : #MiButterflyMapBrowser,
-	#superclass : #MiAbstractBrowser,
-	#instVars : [
-		'visualization'
-	],
+	#superclass : #MiAbstractVisualizationBrowser,
 	#category : #'MooseIDE-ButterflyMap-Browser'
 }
 
@@ -125,12 +122,6 @@ MiButterflyMapBrowser >> itemsFor: aClass [
 	^ self application itemsFor: aClass
 ]
 
-{ #category : #accessing }
-MiButterflyMapBrowser >> miSelectedItem [
-
-	^ specModel currentEntity
-]
-
 { #category : #running }
 MiButterflyMapBrowser >> run [
 

diff --git a/src/MooseIDE-ButterflyMap/MiButterflyMapVisualization.class.st b/src/MooseIDE-ButterflyMap/MiButterflyMapVisualization.class.st
@@ -3,24 +3,10 @@ Butterfly visualization.
 "
 Class {
 	#name : #MiButterflyMapVisualization,
-	#superclass : #MiAbstractVisualization,
-	#instVars : [
-		'builder'
-	],
+	#superclass : #MiAbstractHierarchicalVisualization,
 	#category : #'MooseIDE-ButterflyMap-Browser'
 }
 
-{ #category : #running }
-MiButterflyMapVisualization >> builder [
-
-	^ builder
-]
-
-{ #category : #highlighting }
-MiButterflyMapVisualization >> highlightShapes [
-
-]
-
 { #category : #running }
 MiButterflyMapVisualization >> model [
 

diff --git a/src/MooseIDE-CoUsageMap/MiCoUsageMapBrowser.class.st b/src/MooseIDE-CoUsageMap/MiCoUsageMapBrowser.class.st
@@ -25,18 +25,15 @@ Controls:
 "
 Class {
 	#name : #MiCoUsageMapBrowser,
-	#superclass : #MiAbstractBrowser,
-	#instVars : [
-		'mapVisualization'
-	],
+	#superclass : #MiAbstractVisualizationBrowser,
 	#category : #'MooseIDE-CoUsageMap-Browser'
 }
 
 { #category : #layout }
 MiCoUsageMapBrowser class >> defaultLayout [
 
 	^ SpBoxLayout newLeftToRight
-		  add: #mapVisualization
+		  add: #visualization
 		  yourself
 ]
 
@@ -86,8 +83,8 @@ MiCoUsageMapBrowser class >> windowSize [
 { #category : #'window control' }
 MiCoUsageMapBrowser >> browserClosed [
 	super browserClosed.
-	application unregisterConsumer: mapVisualization.
-	application unregisterProducer: mapVisualization.
+	application unregisterConsumer: visualization.
+	application unregisterProducer: visualization.
 	"settings mapVisualization: nil.
 	mapVisualization settings: nil."
 
@@ -112,11 +109,6 @@ MiCoUsageMapBrowser >> connectPresenters [
 	mapVisualization settings: settings."
 ]
 
-{ #category : #accessing }
-MiCoUsageMapBrowser >> defaultSettings [
-	^ MiCoUsageMapInstanceSettingsPresenter new
-]
-
 { #category : #actions }
 MiCoUsageMapBrowser >> followEntity: anEntity [
 	self model followEntity: anEntity
@@ -129,26 +121,21 @@ MiCoUsageMapBrowser >> hasSettings [
 
 { #category : #initialization }
 MiCoUsageMapBrowser >> initializePresenters [
-	mapVisualization := self instantiate: MiCoUsageMapVisualization.
-	mapVisualization specModel: specModel.
+	visualization := self instantiate: MiCoUsageMapVisualization.
+	visualization specModel: specModel.
 
 	"self flag: 'this should be in MiCoUsageMapModel'.
 	settings := self instantiate: MiCoUsageMapInstanceSettingsPresenter."
 
 	self flag: 'this should be in MiCoUsageMapVisualization'.
-	application registerConsumer: mapVisualization for: FamixTag.
-	application registerConsumer: mapVisualization for: FamixTagAssociation.
-	application registerProducer: mapVisualization for: FamixTagAssociation.
+	application registerConsumer: visualization for: FamixTag.
+	application registerConsumer: visualization for: FamixTagAssociation.
+	application registerProducer: visualization for: FamixTagAssociation.
 ]
 
 { #category : #accessing }
 MiCoUsageMapBrowser >> mapVisualization [
-	^ mapVisualization
-]
-
-{ #category : #accessing }
-MiCoUsageMapBrowser >> miSelectedItem [
-	^ specModel miSelectedItem
+	^ visualization
 ]
 
 { #category : #dependencies }
@@ -163,11 +150,11 @@ MiCoUsageMapBrowser >> settings [
 
 { #category : #updating }
 MiCoUsageMapBrowser >> update [
-	mapVisualization run
+	visualization run
 ]
 
 { #category : #public }
 MiCoUsageMapBrowser >> updateBoxColor: aMiCoBox fromTags: tags [
 
-	mapVisualization updateBoxColor: aMiCoBox fromTags: tags
+	visualization updateBoxColor: aMiCoBox fromTags: tags
 ]
diff --git a/src/MooseIDE-CoUsageMap/MiCoUsageMapVisualization.class.st b/src/MooseIDE-CoUsageMap/MiCoUsageMapVisualization.class.st
@@ -36,15 +36,9 @@ MiCoUsageMapVisualization >> consumeTagAssociation: aFamixTagAssociation [
 	mapBuilder updateShapeColors
 ]
 
-{ #category : #highlighting }
-MiCoUsageMapVisualization >> highlightShapes [
-	^ #()
-]
-
 { #category : #initialization }
 MiCoUsageMapVisualization >> initialize [
 	super initialize.
-	self script: [ :canvas | canvas ].
 
 	mapBuilder := MiCoUsageMapBuilder new.
 	mapBuilder visualization: self.
@@ -65,6 +59,15 @@ MiCoUsageMapVisualization >> mapBuilder [
 	^mapBuilder 
 ]
 
+{ #category : #'as yet unclassified' }
+MiCoUsageMapVisualization >> modelForShape: aShape [
+
+	| containerBox |
+	containerBox := aShape model.
+
+	^ containerBox mooseEntity
+]
+
 { #category : #actions }
 MiCoUsageMapVisualization >> openSettings [
 	"called from the visualization's globalMenu"

diff --git a/src/MooseIDE-Core/MiAbstractBrowser.class.st b/src/MooseIDE-Core/MiAbstractBrowser.class.st
@@ -344,7 +344,7 @@ MiAbstractBrowser >> canFollowEntity: anObject [
 	self subclassResponsibility
 ]
 
-{ #category : #testing }
+{ #category : #highlighting }
 MiAbstractBrowser >> canHighlight [
 
 	"Override to retrun true if you want to give your browser a highlight behavior. 
@@ -415,7 +415,7 @@ MiAbstractBrowser >> hasSettings [
 	^false
 ]
 
-{ #category : #actions }
+{ #category : #highlighting }
 MiAbstractBrowser >> highlightEntity: anEntity [
 
 	"Override to add behavior on highlight. 

diff --git a/src/MooseIDE-Core/MiAbstractVisualizationBrowser.class.st b/src/MooseIDE-Core/MiAbstractVisualizationBrowser.class.st
@@ -0,0 +1,28 @@
+Class {
+	#name : #MiAbstractVisualizationBrowser,
+	#superclass : #MiAbstractBrowser,
+	#instVars : [
+		'visualization'
+	],
+	#category : #'MooseIDE-Core-Browser'
+}
+
+{ #category : #actions }
+MiAbstractVisualizationBrowser >> canHighlight [
+
+	^ true
+]
+
+{ #category : #highlighting }
+MiAbstractVisualizationBrowser >> highlightEntity: entities [
+
+	visualization highlightEntities: entities
+]
+
+{ #category : #accessing }
+MiAbstractVisualizationBrowser >> miSelectedItem [
+
+	^ visualization miSelectedItem ifEmpty: [
+		  specModel ifNil: [ ^ #(  ) ].
+		  specModel entities mooseInterestingEntity ]
+]
diff --git a/src/MooseIDE-Dependency/MiArchitecturalMapBrowser.class.st b/src/MooseIDE-Dependency/MiArchitecturalMapBrowser.class.st
@@ -22,10 +22,7 @@ Controls:
 "
 Class {
 	#name : #MiArchitecturalMapBrowser,
-	#superclass : #MiAbstractBrowser,
-	#instVars : [
-		'visualization'
-	],
+	#superclass : #MiAbstractVisualizationBrowser,
 	#category : #'MooseIDE-Dependency-ArchitecturalMap'
 }
 
@@ -154,16 +151,6 @@ MiArchitecturalMapBrowser >> initializePresenters [
 	self initializeLayout
 ]
 
-{ #category : #accessing }
-MiArchitecturalMapBrowser >> miSelectedItem [
-
-	^visualization canvas selectedShapes
-		ifEmpty: [ specModel entities mooseInterestingEntity ]
-		ifNotEmpty: [ :selectedShapes |
-			(selectedShapes collect: [:shape | shape model rawModel])
-				asMooseGroup ]
-]
-
 { #category : #actions }
 MiArchitecturalMapBrowser >> runVisualization [
 

diff --git a/src/MooseIDE-Dependency/MiArchitecturalMapVisualization.class.st b/src/MooseIDE-Dependency/MiArchitecturalMapVisualization.class.st
@@ -6,25 +6,10 @@ Handle interactions.
 "
 Class {
 	#name : #MiArchitecturalMapVisualization,
-	#superclass : #MiAbstractVisualization,
-	#instVars : [
-		'builder'
-	],
+	#superclass : #MiAbstractHierarchicalVisualization,
 	#category : #'MooseIDE-Dependency-ArchitecturalMap'
 }
 
-{ #category : #accessing }
-MiArchitecturalMapVisualization >> builder [
-
-	^ builder
-]
-
-{ #category : #highlighting }
-MiArchitecturalMapVisualization >> highlightShapes [
-
-
-]
-
 { #category : #running }
 MiArchitecturalMapVisualization >> run [
 

diff --git a/src/MooseIDE-Dependency/MiDMBrowser.class.st b/src/MooseIDE-Dependency/MiDMBrowser.class.st
@@ -22,10 +22,7 @@ Controls:
 "
 Class {
 	#name : #MiDMBrowser,
-	#superclass : #MiAbstractBrowser,
-	#instVars : [
-		'visualization'
-	],
+	#superclass : #MiAbstractVisualizationBrowser,
 	#category : #'MooseIDE-Dependency-DistributionMap'
 }
 
@@ -146,12 +143,6 @@ MiDMBrowser >> initializePresenters [
 	self initializeLayout
 ]
 
-{ #category : #accessing }
-MiDMBrowser >> miSelectedItem [
-
-	^ specModel entities mooseInterestingEntity
-]
-
 { #category : #actions }
 MiDMBrowser >> runVisualization [
 

diff --git a/src/MooseIDE-Dependency/MiDMVisualization.class.st b/src/MooseIDE-Dependency/MiDMVisualization.class.st
@@ -5,18 +5,10 @@ I am a visualization, using a builder to draw a distribution map [1] on my canva
 "
 Class {
 	#name : #MiDMVisualization,
-	#superclass : #MiAbstractVisualization,
-	#instVars : [
-		'builder'
-	],
+	#superclass : #MiAbstractHierarchicalVisualization,
 	#category : #'MooseIDE-Dependency-DistributionMap'
 }
 
-{ #category : #highlighting }
-MiDMVisualization >> highlightShapes [
-
-]
-
 { #category : #running }
 MiDMVisualization >> run [
 

diff --git a/src/MooseIDE-Dependency/MiDependencyBrowser.class.st b/src/MooseIDE-Dependency/MiDependencyBrowser.class.st
@@ -25,17 +25,17 @@ Controls:
 "
 Class {
 	#name : #MiDependencyBrowser,
-	#superclass : #MiAbstractDependencyBrowser,
+	#superclass : #MiAbstractVisualizationBrowser,
 	#instVars : [
-		'diagram'
+		'entities'
 	],
 	#category : #'MooseIDE-Dependency-Dependency'
 }
 
 { #category : #layout }
 MiDependencyBrowser class >> defaultLayout [
 	^ super defaultLayout
-		add: #diagram;
+		add: #visualization;
 		yourself
 ]
 
@@ -61,7 +61,7 @@ MiDependencyBrowser class >> menuItem [
 { #category : #'world menu' }
 MiDependencyBrowser class >> menuParent [
 
-	^ self dependencyMenuRoot
+	^ #MooseIDEDependencyBrowsers
 ]
 
 { #category : #'world menu' }
@@ -105,26 +105,28 @@ MiDependencyBrowser >> canTagEntities [
 { #category : #actions }
 MiDependencyBrowser >> followEntity: anEntity [
 
-	diagram
-		entities: (anEntity asMooseGroup select: [ :a | 
-					 a usesFamixTrait: TEntityMetaLevelDependency ]);
+	entities := anEntity asMooseGroup select: [ :a |
+		            a usesFamixTrait: TEntityMetaLevelDependency ].
+	visualization
+		entities: entities;
 		run
 ]
 
-{ #category : #actions }
-MiDependencyBrowser >> highlightEntity: anEntity [
+{ #category : #accessing }
+MiDependencyBrowser >> initialize [
 
-	diagram highlightEntities: anEntity asCollection
+	super initialize.
+	entities := MooseGroup new
 ]
 
 { #category : #initialization }
 MiDependencyBrowser >> initializePresenters [
 
-	diagram := self instantiate: MiDependencyVisualization
+	visualization := self instantiate: MiDependencyVisualization
 ]
 
 { #category : #accessing }
 MiDependencyBrowser >> miSelectedItem [
 
-	^ diagram selected ifNil: [ diagram entities ]
+	^ entities
 ]