--- a/packages/Package.st Thu Aug 24 10:38:42 2006 +0200
+++ b/packages/Package.st Thu Aug 24 10:38:50 2006 +0200
@@ -1,6 +1,6 @@
"
COPYRIGHT (c) 2003 by eXept Software AG
- All Rights Reserved
+ All Rights Reserved
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
@@ -65,7 +65,7 @@
copyright
"
COPYRIGHT (c) 2003 by eXept Software AG
- All Rights Reserved
+ All Rights Reserved
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
@@ -81,32 +81,32 @@
documentation to be added.
[author:]
- (james@miraculix)
+ (james@miraculix)
[instance variables:]
- blockedMethods <Dictionary>
- A reference of methods that the receiver is NOT responsible for
- but the receiver is responsible for the method's class. It usage is
- the same as a filter would be.
-
- overriddenChanges <Dictionary1><Dictionary2><Dictionary3>
- This variable helps the receiver keep its original state. When a
- method changes it is held here so we can get the original. So the package
- is still responsible for the overridden changes.
-
- There are two way items can become added to overriddenChanges:
- 1) through loading packages - too many of these may not be desirable.
- 2) through editing a package - default package 'overrides it!!'
-
- DESIGN: it is designed with dictionaries containing dictionaries as - for the
- time being - to cope with different types of change. At the moment being
- methodChanges (and soon classChanges). It is easier to search for changes
- by using this hierarchy of dictionaries, and - i think - it is quite
- extendable.
- The only problem i can see with it is lingering dictionaries which are not deleted
- when they contain nothing.
-
+ blockedMethods <Dictionary>
+ A reference of methods that the receiver is NOT responsible for
+ but the receiver is responsible for the method's class. It usage is
+ the same as a filter would be.
+
+ overriddenChanges <Dictionary1><Dictionary2><Dictionary3>
+ This variable helps the receiver keep its original state. When a
+ method changes it is held here so we can get the original. So the package
+ is still responsible for the overridden changes.
+
+ There are two way items can become added to overriddenChanges:
+ 1) through loading packages - too many of these may not be desirable.
+ 2) through editing a package - default package 'overrides it!!'
+
+ DESIGN: it is designed with dictionaries containing dictionaries as - for the
+ time being - to cope with different types of change. At the moment being
+ methodChanges (and soon classChanges). It is easier to search for changes
+ by using this hierarchy of dictionaries, and - i think - it is quite
+ extendable.
+ The only problem i can see with it is lingering dictionaries which are not deleted
+ when they contain nothing.
+
@@ -122,10 +122,10 @@
"
more examples to be added:
- [exBegin]
- ... add code fragment for
+ [exBegin]
+ ... add code fragment for
... executable example here ...
- [exEnd]
+ [exEnd]
"
!
@@ -144,7 +144,7 @@
^ self named:aString withClasses:nil withMethods:nil addToManager:aManager
!
-named:aString withClasses:classes
+named:aString withClasses:classes
^ self named:aString withClasses:classes withMethods:nil addToManager:nil
!
@@ -153,19 +153,19 @@
|anInstance |
anInstance := self new name:aString.
classes ifNotNil:[
- anInstance addedClasses:classes.
+ anInstance addedClasses:classes.
].
methods ifNotNil:[
- anInstance addedMethods:methods.
+ anInstance addedMethods:methods.
].
aManager ifNotNil:[
- aManager addPackage:anInstance.
+ aManager addPackage:anInstance.
].
- ^ anInstance
+ ^ anInstance
!
-named:aString withMethods:methods
+named:aString withMethods:methods
^ self named:aString withClasses:nil withMethods:methods addToManager:nil
! !
@@ -176,7 +176,7 @@
!
defaultOverriddenChangesCollection
- "a dictionary of sets. The keys are the classes and
+ "a dictionary of sets. The keys are the classes and
the sets are a collection of selectors!!"
^ Dictionary new
!
@@ -198,7 +198,7 @@
!
newDefaultPackage
- ^ self named:#'__NoProject__'.
+ ^ self named:(Project noProjectID).
!
packageManager
@@ -232,27 +232,27 @@
blockedMethods := something.
!
-blockedMethodsAtClassNamed:arg
+blockedMethodsAtClassNamed:arg
^ (blockedMethods at:arg ifAbsent:[nil])
!
-blockedMethodsAtClassNamed:aClassName ifAbsentPut:anObject
- ^ blockedMethods at:aClassName ifAbsentPut:anObject
+blockedMethodsAtClassNamed:aClassName ifAbsentPut:anObject
+ ^ blockedMethods at:aClassName ifAbsentPut:anObject
!
-blockedMethodsRemoveAtClassNamed:arg ifAbsent:aBlock
+blockedMethodsRemoveAtClassNamed:arg ifAbsent:aBlock
^ (blockedMethods removeKey:arg ifAbsent:aBlock)
!
classNames
^ self packagedClasses values collect:[:aPackagedClass |
- aPackagedClass name
+ aPackagedClass name
].
!
classPrerequisites
^ prerequisites select:[:aPre |
- aPre isClassPrerequisite
+ aPre isClassPrerequisite
].
!
@@ -266,8 +266,8 @@
getInterestedMethodsFromClass:aClass
| aClassName |
aClassName := aClass name.
- ^ aClass methodDictionary copy values select:[:aMethod |
- self definesSelector:aMethod name forClassNamed:aClassName
+ ^ aClass methodDictionary copy values select:[:aMethod |
+ self definesSelector:aMethod name forClassNamed:aClassName
]
!
@@ -276,11 +276,11 @@
aClassName := aClass name.
(aPackagedClass := self packagedClassNamed:aClassName) ifNotNil:[
- ^ aPackagedClass packagedMethods
+ ^ aPackagedClass packagedMethods
].
^ (packagedMethods at:aClassName ifAbsent:[^ OrderedCollection new ]) values
-"/ ^ aClass methodDictionary copy values collectAndselect:[:aMethod |
+"/ ^ aClass methodDictionary copy values collectAndselect:[:aMethod |
"/ self definesSelector:aMethod name forClassNamed:aClassName
"/ ]
"/
@@ -311,13 +311,13 @@
isInstalled := something.
!
-looseMethodAtClass:aClassName atMethodName:aMethodName
+looseMethodAtClass:aClassName atMethodName:aMethodName
self looseMethods do:[:aLooseMethod |
- ((aLooseMethod name == aMethodName) and:[
- aLooseMethod className == aClassName]) ifTrue:[
- ^ aLooseMethod
- ].
-
+ ((aLooseMethod name == aMethodName) and:[
+ aLooseMethod className == aClassName]) ifTrue:[
+ ^ aLooseMethod
+ ].
+
].
^ nil
!
@@ -327,12 +327,12 @@
col := OrderedCollection new.
self packagedMethods keysAndValuesDo:[:key :aDic | | looseMethodsInKey|
- looseMethodsInKey := aDic keysAndValuesDo:[:selector :aPackagedMethod | |collectValue|
- aPackagedMethod isLoose ifTrue:[
- mthdInImage := aPackagedMethod methodInImage.
- col add:aPackagedMethod.
- ].
- ].
+ looseMethodsInKey := aDic keysAndValuesDo:[:selector :aPackagedMethod | |collectValue|
+ aPackagedMethod isLoose ifTrue:[
+ mthdInImage := aPackagedMethod methodInImage.
+ col add:aPackagedMethod.
+ ].
+ ].
].
@@ -355,7 +355,7 @@
"return the value of the instance variable 'packageHandler' (automatically generated)"
packageHandler isNil ifTrue:[
- packageHandler := PackageHandler forPackage:self.
+ packageHandler := PackageHandler forPackage:self.
].
^ packageHandler
!
@@ -368,7 +368,7 @@
packagePrerequisites
^ prerequisites select:[:aPre |
- aPre isPackagePrerequisite
+ aPre isPackagePrerequisite
].
!
@@ -446,10 +446,10 @@
className := aPackagedClass name.
((overriddenClassChanges at:byPackageName ifAbsentPut:[Set new])
- add:className)
+ add:className)
!
-addOverriddenMethodChange:aPackagedMethod byPackageNamed:byPackageNamed
+addOverriddenMethodChange:aPackagedMethod byPackageNamed:byPackageNamed
"add an overridden method. under #package -> #methodClassName -> #packagedMethod"
| methodClassName |
methodClassName := aPackagedMethod ownedClassName.
@@ -457,43 +457,43 @@
self addPackagedMethod:aPackagedMethod.
(((overriddenMethodChanges at:byPackageNamed ifAbsentPut:[Dictionary new])
- at:methodClassName ifAbsentPut:[Set new]) add:aPackagedMethod name)
+ at:methodClassName ifAbsentPut:[Set new]) add:aPackagedMethod name)
!
-addPackagedClass:aPackagedClass
+addPackagedClass:aPackagedClass
"adds a class to the receiver.
- NOTE: Does not mark the receiver as dirty.
+ NOTE: Does not mark the receiver as dirty.
That is the responsibility of the called of this method!!"
aPackagedClass isClass ifTrue:[
- self error:'I am expected a PackagedClass not a Class'.
+ self error:'I am expected a PackagedClass not a Class'.
].
self packagedClasses at:aPackagedClass name put:(aPackagedClass).
^ aPackagedClass
!
-addPackagedMethod:aPackagedMethod
+addPackagedMethod:aPackagedMethod
"add or replace aPackagedMethod from the receiver"
| aPackagedMethodsOwnedClass |
aPackagedMethodsOwnedClass := aPackagedMethod ownedClassName.
- ^ (self packagedMethodsAtClassNamed:aPackagedMethodsOwnedClass ifAbsentPut:[Dictionary new])
- at:aPackagedMethod name put:aPackagedMethod.
+ ^ (self packagedMethodsAtClassNamed:aPackagedMethodsOwnedClass ifAbsentPut:[Dictionary new])
+ at:aPackagedMethod name put:aPackagedMethod.
!
-addPackagedMethods:somePackageMethods
+addPackagedMethods:somePackageMethods
somePackageMethods do:[:aPackageMethod |
- self addPackagedMethod:aPackageMethod copy.
+ self addPackagedMethod:aPackageMethod copy.
].
^ somePackageMethods
!
-addPrerequisite:aPrerequisite
+addPrerequisite:aPrerequisite
prerequisites add:aPrerequisite
!
-addedPackagedClasses:somePackagedClasses
+addedPackagedClasses:somePackagedClasses
somePackagedClasses do:[:each |
- self addedPackagedClass:each
+ self addedPackagedClass:each
].
^ somePackagedClasses
!
@@ -511,10 +511,10 @@
!
removeOverriddenMethodNamed:aMethodName forClassNamed:aClassName
- ^ self
- removeOverriddenMethodNamed:aMethodName
- forClassNamed:aClassName
- ifAbsent:[self error:'trying to remove a method that does not exist!!'"should i keep this?"]
+ ^ self
+ removeOverriddenMethodNamed:aMethodName
+ forClassNamed:aClassName
+ ifAbsent:[self error:'trying to remove a method that does not exist!!'"should i keep this?"]
!
removeOverriddenMethodNamed:aMethodName forClassNamed:aClassName ifAbsent:aBlock
@@ -522,14 +522,14 @@
| dictionaryOfMethodNamesAndPackagedMethods removedPackagedMethod|
overriddenMethodChanges values do:[:aDictionaryOfClassNamesAndPackagedMethods |
- (dictionaryOfMethodNamesAndPackagedMethods :=
- aDictionaryOfClassNamesAndPackagedMethods at:aClassName ifAbsent:[nil]).
- dictionaryOfMethodNamesAndPackagedMethods ifNotNil:[
- removedPackagedMethod := (dictionaryOfMethodNamesAndPackagedMethods remove:aMethodName ifAbsent:[nil]).
- removedPackagedMethod ifNotNil:[ "once found it can just exit as there should not be any more here!!"
- ^ self
- ].
- ].
+ (dictionaryOfMethodNamesAndPackagedMethods :=
+ aDictionaryOfClassNamesAndPackagedMethods at:aClassName ifAbsent:[nil]).
+ dictionaryOfMethodNamesAndPackagedMethods ifNotNil:[
+ removedPackagedMethod := (dictionaryOfMethodNamesAndPackagedMethods remove:aMethodName ifAbsent:[nil]).
+ removedPackagedMethod ifNotNil:[ "once found it can just exit as there should not be any more here!!"
+ ^ self
+ ].
+ ].
].
!
@@ -554,9 +554,9 @@
self basicAddedPackagedClass:newPackagedClass.
(aClass methodDictionary copy) keysAndValuesDo:[:aMethodName :aMethod |
- (aMethod package == self name) ifFalse:[
- newPackagedClass addBlockedMethodNamed:aMethodName.
- ].
+ (aMethod package == self name) ifFalse:[
+ newPackagedClass addBlockedMethodNamed:aMethodName.
+ ].
].
^ aClass
@@ -572,12 +572,12 @@
aMethodName := aMethod name.
(self includesPackagedClassNamed:aMethodClassName) ifTrue:[
- ^ (self packagedClassNamed:aMethodClassName) addMethodNamed:aMethodName
+ ^ (self packagedClassNamed:aMethodClassName) addMethodNamed:aMethodName
].
aPackagedMethod := (self newPackagedMethodSelector:aMethodName className:aMethodClassName source:aMethod source).
- self addPackagedMethod:aPackagedMethod.
+ self addPackagedMethod:aPackagedMethod.
^ aPackagedMethod "if nil, the method is still to be installed. Could use a dummy here instead??"
!
@@ -590,33 +590,33 @@
"
| aPackagedClassName |
aPackagedClassName := aPackagedClass name.
- self assert:(aPackagedClassName isSymbol).
+ self assert:(aPackagedClassName isSymbol).
(aPackagedClass package == self) ifFalse:[
- self error:'Cannot add ', aPackagedClassName, ' to package ''', name,
- ''' as the class ', aPackagedClassName, Character cr asString,
- ' belongs in the package''', aPackagedClass package name asString,''''.
+ self error:'Cannot add ', aPackagedClassName, ' to package ''', name,
+ ''' as the class ', aPackagedClassName, Character cr asString,
+ ' belongs in the package''', aPackagedClass package name asString,''''.
].
(self includesPackagedClassNamed:aPackagedClass name) ifTrue:[
- (self overriddenClassChangesIncludesClassNamed:aPackagedClass name) ifFalse:[
- PackageError raiseAddedClassFailedNamed:aPackagedClass name toPackage:self.
- ].
+ (self overriddenClassChangesIncludesClassNamed:aPackagedClass name) ifFalse:[
+ PackageError raiseAddedClassFailedNamed:aPackagedClass name toPackage:self.
+ ].
].
self removeOverriddenClassNamed:aPackagedClassName ifAbsent:[nil].
- self removeBlockedMethodsForClassNamed:aPackagedClassName ifAbsent:[nil].
+ self removeBlockedMethodsForClassNamed:aPackagedClassName ifAbsent:[nil].
self packagedClasses at:aPackagedClassName put:(aPackagedClass).
^ aPackagedClass
!
-basicRemoveClassNamed:aSymbol
+basicRemoveClassNamed:aSymbol
packagedClasses removeKey:aSymbol ifAbsent:[
- "how much information do i need to recover from this error?"
- PackageError raiseCannotRemoveClassNamed:aSymbol fromPackage:self
- "'Cannot remove packagedClass ', aSymbol asString,
- ' from package: ', name string."
- ].
- self blockedMethodsRemoveAtClassNamed:aSymbol ifAbsent:[nil "a blocked method is not always there!!"].
+ "how much information do i need to recover from this error?"
+ PackageError raiseCannotRemoveClassNamed:aSymbol fromPackage:self
+ "'Cannot remove packagedClass ', aSymbol asString,
+ ' from package: ', name string."
+ ].
+ self blockedMethodsRemoveAtClassNamed:aSymbol ifAbsent:[nil "a blocked method is not always there!!"].
self removeOverriddenClassNamed:aSymbol ifAbsent:[nil "a overridden class is not always there!!"].
^ aSymbol
!
@@ -624,17 +624,17 @@
basicRemoveMethodNamed:aMethodName forClassNamed:aClassName ifAbsent:aBlock
"remove method named aMethodName from the receiver. If it is in loose methods, remove it,
if the receiver just owns the class, add it to the blockedMethods if teh blockedMethods already have it,
- evaluate aBlock"
+ evaluate aBlock"
| aPackagedMethod |
(self includesPackagedClassNamed:aClassName) ifTrue:[
- ^ (self packagedClassNamed:aClassName) basicRemoveMethodNamed:aMethodName ifAbsent:aBlock
+ ^ (self packagedClassNamed:aClassName) basicRemoveMethodNamed:aMethodName ifAbsent:aBlock
].
(self packagedMethodsAtClassName:aClassName ifAbsent:aBlock)
- removeKey:aMethodName ifAbsent:aBlock.
+ removeKey:aMethodName ifAbsent:aBlock.
(self overriddenChangesIncludesMethodName:aMethodName forClassNamed:aClassName) ifTrue:[
- self removeOverriddenMethodNamed:aMethodName forClassNamed:aClassName ifAbsent:aBlock
+ self removeOverriddenMethodNamed:aMethodName forClassNamed:aClassName ifAbsent:aBlock
].
^ aPackagedMethod
@@ -644,18 +644,18 @@
!Package methodsFor:'api - accessing'!
-changePackageOverrideFromPackage:fromPackage toPackage:toPackage forClassNamed:className
+changePackageOverrideFromPackage:fromPackage toPackage:toPackage forClassNamed:className
"assumes that all the checks have been made that this className and these
packages do exist!!"
| overridenClassChangesHoldersForPackage |
- overridenClassChangesHoldersForPackage := (overriddenClassChanges at:fromPackage name).
+ overridenClassChangesHoldersForPackage := (overriddenClassChanges at:fromPackage name).
overridenClassChangesHoldersForPackage remove:className.
self overrideClassNamed:className byPackageNamed:toPackage name.
"cleanUp empty collections which are not needed!!"
overriddenClassChanges size == 0 ifTrue:[
- (overriddenClassChanges removeKey:fromPackage name)
+ (overriddenClassChanges removeKey:fromPackage name)
].
!
@@ -666,7 +666,7 @@
changeSet addAll:aPackagedClass changeSet
].
self looseMethods do:[:aPackageMethod | | aMethod aClass |
- changeSet addMethodChange:aPackageMethod method in:aPackageMethod ownedClass
+ changeSet addMethodChange:aPackageMethod method in:aPackageMethod ownedClass
].
^ changeSet
@@ -676,7 +676,7 @@
| return |
return := Set new. "to make sure that each category is unique"
self packagedClassesDo:[:aPackagedClass |
- return add:aPackagedClass category.
+ return add:aPackagedClass category.
].
^ return asOrderedCollection sort:[:x :y | x > y].
!
@@ -686,29 +686,29 @@
collectingClasses := OrderedCollection new.
self packagedClassesDo:[:aPackagedClass |
- aPackagedClass category == aCategory ifTrue:[
- collectingClasses add: aPackagedClass.
- ].
+ aPackagedClass category == aCategory ifTrue:[
+ collectingClasses add: aPackagedClass.
+ ].
].
^ collectingClasses
!
-overriddenClassNamesByPackage:aPackage
+overriddenClassNamesByPackage:aPackage
^ (overriddenClassChanges at:aPackage name ifAbsent:[^#() "empty"]) asOrderedCollection.
!
-overriddenClassesByPackage:aPackage
+overriddenClassesByPackage:aPackage
^ (self overriddenClassNamesByPackage:aPackage) collect:[:aPackagedClassName |
- self packagedClassNamed:aPackagedClassName
- ]
+ self packagedClassNamed:aPackagedClassName
+ ]
!
-overriddingPackageNameAtClassName:aClassName
+overriddingPackageNameAtClassName:aClassName
"returns a PackagedClass or nil"
overriddenClassChanges keysAndValuesDo:[:packageName :aSetOfClassNames |
- (aSetOfClassNames includes:aClassName) ifTrue:[
- ^ packageName
- ].
+ (aSetOfClassNames includes:aClassName) ifTrue:[
+ ^ packageName
+ ].
].
^ nil.
!
@@ -717,14 +717,14 @@
^ (self packagedClassNamed:aSymbol ifAbsent:[nil])
!
-packagedClassNamed:aSymbol ifAbsent:aBlock
+packagedClassNamed:aSymbol ifAbsent:aBlock
| classWithoutClassEnding |
- classWithoutClassEnding := (aSymbol asString copyUpTo:Character space) asSymbol.
+ classWithoutClassEnding := (aSymbol asString copyUpTo:Character space) asSymbol.
(classWithoutClassEnding size < aSymbol asString size) ifTrue:[
- "here i am making a crude assumption that aSymbol is refering to the class side of a class.
- whether i should check if this is true or not is another matter..."
- ^ (packagedClasses at:classWithoutClassEnding ifAbsent:[^ aBlock value]) classSide
+ "here i am making a crude assumption that aSymbol is refering to the class side of a class.
+ whether i should check if this is true or not is another matter..."
+ ^ (packagedClasses at:classWithoutClassEnding ifAbsent:[^ aBlock value]) classSide
].
^ (packagedClasses at:aSymbol "or classWithoutClassEnding" ifAbsent:[^ aBlock value])
@@ -736,22 +736,22 @@
packagedMethodNamed:aMethodName forClassNamed:aClassName ifAbsent:aBlock
| returnValue packagedMethodsAtClassName |
- packagedMethodsAtClassName := (self packagedMethods at:aClassName ifAbsent:[nil]).
+ packagedMethodsAtClassName := (self packagedMethods at:aClassName ifAbsent:[nil]).
packagedMethodsAtClassName ifNotNil:[
- returnValue := packagedMethodsAtClassName at:aMethodName ifAbsent:[nil].
+ returnValue := packagedMethodsAtClassName at:aMethodName ifAbsent:[nil].
].
returnValue ifNil:[
- (self definesSelector:aMethodName forClassNamed:aClassName) ifTrue:[| smalltalkMethod|
- smalltalkMethod := (Smalltalk classNamed:aClassName) compiledMethodAt:aMethodName.
- smalltalkMethod ifNil:[^ self error:'I am in an impossible state!!'].
- ^ self newPackagedMethodWithMethod:smalltalkMethod
-
- ].
- aBlock value
+ (self definesSelector:aMethodName forClassNamed:aClassName) ifTrue:[| smalltalkMethod|
+ smalltalkMethod := (Smalltalk classNamed:aClassName) compiledMethodAt:aMethodName.
+ smalltalkMethod ifNil:[^ self error:'I am in an impossible state!!'].
+ ^ self newPackagedMethodWithMethod:smalltalkMethod
+
+ ].
+ aBlock value
].
- ^ returnValue.
+ ^ returnValue.
!
workingPackage
@@ -772,12 +772,12 @@
| aPackagedMethod |
(self includesPackagedClassNamed:aClassName) ifTrue:[
- ^ (self packagedClassNamed:aClassName) addMethodNamed:aMethodName
+ ^ (self packagedClassNamed:aClassName) addMethodNamed:aMethodName
].
aPackagedMethod := (self newPackagedMethodSelector:aMethodName className:aClassName).
- self addPackagedMethod:aPackagedMethod.
+ self addPackagedMethod:aPackagedMethod.
self markDirty.
^ aPackagedMethod "if nil, the method is still to be installed. Could use a dummy here instead??"
@@ -798,7 +798,7 @@
addedClasses:aClasses
"Add a class to a package. Return the aClass"
aClasses do:[:aClass |
- self basicAddedClass:aClass.
+ self basicAddedClass:aClass.
].
self markDirty.
@@ -817,7 +817,7 @@
addedMethods:someMethods
"Add someMethods to a package. Return the someMethods"
someMethods do:[:aMethod |
- self basicAddedMethod:aMethod.
+ self basicAddedMethod:aMethod.
].
self markDirty.
self changed:#addedMethods: with:someMethods.
@@ -847,64 +847,64 @@
self addedPackagedClass:packagedClass.
aSetOfBlockedMethods size > 0 ifTrue:[
- blockedMethodsAtClassName := (self blockedMethodsAtClassNamed:packagedClass name ifAbsentPut:[Set new]).
- blockedMethodsAtClassName addAll:aSetOfBlockedMethods.
+ blockedMethodsAtClassName := (self blockedMethodsAtClassNamed:packagedClass name ifAbsentPut:[Set new]).
+ blockedMethodsAtClassName addAll:aSetOfBlockedMethods.
].
^ packagedClass
!
-overrideClassNamed:classBeingOverriddenName byPackageNamed:byPackageName
+overrideClassNamed:classBeingOverriddenName byPackageNamed:byPackageName
| originalClassDefinition |
self assert:(byPackageName ~= name).
originalClassDefinition := (self packagedClassNamed: classBeingOverriddenName).
originalClassDefinition ifNil:[
- PackageError raiseWithOverrideClassErrorClassNotFound:classBeingOverriddenName fromPackage:self
+ PackageError raiseWithOverrideClassErrorClassNotFound:classBeingOverriddenName fromPackage:self
].
self addOverriddenClassChange:originalClassDefinition byPackageNamed:byPackageName.
self changed:#overrideClassNamed:byPackageNamed: with:(Array with:classBeingOverriddenName with:byPackageName)
!
-overrideMethod:methodBeingOverridden byPackageNamed:byPackageName
+overrideMethod:methodBeingOverridden byPackageNamed:byPackageName
| originalMethodDefinition |
- originalMethodDefinition :=
- (self newPackagedMethodSelector:methodBeingOverridden name
- className:methodBeingOverridden mclass name asSymbol
- source:methodBeingOverridden source).
+ originalMethodDefinition :=
+ (self newPackagedMethodSelector:methodBeingOverridden name
+ className:methodBeingOverridden mclass name asSymbol
+ source:methodBeingOverridden source).
originalMethodDefinition ifNil:[
- PackageError raiseWithOverrideMethodErrorMethodNotFound:methodBeingOverridden fromPackage:self
+ PackageError raiseWithOverrideMethodErrorMethodNotFound:methodBeingOverridden fromPackage:self
].
self addOverriddenMethodChange:originalMethodDefinition byPackageNamed:byPackageName.
self changed:#overrideMethod: with:methodBeingOverridden
!
-overrideMethod:methodBeingOverridden forClassNamed:aClassName byPackageNamed:byPackageName
+overrideMethod:methodBeingOverridden forClassNamed:aClassName byPackageNamed:byPackageName
| originalMethodDefinition methodName |
self assert:(byPackageName ~= name).
(methodBeingOverridden isKindOf:Method) ifTrue:[
- "unbound methods do not know there name so i have to do this... This could be done in Method>>selector"
- (methodName := methodBeingOverridden name) ifNil:[
- methodName := (methodBeingOverridden source upTo:Character space) asSymbol.
- ].
-
- originalMethodDefinition :=
- (self newPackagedMethodSelector:methodName
- className:aClassName
- source:methodBeingOverridden source).
-
- originalMethodDefinition ifNil:[
- PackageError raiseWithOverrideMethodErrorMethodNotFound:methodBeingOverridden fromPackage:self
- ].
+ "unbound methods do not know there name so i have to do this... This could be done in Method>>selector"
+ (methodName := methodBeingOverridden name) ifNil:[
+ methodName := (methodBeingOverridden source upTo:Character space) asSymbol.
+ ].
+
+ originalMethodDefinition :=
+ (self newPackagedMethodSelector:methodName
+ className:aClassName
+ source:methodBeingOverridden source).
+
+ originalMethodDefinition ifNil:[
+ PackageError raiseWithOverrideMethodErrorMethodNotFound:methodBeingOverridden fromPackage:self
+ ].
] ifFalse:[
- (methodBeingOverridden isKindOf:(Package::PackagedMethod)) ifFalse:[
- self error:'This method needs a PackagedMethod or a Method'
- ].
- originalMethodDefinition := methodBeingOverridden.
+ (methodBeingOverridden isKindOf:(Package::PackagedMethod)) ifFalse:[
+ self error:'This method needs a PackagedMethod or a Method'
+ ].
+ originalMethodDefinition := methodBeingOverridden.
].
self addOverriddenMethodChange:originalMethodDefinition byPackageNamed:byPackageName.
@@ -913,11 +913,11 @@
removeFromSystem
self packagedClassesDo:[:aPackagedClass |
- aPackagedClass removeFromSystem
+ aPackagedClass removeFromSystem
].
self packagedMethodsDo:[:aPackagedMethod |
- aPackagedMethod removeFromSystem
+ aPackagedMethod removeFromSystem
].
!
@@ -929,21 +929,21 @@
removeOverriddenClassNamed:aClassNameSymbol ifAbsent:aBlock
overriddenClassChanges copy keysAndValuesDo:[:aPackageName :aSet |
- aSet remove:aClassNameSymbol ifAbsent:aBlock.
- aSet isEmpty ifTrue:[
- overriddenClassChanges removeKey:aPackageName.
- ].
+ aSet remove:aClassNameSymbol ifAbsent:aBlock.
+ aSet isEmpty ifTrue:[
+ overriddenClassChanges removeKey:aPackageName.
+ ].
].
overriddenMethodChanges copy keysAndValuesDo:[:aPackageName :aDic |
- (aDic removeKey:aClassNameSymbol ifAbsent:aBlock).
- aDic isEmpty ifTrue:[
- overriddenMethodChanges removeKey:aPackageName
- ].
+ (aDic removeKey:aClassNameSymbol ifAbsent:aBlock).
+ aDic isEmpty ifTrue:[
+ overriddenMethodChanges removeKey:aPackageName
+ ].
].
!
-removedClassNamed:aSymbol
+removedClassNamed:aSymbol
self basicRemoveClassNamed:aSymbol.
self markDirty.
self changed:#removedClassNamed: with:aSymbol.
@@ -951,9 +951,9 @@
!
removedMethod:aMethod
- ^ self
- removedMethodNamed:aMethod name
- forClassNamed:aMethod mclass name.
+ ^ self
+ removedMethodNamed:aMethod name
+ forClassNamed:aMethod mclass name.
!
removedMethodNamed:aMethodName forClassNamed:aClassName
@@ -972,18 +972,18 @@
!Package methodsFor:'api - changes'!
-classDefinitionChange:aClassDefinitionChange
- "assumes that checks to see if the receiver is affected by the change have been made.
- At present a classDefinitionChange does not result in a class changing packages!!
+classDefinitionChange:aClassDefinitionChange
+ "assumes that checks to see if the receiver is affected by the change have been made.
+ At present a classDefinitionChange does not result in a class changing packages!!
If it does then this method needs to change and put this change type in overridden changes!!
"
self markDirty.
self changed:#classDefinitionChange: with:aClassDefinitionChange
!
-classInstVarDefinitionChange:aClassInstVarDefinitionChange
- "assumes that checks to see if the receiver is affected by the change have been made.
- At present a classInstVarDefinitionChange does not result in a class changing packages!!
+classInstVarDefinitionChange:aClassInstVarDefinitionChange
+ "assumes that checks to see if the receiver is affected by the change have been made.
+ At present a classInstVarDefinitionChange does not result in a class changing packages!!
If it does then this method needs to change and put this change type in overridden changes!!
"
self markDirty.
@@ -992,46 +992,46 @@
classRemoveChange:aClassRemoveChange
"assumes that checks to see if the receiver is affected by the change have been made.
- At the moment i store the original package information in the instance variable
+ At the moment i store the original package information in the instance variable
packagedClasses, and this is where i get the original class definition from!! It might be
an idea to get this info from aClassRemoveChange like it is done in methodRemoveChange.
- Then we would not need the packageClasses themselves and just storing symbolic links
+ Then we would not need the packageClasses themselves and just storing symbolic links
to the classesand create the packageClasses on the fly when needed.
"
|classBeingRemoved originalClassDefinition interestedMethods |
classBeingRemoved := ClassRemoveChange::ClassBeingRemovedQuery query.
originalClassDefinition := (self packagedClassNamed: classBeingRemoved name).
- interestedMethods := self getInterestedPackagedMethodsFromClass:classBeingRemoved.
+ interestedMethods := self getInterestedPackagedMethodsFromClass:classBeingRemoved.
interestedMethods do:[:aPackagedMethod |
- self addPackagedMethod:aPackagedMethod.
- self overrideMethod:aPackagedMethod forClassNamed:classBeingRemoved name byPackageNamed:#Smalltalk
+ self addPackagedMethod:aPackagedMethod.
+ self overrideMethod:aPackagedMethod forClassNamed:classBeingRemoved name byPackageNamed:#Smalltalk
].
- (originalClassDefinition isNil and:[interestedMethods isEmpty]) ifTrue:[
- self error:'Oops. I should know this!! look #isDependentOnClassRemoveChange: This should be called
- before me and should work!!)'
+ (originalClassDefinition isNil and:[interestedMethods isEmpty]) ifTrue:[
+ self error:'Oops. I should know this!! look #isDependentOnClassRemoveChange: This should be called
+ before me and should work!!)'
].
originalClassDefinition ifNotNil:[
- self addOverriddenClassChange:originalClassDefinition byPackageNamed:#Smalltalk.
+ self addOverriddenClassChange:originalClassDefinition byPackageNamed:#Smalltalk.
].
self changed:#classRemoveChange:
!
-classRenameChange:aClassRenameChange
- "assumes that checks to see if the receiver is affected by the change have been made.
+classRenameChange:aClassRenameChange
+ "assumes that checks to see if the receiver is affected by the change have been made.
This action requires the receiver to change all references to the old class name to the
new name.
"
| newClass newPackagedClass|
newClass := (Smalltalk classNamed:aClassRenameChange className).
newClass ifNil:[
- self error:'The class named ', newClass name,
- 'does not exist!! It is expected to exist from a rename action!!'
+ self error:'The class named ', newClass name,
+ 'does not exist!! It is expected to exist from a rename action!!'
].
self packagedClassesRemoveAtClassName:aClassRenameChange oldName ifAbsent:[nil].
newPackagedClass := self newPackagedClass:newClass.
- self addedPackagedClass:newPackagedClass.
+ self addedPackagedClass:newPackagedClass.
self markDirty.
self changed:#classRenameChange: with:aClassRenameChange
!
@@ -1045,7 +1045,7 @@
!
methodCategoryChange:aChange
- "assumes that checks to see if the receiver is affected by the change have been made.
+ "assumes that checks to see if the receiver is affected by the change have been made.
This is not considered a 'major change'. Therefore do nothing to the receiver to indicate that
this method (specified by aChange) has been overriden or change. Just mark the receiver as
dirty
@@ -1055,7 +1055,7 @@
!
methodCategoryRenameChange:aChange
- "assumes that checks to see if the receiver is affected by the change have been made.
+ "assumes that checks to see if the receiver is affected by the change have been made.
This is not considered a 'major change'. Therefore do nothing to the receiver to indicate that
this method (specified by aChange) has been overriden or change. Just mark the receiver as
dirty
@@ -1070,60 +1070,60 @@
There are really two types of change that come in here. A 'new method change' and a
'method redefinition'.
-
+
If the receiver is dependent on the change there are two things that
can happen depending on the change:
- 1) if the receiver owns the class but not the method
- - to keep the package consistant - we add a blocked method to the receiver
-
- 2) if the receiver has a loose method defining the method
- add an overriddenMethod change - to store the original.
+ 1) if the receiver owns the class but not the method
+ - to keep the package consistant - we add a blocked method to the receiver
+
+ 2) if the receiver has a loose method defining the method
+ add an overriddenMethod change - to store the original.
Context note:
- at present a change to a methods results ALWAYS in the default package owning the method.
- so here we assume that the current version package is NEVER the receiver!! This could be
- added functionality option later on (i have no way of testing this now).
+ at present a change to a methods results ALWAYS in the default package owning the method.
+ so here we assume that the current version package is NEVER the receiver!! This could be
+ added functionality option later on (i have no way of testing this now).
"
| previousVersion aMethodName aClassName aPackagedMethod byPackageName |
aMethodName := aMethodChange selector.
aClassName := aMethodChange className asSymbol.
previousVersion := aMethodChange previousVersion.
- aPackagedMethod := self
- newPackagedMethodSelector:aMethodName
- className:aClassName
- source:previousVersion.
+ aPackagedMethod := self
+ newPackagedMethodSelector:aMethodName
+ className:aClassName
+ source:previousVersion.
byPackageName := aPackagedMethod currentPackageOwner.
(self includesPackagedClassNamed:aClassName) ifTrue:[
- previousVersion ifNil:[
- "should only really happen in Default class - at least for the time being.
- This is because as is noted in - 'Context note' - above"
- ^ self newMethodChanged:aMethodChange
- ].
-
- previousVersion package asSymbol == self name ifTrue:[
- ^ self addOverriddenMethodChange:aPackagedMethod byPackageNamed:byPackageName.
- ].
- Transcript nextPutAll:'i should NEVER be here.... either isDependentOnMethodChange does not
- work correctly OR i have just gone a bit bonkers!! From Package>>#methodChanged:';cr.
- ].
+ previousVersion ifNil:[
+ "should only really happen in Default class - at least for the time being.
+ This is because as is noted in - 'Context note' - above"
+ ^ self newMethodChanged:aMethodChange
+ ].
+
+ previousVersion package asSymbol == self name ifTrue:[
+ ^ self addOverriddenMethodChange:aPackagedMethod byPackageNamed:byPackageName.
+ ].
+ Transcript nextPutAll:'i should NEVER be here.... either isDependentOnMethodChange does not
+ work correctly OR i have just gone a bit bonkers!! From Package>>#methodChanged:';cr.
+ ].
"when i am here aMethodChange is in with my packageMethods (loose method)
the following should be true(but is it needed???):
- previousVersion package asSymbol == self name
+ previousVersion package asSymbol == self name
"
- self addOverriddenMethodChange:aPackagedMethod byPackageNamed:byPackageName.
+ self addOverriddenMethodChange:aPackagedMethod byPackageNamed:byPackageName.
self changed:#methodChanged: with:aMethodChange
!
-methodRemoveChange:aMethodRemoveChange
- "assumes that checks to see if the receiver is affected by the change have been made.
+methodRemoveChange:aMethodRemoveChange
+ "assumes that checks to see if the receiver is affected by the change have been made.
A method that i am dependant on has been removed. I could be dependent on it's class
- or the method itself (then it would be a loose method).
+ or the method itself (then it would be a loose method).
There is one special case where i would be dependent on the class but not the method.
In this case i just remove the blocked method from my blocked method list!!
@@ -1135,25 +1135,25 @@
methodBeingRemoved := aMethodRemoveChange previousVersion.
(self blockedMethodsIncludeMethodName:aMethodName forClassNamed:aClassName) ifTrue:[
- self removeBlockedMethodNamed:aMethodName forClassNamed:aClassName.
- self changed:#methodChanged: with:aMethodRemoveChange.
- ^ self.
+ self removeBlockedMethodNamed:aMethodName forClassNamed:aClassName.
+ self changed:#methodChanged: with:aMethodRemoveChange.
+ ^ self.
].
overriddenByPackage := self workingPackage.
overriddenByPackage == name ifTrue:[
- overriddenByPackage := #Smalltalk
+ overriddenByPackage := #Smalltalk
].
self overrideMethod:methodBeingRemoved forClassNamed:aClassName byPackageNamed:#Smalltalk.
self changed:#methodChanged: with:aMethodRemoveChange.
!
-newMethodChanged:aMethodChange
+newMethodChanged:aMethodChange
"a new method has been created. In this case i must be dependent on the method's class
so i need to block this method from my 'view of the world'."
| aMethodName aClassName |
aMethodName := aMethodChange selector.
aClassName := aMethodChange className.
- ^ self addBlockedMethodNamed:aMethodName forClassNamed:aClassName
+ ^ self addBlockedMethodNamed:aMethodName forClassNamed:aClassName
! !
!Package methodsFor:'api - prerequisites'!
@@ -1163,27 +1163,27 @@
^ self addClassNamePrerequisite:aClassName ifFailString:''.
!
-addClassNamePrerequisite:aName ifFailString:aString
+addClassNamePrerequisite:aName ifFailString:aString
|returnValue|
- returnValue := self
- addPrerequisite:(self newClassPrerequisiteNamed:aName
- ifFailString:aString).
+ returnValue := self
+ addPrerequisite:(self newClassPrerequisiteNamed:aName
+ ifFailString:aString).
self changed:#addClassNamePrerequisite: with:aName.
^ returnValue
!
-addPackageNamePrerequisite:aName
+addPackageNamePrerequisite:aName
"changed sent in the following call"
^ self addPackageNamePrerequisite:aName ifFailString:''.
!
-addPackageNamePrerequisite:aName ifFailString:aString
+addPackageNamePrerequisite:aName ifFailString:aString
|returnValue|
- returnValue := self
- addPrerequisite:(self newPackagePrerequisiteNamed:aName
- ifFailString:aString).
+ returnValue := self
+ addPrerequisite:(self newPackagePrerequisiteNamed:aName
+ ifFailString:aString).
self changed:#addPackageNamePrerequisite: with:aName.
^ returnValue
! !
@@ -1191,7 +1191,7 @@
!Package methodsFor:'api - scripts'!
postInstallScript
- ^ self scriptAt:#postInstall
+ ^ self scriptAt:#postInstall
!
postInstallScriptString:aString
@@ -1200,7 +1200,7 @@
!
postUninstallScript
- ^ self scriptAt:#postUninstall
+ ^ self scriptAt:#postUninstall
!
postUninstallScriptString:aString
@@ -1209,7 +1209,7 @@
!
preInstallScript
- ^ (self scriptAt:#preInstall)
+ ^ (self scriptAt:#preInstall)
!
preInstallScriptString:aString
@@ -1218,7 +1218,7 @@
!
preUninstallScript
- ^ self scriptAt:#preUninstall
+ ^ self scriptAt:#preUninstall
!
preUninstallScriptString:aString
@@ -1231,11 +1231,11 @@
uninstallFromManager:aPackageManager
self packagedClasses copy do:[:aPackagedClass |
- "i remove here from packagedClasses so a shallow copy is needed!!"
- aPackageManager
- removeClassNamed:aPackagedClass name
- fromPackage:self
- moveToDefaultPackage:false.
+ "i remove here from packagedClasses so a shallow copy is needed!!"
+ aPackageManager
+ removeClassNamed:aPackagedClass name
+ fromPackage:self
+ moveToDefaultPackage:false.
].
self checkOkToUninstall.
@@ -1245,31 +1245,31 @@
!Package methodsFor:'api-moving'!
movedClassNamed:aClassName toPackage:newOwnerPackage
- "Note: all the methods of the class have also been moved to newOwnerPackage BUT
- we do not have to do anything about that here!! We also do not get any change messages
+ "Note: all the methods of the class have also been moved to newOwnerPackage BUT
+ we do not have to do anything about that here!! We also do not get any change messages
and we - in effect - get this change for free :-) as now newOwnerPackage owns the class!!"
| packagedClass blockedMethods|
- packagedClass := self packagedClassNamed:aClassName.
+ packagedClass := self packagedClassNamed:aClassName.
blockedMethods := self blockedMethodsAtClassNamed:aClassName.
packagedClass ifNil:[
- PackageError raiseCannotMoveClassNamed:aClassName toPackage:newOwnerPackage.
+ PackageError raiseCannotMoveClassNamed:aClassName toPackage:newOwnerPackage.
].
packagedClass package:newOwnerPackage.
PackageError removeClassError handle:[:ex |
- PackageError raiseCannotMoveClassNamed:aClassName toPackage:newOwnerPackage.
+ PackageError raiseCannotMoveClassNamed:aClassName toPackage:newOwnerPackage.
] do:[
- self removedClassNamed:aClassName.
+ self removedClassNamed:aClassName.
].
newOwnerPackage addedPackagedClass:packagedClass blockedMethods:blockedMethods.
self markDirty.
- self changed:#'movedClassNamed:toPackage:'
- with:(Array with:aClassName with:newOwnerPackage).
+ self changed:#'movedClassNamed:toPackage:'
+ with:(Array with:aClassName with:newOwnerPackage).
!
-movedMethod:aMethod toPackage:newOwnerPackage
+movedMethod:aMethod toPackage:newOwnerPackage
self removedMethod:aMethod.
newOwnerPackage addedMethod:aMethod.
! !
@@ -1286,25 +1286,25 @@
!Package methodsFor:'enumerating'!
-classesInSystemDo:aBlock
+classesInSystemDo:aBlock
self packagedClassesDo:[:aPackage | | aClass |
- (aClass"orNil" := aPackage classInSmalltalk) ifNotNil:[
- aBlock value:aClass
- ].
+ (aClass"orNil" := aPackage classInSmalltalk) ifNotNil:[
+ aBlock value:aClass
+ ].
].
!
-loosePackagedMethodsDo:aBlock
+loosePackagedMethodsDo:aBlock
self looseMethods do:aBlock.
!
-packagedClassesDo:aOneArgBlock
+packagedClassesDo:aOneArgBlock
^ packagedClasses do:aOneArgBlock
!
-packagedMethodsDo:aBlock
+packagedMethodsDo:aBlock
self packagedMethods values do:[:aDicOfPackagedMethods |
- aDicOfPackagedMethods values do:aBlock
+ aDicOfPackagedMethods values do:aBlock
].
@@ -1317,7 +1317,7 @@
^ ClassPrerequisite named:aName ifFailString:aString.
!
-newOverriddenChangeWithChange:aChange
+newOverriddenChangeWithChange:aChange
^ OverriddenChange newChange:aChange package:self.
!
@@ -1335,27 +1335,27 @@
newPackagedMethodSelector:aMethodSelector className:aClassName
^ PackagedMethod new
- name:aMethodSelector;
- ownedClassName: aClassName;
- package:self.
+ name:aMethodSelector;
+ ownedClassName: aClassName;
+ package:self.
!
newPackagedMethodSelector:aMethodSelector className:aClassName source:aSourceString
- ^ PackagedMethod
- name:aMethodSelector
- ownedClassName: aClassName
- category:String new
- package:self
- source:aSourceString
+ ^ PackagedMethod
+ name:aMethodSelector
+ ownedClassName: aClassName
+ category:String new
+ package:self
+ source:aSourceString
!
-newPackagedMethodWithMethod:aMethod
- ^ PackagedMethod
- name:aMethod selector
- ownedClassName: aMethod mclass name
- category:aMethod category
- package:self
- source:aMethod source
+newPackagedMethodWithMethod:aMethod
+ ^ PackagedMethod
+ name:aMethod selector
+ ownedClassName: aMethod mclass name
+ category:aMethod category
+ package:self
+ source:aMethod source
! !
!Package methodsFor:'initialization'!
@@ -1379,7 +1379,7 @@
initializeClasses
self classesInSystemDo:[:aClass |
- aClass initialize.
+ aClass initialize.
].
!
@@ -1390,12 +1390,12 @@
self isDirty:false.
self isInstalled:true.
self classesInSystemDo:[:aClass |
- aClass setPackage:myName.
- "get initial information"
- packagedClass := (self packagedClassNamed:aClass name).
- packagedClass instanceDefinition:aClass definition
- classDefinition:aClass class definition
- category:aClass category
+ aClass setPackage:myName.
+ "get initial information"
+ packagedClass := (self packagedClassNamed:aClass name).
+ packagedClass instanceDefinition:aClass definition
+ classDefinition:aClass class definition
+ category:aClass category
].
"you need to set the working package to the package you are loading... maybe???"
@@ -1413,7 +1413,7 @@
!Package methodsFor:'printing'!
printOn:aStream
-
+
'named:', self name.
aStream nextPutAll:self class printString.
aStream nextPutAll:' named:'.
@@ -1428,40 +1428,40 @@
| blockedMethods |
blockedMethods := (self blockedMethodsAtClassNamed:aClassName).
blockedMethods ifNil:[
- ^ false.
+ ^ false.
].
^ blockedMethods includes:aMethodName
!
definesSelector:aMethodSymbol forClassNamed:aClassSymbol
- "checks to see if the receiver defines a method selector associated
+ "checks to see if the receiver defines a method selector associated
with a class symbol."
| theClass dictionaryOfPackagedMethods |
(theClass := self packagedClassNamed:aClassSymbol) ifNil:[
- dictionaryOfPackagedMethods := self packagedMethods at:aClassSymbol ifAbsent:[^ false].
- dictionaryOfPackagedMethods at:aMethodSymbol ifAbsent:[^ false]. "assumes a packagedMethod is returned"
- aMethodSymbol ifNil:[
- ^ false.
- ].
- ^ true.
+ dictionaryOfPackagedMethods := self packagedMethods at:aClassSymbol ifAbsent:[^ false].
+ dictionaryOfPackagedMethods at:aMethodSymbol ifAbsent:[^ false]. "assumes a packagedMethod is returned"
+ aMethodSymbol ifNil:[
+ ^ false.
+ ].
+ ^ true.
].
"if i am here then i know the class!!"
(self blockedMethodsIncludeMethodName:aMethodSymbol forClassNamed:aClassSymbol) ifTrue:[
- ^ false.
+ ^ false.
].
aMethodSymbol ifNil:[
- ^ false.
+ ^ false.
].
^ true.
!
-includesPackagedClassNamed:aSymbol
+includesPackagedClassNamed:aSymbol
^ (self packagedClassNamed:aSymbol) notNil
!
@@ -1477,18 +1477,18 @@
overriddenChangesIncludesClassNamed:aClassName
- overriddenClassChanges values do:[:aSetOfClassNames |
- (aSetOfClassNames includes:aClassName) ifTrue:[
- ^ true
- ].
- ].
+ overriddenClassChanges values do:[:aSetOfClassNames |
+ (aSetOfClassNames includes:aClassName) ifTrue:[
+ ^ true
+ ].
+ ].
overriddenMethodChanges values do:[:aColOfDics |
- (aColOfDics keys includes:aClassName) ifTrue:[
- ^ true
- ].
- ].
-
- ^ false
+ (aColOfDics keys includes:aClassName) ifTrue:[
+ ^ true
+ ].
+ ].
+
+ ^ false
!
@@ -1496,46 +1496,46 @@
| aSetOfPackageMethods |
overriddenMethodChanges values do:[:aDicOfClassNamesAndMethods |
- aSetOfPackageMethods := (aDicOfClassNamesAndMethods at:aClassName ifAbsent:[nil]).
- aSetOfPackageMethods ifNotNil:[
- (aSetOfPackageMethods includes:aMethodName) ifTrue:[
- ^ true
- ].
- ].
+ aSetOfPackageMethods := (aDicOfClassNamesAndMethods at:aClassName ifAbsent:[nil]).
+ aSetOfPackageMethods ifNotNil:[
+ (aSetOfPackageMethods includes:aMethodName) ifTrue:[
+ ^ true
+ ].
+ ].
].
- ^ false
+ ^ false
!
overriddenClassChangesIncludesClassNamed:aClassName
overriddenClassChanges isEmpty ifTrue:[
- ^ false
+ ^ false
].
- overriddenClassChanges values do:[:aSetOfClassNames |
- (aSetOfClassNames includes:aClassName) ifTrue:[
- ^ true
- ].
- ].
-
- ^ false
+ overriddenClassChanges values do:[:aSetOfClassNames |
+ (aSetOfClassNames includes:aClassName) ifTrue:[
+ ^ true
+ ].
+ ].
+
+ ^ false
!
overriddenMethodChangesIncludesClassNamed:aClassName
overriddenMethodChanges isEmpty ifTrue:[
- ^ false
+ ^ false
].
- overriddenClassChanges values do:[:aDic |
- (aDic keys includes:aClassName) ifTrue:[
- ^ true
- ].
- ].
-
- ^ false
+ overriddenClassChanges values do:[:aDic |
+ (aDic keys includes:aClassName) ifTrue:[
+ ^ true
+ ].
+ ].
+
+ ^ false
! !
!Package methodsFor:'queries - dependents'!
@@ -1547,7 +1547,7 @@
self assert:aClassName isSymbol.
^ ((self includesPackagedClassNamed:aClassName) or:[
- (self packagedMethods at:aClassName ifAbsent:[nil])notNil] )
+ (self packagedMethods at:aClassName ifAbsent:[nil])notNil] )
!
isDependentOnClassNamed:aClassName
@@ -1559,20 +1559,20 @@
methodCheck := true.
(self hasRelationshipWithClassNamed:aClassName) ifFalse:[
- ^ false
+ ^ false
].
packagedClass := (self packagedClassNamed:aClassName) ifNotNil:[
- classCheck := (self overriddingPackageNameAtClassName:aClassName) isNil
+ classCheck := (self overriddingPackageNameAtClassName:aClassName) isNil
].
(packagedMethods := self packagedMethods at:aClassName ifAbsent:[nil]) ifNotNil:[
- packagedMethods keys do:[:aMethodSelector |
- (self isDependentOnMethodNamed:aMethodSelector forClassNamed:aClassName) ifFalse:[
- methodCheck := false.
- ].
- ].
-
+ packagedMethods keys do:[:aMethodSelector |
+ (self isDependentOnMethodNamed:aMethodSelector forClassNamed:aClassName) ifFalse:[
+ methodCheck := false.
+ ].
+ ].
+
].
^ classCheck or:[methodCheck].
@@ -1581,21 +1581,21 @@
isDependentOnMethodNamed:aMethodSelector forClassNamed:aMethodClassName
"If the receiver is responsible for the change return true or false."
(self definesSelector:aMethodSelector forClassNamed:aMethodClassName) ifTrue:[
- (self includesPackagedClassNamed:aMethodClassName) ifTrue:[
- (self blockedMethodsIncludeMethodName:aMethodSelector forClassNamed:aMethodClassName) ifTrue:[
- ^ false.
- ].
- ].
-
- (self overriddenChangesIncludesMethodName:aMethodSelector forClassNamed:aMethodClassName) ifTrue:[
- ^ false.
- ].
- ^ true.
+ (self includesPackagedClassNamed:aMethodClassName) ifTrue:[
+ (self blockedMethodsIncludeMethodName:aMethodSelector forClassNamed:aMethodClassName) ifTrue:[
+ ^ false.
+ ].
+ ].
+
+ (self overriddenChangesIncludesMethodName:aMethodSelector forClassNamed:aMethodClassName) ifTrue:[
+ ^ false.
+ ].
+ ^ true.
].
- ^ false
+ ^ false
! !
!Package methodsFor:'uninstall'!
@@ -1616,7 +1616,7 @@
uninstallClasses
self classesInSystemDo:[:aClass |
- aClass removeFromSystem.
+ aClass removeFromSystem.
]
!
@@ -1626,7 +1626,7 @@
uninstallLooseMethods
self loosePackagedMethodsDo:[:aLooseMethod |
- aLooseMethod removeFromSystem.
+ aLooseMethod removeFromSystem.
].
! !
@@ -1636,14 +1636,14 @@
| anInstance|
anInstance := (self basicNew name:aClass name package:aPackage).
(aClass isLoaded) ifFalse:[
- "could also be dependant on Smalltalk!!"
- aClass addDependent:anInstance. "get the definition when the class is autoloaded"
- anInstance category: aClass category.
- ^ anInstance.
+ "could also be dependant on Smalltalk!!"
+ aClass addDependent:anInstance. "get the definition when the class is autoloaded"
+ anInstance category: aClass category.
+ ^ anInstance.
].
- anInstance instanceDefinition: aClass definition
- classDefinition: aClass class definition
- category: aClass category.
+ anInstance instanceDefinition: aClass definition
+ classDefinition: aClass class definition
+ category: aClass category.
^ anInstance
!
@@ -1688,7 +1688,7 @@
^ instanceDefinition
!
-instanceDefinition:instanceDefinitionArg classDefinition:classDefinitionArg category:categoryArg
+instanceDefinition:instanceDefinitionArg classDefinition:classDefinitionArg category:categoryArg
"set instance variables (automatically generated)"
instanceDefinition := instanceDefinitionArg.
@@ -1708,7 +1708,7 @@
^ name
!
-name:nameArg package:packageArg
+name:nameArg package:packageArg
"set instance variables (automatically generated)"
name := nameArg.
@@ -1726,7 +1726,7 @@
I hope this wont make the functionality get a bit hairy..."
self isInSmalltalk ifTrue:[
- self classInSmalltalk package:aPackage name
+ self classInSmalltalk package:aPackage name
].
package := aPackage.
!
@@ -1738,13 +1738,13 @@
associated with the receiver are also its privateClasses!! Although this may not happen
often
"
- ^ self privateClassesOrAll:false
+ ^ self privateClassesOrAll:false
!
-privateClassesOrAll:allOfThem
+privateClassesOrAll:allOfThem
"implementation based on Class>>privateClasesOrNil: "
|classes myName myNamePrefix myNamePrefixLen cls|
@@ -1753,22 +1753,22 @@
myNamePrefixLen := myNamePrefix size.
package packagedClasses keys do:[:nm |
- (nm startsWith:myNamePrefix) ifTrue:[
- (allOfThem
- or:[(nm indexOf:$: startingAt:myNamePrefixLen + 1) == 0]) ifTrue:[
- cls := package packagedClassNamed:nm.
-
- (cls notNil) ifTrue:[
- classes isNil ifTrue:[
- classes := IdentitySet new:10.
- ].
- classes add:cls.
- ]
- ]
- ]
+ (nm startsWith:myNamePrefix) ifTrue:[
+ (allOfThem
+ or:[(nm indexOf:$: startingAt:myNamePrefixLen + 1) == 0]) ifTrue:[
+ cls := package packagedClassNamed:nm.
+
+ (cls notNil) ifTrue:[
+ classes isNil ifTrue:[
+ classes := IdentitySet new:10.
+ ].
+ classes add:cls.
+ ]
+ ]
+ ]
].
self isInSmalltalk ifTrue:[
- ^ classes ? (OrderedCollection new) addAll:(self classInSmalltalk privateClasses)
+ ^ classes ? (OrderedCollection new) addAll:(self classInSmalltalk privateClasses)
].
^ classes ? #()
!
@@ -1780,32 +1780,32 @@
nm := self name.
idx := nm lastIndexOf:$:.
idx == 0 ifTrue:[
- ^ nm
+ ^ nm
].
^ (nm copyFrom:idx+1) asSymbol. "asSymbol was added"
! !
!Package::PackagedClass methodsFor:'api'!
-addBlockedMethodNamed:aMethodName
+addBlockedMethodNamed:aMethodName
^ package addBlockedMethodNamed:aMethodName forClassNamed:name
!
-addMethodNamed:aMethodName
+addMethodNamed:aMethodName
| aPackagedMethod |
(self blockedMethodsIncludeMethodName:aMethodName) ifTrue:[
- self removeBlockedMethodNamed:aMethodName.
- self markDirty.
- ^ aPackagedMethod.
+ self removeBlockedMethodNamed:aMethodName.
+ self markDirty.
+ ^ aPackagedMethod.
].
(self overriddenChangesIncludesMethodName:aMethodName) ifTrue:[
"it should not be consider overriden anymore has the method has just been
added to the receiver!! And we dont need to add it as an extra method either
as i now am a 'holder for this method!!' But to show this i need to mark myself dirty"
- self markDirty.
- self removeOverriddenMethodNamed:aMethodName.
- ^ aPackagedMethod.
+ self markDirty.
+ self removeOverriddenMethodNamed:aMethodName.
+ ^ aPackagedMethod.
].
"if i am here the method is in effect added as the package the receiver is related to
@@ -1819,22 +1819,22 @@
!
-basicRemoveMethodNamed:aMethodName ifAbsent:aBlock
+basicRemoveMethodNamed:aMethodName ifAbsent:aBlock
(self blockedMethodsIncludeMethodName:aMethodName) ifTrue:[
- ^ aBlock value
+ ^ aBlock value
]. "the receiver does not know this method!!"
self addBlockedMethodNamed:aMethodName.
(self overriddenChangesIncludesMethodName:aMethodName) ifTrue:[
- self removeOverriddenMethodNamed:aMethodName
+ self removeOverriddenMethodNamed:aMethodName
].
!
changeSet
| theClass |
(theClass := self classInSmalltalk) ifNil:[
- ^ ChangeSet new
+ ^ ChangeSet new
].
theClass autoload.
@@ -1844,7 +1844,7 @@
classInSmalltalk
self isInSmalltalk ifTrue:[
- ^ Smalltalk classNamed:name
+ ^ Smalltalk classNamed:name
].
^ nil
@@ -1855,7 +1855,7 @@
^ ClassSide instanceSide:self.
!
-definesSelector:aSelector
+definesSelector:aSelector
^ package definesSelector:aSelector forClassNamed:name
!
@@ -1863,13 +1863,13 @@
"if evaluates to false, it should not be in Smalltalk."
| classInSmalltalk|
((package packagedClassNamed:name) == self) ifFalse:[
- ^ false.
+ ^ false.
].
^ (package isDependentOnClassNamed:name) and:[
- (classInSmalltalk := Smalltalk classNamed:name) notNil and:[
- (classInSmalltalk package == package name)
- ].
+ (classInSmalltalk := Smalltalk classNamed:name) notNil and:[
+ (classInSmalltalk package == package name)
+ ].
].
!
@@ -1877,8 +1877,8 @@
^ package markDirty
!
-overriddenChangesIncludesMethodName:aMethodName
- ^ package overriddenChangesIncludesMethodName:aMethodName forClassNamed:name
+overriddenChangesIncludesMethodName:aMethodName
+ ^ package overriddenChangesIncludesMethodName:aMethodName forClassNamed:name
!
packagedMethods
@@ -1888,32 +1888,32 @@
isMyClassInSmalltalkGone := possibleClassRemoved notNil.
isMyClassInSmalltalkGone ifTrue:[
- definedMethods := possibleClassRemoved methodDictionary copy values select:[:aMethod |
- self definesSelector:aMethod name
- ].
-
- ^ definedMethods collect:[:aMethod |
- package newPackagedMethodWithMethod:aMethod
- ].
+ definedMethods := possibleClassRemoved methodDictionary copy values select:[:aMethod |
+ self definesSelector:aMethod name
+ ].
+
+ ^ definedMethods collect:[:aMethod |
+ package newPackagedMethodWithMethod:aMethod
+ ].
].
packagedMethodsInClass := (package packagedMethods at:name ifAbsent:[Dictionary new]).
(classInSmalltalk := Smalltalk classNamed: name) ifNil:[
- ^ packagedMethodsInClass
+ ^ packagedMethodsInClass
].
- definedMethods := classInSmalltalk methodDictionary copy values select:[:aMethod |
- self definesSelector:aMethod name
+ definedMethods := classInSmalltalk methodDictionary copy values select:[:aMethod |
+ self definesSelector:aMethod name
].
"get from package or create on the fly packaged methods"
^ definedMethods collect:[:aMethod |
- packagedMethodsInClass at:aMethod name ifAbsent:[
- package newPackagedMethodWithMethod:aMethod
- ].
+ packagedMethodsInClass at:aMethod name ifAbsent:[
+ package newPackagedMethodWithMethod:aMethod
+ ].
].
!
-removeBlockedMethodNamed:aMethodName
+removeBlockedMethodNamed:aMethodName
^ package removeBlockedMethodNamed:aMethodName forClassNamed:name
!
@@ -1925,11 +1925,11 @@
| class |
self removeFromPackage.
(class := self classInSmalltalk) ifNotNil:[
- class removeFromSystem.
+ class removeFromSystem.
].
!
-removeOverriddenMethodNamed:aMethodName
+removeOverriddenMethodNamed:aMethodName
^ package removeOverriddenMethodNamed:aMethodName forClassNamed:name.
! !
@@ -1938,10 +1938,10 @@
update:something with:aParameter from:changedObject
| definition|
(changedObject == self classInSmalltalk) ifTrue:[
- changedObject isLoaded ifTrue:[
- changedObject removeDependent:self. "dont need you any more"
- definition := changedObject definition.
- ].
+ changedObject isLoaded ifTrue:[
+ changedObject removeDependent:self. "dont need you any more"
+ definition := changedObject definition.
+ ].
].
! !
@@ -1953,8 +1953,8 @@
!Package::PackagedClass methodsFor:'queries'!
-blockedMethodsIncludeMethodName:aMethodName
- ^ package blockedMethodsIncludeMethodName:aMethodName forClassNamed:name.
+blockedMethodsIncludeMethodName:aMethodName
+ ^ package blockedMethodsIncludeMethodName:aMethodName forClassNamed:name.
!
isLoaded
@@ -1966,14 +1966,14 @@
out from the image as this class may not implemented!!"
| readStream |
self isInSmalltalk ifTrue:[
- ^ self classInSmalltalk isPrivate.
+ ^ self classInSmalltalk isPrivate.
].
readStream := ((Parser parseExpression:instanceDefinition) selector readStream).
[readStream atEnd] whileFalse:[
- ((readStream upTo:$:) asSymbol == #privateIn:) ifTrue:[
- ^ true
- ].
+ ((readStream upTo:$:) asSymbol == #privateIn:) ifTrue:[
+ ^ true
+ ].
].
^ false
@@ -2009,76 +2009,76 @@
!Package::PackagedClass::ClassSide methodsFor:'api'!
-addBlockedMethodNamed:aMethodName
+addBlockedMethodNamed:aMethodName
^ self package addBlockedMethodNamed:aMethodName forClassNamed:self name
!
-addMethodNamed:aMethodName
+addMethodNamed:aMethodName
| aPackagedMethod |
(self blockedMethodsIncludeMethodName:aMethodName) ifTrue:[
- self removeBlockedMethodNamed:aMethodName.
- self markDirty.
- ^ aPackagedMethod.
+ self removeBlockedMethodNamed:aMethodName.
+ self markDirty.
+ ^ aPackagedMethod.
].
(self overriddenChangesIncludesMethodName:aMethodName) ifTrue:[
"it should not be consider overriden anymore has the method has just been
added to the receiver!! And we dont need to add it as an extra method either
as i now am a 'holder for this method!!' But to show this i need to mark myself dirty"
- self markDirty.
- self removeOverriddenMethodNamed:aMethodName.
- ^ aPackagedMethod.
+ self markDirty.
+ self removeOverriddenMethodNamed:aMethodName.
+ ^ aPackagedMethod.
].
"if i am here the method is in effect added as the package the receiver is related to
knows the class and does not include any blocked methods for the method aMethodName"
!
-basicRemoveMethodNamed:aMethodName ifAbsent:aBlock
+basicRemoveMethodNamed:aMethodName ifAbsent:aBlock
(self blockedMethodsIncludeMethodName:aMethodName) ifTrue:[
- ^ aBlock value
+ ^ aBlock value
]. "the receiver does not know this method!!"
self addBlockedMethodNamed:aMethodName.
(self overriddenChangesIncludesMethodName:aMethodName) ifTrue:[
- self removeOverriddenMethodNamed:aMethodName
+ self removeOverriddenMethodNamed:aMethodName
].
!
-blockedMethodsIncludeMethodName:aMethodName
- ^ self package blockedMethodsIncludeMethodName:aMethodName forClassNamed:self name.
+blockedMethodsIncludeMethodName:aMethodName
+ ^ self package blockedMethodsIncludeMethodName:aMethodName forClassNamed:self name.
!
markDirty
^ self package markDirty
!
-overriddenChangesIncludesMethodName:aMethodName
- ^ self package overriddenChangesIncludesMethodName:aMethodName forClassNamed:self name
+overriddenChangesIncludesMethodName:aMethodName
+ ^ self package overriddenChangesIncludesMethodName:aMethodName forClassNamed:self name
!
-removeBlockedMethodNamed:aMethodName
+removeBlockedMethodNamed:aMethodName
^ self package removeBlockedMethodNamed:aMethodName forClassNamed:self name
!
-removeOverriddenMethodNamed:aMethodName
+removeOverriddenMethodNamed:aMethodName
^ self package removeOverriddenMethodNamed:aMethodName forClassNamed:self name.
! !
!Package::PackagedMethod class methodsFor:'instance creation'!
-name:aMethodName ownedClassName: aClassName category:aCategory package:aPackage source:source
+name:aMethodName ownedClassName: aClassName category:aCategory package:aPackage source:source
self assert:(aClassName isSymbol).
self assert:(aMethodName isSymbol).
- ^ self basicNew name:aMethodName ownedClassName: aClassName category:aCategory package:aPackage source:source
+ ^ self basicNew name:aMethodName ownedClassName: aClassName category:aCategory package:aPackage source:source
! !
!Package::PackagedMethod methodsFor:'accessing'!
category
(self isInSmalltalk) ifTrue:[
- ^ self method category.
+ ^ self method category.
].
^ nil.
!
@@ -2087,12 +2087,12 @@
| class method |
class := (Smalltalk classNamed:ownedClassName).
class ifNil:[
- ^ nil.
+ ^ nil.
].
method := class compiledMethodAt:self name.
method ifNil:[
- ^ nil
+ ^ nil
].
^ method package
@@ -2124,7 +2124,7 @@
name := something.
!
-name:nameArg ownedClassName:classNameArg category:categoryArg package:packageArg source:sourceArg
+name:nameArg ownedClassName:classNameArg category:categoryArg package:packageArg source:sourceArg
name := nameArg.
ownedClassName := classNameArg.
category := categoryArg.
@@ -2133,18 +2133,18 @@
!
ownedClass
- ^ Compiler evaluate:ownedClassName
- in:nil
- receiver:nil
- notifying:nil
- logged:false
- ifFail:[nil]
- compile:false
+ ^ Compiler evaluate:ownedClassName
+ in:nil
+ receiver:nil
+ notifying:nil
+ logged:false
+ ifFail:[nil]
+ compile:false
"
- (self new ownedClassName:'Integer') ownedClass
+ (self new ownedClassName:'Integer') ownedClass
"
!
@@ -2167,7 +2167,7 @@
nm := self ownedClassName.
idx := nm lastIndexOf:$:.
idx == 0 ifTrue:[
- ^ nm
+ ^ nm
].
^ (nm copyFrom:idx+1) asSymbol. "asSymbol was added"
!
@@ -2186,10 +2186,10 @@
source
source isNil ifTrue:[
- self isInSmalltalk ifFalse:[
- ^ '** no method - no source **' copy.
- ].
- source := self method source.
+ self isInSmalltalk ifFalse:[
+ ^ '** no method - no source **' copy.
+ ].
+ source := self method source.
].
^ source.
@@ -2203,7 +2203,7 @@
!Package::PackagedMethod methodsFor:'fileIn/Out'!
-fileOutOn:aWriteStream
+fileOutOn:aWriteStream
aWriteStream nextPut:$!!.
aWriteStream nextPutAll:ownedClassName asString.
@@ -2233,10 +2233,10 @@
| classInSmalltalk |
self removeFromPackage.
(self isInSmalltalk) ifTrue:[
- classInSmalltalk := Smalltalk classNamed:ownedClassName.
- classInSmalltalk ifNotNil:[
- classInSmalltalk removeSelector:name.
- ]
+ classInSmalltalk := Smalltalk classNamed:ownedClassName.
+ classInSmalltalk ifNotNil:[
+ classInSmalltalk removeSelector:name.
+ ]
].
!
@@ -2248,9 +2248,9 @@
printOn:aStream
self isLoose ifTrue:[
- aStream nextPutAll:'LooseMethod:'.
+ aStream nextPutAll:'LooseMethod:'.
] ifFalse:[
- aStream nextPutAll:'Method:'.
+ aStream nextPutAll:'Method:'.
].
aStream nextPutAll:self ownedClassShortName.
@@ -2262,7 +2262,7 @@
isInSmalltalk
^ (package overriddenChangesIncludesMethodName:name forClassNamed:ownedClassName) not and:[
- (package blockedMethodsIncludeMethodName:name forClassNamed:ownedClassName) not
+ (package blockedMethodsIncludeMethodName:name forClassNamed:ownedClassName) not
]
@@ -2275,10 +2275,10 @@
isTheSameAsInImage
| myClass method|
(myClass := (Smalltalk at:ownedClassName)) ifNotNil:[
- (method :=(myClass methodDictionary at:name ifAbsent:[nil])) ifNotNil:[
- ^ method source = source. "there is a more efficient way but i have forgotten"
- ].
-
+ (method :=(myClass methodDictionary at:name ifAbsent:[nil])) ifNotNil:[
+ ^ method source = source. "there is a more efficient way but i have forgotten"
+ ].
+
].
^ false.
!
@@ -2286,9 +2286,9 @@
method
| myClass|
(myClass := self ownedClass) ifNotNil:[
- ^ (myClass methodDictionary at:name ifAbsent:[nil]).
+ ^ (myClass methodDictionary at:name ifAbsent:[nil]).
].
- self halt.
+ self halt.
^ nil.
! !
@@ -2304,7 +2304,7 @@
^ string
!
-string:stringArg receiver:receiverArg
+string:stringArg receiver:receiverArg
"set instance variables (automatically generated)"
string := stringArg.
@@ -2329,12 +2329,12 @@
aStream nextPut:$).
"
- self string:'1 + 1' receiver:nil
+ self string:'1 + 1' receiver:nil
"
! !
!Package class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/packages/Package.st,v 1.8 2006-01-10 09:25:22 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/packages/Package.st,v 1.9 2006-08-24 08:38:50 cg Exp $'
! !