Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix internal dependencies #940

Merged
merged 13 commits into from
Oct 26, 2023
Merged

Fix internal dependencies #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
40a09bf
Move ColorPicker to Colors.
ClotildeToullec Oct 25, 2023
55a2aa9
Color picker presenters do not need to be MiPresenters
ClotildeToullec Oct 25, 2023
b9f5c6d
First step at moving Inspection to MooseIDE-NewTools
ClotildeToullec Oct 25, 2023
0ff2f8c
FamixQueries in baseline
ClotildeToullec Oct 26, 2023
ed19442
FamixQueris in MooseCriticsBrowser
ClotildeToullec Oct 26, 2023
d869f92
Fix error in renaming
ClotildeToullec Oct 26, 2023
059be48
Is it more clear now?
ClotildeToullec Oct 26, 2023
1c72634
Remove duplications as it seems to not be the problem.
ClotildeToullec Oct 26, 2023
16d739e
halt
ClotildeToullec Oct 26, 2023
d827f8d
Other halt
ClotildeToullec Oct 26, 2023
6b09eb2
halt.
ClotildeToullec Oct 26, 2023
8798a23
Remove dependencies
ClotildeToullec Oct 26, 2023
5de78f9
Remove halt
ClotildeToullec Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .smalltalk.ston
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
SmalltalkCISpec {
#preLoading : '.dependencies.st',
#loading : [
SCIMetacelloLoadSpec {
#baseline : 'MooseIDE',
Expand Down
158 changes: 68 additions & 90 deletions src/BaselineOfMooseIDE/BaselineOfMooseIDE.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Class {
BaselineOfMooseIDE >> baseline: spec [

<baseline>

spec for: #common do: [ "Dependencies"
self tylerDurden: spec.
self labelContractor: spec.
Expand Down Expand Up @@ -41,19 +42,14 @@ BaselineOfMooseIDE >> customProjectAttributes [
BaselineOfMooseIDE >> defineMooseCriticsPackages: spec [

spec
package: 'MooseIDE-CriticBrowser' with: [
spec requires: #( 'MooseIDE-Core' 'Famix-CriticBrowser-Entities'
'STONCustomizer' ) ];
package: 'MooseIDE-CriticBrowser-Tests'
with: [
spec requires: #( 'MooseIDE-Tests' 'MooseIDE-CriticBrowser' ) ];
package: 'Famix-CriticBrowser-Entities'
with: [ spec requires: 'Famix-CriticBrowser-ManualEntities' ];
package: 'Famix-CriticBrowser-ManualEntities'
with: [ spec requires: #( 'FamixQueries' ) ];
package: 'MooseIDE-CriticBrowser' with: [ spec requires: #( 'MooseIDE-Core' 'Famix-CriticBrowser-Entities' 'STONCustomizer' ) ];
package: 'MooseIDE-CriticBrowser-Tests' with: [ spec requires: #( 'MooseIDE-Tests' 'MooseIDE-CriticBrowser' ) ];

package: 'Famix-CriticBrowser-ManualEntities';
package: 'Famix-CriticBrowser-Entities' with: [ spec requires: #('Famix-CriticBrowser-ManualEntities') ];
package: 'Famix-CriticBrowser-Generator';
package: 'Famix-CriticBrowser-Tests'
with: [ spec requires: 'Famix-CriticBrowser-Entities' ].

package: 'Famix-CriticBrowser-Tests' with: [ spec requires: 'Famix-CriticBrowser-Entities' ].

spec
group: 'CriticBrowser-Metamodel'
Expand All @@ -62,68 +58,55 @@ BaselineOfMooseIDE >> defineMooseCriticsPackages: spec [
'Famix-CriticBrowser-Generator' 'Famix-CriticBrowser-Tests' )
]

{ #category : #baselines }
BaselineOfMooseIDE >> defineMooseCriticsPackagesWithoutFamix: spec [

spec
package: 'Famix-CriticBrowser-ManualEntities' with: [ spec requires: #( 'FamixQueries' ) ];
package: 'Famix-CriticBrowser-Entities' with: [ spec requires: #( 'Famix') ];
package: 'Famix-CriticBrowser-Generator' with: [ spec requires: 'Famix' ]
]

{ #category : #baselines }
BaselineOfMooseIDE >> definePackages: spec [

spec
package: 'MooseIDE-Core'
with: [ spec requires: #( 'LabelContractor' ) ];
package: 'MooseIDE-Visualization'
with: [
spec requires: #( 'MooseIDE-Core' 'HierarchicalVisualizations' ) ];
package: 'MooseIDE-Meta'
with: [ spec requires: #( 'MooseIDE-Core' ) ];
package: 'MooseIDE-Tests' with: [
spec requires:
#( 'MooseIDE-Core' 'MooseIDE-Dependency' 'MooseIDE-Visualization' ) ];
package: 'MooseIDE-Dependency' with: [
spec requires:
#( 'MooseIDE-Core' 'MooseIDE-Visualization'
'Roassal3' 'AIHierarchicalClustering' ) ];
package: 'MooseIDE-Famix'
with: [
spec requires: #( 'MooseIDE-Core' 'MooseIDE-Visualization' ) ];
package: 'MooseIDE-Tagging'
with: [
spec requires: #( 'MooseIDE-Core' 'MooseIDE-Visualization' ) ];
package: 'MooseIDE-Tagging-Tests'
with: [ spec requires: #( 'MooseIDE-Tagging' 'MooseIDE-Tests' ) ];
package: 'MooseIDE-QueriesBrowser'
with: [ spec requires: #( 'MooseIDE-Core' 'FamixQueries' ) ];
package: 'MooseIDE-QueriesBrowser-Tests'
with: [
spec requires: #( 'MooseIDE-QueriesBrowser'
'MooseIDE-Tests' ) ];
package: 'MooseIDE-NewTools'
with: [ spec requires: #( 'MooseIDE-Meta' 'MooseIDE-Core' ) ];
package: 'MooseIDE-NewTools-Tests'
with: [ spec requires: #( 'MooseIDE-NewTools' 'MooseIDE-Tests' ) ];
package: 'MooseIDE-Export'
with: [ spec requires: #( 'MooseIDE-Core' 'Microdown' ) ];
package: 'MooseIDE-ColorPalette';
package: 'MooseIDE-ColorPalette-Tests'
with: [ spec requires: #( 'MooseIDE-ColorPalette' ) ];
package: 'MooseIDE-Durden'
with: [ spec requires: #( 'MooseIDE-Core' 'Durden' ) ];
package: 'MooseIDE-CoUsageMap'
with: [
spec requires: #( 'MooseIDE-Core' 'MooseIDE-Visualization' ) ];
package: 'MooseIDE-CoUsageMap-Tests'
with: [ spec requires: #( 'MooseIDE-CoUsageMap'
'MooseIDE-Tests' ) ];
package: 'MooseIDE-Duplication'
with: [ spec requires: #( 'MooseIDE-Core' ) ];
package: 'MooseIDE-ButterflyMap'
with: [
spec requires: #( 'MooseIDE-Core' 'MooseIDE-Visualization' ) ];
package: 'MooseIDE-Preview'
with: [ spec requires: #( 'MooseIDE-Core' ) ];
package: 'MooseIDE-LayerVisualization' with: [
spec requires:
#( 'MooseIDE-Core' 'MooseIDE-Visualization'
'MooseIDE-Preview' ) ];
package: 'MooseIDE-ButterflyMap-Tests'
with: [ spec requires: #( 'MooseIDE-ButterflyMap' ) ].
package: 'MooseIDE-Colors' with: [ spec requires: #( 'Roassal3' ) ];
package: 'MooseIDE-Colors-Tests' with: [ spec requires: #( 'MooseIDE-Colors' ) ];

package: 'MooseIDE-Core' with: [ spec requires: #( 'MooseIDE-Colors' 'LabelContractor' 'Roassal3Exporters' ) ];

package: 'MooseIDE-Visualization' with: [ spec requires: #( 'MooseIDE-Core' 'HierarchicalVisualizations' ) ];

package: 'MooseIDE-Meta' with: [ spec requires: #( 'MooseIDE-Core' ) ];

package: 'MooseIDE-Dependency' with: [ spec requires: #( 'MooseIDE-Core' 'MooseIDE-Visualization' 'Roassal3' 'AIHierarchicalClustering' ) ];

package: 'MooseIDE-Tests' with: [ spec requires: #( 'MooseIDE-Core' 'MooseIDE-Dependency' 'MooseIDE-Visualization' ) ];

package: 'MooseIDE-Famix' with: [ spec requires: #( 'MooseIDE-Core' 'MooseIDE-Visualization' ) ];

package: 'MooseIDE-QueriesBrowser' with: [ spec requires: #( 'MooseIDE-Core' ) ];
package: 'MooseIDE-QueriesBrowser-Tests' with: [ spec requires: #( 'MooseIDE-QueriesBrowser' 'MooseIDE-Tests' ) ];

package: 'MooseIDE-Tagging' with: [ spec requires: #( 'MooseIDE-Core' 'MooseIDE-Visualization' ) ];
package: 'MooseIDE-Tagging-Tests' with: [ spec requires: #( 'MooseIDE-Tagging' 'MooseIDE-Tests' ) ];

package: 'MooseIDE-CoUsageMap' with: [ spec requires: #( 'MooseIDE-Core' 'MooseIDE-Visualization' ) ];
package: 'MooseIDE-CoUsageMap-Tests' with: [ spec requires: #( 'MooseIDE-CoUsageMap' 'MooseIDE-Tests' ) ];

package: 'MooseIDE-NewTools' with: [ spec requires: #( 'MooseIDE-Meta' 'MooseIDE-Core' ) ];
package: 'MooseIDE-NewTools-Tests' with: [ spec requires: #( 'MooseIDE-NewTools' 'MooseIDE-Tests' ) ];

package: 'MooseIDE-Export' with: [ spec requires: #( 'MooseIDE-Core' 'Microdown' ) ];
package: 'MooseIDE-Durden' with: [ spec requires: #( 'MooseIDE-Core' 'Durden' ) ];

package: 'MooseIDE-Duplication' with: [ spec requires: #( 'MooseIDE-Core' ) ];

package: 'MooseIDE-ButterflyMap' with: [ spec requires: #( 'MooseIDE-Core' 'MooseIDE-Visualization' ) ];
package: 'MooseIDE-ButterflyMap-Tests' with: [ spec requires: #( 'MooseIDE-ButterflyMap' ) ];
package: 'MooseIDE-Preview' with: [ spec requires: #( 'MooseIDE-Core' ) ];
package: 'MooseIDE-LayerVisualization' with: [ spec requires: #( 'MooseIDE-Core' 'MooseIDE-Visualization' 'MooseIDE-Preview' ) ].

self defineMooseCriticsPackages: spec
]
Expand All @@ -137,26 +120,21 @@ BaselineOfMooseIDE >> definePackagesWhithoutFamix: spec [
self famixQueries: spec.

spec
package: 'MooseIDE-Core'
with: [ spec requires: #( 'Famix' 'Roassal3Exporters' ) ];
package: 'MooseIDE-Meta'
with: [ spec requires: #( 'MooseIDE-Core' ) ];
package: 'MooseIDE-QueriesBrowser'
with: [ spec requires: #( 'FamixQueries' ) ];
package: 'MooseIDE-Tagging'
with: [ spec requires: #( 'FamixTagging' ) ];
package: 'MooseIDE-CoUsageMap'
with: [ spec requires: #( 'FamixTagging' ) ];
package: 'MooseIDE-Dependency'
with: [ spec requires: #( 'FamixTagging' ) ];
package: 'MooseIDE-NewTools'
with: [ spec requires: #( 'FamixQueries' ) ];
package: 'MooseIDE-Duplication'
with: [ spec requires: #( 'FamixReplication' ) ];
package: 'Famix-CriticBrowser-Entities'
with: [ spec requires: 'Famix' ];
package: 'Famix-CriticBrowser-Generator'
with: [ spec requires: 'Famix' ]
package: 'MooseIDE-Core' with: [ spec requires: #( 'Famix' ) ];

package: 'MooseIDE-Dependency' with: [ spec requires: #( 'FamixTagging' ) ];

package: 'MooseIDE-QueriesBrowser' with: [ spec requires: #( 'FamixQueries' ) ];

package: 'MooseIDE-Tagging' with: [ spec requires: #( 'FamixTagging' ) ];

package: 'MooseIDE-CoUsageMap' with: [ spec requires: #( 'FamixTagging' ) ];

package: 'MooseIDE-NewTools' with: [ spec requires: #( 'FamixQueries' ) ];

package: 'MooseIDE-Duplication' with: [ spec requires: #( 'FamixReplication' ) ].

self defineMooseCriticsPackagesWithoutFamix: spec
]

{ #category : #dependencies }
Expand Down
1 change: 0 additions & 1 deletion src/MooseIDE-ColorPalette-Tests/package.st
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/MooseIDE-ColorPalette/package.st
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...ClpDivergingPaletteGeneratorTest.class.st → ...ClpDivergingPaletteGeneratorTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ Class {
#instVars : [
'diverging'
],
#category : #'MooseIDE-ColorPalette-Tests-GeneratePalettes-Test'
#category : #'MooseIDE-Colors-Tests-PaletteGenerators-Tests'
}

{ #category : #accessing }
ClpDivergingPaletteGeneratorTest >> classToTest [

^ ClpDivergingPaletteGenerator
^ MiDivergingPaletteGenerator
]

{ #category : #running }
Expand Down
4 changes: 2 additions & 2 deletions ...dQualitativePaletteGeneratorTest.class.st → ...dQualitativePaletteGeneratorTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Class {
#name : #ClpFixedQualitativePaletteGeneratorTest,
#superclass : #ClpPaletteGeneratorTest,
#category : #'MooseIDE-ColorPalette-Tests-GeneratePalettes-Test'
#category : #'MooseIDE-Colors-Tests-PaletteGenerators-Tests'
}

{ #category : #accessing }
ClpFixedQualitativePaletteGeneratorTest >> classToTest [

^ ClpFixedQualitativePaletteGenerator
^ MiFixedQualitativePaletteGenerator
]

{ #category : #tests }
Expand Down
2 changes: 1 addition & 1 deletion ...te-Tests/ClpPaletteGeneratorTest.class.st → ...rs-Tests/ClpPaletteGeneratorTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Class {
#instVars : [
'generator'
],
#category : #'MooseIDE-ColorPalette-Tests-GeneratePalettes-Test'
#category : #'MooseIDE-Colors-Tests-PaletteGenerators-Tests'
}

{ #category : #testing }
Expand Down
4 changes: 2 additions & 2 deletions ...pQualitativePaletteGeneratorTest.class.st → ...pQualitativePaletteGeneratorTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Class {
#name : #ClpQualitativePaletteGeneratorTest,
#superclass : #ClpPaletteGeneratorTest,
#category : #'MooseIDE-ColorPalette-Tests-GeneratePalettes-Test'
#category : #'MooseIDE-Colors-Tests-PaletteGenerators-Tests'
}

{ #category : #accessing }
ClpQualitativePaletteGeneratorTest >> classToTest [

^ ClpQualitativePaletteGenerator
^ MiQualitativePaletteGenerator
]
6 changes: 3 additions & 3 deletions ...lpSequentialPaletteGeneratorTest.class.st → ...lpSequentialPaletteGeneratorTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ Class {
#instVars : [
'sequentialPalette'
],
#category : #'MooseIDE-ColorPalette-Tests-GeneratePalettes-Test'
#category : #'MooseIDE-Colors-Tests-PaletteGenerators-Tests'
}

{ #category : #accessing }
ClpSequentialPaletteGeneratorTest >> classToTest [

^ ClpSequentialPaletteGenerator
^ MiSequentialPaletteGenerator
]

{ #category : #running }
ClpSequentialPaletteGeneratorTest >> setUp [
super setUp.

sequentialPalette := ClpSequentialPaletteGenerator new
sequentialPalette := MiSequentialPaletteGenerator new
]

{ #category : #tests }
Expand Down
12 changes: 6 additions & 6 deletions ...ColorPalette-Tests/ColorTest.extension.st → ...seIDE-Colors-Tests/ColorTest.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #ColorTest }

{ #category : #'*MooseIDE-ColorPalette-Tests' }
{ #category : #'*MooseIDE-Colors-Tests' }
ColorTest >> testHclToLab [

self "white"
Expand Down Expand Up @@ -54,7 +54,7 @@ ColorTest >> testHclToLab [
#b -> 112.02942991288029 negated } asDictionary
]

{ #category : #'*MooseIDE-ColorPalette-Tests' }
{ #category : #'*MooseIDE-Colors-Tests' }
ColorTest >> testHclToRgb [

self "white"
Expand Down Expand Up @@ -93,7 +93,7 @@ ColorTest >> testHclToRgb [
equals: (Color r: 0 g: 0 b: 1)
]

{ #category : #'*MooseIDE-ColorPalette-Tests' }
{ #category : #'*MooseIDE-Colors-Tests' }
ColorTest >> testLabToHcl [

self "white"
Expand Down Expand Up @@ -147,7 +147,7 @@ ColorTest >> testLabToHcl [
#luminance -> 29.567572863553245 } asDictionary
]

{ #category : #'*MooseIDE-ColorPalette-Tests' }
{ #category : #'*MooseIDE-Colors-Tests' }
ColorTest >> testLabToRgb [

self "white"
Expand Down Expand Up @@ -186,7 +186,7 @@ ColorTest >> testLabToRgb [
equals: (Color r:0 g:0 b:1)
]

{ #category : #'*MooseIDE-ColorPalette-Tests' }
{ #category : #'*MooseIDE-Colors-Tests' }
ColorTest >> testRgbToHcl [

self "white"
Expand Down Expand Up @@ -225,7 +225,7 @@ ColorTest >> testRgbToHcl [
#luminance -> 29.567572863553245 } asDictionary
]

{ #category : #'*MooseIDE-ColorPalette-Tests' }
{ #category : #'*MooseIDE-Colors-Tests' }
ColorTest >> testRgbToLab [

self assert: (Color r: 1 g: 1 b: 1) rgbToLab equals: {
Expand Down
18 changes: 9 additions & 9 deletions ...lette-Tests/GeneratedPaletteTest.class.st → ...ors-Tests/MiGeneratedPaletteTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Class {
#name : #GeneratedPaletteTest,
#superclass : #PaletteTest,
#category : #'MooseIDE-ColorPalette-Tests-Palette-Test'
#name : #MiGeneratedPaletteTest,
#superclass : #MiPaletteTest,
#category : #'MooseIDE-Colors-Tests-Palettes-Tests'
}

{ #category : #accessing }
GeneratedPaletteTest >> classToTest [
MiGeneratedPaletteTest >> classToTest [

^ GeneratedPalette
^ MiGeneratedPalette
]

{ #category : #tests }
GeneratedPaletteTest >> testCurrentColor [
MiGeneratedPaletteTest >> testCurrentColor [

| aChosenColor |
self assert: nonEmptyPalette currentColor equals: nonEmptyPalette first .
Expand All @@ -20,7 +20,7 @@ GeneratedPaletteTest >> testCurrentColor [
]

{ #category : #tests }
GeneratedPaletteTest >> testNextColor [
MiGeneratedPaletteTest >> testNextColor [

| aChosenColor |
self assert: nonEmptyPalette currentColor equals: nonEmptyPalette first .
Expand All @@ -36,7 +36,7 @@ GeneratedPaletteTest >> testNextColor [
]

{ #category : #tests }
GeneratedPaletteTest >> testPreviousColor [
MiGeneratedPaletteTest >> testPreviousColor [

| colorSelected |
self assert: nonEmptyPalette currentColor equals: self colors first .
Expand All @@ -48,7 +48,7 @@ GeneratedPaletteTest >> testPreviousColor [
]

{ #category : #tests }
GeneratedPaletteTest >> testRemoveColorAt [
MiGeneratedPaletteTest >> testRemoveColorAt [

| colorToRemove removedColor nonExistantKeyColor |
colorToRemove := self colors first.
Expand Down
Loading