Skip to content

Commit a54e6db

Browse files
committed
Remove more dead code
1 parent da26a0d commit a54e6db

5 files changed

+9
-90
lines changed

src/Metacello-Core/MetacelloMCBaselineOfProjectSpec.class.st

-16
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,6 @@ MetacelloMCBaselineOfProjectSpec >> copyForRegistration: aMetacelloProjectRegist
6565
ifAbsent: [ aBlock value: nil ] ]
6666
]
6767

68-
{ #category : 'loading' }
69-
MetacelloMCBaselineOfProjectSpec >> determineCurrentVersionForLoad [
70-
^ self version
71-
]
72-
73-
{ #category : 'loading' }
74-
MetacelloMCBaselineOfProjectSpec >> ensureConfigurationLoaded: vrsn ensured: ensured withEngine: anObject [
75-
"answer true if the configuration should be reloaded"
76-
77-
"see Issue #181 for details ... basically we always want to consider loading the baseline from a project reference, especially if the two project specs are not the same..."
78-
79-
"https://github.com/dalehenrich/metacello-work/issues/181"
80-
81-
^ true
82-
]
83-
8468
{ #category : 'printing' }
8569
MetacelloMCBaselineOfProjectSpec >> hasClassName [
8670

src/Metacello-Core/MetacelloMemberListSpec.class.st

-9
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,6 @@ MetacelloMemberListSpec >> copy: aMemberSpec [
4343
self addMember: aMemberSpec
4444
]
4545

46-
{ #category : 'toolbox support' }
47-
MetacelloMemberListSpec >> deleteSpec: aSpec [
48-
"remove the spec from list"
49-
50-
self list
51-
detect: [ :aMember | aMember spec = aSpec ]
52-
ifFound: [ :member | self list remove: member ]
53-
]
54-
5546
{ #category : 'enumeration' }
5647
MetacelloMemberListSpec >> detect: aBlock [
5748
"Evaluate aBlock with each of the receiver's elements as the argument.

src/Metacello-Core/MetacelloProjectRegistration.class.st

-6
Original file line numberDiff line numberDiff line change
@@ -299,12 +299,6 @@ MetacelloProjectRegistration >> currentVersionString [
299299
ifNil: [ baselineProjectSpec repositoryVersionString ]
300300
]
301301

302-
{ #category : 'testing' }
303-
MetacelloProjectRegistration >> currentlyLoadedClassesInProject [
304-
305-
^ self projectSpec currentlyLoadedClassesInVersion asSet
306-
]
307-
308302
{ #category : 'testing' }
309303
MetacelloProjectRegistration >> hasLoadConflicts: aProjectRegistration [
310304
"5 combinations of loads with no load conflicts:

src/Metacello-Core/MetacelloProjectSpec.class.st

-8
Original file line numberDiff line numberDiff line change
@@ -342,14 +342,6 @@ MetacelloProjectSpec >> copyForScriptingInto: aProjectSpec [
342342
file: file
343343
]
344344

345-
{ #category : 'enumerating' }
346-
MetacelloProjectSpec >> currentlyLoadedClassesInVersion [
347-
348-
self versionOrNil ifNotNil: [ :vrsn |
349-
^ vrsn spec currentlyLoadedClassesInVersion ].
350-
^ #( )
351-
]
352-
353345
{ #category : 'loading' }
354346
MetacelloProjectSpec >> ensureProjectLoadedWithEngine: anEngine [
355347
"Ensure that the MetacelloProject is loaded in image.

src/Metacello-Core/MetacelloVersionSpec.class.st

+9-51
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ MetacelloVersionSpec >> configPackagesSpecMethodOn: aStream indent: indent [
188188
projectDo: [ :proj | member spec name ifNotNil: [ projectSpecs add: member ] ]
189189
packageDo: [ :package | member spec name ifNotNil: [ packageSpecs add: member ] ]
190190
groupDo: [ :group | member spec name ifNotNil: [ groupSpecs add: member ] ] ].
191-
projectSpecs isEmpty not ifTrue: [
191+
projectSpecs ifNotEmpty: [
192192
aStream
193193
tab: indent;
194194
nextPutAll: 'spec '.
@@ -199,8 +199,8 @@ MetacelloVersionSpec >> configPackagesSpecMethodOn: aStream indent: indent [
199199
1 to: projectSpecs size do: [ :index |
200200
(projectSpecs at: index) configMethodCascadeOn: aStream last: index == projectSpecs size indent: indent + 1.
201201
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 ].
204204
aStream
205205
tab: indent;
206206
nextPutAll: 'spec '.
@@ -211,8 +211,8 @@ MetacelloVersionSpec >> configPackagesSpecMethodOn: aStream indent: indent [
211211
1 to: packageSpecs size do: [ :index |
212212
(packageSpecs at: index) configMethodCascadeOn: aStream last: index == packageSpecs size indent: indent + 1.
213213
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 ].
216216
aStream
217217
tab: indent;
218218
nextPutAll: 'spec '.
@@ -231,23 +231,6 @@ MetacelloVersionSpec >> createVersion [
231231
^ self versionClass fromSpec: self
232232
]
233233

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-
251234
{ #category : 'loading' }
252235
MetacelloVersionSpec >> defaultPackageNames [
253236
"if there is a package named 'default' (a group) then it defines the default package names,
@@ -257,13 +240,6 @@ MetacelloVersionSpec >> defaultPackageNames [
257240
^#('default')
258241
]
259242

260-
{ #category : 'toolbox support' }
261-
MetacelloVersionSpec >> deleteSpec: aSpec [
262-
"remove the spec from packages"
263-
264-
self packages deleteSpec: aSpec
265-
]
266-
267243
{ #category : 'accessing' }
268244
MetacelloVersionSpec >> description [
269245

@@ -366,14 +342,10 @@ MetacelloVersionSpec >> mergeSpec: anotherSpec [
366342
| newSpec map anotherPackages anotherRepositories |
367343
newSpec := super mergeSpec: anotherSpec.
368344
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 ]) ].
377349
^ newSpec
378350
]
379351

@@ -478,11 +450,6 @@ MetacelloVersionSpec >> packageSpecsInLoadOrderForMap: packageMap [
478450
^ pkgs
479451
]
480452

481-
{ #category : 'querying' }
482-
MetacelloVersionSpec >> packageSpecsInLoadOrderWithEngine: anObject [
483-
^ self packages packageSpecsInLoadOrderFor: self
484-
]
485-
486453
{ #category : 'accessing' }
487454
MetacelloVersionSpec >> packages [
488455
"leave reference to packages for upgrade purposes"
@@ -636,15 +603,6 @@ MetacelloVersionSpec >> specListProjectDo: projectBlock packageDo: packageBlock
636603
pkgSpec projectDo: projectBlock packageDo: packageBlock groupDo: groupBlock ]
637604
]
638605

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-
648606
{ #category : 'accessing' }
649607
MetacelloVersionSpec >> timestamp [
650608

0 commit comments

Comments
 (0)