SmalltalkChunkFileSourceWriter.st
branchjv
changeset 17845 7e0cfaac936d
parent 17841 7abcc4aef871
child 17846 24edc476ac18
--- a/SmalltalkChunkFileSourceWriter.st	Thu Jun 23 16:55:10 2011 +0100
+++ b/SmalltalkChunkFileSourceWriter.st	Thu Jul 07 23:08:07 2011 +0100
@@ -121,7 +121,7 @@
                 |source|
 
                 source := versionMethod source.
-                (source isEmptyOrNil or:[(source startsWith:nonMeta nameOfVersionMethod) not]) ifTrue:[
+                (source isEmptyOrNil or:[(source startsWith:nonMeta nameOfOldVersionMethod) not]) ifTrue:[
                     "something bad happend to the classes code"
 
                     Class fileOutErrorSignal 
@@ -294,34 +294,26 @@
 
     interestingMethods := OrderedCollection new.
     aClass methodsDo:[:aMethod |
-        |method wanted|
-        wanted := false.
-        method := aMethod.
-        "Check all overridden methods as well"
-        [ wanted not and:[method notNil]]
-            whileTrue:[
-        (methodsAlreadySaved includes:method) ifFalse:[
-            (aCategory = method category) ifTrue:[
-                (methodFilter isNil or:[methodFilter value:method]) ifTrue:[
+        |wanted|
+
+        (methodsAlreadySaved includes:aMethod) ifFalse:[
+            (aCategory = aMethod category) ifTrue:[
+                (methodFilter isNil or:[methodFilter value:aMethod]) ifTrue:[
                     skippedMethods notNil ifTrue:[
-                        wanted := (skippedMethods includesIdentical:method) not
+                        wanted := (skippedMethods includesIdentical:aMethod) not
                     ] ifFalse:[
-                        wanted := savedMethods isNil or:[ savedMethods includesIdentical:method ].
+                        wanted := savedMethods isNil or:[ savedMethods includesIdentical:aMethod ].
                     ].
                     wanted ifTrue:[
-                        "JV@2010-07-01: Changed to support selector/language namespaces"
-                        "Namespaced methods are stored in class under string selector"
-                        (method selector isSymbol or:[method nameSpace notNil]) ifTrue:[
-                            interestingMethods add:method
+                        aMethod selector isSymbol ifTrue:[
+                            interestingMethods add:aMethod
                         ] ifFalse:[
-                            Transcript showCR:'skipping non-symbol method ',method selector.
+                            Transcript showCR:'skipping non-symbol method ',aMethod selector.
                         ].
                     ].
                 ]
             ]
-        ].
-        method := method overriddenMethod.
-        ].
+        ]
     ].
     interestingMethods notEmpty ifTrue:[
         first := true.
@@ -369,11 +361,10 @@
         aStream cr
     ]
 
-    "Modified: / 28-08-1995 / 14:30:41 / claus"
-    "Modified: / 15-11-1996 / 11:32:21 / cg"
-    "Created: / 01-04-1997 / 16:04:33 / stefan"
-    "Modified: / 21-08-2009 / 23:57:53 / Jan Vrany <vranyj1@fel.cvut.cz>"
-    "Modified: / 01-07-2010 / 21:45:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: 28.8.1995 / 14:30:41 / claus"
+    "Modified: 12.6.1996 / 11:37:33 / stefan"
+    "Modified: 15.11.1996 / 11:32:21 / cg"
+    "Created: 1.4.1997 / 16:04:33 / stefan"
 !
 
 fileOutCategory:aCategory of:aClass methodFilter:methodFilter on:aStream
@@ -395,9 +386,7 @@
 
     aStream 
         nextPutAll:'"/ ';
-        nextPutAll: aString.
-
-    "Modified: / 14-02-2010 / 10:24:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+        nextPutAll: aString
 !
 
 fileOutCommentStartOn:aStream
@@ -504,19 +493,10 @@
 
 !SmalltalkChunkFileSourceWriter class methodsFor:'documentation'!
 
-version
-    ^ '$Id: SmalltalkChunkFileSourceWriter.st 10643 2011-06-08 21:53:07Z vranyj1 $'
-!
-
 version_CVS
-    ^ 'Header: /cvs/stx/stx/libbasic/SmalltalkChunkFileSourceWriter.st,v 1.12 2009/10/02 14:30:07 cg Exp '
+    ^ '§Header: /cvs/stx/stx/libbasic/SmalltalkChunkFileSourceWriter.st,v 1.14 2011/06/29 14:12:59 cg Exp §'
 !
 
 version_SVN
-    ^ '$Id: SmalltalkChunkFileSourceWriter.st 10643 2011-06-08 21:53:07Z vranyj1 $'
-! !
-
-
-
-
-
+    ^ '$ Id: SmalltalkChunkFileSourceWriter.st 10643 2011-06-08 21:53:07Z vranyj1  $'
+! !
\ No newline at end of file