@@ -188,7 +188,7 @@ MetacelloVersionSpec >> configPackagesSpecMethodOn: aStream indent: indent [
188
188
projectDo: [ :proj | member spec name ifNotNil: [ projectSpecs add: member ] ]
189
189
packageDo: [ :package | member spec name ifNotNil: [ packageSpecs add: member ] ]
190
190
groupDo: [ :group | member spec name ifNotNil: [ groupSpecs add: member ] ] ].
191
- projectSpecs isEmpty not ifTrue : [
191
+ projectSpecs ifNotEmpty : [
192
192
aStream
193
193
tab: indent;
194
194
nextPutAll: ' spec ' .
@@ -199,8 +199,8 @@ MetacelloVersionSpec >> configPackagesSpecMethodOn: aStream indent: indent [
199
199
1 to: projectSpecs size do: [ :index |
200
200
(projectSpecs at: index) configMethodCascadeOn: aStream last: index == projectSpecs size indent: indent + 1 .
201
201
index ~= projectSpecs size ifTrue: [ aStream tab: indent + 1 ] ] ].
202
- packageSpecs isEmpty not ifTrue : [
203
- projectSpecs isEmpty not ifTrue : [ aStream cr ].
202
+ packageSpecs ifNotEmpty : [
203
+ projectSpecs ifNotEmpty : [ aStream cr ].
204
204
aStream
205
205
tab: indent;
206
206
nextPutAll: ' spec ' .
@@ -211,8 +211,8 @@ MetacelloVersionSpec >> configPackagesSpecMethodOn: aStream indent: indent [
211
211
1 to: packageSpecs size do: [ :index |
212
212
(packageSpecs at: index) configMethodCascadeOn: aStream last: index == packageSpecs size indent: indent + 1 .
213
213
index ~= packageSpecs size ifTrue: [ aStream tab: indent + 1 ] ] ].
214
- groupSpecs isEmpty not ifTrue : [
215
- projectSpecs isEmpty not | packageSpecs isEmpty not ifTrue: [ aStream cr ].
214
+ groupSpecs ifNotEmpty : [
215
+ ( projectSpecs isNotEmpty or : [ packageSpecs isNotEmpty ]) ifTrue: [ aStream cr ].
216
216
aStream
217
217
tab: indent;
218
218
nextPutAll: ' spec ' .
@@ -231,23 +231,6 @@ MetacelloVersionSpec >> createVersion [
231
231
^ self versionClass fromSpec: self
232
232
]
233
233
234
- { #category : ' enumerating' }
235
- MetacelloVersionSpec >> currentlyLoadedClassesInVersion [
236
-
237
- | classes |
238
- classes := Set new .
239
- self
240
- projectDo: [ :ignored | ]
241
- packageDo: [ :packageSpec |
242
- ([ packageSpec workingCopy ]
243
- on: Error
244
- do: [ :ex | ex return: nil ]) ifNotNil: [ :workingCopy |
245
- workingCopy systemPackage ifNotNil: [ :package |
246
- classes addAll: package classes ] ] ]
247
- groupDo: [ :ignored | ].
248
- ^ classes
249
- ]
250
-
251
234
{ #category : ' loading' }
252
235
MetacelloVersionSpec >> defaultPackageNames [
253
236
" if there is a package named 'default' (a group) then it defines the default package names,
@@ -257,13 +240,6 @@ MetacelloVersionSpec >> defaultPackageNames [
257
240
^ #('default')
258
241
]
259
242
260
- { #category : ' toolbox support' }
261
- MetacelloVersionSpec >> deleteSpec: aSpec [
262
- " remove the spec from packages"
263
-
264
- self packages deleteSpec: aSpec
265
- ]
266
-
267
243
{ #category : ' accessing' }
268
244
MetacelloVersionSpec >> description [
269
245
@@ -366,14 +342,10 @@ MetacelloVersionSpec >> mergeSpec: anotherSpec [
366
342
| newSpec map anotherPackages anotherRepositories |
367
343
newSpec := super mergeSpec: anotherSpec.
368
344
map := anotherSpec mergeMap.
369
- (anotherPackages := map at: #packageList ) isEmpty not ifTrue: [
370
- newSpec packages: (self packages isEmpty
371
- ifTrue: [ anotherPackages ]
372
- ifFalse: [ self packages mergeSpec: anotherPackages ]) ].
373
- (anotherRepositories := map at: #repositories ) isEmpty not ifTrue: [
374
- newSpec repositories: (self repositories isEmpty
375
- ifTrue: [ anotherRepositories ]
376
- ifFalse: [ self repositories mergeSpec: anotherRepositories ]) ].
345
+ (anotherPackages := map at: #packageList ) ifNotEmpty: [
346
+ newSpec packages: (self packages ifEmpty: [ anotherPackages ] ifNotEmpty: [ self packages mergeSpec: anotherPackages ]) ].
347
+ (anotherRepositories := map at: #repositories ) ifNotEmpty: [
348
+ newSpec repositories: (self repositories ifEmpty: [ anotherRepositories ] ifNotEmpty: [ self repositories mergeSpec: anotherRepositories ]) ].
377
349
^ newSpec
378
350
]
379
351
@@ -478,11 +450,6 @@ MetacelloVersionSpec >> packageSpecsInLoadOrderForMap: packageMap [
478
450
^ pkgs
479
451
]
480
452
481
- { #category : ' querying' }
482
- MetacelloVersionSpec >> packageSpecsInLoadOrderWithEngine: anObject [
483
- ^ self packages packageSpecsInLoadOrderFor: self
484
- ]
485
-
486
453
{ #category : ' accessing' }
487
454
MetacelloVersionSpec >> packages [
488
455
" leave reference to packages for upgrade purposes"
@@ -636,15 +603,6 @@ MetacelloVersionSpec >> specListProjectDo: projectBlock packageDo: packageBlock
636
603
pkgSpec projectDo: projectBlock packageDo: packageBlock groupDo: groupBlock ]
637
604
]
638
605
639
- { #category : ' enumerating' }
640
- MetacelloVersionSpec >> specsNamed: packageAndProjectNames projectDo: projectBlock packageDo: packageBlock groupDo: groupBlock [
641
-
642
- | map |
643
- map := self packages map.
644
- packageAndProjectNames do: [ :name |
645
- (map at: name ifAbsent: [ ]) ifNotNil: [ :pkgSpec | pkgSpec projectDo: projectBlock packageDo: packageBlock groupDo: groupBlock ] ]
646
- ]
647
-
648
606
{ #category : ' accessing' }
649
607
MetacelloVersionSpec >> timestamp [
650
608
0 commit comments