Skip to content

Commit 7753372

Browse files
committed
fix + refactor dialogs; reintroduce overview pyramid morph
* use #containingWindow instead of preserving toolbuilder outputs * fix multiselection by adding observer updates required in newer Squeak versions * use accessors for more variables * UIManager default -> Project uiManager * dump descriptionCollection
1 parent 734db2d commit 7753372

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+245
-261
lines changed

packages/SwaLint-Core.package/SLDefaultDialog.class/instance/autoLint.st

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,9 @@ actions
22
autoLint
33

44
self runnable ifFalse: [^ self].
5-
SLTestAutoRunner on: classesSelected with: testsSelected calledBy: (self dependents first) reopens: self.
5+
SLTestAutoRunner
6+
on: self classesSelected
7+
with: self testsSelected
8+
calledBy: self containingWindow
9+
reopens: self.
610
self close.

packages/SwaLint-Core.package/SLDefaultDialog.class/instance/buildWith..st

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ buildWith: aBuilder
1212
self testsFrame -> [self buildTestListWith: aBuilder].
1313
}.
1414

15-
window := aBuilder build: windowSpec.
16-
^window
15+
^ aBuilder build: windowSpec
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
accessing
2+
categoriesSelected: aSet
3+
4+
categoriesSelected := aSet.
5+
self changed: #categoriesSelected; updateClasses.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
accessing
2+
categoriesSelected
3+
4+
^ categoriesSelected
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
accessing-categories
22
categoryAt: anIndex
33

4-
^ categoriesSelected includes: (self categories at: anIndex ifAbsent: [ ^ false ])
4+
^ self categoriesSelected includes:
5+
(self categories at: anIndex ifAbsent: [ ^ false ])
Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
accessing-categories
22
categoryAt: anInteger put: aBoolean
3+
34
| target |
45
target := self categories at: anInteger ifAbsent: [^ self].
5-
self selectByCategory
6-
ifTrue: [categoriesSelected := aBoolean
7-
ifTrue: [ categoriesSelected copyWith: target ]
8-
ifFalse: [ categoriesSelected copyWithout: target ]]
9-
ifFalse: [| categoryList package |
10-
package := self environment packageForCategory: target.
11-
categoryList := self getCategoriesFor: package.
12-
categoriesSelected := aBoolean
13-
ifTrue: [ categoriesSelected, categoryList ]
14-
ifFalse: [ categoriesSelected copyWithoutAll: categoryList ]].
15-
self changed: #categorySelected; updateClasses.
6+
self categoriesSelected:
7+
(self selectByCategory
8+
ifTrue: [aBoolean
9+
ifTrue: [ self categoriesSelected copyWith: target ]
10+
ifFalse: [ self categoriesSelected copyWithout: target ]]
11+
ifFalse: [| categoryList package |
12+
package := self environment packageForCategory: target.
13+
categoryList := self getCategoriesFor: package.
14+
aBoolean
15+
ifTrue: [ self categoriesSelected, categoryList ]
16+
ifFalse: [ self categoriesSelected copyWithoutAll: categoryList ]]).
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
accessing-classes
22
classAt: anInteger
33

4-
^ classesSelected includes: (classes at: anInteger ifAbsent: [ ^ false ])
4+
^ self classesSelected includes:
5+
(self classes at: anInteger ifAbsent: [ ^ false ])
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
accessing-classes
22
classAt: anInteger put: aBoolean
33

4-
classesSelected := classesSelected
5-
perform: (aBoolean ifTrue: [ #copyWith: ] ifFalse: [ #copyWithout: ])
6-
with: (classes at: anInteger ifAbsent: [ ^ self ]).
7-
self changed: #classSelected; changed: #runnable.
4+
| target |
5+
target := self classes at: anInteger ifAbsent: [ ^ self ].
6+
self classesSelected:
7+
(self classesSelected
8+
perform: (aBoolean ifTrue: [ #copyWith: ] ifFalse: [ #copyWithout: ])
9+
with: target).
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
accessing
2+
classesSelected
3+
4+
^ classesSelected
Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
accessing-categories
22
filterCategories
3+
34
| pattern |
4-
pattern := UIManager default
5+
pattern := Project uiManager
56
request: 'Pattern(s) to select categories:\ (separate patterns with '';'')' withCRs
67
initialAnswer: (categoryPattern ifNil: ['*']).
78
(pattern isNil or: [pattern isEmpty]) ifTrue:
89
[^self].
9-
categoriesSelected := ((categoryPattern := pattern) subStrings: ';')
10-
inject: Set new
11-
into: [:matches :subPattern|
12-
matches
13-
addAll: (self categories select: [ :each | subPattern match: each]);
14-
yourself].
15-
self changed: #categorySelected; update.
10+
self categoriesSelected:
11+
(((categoryPattern := pattern) subStrings: ';')
12+
inject: Set new
13+
into: [:matches :subPattern|
14+
matches
15+
addAll: (self categories select: [ :each | subPattern match: each]);
16+
yourself]).

0 commit comments

Comments
 (0)