#REFACTORING by cg
class: Class
changed:
#fileOutAllMethodsOn:methodFilter: (send #methodCategories instead of #categories)
#fileOutXMLAllMethodsOn:methodFilter: (send #methodCategories instead of #categories)
#fileOutXMLOn:withTimeStamp:withInitialize:withDefinition:methodFilter: (send #methodCategories instead of #categories)
#printOutOn: (send #methodCategories instead of #categories)
#printOutProtocolOn: (send #methodCategories instead of #categories)
--- a/Class.st Wed Jul 05 10:55:23 2017 +0200
+++ b/Class.st Wed Jul 05 10:55:51 2017 +0200
@@ -495,6 +495,7 @@
! !
+
!Class methodsFor:'Compatibility-Dolphin'!
defaultCategoryForDolphinClasses
@@ -701,10 +702,6 @@
commentStamp:stampString prior:priorVersion
^ SqueakCommentReader new
class:self stamp:stampString priorVersion:priorVersion
-!
-
-poolDictionaryNames
- ^ self sharedPoolNames
! !
!Class methodsFor:'accessing'!
@@ -2559,27 +2556,27 @@
fileOutAllMethodsOn:aStream methodFilter:methodFilter
|collectionOfCategories|
- collectionOfCategories := self class categories asSortedCollection.
+ collectionOfCategories := self class methodCategories asSortedCollection.
collectionOfCategories notNil ifTrue:[
- collectionOfCategories do:[:aCategory |
- self class fileOutCategory:aCategory methodFilter:methodFilter on:aStream.
- aStream cr
- ]
+ collectionOfCategories do:[:aCategory |
+ self class fileOutCategory:aCategory methodFilter:methodFilter on:aStream.
+ aStream cr
+ ]
].
- collectionOfCategories := self categories asSortedCollection.
+ collectionOfCategories := self methodCategories asSortedCollection.
collectionOfCategories notNil ifTrue:[
- collectionOfCategories do:[:aCategory |
- self fileOutCategory:aCategory methodFilter:methodFilter on:aStream.
- aStream cr
- ]
+ collectionOfCategories do:[:aCategory |
+ self fileOutCategory:aCategory methodFilter:methodFilter on:aStream.
+ aStream cr
+ ]
].
self privateClassesSorted do:[:aClass |
- aClass fileOutAllMethodsOn:aStream methodFilter:methodFilter
+ aClass fileOutAllMethodsOn:aStream methodFilter:methodFilter
].
- "Created: 15.10.1996 / 11:13:00 / cg"
- "Modified: 22.3.1997 / 16:12:17 / cg"
+ "Created: / 15-10-1996 / 11:13:00 / cg"
+ "Modified: / 05-07-2017 / 10:50:45 / cg"
!
fileOutAs:filenameString
@@ -3164,25 +3161,26 @@
fileOutXMLAllMethodsOn:aStream methodFilter:methodFilter
|collectionOfCategories|
- collectionOfCategories := self class categories asSortedCollection.
+ collectionOfCategories := self class methodCategories asSortedCollection.
collectionOfCategories notNil ifTrue:[
- collectionOfCategories do:[:aCategory |
- self class fileOutXMLCategory:aCategory methodFilter:methodFilter on:aStream.
- aStream cr
- ]
+ collectionOfCategories do:[:aCategory |
+ self class fileOutXMLCategory:aCategory methodFilter:methodFilter on:aStream.
+ aStream cr
+ ]
].
- collectionOfCategories := self categories asSortedCollection.
+ collectionOfCategories := self methodCategories asSortedCollection.
collectionOfCategories notNil ifTrue:[
- collectionOfCategories do:[:aCategory |
- self fileOutXMLCategory:aCategory methodFilter:methodFilter on:aStream.
- aStream cr
- ]
+ collectionOfCategories do:[:aCategory |
+ self fileOutXMLCategory:aCategory methodFilter:methodFilter on:aStream.
+ aStream cr
+ ]
].
self privateClassesSorted do:[:aClass |
- aClass fileOutXMLAllMethodsOn:aStream methodFilter:methodFilter
+ aClass fileOutXMLAllMethodsOn:aStream methodFilter:methodFilter
].
+ "Modified: / 05-07-2017 / 10:50:49 / cg"
!
fileOutXMLAs:fileNameOrString
@@ -3404,7 +3402,7 @@
"/ avoid sourcePosition-shifts when checked out later.
"/ (RCS expands this string, so its size is not constant)
"/
- collectionOfCategories := meta categories asSortedCollection.
+ collectionOfCategories := meta methodCategories asSortedCollection.
collectionOfCategories notNil ifTrue:[
collectionOfCategories do:[:aCategory |
meta fileOutXMLCategory:aCategory methodFilter:methodFilter on:aStream.
@@ -3414,7 +3412,7 @@
"/
"/ methods from all categories in myself
"/
- collectionOfCategories := self categories asSortedCollection.
+ collectionOfCategories := self methodCategories asSortedCollection.
collectionOfCategories notNil ifTrue:[
collectionOfCategories do:[:aCategory |
self fileOutXMLCategory:aCategory methodFilter:methodFilter on:aStream.
@@ -3452,6 +3450,8 @@
withDefinition:true
methodFilter:nil
"
+
+ "Modified: / 05-07-2017 / 10:50:57 / cg"
! !
@@ -3540,24 +3540,24 @@
self printOutDefinitionOn:aPrintStream.
aPrintStream cr.
- collectionOfCategories := self class categories asSortedCollection.
+ collectionOfCategories := self class methodCategories asSortedCollection.
collectionOfCategories notNil ifTrue:[
- aPrintStream nextPutLine:'class protocol'.
- aPrintStream cr.
- collectionOfCategories do:[:aCategory |
- self class printOutCategory:aCategory on:aPrintStream
- ]
+ aPrintStream nextPutLine:'class protocol'.
+ aPrintStream cr.
+ collectionOfCategories do:[:aCategory |
+ self class printOutCategory:aCategory on:aPrintStream
+ ]
].
- collectionOfCategories := self categories asSortedCollection.
+ collectionOfCategories := self methodCategories asSortedCollection.
collectionOfCategories notNil ifTrue:[
- aPrintStream nextPutLine:'instance protocol'.
- aPrintStream cr.
- collectionOfCategories do:[:aCategory |
- self printOutCategory:aCategory on:aPrintStream
- ]
+ aPrintStream nextPutLine:'instance protocol'.
+ aPrintStream cr.
+ collectionOfCategories do:[:aCategory |
+ self printOutCategory:aCategory on:aPrintStream
+ ]
]
- "Modified: / 25.11.1998 / 12:40:31 / cg"
+ "Modified: / 05-07-2017 / 10:51:01 / cg"
!
printOutProtocolOn:aPrintStream
@@ -3567,24 +3567,24 @@
self printOutDefinitionOn:aPrintStream.
aPrintStream cr.
- collectionOfCategories := self class categories asSortedCollection.
+ collectionOfCategories := self class methodCategories asSortedCollection.
collectionOfCategories notNil ifTrue:[
- aPrintStream nextPutLine:'class protocol'.
- aPrintStream cr.
- collectionOfCategories do:[:aCategory |
- self class printOutCategoryProtocol:aCategory on:aPrintStream
- ]
+ aPrintStream nextPutLine:'class protocol'.
+ aPrintStream cr.
+ collectionOfCategories do:[:aCategory |
+ self class printOutCategoryProtocol:aCategory on:aPrintStream
+ ]
].
- collectionOfCategories := self categories asSortedCollection.
+ collectionOfCategories := self methodCategories asSortedCollection.
collectionOfCategories notNil ifTrue:[
- aPrintStream nextPutLine:'instance protocol'.
- aPrintStream cr.
- collectionOfCategories do:[:aCategory |
- self printOutCategoryProtocol:aCategory on:aPrintStream
- ]
+ aPrintStream nextPutLine:'instance protocol'.
+ aPrintStream cr.
+ collectionOfCategories do:[:aCategory |
+ self printOutCategoryProtocol:aCategory on:aPrintStream
+ ]
]
- "Modified: / 25.11.1998 / 12:40:38 / cg"
+ "Modified: / 05-07-2017 / 10:51:07 / cg"
!
printSharedPoolNamesOn:aStream indent:indent