ChangeSet.st
branchjv
changeset 3243 292f55bcd8f0
parent 3237 d24781ec9edc
child 3244 acbe45bcd122
--- a/ChangeSet.st	Tue Apr 30 10:50:53 2013 +0100
+++ b/ChangeSet.st	Wed May 01 09:34:36 2013 +0100
@@ -20,8 +20,9 @@
 
 Object subclass:#ChangeFileReader
 	instanceVariableNames:'inputStream parseTree changeAction changeSet selector receiver
-                arguments receiverSelector receiverReceiver lineNumber position
-                className methodSelector nameSpaceOverride chunk timestamp classIsJava'
+		arguments receiverSelector receiverReceiver lineNumber position
+		className methodSelector nameSpaceOverride chunk timestamp
+		classIsJava'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:ChangeSet
@@ -104,7 +105,6 @@
 "
 ! !
 
-
 !ChangeSet class methodsFor:'instance creation'!
 
 forExistingClass:aClass
@@ -650,7 +650,6 @@
     "
 ! !
 
-
 !ChangeSet class methodsFor:'Compatibility-ST80'!
 
 patches
@@ -677,7 +676,6 @@
 
 ! !
 
-
 !ChangeSet class methodsFor:'instance creation-private'!
 
 changesFromStream:aStream do:aBlock
@@ -832,7 +830,6 @@
     "Modified: / 30-01-2013 / 10:30:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSet class methodsFor:'queries'!
 
 current
@@ -850,7 +847,6 @@
     "
 ! !
 
-
 !ChangeSet class methodsFor:'utilities'!
 
 decodedStreamFor:aStream
@@ -858,7 +854,6 @@
     ^ EncodedStream decodedStreamFor:aStream
 ! !
 
-
 !ChangeSet methodsFor:'Compatibility-ST80'!
 
 changeClass:aClass
@@ -950,7 +945,6 @@
     "Created: / 6.2.2000 / 20:45:10 / cg"
 ! !
 
-
 !ChangeSet methodsFor:'accessing'!
 
 name
@@ -963,7 +957,6 @@
     "Modified (format): / 28-07-2012 / 09:34:52 / cg"
 ! !
 
-
 !ChangeSet methodsFor:'change & update'!
 
 changed:anAspectSymbol with:aParameter 
@@ -976,7 +969,6 @@
     super changed:anAspectSymbol with:aParameter
 ! !
 
-
 !ChangeSet methodsFor:'changes management'!
 
 addClassCommentChangeFor:aClass
@@ -1219,7 +1211,6 @@
     "Modified: / 14.11.2001 / 13:36:06 / cg"
 ! !
 
-
 !ChangeSet methodsFor:'fileOut'!
 
 fileOutAs: aStringOrFilename
@@ -1291,8 +1282,6 @@
     ].
 !
 
-
-
 removeAll:aCollection
     aCollection notEmpty ifTrue:[
         super removeAll:aCollection.
@@ -1305,7 +1294,6 @@
     changedClasses := nil
 ! !
 
-
 !ChangeSet methodsFor:'queries'!
 
 changedPackages
@@ -1593,7 +1581,6 @@
     "Created: / 08-09-2011 / 04:38:32 / cg"
 ! !
 
-
 !ChangeSet methodsFor:'utilities'!
 
 apply
@@ -2207,7 +2194,6 @@
     "Modified (comment): / 31-07-2012 / 13:38:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSet::ChangeFileReader methodsFor:'accessing'!
 
 changeAction:aBlock
@@ -2224,7 +2210,6 @@
     inputStream := aStream.
 ! !
 
-
 !ChangeSet::ChangeFileReader methodsFor:'helpers'!
 
 addChange:change
@@ -2362,7 +2347,6 @@
     ^ receiver name
 ! !
 
-
 !ChangeSet::ChangeFileReader methodsFor:'reading'!
 
 changesFromParseTree:aTree lineNumber:initialLineNumberOrNil position:initialPositionOrNil
@@ -2403,7 +2387,6 @@
     "Created: / 24-01-2012 / 17:28:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSet::ChangeFileReader methodsFor:'reading-private'!
 
 handleCategoriesForChange
@@ -3207,7 +3190,6 @@
     "Created: / 02-04-2012 / 19:08:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSet::ClassSourceWriter methodsFor:'private'!
 
 analyze
@@ -3348,7 +3330,6 @@
     "Created: / 15-03-2012 / 19:45:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSet::ClassSourceWriter methodsFor:'source writing'!
 
 fileOut:aChangeSet on:outStreamArg withTimeStamp:stampIt withInitialize:initIt withDefinition:withDefinition methodFilter:methodFilter encoder:encoderOrNil
@@ -3450,7 +3431,6 @@
 "/            ].
 
             self fileOutCategory:'documentation' of:meta except:versionMethods only:nil methodFilter:methodFilter on:outStream.
-            outStream cr.
         ].
 
         "/
@@ -3458,7 +3438,6 @@
         "/
         (collectionOfCategories includes:'initialization') ifTrue:[
             self fileOutCategory:'initialization' of:meta methodFilter:methodFilter on:outStream.
-            outStream cr.
         ].
 
         "/
@@ -3466,14 +3445,12 @@
         "/
         (collectionOfCategories includes:'instance creation') ifTrue:[
             self fileOutCategory:'instance creation' of:meta methodFilter:methodFilter on:outStream.
-            outStream cr.
         ].
         collectionOfCategories do:[:aCategory |
             ((aCategory ~= 'documentation')
             and:[(aCategory ~= 'initialization')
             and:[aCategory ~= 'instance creation']]) ifTrue:[
                 self fileOutCategory:aCategory of:meta methodFilter:methodFilter on:outStream.
-                outStream cr
             ]
         ]
     ].
@@ -3495,7 +3472,6 @@
     collectionOfCategories notNil ifTrue:[
         collectionOfCategories do:[:aCategory |
             self fileOutCategory:aCategory of:nonMeta methodFilter:methodFilter on:outStream.
-            outStream cr
         ]
     ].
 
@@ -3541,7 +3517,7 @@
     "Modified: / 01-04-1997 / 16:01:05 / stefan"
     "Modified: / 29-09-2011 / 14:53:49 / cg"
     "Created: / 15-03-2012 / 17:39:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 30-01-2013 / 09:25:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 01-05-2013 / 09:17:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 fileOutAllDefinitionsOf:nonMetaInfo on:aStream
@@ -3628,14 +3604,14 @@
     collectionOfCategories notNil ifTrue:[
         collectionOfCategories do:[:aCategory |
             self fileOutCategory:aCategory of:meta  methodFilter:methodFilter on:aStream.
-            aStream cr
+"/            aStream cr.
         ]
     ].
     collectionOfCategories := aClass categories asSortedCollection.
     collectionOfCategories notNil ifTrue:[
         collectionOfCategories do:[:aCategory |
             self fileOutCategory:aCategory of:aClass methodFilter:methodFilter on:aStream.
-            aStream cr
+"/            aStream cr.
         ]
     ].
 
@@ -3646,6 +3622,7 @@
     "Created: / 15-10-1996 / 11:13:00 / cg"
     "Modified: / 22-03-1997 / 16:12:17 / cg"
     "Created: / 19-03-2012 / 18:21:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 01-05-2013 / 09:06:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 fileOutMethod:change on:aStream
@@ -3801,7 +3778,6 @@
     "Created: / 15-03-2012 / 19:01:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSet::ClassSourceWriter::ClassInfo class methodsFor:'documentation'!
 
 copyright
@@ -3822,7 +3798,6 @@
     ^ 'Id:: ChangeSet.st 1981 2012-11-30 17:20:01Z vranyj1                                                                         '
 ! !
 
-
 !ChangeSet::ClassSourceWriter::ClassInfo class methodsFor:'instance creation'!
 
 new
@@ -3831,7 +3806,6 @@
     ^ self basicNew initialize.
 ! !
 
-
 !ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'accessing'!
 
 categories
@@ -3951,7 +3925,6 @@
     superclass := something.
 ! !
 
-
 !ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'adding'!
 
 addChange: change
@@ -4001,7 +3974,6 @@
     "Created: / 15-03-2012 / 19:12:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'enumerating'!
 
 methodsDo: aBlock
@@ -4011,7 +3983,6 @@
     "Created: / 19-03-2012 / 18:14:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'initialization'!
 
 initialize
@@ -4028,7 +3999,6 @@
     "Modified: / 15-03-2012 / 19:12:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'printing & storing'!
 
 printClassNameOn:aStream
@@ -4056,7 +4026,6 @@
     "Modified: / 19-03-2012 / 19:43:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'queries'!
 
 includesSelector: selector
@@ -4083,7 +4052,6 @@
     "Created: / 15-03-2012 / 19:41:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSet::DiffSet class methodsFor:'documentation'!
 
 documentation
@@ -4093,7 +4061,6 @@
 "
 ! !
 
-
 !ChangeSet::DiffSet methodsFor:'accessing'!
 
 changed
@@ -4175,7 +4142,6 @@
     same := something.
 ! !
 
-
 !ChangeSet::DiffSet methodsFor:'merging'!
 
 addDiffSet:anotherDiffset
@@ -4199,7 +4165,6 @@
     "Modified: / 19-03-2012 / 21:36:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSet::DiffSet methodsFor:'misc'!
 
 removeAllVersionMethods
@@ -4217,7 +4182,6 @@
                     ].
 ! !
 
-
 !ChangeSet::DiffSet methodsFor:'queries'!
 
 changedClasses
@@ -4248,7 +4212,6 @@
     "Created: / 12-10-2006 / 23:12:27 / cg"
 ! !
 
-
 !ChangeSet::DolphinPACFileReader methodsFor:'reading-private'!
 
 handleCategoriesForClass
@@ -4366,7 +4329,6 @@
     "Modified: / 15.12.1999 / 00:29:06 / cg"
 ! !
 
-
 !ChangeSet::SIFChangeFileReader methodsFor:'reading-private'!
 
 handleAnnotation
@@ -4503,15 +4465,14 @@
     "Modified: / 15.12.1999 / 00:29:06 / cg"
 ! !
 
-
 !ChangeSet class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.224 2013-04-25 13:11:15 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.225 2013-05-01 09:33:15 +0100 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.224 2013-04-25 13:11:15 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.225 2013-05-01 09:33:15 +0100 vrany Exp $'
 !
 
 version_HG