ChangeSet.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Wed, 01 Aug 2012 15:21:03 +0100
branchjv
changeset 3073 921dc719ceda
parent 3072 300c029115d6
child 3075 e65e624f5cb5
permissions -rw-r--r--
- ChangeSet comment/format in: #fromStream:while: changed: #changesFromStream:for:reader:do: #fromFile:
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
     1
"
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
     2
 COPYRIGHT (c) 1993 by Claus Gittinger
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
     3
              All Rights Reserved
3
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
     4
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
     5
 This software is furnished under a license and may be used
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
     6
 only in accordance with the terms of that license and with the
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
     8
 be provided or otherwise made available to, or used by, any
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
     9
 other person.  No title to or ownership of the software is
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
    10
 hereby transferred.
263f814933d4 *** empty log message ***
claus
parents: 0
diff changeset
    11
"
921
fa4db05c887b oops - nameSpace prefix handling needed fix due
Claus Gittinger <cg@exept.de>
parents: 916
diff changeset
    12
"{ Package: 'stx:libbasic3' }"
fa4db05c887b oops - nameSpace prefix handling needed fix due
Claus Gittinger <cg@exept.de>
parents: 916
diff changeset
    13
0
470788421600 Initial revision
claus
parents:
diff changeset
    14
OrderedCollection subclass:#ChangeSet
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    15
	instanceVariableNames:'changedClasses changeSelectors name'
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    16
	classVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    17
	poolDictionaries:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    18
	category:'System-Changes'
0
470788421600 Initial revision
claus
parents:
diff changeset
    19
!
470788421600 Initial revision
claus
parents:
diff changeset
    20
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
    21
Object subclass:#ChangeFileReader
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    22
	instanceVariableNames:'inputStream parseTree changeAction changeSet selector receiver
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    23
		arguments receiverSelector receiverReceiver lineNumber position
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
    24
		className methodSelector chunk timestamp'
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    25
	classVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    26
	poolDictionaries:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    27
	privateIn:ChangeSet
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
    28
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
    29
2256
b98137d2aa30 changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents: 2247
diff changeset
    30
Error subclass:#ChangeProcessingError
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    31
	instanceVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    32
	classVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    33
	poolDictionaries:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    34
	privateIn:ChangeSet
2256
b98137d2aa30 changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents: 2247
diff changeset
    35
!
b98137d2aa30 changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents: 2247
diff changeset
    36
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    37
SmalltalkChunkFileSourceWriter subclass:#ClassSourceWriter
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
    38
	instanceVariableNames:'changeSetBeingSaved namespaceName topClassName classInfos
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
    39
		metaInfos'
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    40
	classVariableNames:''
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    41
	poolDictionaries:''
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    42
	privateIn:ChangeSet
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    43
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    44
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    45
Object subclass:#ClassInfo
3049
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
    46
	instanceVariableNames:'name superclass definition methods methodDictionary namespace
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
    47
		primitiveDefinitions primitiveVariables primitiveFunctions'
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    48
	classVariableNames:''
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    49
	poolDictionaries:''
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    50
	privateIn:ChangeSet::ClassSourceWriter
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    51
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
    52
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
    53
Object subclass:#DiffSet
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
    54
	instanceVariableNames:'changed onlyInReceiver onlyInArg same'
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    55
	classVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    56
	poolDictionaries:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    57
	privateIn:ChangeSet
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
    58
!
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
    59
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
    60
ChangeSet::ChangeFileReader subclass:#DolphinPACFileReader
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    61
	instanceVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    62
	classVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    63
	poolDictionaries:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    64
	privateIn:ChangeSet
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
    65
!
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
    66
2256
b98137d2aa30 changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents: 2247
diff changeset
    67
ChangeSet::ChangeProcessingError subclass:#InvalidChangeChunkError
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    68
	instanceVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    69
	classVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    70
	poolDictionaries:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    71
	privateIn:ChangeSet
2256
b98137d2aa30 changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents: 2247
diff changeset
    72
!
b98137d2aa30 changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents: 2247
diff changeset
    73
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
    74
ChangeSet::ChangeFileReader subclass:#SIFChangeFileReader
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    75
	instanceVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    76
	classVariableNames:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    77
	poolDictionaries:''
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
    78
	privateIn:ChangeSet
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
    79
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
    80
625
06f4ed35832b added #patches for ST80 compatibility
Claus Gittinger <cg@exept.de>
parents: 378
diff changeset
    81
!ChangeSet class methodsFor:'documentation'!
9
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    82
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    83
copyright
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    84
"
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    85
 COPYRIGHT (c) 1993 by Claus Gittinger
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
    86
              All Rights Reserved
9
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    87
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    88
 This software is furnished under a license and may be used
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    89
 only in accordance with the terms of that license and with the
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    90
 inclusion of the above copyright notice.   This software may not
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    91
 be provided or otherwise made available to, or used by, any
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    92
 other person.  No title to or ownership of the software is
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    93
 hereby transferred.
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    94
"
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    95
!
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    96
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    97
documentation
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    98
"
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
    99
    used in the changes management to keep track of changes
235
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
   100
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
   101
    [author:]
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
   102
        Claus Gittinger
9
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
   103
"
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
   104
! !
f5b6ab00bdf6 *** empty log message ***
claus
parents: 3
diff changeset
   105
654
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
   106
!ChangeSet class methodsFor:'instance creation'!
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
   107
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   108
forExistingClass:aClass
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   109
    "build a changeSet for some given class, all of its private classes
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   110
     and all extensions if any. 
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   111
     I.e. a changeSet which represents the existing class in the image.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   112
     That does of course not give deltas, but instead reflects the current
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   113
     state of the given class.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   114
     It is useful in conjunction with the other utility methods,
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   115
     for example, when building patchLists, diffSets, comparing etc."
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   116
1954
521fa986be30 Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents: 1920
diff changeset
   117
    |changeSet s changeObject|
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   118
2633
5a5460e5231a comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2626
diff changeset
   119
    "/ kludge: could do this much faster...
1188
a4594193f884 Remove unused method variables
Stefan Vogel <sv@exept.de>
parents: 1187
diff changeset
   120
    s := ReadWriteStream on:''.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   121
    aClass fileOutOn:s.
1188
a4594193f884 Remove unused method variables
Stefan Vogel <sv@exept.de>
parents: 1187
diff changeset
   122
    s reset.
a4594193f884 Remove unused method variables
Stefan Vogel <sv@exept.de>
parents: 1187
diff changeset
   123
    changeSet := self fromStream:s.
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   124
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   125
    "/ fetch the real package info...
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   126
    changeSet do:[:eachChange |
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   127
        eachChange isMethodChange ifTrue:[
1954
521fa986be30 Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents: 1920
diff changeset
   128
            changeObject := eachChange changeMethod.
521fa986be30 Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents: 1920
diff changeset
   129
            changeObject notNil ifTrue:[
521fa986be30 Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents: 1920
diff changeset
   130
                eachChange package:changeObject package
521fa986be30 Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents: 1920
diff changeset
   131
            ].
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   132
        ] ifFalse:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   133
            eachChange isClassChange ifTrue:[
1954
521fa986be30 Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents: 1920
diff changeset
   134
                changeObject := eachChange changeClass.
521fa986be30 Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents: 1920
diff changeset
   135
                changeObject notNil ifTrue:[
521fa986be30 Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents: 1920
diff changeset
   136
                    eachChange package:changeObject package
521fa986be30 Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents: 1920
diff changeset
   137
                ].
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   138
            ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   139
        ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   140
    ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   141
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   142
    ^ changeSet
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   143
1188
a4594193f884 Remove unused method variables
Stefan Vogel <sv@exept.de>
parents: 1187
diff changeset
   144
"/    |source changeSet chunk sawExcla lastTimeStamp s change nameSpace|
a4594193f884 Remove unused method variables
Stefan Vogel <sv@exept.de>
parents: 1187
diff changeset
   145
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   146
"/    changeSet := self new.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   147
"/
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   148
"/    "/ first, a classDefinition change ...
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   149
"/    changeSet addClassDefinitionChangeFor:aClass.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   150
"/    "/ are there any class-instVars ?
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   151
"/    aClass class instVarNames size > 0 ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   152
"/        changeSet addInstVarDefinitionChangeFor:aClass class.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   153
"/    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   154
"/    "/ a comment ?
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   155
"/    aClass comment size > 0 ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   156
"/        changeSet addClassCommentChangeFor:aClass.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   157
"/    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   158
"/
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   159
"/    "/ class methods first ...
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   160
"/    aClass class methodDictionary keysAndValuesDo:[:sel :mthd |
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   161
"/        changeSet addMethodChange:mthd in:aClass class. 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   162
"/    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   163
"/
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   164
"/    "/ instance methods ...
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   165
"/    aClass methodDictionary keysAndValuesDo:[:sel :mthd |
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   166
"/        changeSet addMethodChange:mthd in:aClass.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   167
"/    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   168
"/
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   169
"/    ^ changeSet
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   170
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   171
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   172
    "
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   173
     ChangeSet forExistingClass:ChangeSet
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   174
     ChangeSet forExistingClass:A
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   175
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   176
     Rectangle hasExtensions
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   177
     ChangeSet forExistingClass:Rectangle
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   178
    "
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   179
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   180
    "Created: / 16-02-1998 / 12:19:34 / cg"
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   181
    "Modified: / 12-10-2006 / 23:45:14 / cg"
2633
5a5460e5231a comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2626
diff changeset
   182
    "Modified (format): / 01-12-2011 / 19:10:22 / cg"
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   183
!
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   184
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   185
forExistingClass:aClass withExtensions:withExtensions extensionsOnly:extensionsOnly
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   186
    "build a changeSet for some given full class, the base-class or the extensions only,
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   187
     as specified by the with-arguments.
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   188
     That does of course not give deltas, but instead reflects the current
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   189
     state of the given class.
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   190
     It is useful in conjunction with the other utility methods,
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   191
     for example, when building patchLists, diffSets etc."
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   192
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   193
    |changeSet classPackage|
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   194
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   195
    changeSet := self forExistingClass:aClass.
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   196
    classPackage := aClass package.
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   197
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   198
    extensionsOnly ifTrue:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   199
        ^ changeSet 
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   200
            select:[:change |
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   201
                change isMethodChange and:[ change package ~= classPackage ]
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   202
            ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   203
    ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   204
    withExtensions ifFalse:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   205
        ^ changeSet 
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   206
            reject:[:change |
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   207
                change isMethodChange and:[ change package ~= classPackage ]
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   208
            ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   209
    ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   210
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   211
    ^ changeSet
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   212
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   213
    "
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   214
     ChangeSet forExistingClass:ChangeSet
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   215
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   216
     Rectangle hasExtensions
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   217
     Rectangle extensions
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   218
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   219
     ChangeSet forExistingClass:Rectangle withExtensions:true extensionsOnly:false
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   220
     ChangeSet forExistingClass:Rectangle withExtensions:false extensionsOnly:false
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   221
     ChangeSet forExistingClass:Rectangle withExtensions:false extensionsOnly:true
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   222
    "
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   223
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   224
    "Created: / 12-10-2006 / 18:13:02 / cg"
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
   225
    "Modified: / 12-10-2006 / 23:46:05 / cg"
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   226
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   227
1292
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   228
forExistingMethods:aCollectionOfMethods
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   229
    "build a changeSet for a collection of methods.
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   230
     That does of course not give deltas, but instead reflects the current
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   231
     state of the given set of methods.
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   232
     It is useful in conjunction with the other utility methods,
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   233
     for example, when building patchLists, diffSets etc."
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   234
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   235
    |changeSet stream previousPackage|
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   236
2244
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   237
    changeSet := self new.
1292
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   238
    aCollectionOfMethods do:[:eachMethod | 
2524
309a3ec3f7d1 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2519
diff changeset
   239
        |change source|
309a3ec3f7d1 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2519
diff changeset
   240
309a3ec3f7d1 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2519
diff changeset
   241
        source := eachMethod source.
309a3ec3f7d1 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2519
diff changeset
   242
        source isNil ifTrue:[
309a3ec3f7d1 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2519
diff changeset
   243
            Transcript showCR:'oops - no source for ',eachMethod whoString.
309a3ec3f7d1 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2519
diff changeset
   244
        ].
2244
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   245
        change := MethodDefinitionChange new.
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   246
        eachMethod mclass notNil ifTrue:[ change className:eachMethod mclass name ].
2524
309a3ec3f7d1 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2519
diff changeset
   247
        source notNil ifTrue:[ change source:source ].
2244
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   248
        change selector:eachMethod selector.
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   249
        change package:(eachMethod package).
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   250
        change category:(eachMethod category).
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   251
        changeSet add:change.
1292
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   252
    ].
2244
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   253
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   254
"/    stream := ReadWriteStream on:''.
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   255
"/    aCollectionOfMethods do:[:eachMethod | 
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   256
"/        previousPackage ~= eachMethod package ifTrue:[
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   257
"/            stream nextPutAll:'"{ Package: '''.
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   258
"/            stream nextPutAll:eachMethod package asString.
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   259
"/            stream nextPutAll:''' }"'; cr; cr.
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   260
"/        ].
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   261
"/        eachMethod mclass fileOutMethod:eachMethod on:stream
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   262
"/    ].
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   263
"/    stream reset.
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   264
"/    changeSet := self fromStream:stream.
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   265
"/    changeSet do:[:eachChange |
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   266
"/        eachChange package:(eachChange changeMethod package).
83dade66e325 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2235
diff changeset
   267
"/    ].
1292
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   268
    ^ changeSet
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   269
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   270
    "
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   271
     ChangeSet forExistingMethods:(Array with:(Array compiledMethodAt:#at:)
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   272
                                         with:(Object compiledMethodAt:#at:)
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   273
                                         with:(Behavior compiledMethodAt:#compiledMethodAt:) )
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   274
    "
1872
7a1f2a26bf90 changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents: 1869
diff changeset
   275
2524
309a3ec3f7d1 changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents: 2519
diff changeset
   276
    "Modified: / 17-09-2011 / 10:26:03 / cg"
1292
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   277
!
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
   278
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   279
forPackage: package
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   280
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   281
    ^self forPackage: package ignoreAutoloaded: false.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   282
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   283
    "Created: / 20-05-2008 / 17:56:18 / Jan Vrany <vranyj1@fel.cvut.cz>"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   284
    "Modified: / 12-08-2009 / 14:23:15 / Jan Vrany <vranyj1@fel.cvut.cz>"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   285
!
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   286
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   287
forPackage: package ignoreAutoloaded: ignoreAutoloaded
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   288
    "build a changeSet for a given package"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   289
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   290
    |changeSet packageClasses packageExtensions|
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   291
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   292
    packageClasses := ProjectDefinition searchForClassesWithProject: package.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   293
    packageExtensions := ProjectDefinition searchForExtensionsWithProject: package.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   294
    changeSet := self forExistingMethods: packageExtensions.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   295
    packageClasses do:
3029
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   296
        [:cls|
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   297
        (ignoreAutoloaded not and:[cls isLoaded not])
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   298
            ifTrue:[cls autoload].
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   299
        cls isLoaded
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   300
            ifTrue:
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   301
                [changeSet addAll:
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   302
                    (self
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   303
                        forExistingClass:cls
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   304
                        withExtensions:false
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   305
                        extensionsOnly:false)]].
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   306
    changeSet name: 'Package ' , package.
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   307
    ^changeSet
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   308
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   309
    "Created: / 12-08-2009 / 14:22:44 / Jan Vrany <vranyj1@fel.cvut.cz>"
3029
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   310
    "Modified: / 16-03-2012 / 15:37:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   311
!
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   312
2321
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   313
fromDiffSet:aDiffSet
2322
c5ebd3b56e54 comment/format in: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2321
diff changeset
   314
    "build a changeSet from a given diffSet. This can be used as a patchSet,
c5ebd3b56e54 comment/format in: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2321
diff changeset
   315
     to update the first-version in the diffSet to the second-version"
2321
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   316
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   317
    |changeSet|
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   318
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   319
    changeSet := self new.
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
   320
    "/ class definitions first...
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
   321
    changeSet addAll:((aDiffSet changed collect:[:eachPair | eachPair second]) select:[:ch | ch isClassDefinitionChange]).
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
   322
    changeSet addAll:((aDiffSet onlyInArg) select:[:ch | ch isClassDefinitionChange]).
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
   323
2321
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   324
    "/ first add new methods...
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
   325
    changeSet addAll:((aDiffSet onlyInArg) reject:[:ch | ch isClassDefinitionChange]).
2321
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   326
    "/ then, changed methods...
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
   327
    changeSet addAll:((aDiffSet changed collect:[:eachPair | eachPair second]) reject:[:ch | ch isClassDefinitionChange]).
2321
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   328
    "/ then, removed methods...
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   329
    aDiffSet onlyInReceiver do:[:each |
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   330
        |ch|
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   331
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   332
        ch := MethodRemoveChange className:(each className) selector:(each selector).
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   333
        changeSet add:ch.
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   334
    ].
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   335
    ^ changeSet
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   336
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   337
    "Created: / 08-02-2011 / 10:48:36 / cg"
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   338
!
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
   339
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   340
fromDirectory: aStringOfFilename
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   341
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   342
    | d cs |
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   343
    d := aStringOfFilename asFilename.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   344
    cs := self new.    
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   345
    d directoryContentsAsFilenames do:
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   346
        [:each|
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   347
        each suffix = 'st' ifTrue:
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   348
            [cs addAll: (self fromFileOrDirectory: each)]].
3029
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   349
    cs name: aStringOfFilename asFilename asAbsoluteFilename pathName.
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   350
    ^cs
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   351
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   352
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   353
    "
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   354
        ChangeSet fromDirectory: (Smalltalk getPackageDirectoryForPackage:'stx:libbasic')
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   355
    "
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   356
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   357
    "Created: / 02-04-2011 / 00:54:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   358
!
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   359
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   360
fromDolphinPACStream:aStream
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   361
    "build a changeSet from a stream, containing dolphin pac file chunks."
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   362
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   363
    ^ self fromDolphinPACStream:aStream while:[:thisChange | true]
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   364
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   365
!
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   366
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   367
fromDolphinPACStream:aStream while:aConditionBlock
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   368
    "build a changeSet from a stream, containing dolphin pac file chunks."
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   369
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   370
    |changeSet|
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   371
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   372
    changeSet := self new.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   373
    self 
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   374
        changesFromStream:aStream 
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   375
        for:changeSet 
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   376
        reader:(DolphinPACFileReader new) 
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   377
        do:[:aChange :lineNumberOrNil :posOrNil |
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   378
            changeSet add:aChange.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   379
            (aConditionBlock value:aChange) ifFalse:[^ changeSet].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   380
        ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   381
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   382
    ^ changeSet
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   383
!
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   384
3072
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   385
fromFile:filenameOrString
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   386
    |filename mime stream changeSet|
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   387
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   388
    filename := filenameOrString asFilename.
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   389
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   390
    mime := MIMETypes mimeTypeForFilename:filename.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   391
    mime isNil ifTrue:[
3072
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   392
        mime := filename mimeTypeOfContents.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   393
        mime isNil ifTrue:[
3072
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   394
            "/ self error:'unknown MIME type for file' mayProceed:true.
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   395
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   396
            "/ assume chunk format
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   397
            mime := 'text/plain'.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   398
        ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   399
    ].
930
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   400
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   401
    [
3072
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   402
        stream := filename readStream.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   403
        mime = 'text/xml' ifTrue:[
3072
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   404
            changeSet := self fromXMLStream:stream.
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   405
        ] ifFalse:[
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   406
            mime = 'application/x-smalltalk-source-sif' ifTrue:[
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   407
                changeSet := self fromSIFStream:stream.
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   408
            ] ifFalse:[
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   409
                mime = 'application/x-smalltalk-dolphin-package' ifTrue:[
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   410
                    changeSet := self fromDolphinPACStream:stream.
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   411
                ] ifFalse:[            
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   412
                    stream := EncodedStream decodedStreamFor:stream.
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   413
                    changeSet := self fromStream:stream.
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   414
                ]
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   415
            ]
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   416
        ]
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   417
    ] ensure:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   418
        stream notNil ifTrue:[stream close].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   419
    ].
3072
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   420
    changeSet name: filename baseName.
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   421
    ^ changeSet
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   422
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   423
    "
3072
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   424
     ChangeSet fromFile: 'st.chg'
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   425
     ChangeSet fromFile: 'patches'
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   426
    "
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   427
3029
c7be0be50898 - ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3028
diff changeset
   428
    "Created: / 16-02-1998 / 12:19:34 / cg"
3072
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   429
    "Modified (comment): / 28-07-2012 / 09:41:40 / cg"
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   430
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   431
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   432
fromFileOrDirectory: fileOrDirectory
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   433
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   434
    | f |
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   435
    f := fileOrDirectory asFilename.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   436
    ^(f isDirectory 
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   437
        ifTrue:[self fromDirectory: f]
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   438
        ifFalse:[self fromFile: f])
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   439
        name: f pathName;
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   440
        yourself.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   441
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   442
    "
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   443
        ChangeSet fromFileOrDirectory: (Smalltalk getPackageDirectoryForPackage:'stx:libbasic')
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   444
    "
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   445
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   446
    "Created: / 02-04-2011 / 00:50:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   447
!
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
   448
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   449
fromSIFStream:aStream
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   450
    "build a changeSet from a SIF stream, containing chunks
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   451
     in smalltalk interchange format.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   452
     Return the changeSet."
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   453
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   454
    ^ self fromSIFStream:aStream while:[:thisChange | true]
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   455
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   456
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   457
fromSIFStream:aStream while:aConditionBlock
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   458
    "build a changeSet from a SIF stream, containing chunks
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   459
     in smalltalk interchange format.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   460
     Return the changeSet."
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   461
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   462
    |changeSet|
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   463
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   464
    changeSet := self new.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   465
    self 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   466
        changesFromStream:aStream 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   467
        for:changeSet 
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   468
        reader:(SIFChangeFileReader new) 
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   469
        do:[:aChange :lineNumberOrNil :posOrNil |
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   470
            changeSet add:aChange.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   471
            (aConditionBlock value:aChange) ifFalse:[^ changeSet].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   472
        ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   473
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   474
    ^ changeSet
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   475
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   476
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   477
fromStream:aStream
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   478
    "build a changeSet from a stream, containing chunks.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   479
     (i.e. either a classes sourceFile or a change-file).
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   480
     Return the changeSet."
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   481
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   482
    ^ self fromStream:aStream while:[:thisChange | true]
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   483
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   484
    "
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   485
     ChangeSet fromStream:('changes' asFilename readStream)
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   486
     ChangeSet fromStream:('patches' asFilename readStream)
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   487
     ChangeSet fromStream:(Object source asString readStream)
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   488
    "
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   489
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   490
    "Created: / 16.2.1998 / 12:19:34 / cg"
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   491
    "Modified: / 14.12.1999 / 15:23:16 / cg"
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   492
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   493
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   494
fromStream:aStream while:aConditionBlock
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   495
    "build a changeSet from a stream, containing chunks.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   496
     (i.e. either a classes sourceFile or a change-file).
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   497
     Return the changeSet."
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   498
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   499
    |changeSet|
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   500
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   501
    changeSet := self new.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   502
    self 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   503
        changesFromStream:aStream 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   504
        for:changeSet 
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   505
        reader:(ChangeFileReader new)
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   506
        do:[:aChange :lineNumberOrNil :posOrNil |
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   507
            changeSet add:aChange.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   508
            (aConditionBlock value:aChange) ifFalse:[^ changeSet].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   509
        ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   510
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   511
    ^ changeSet
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   512
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   513
    "
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   514
     ChangeSet fromStream:('changes' asFilename readStream)
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   515
     ChangeSet fromStream:('patches' asFilename readStream)
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   516
     ChangeSet fromStream:(Object source asString readStream)
3073
921dc719ceda - ChangeSet
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3072
diff changeset
   517
     ChangeSet fromStream:(XWorkstation source asString readStream)
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   518
    "
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   519
3073
921dc719ceda - ChangeSet
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3072
diff changeset
   520
    "Created: / 16-02-1998 / 12:19:34 / cg"
921dc719ceda - ChangeSet
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3072
diff changeset
   521
    "Modified: / 14-12-1999 / 15:23:16 / cg"
921dc719ceda - ChangeSet
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3072
diff changeset
   522
    "Modified (comment): / 01-08-2012 / 15:24:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   523
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   524
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   525
fromXMLStream:aStream
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   526
    "build a changeSet from an XML stream, containing XML definitions.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   527
     Return the changeSet."
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   528
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   529
    |changeSet builder nameSpace|
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   530
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   531
    aStream isNil ifTrue:[^ nil].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   532
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   533
    changeSet := self new.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   534
    nameSpace := Smalltalk.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   535
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   536
    builder := XML::SourceScannerNodeBuilder new.
1475
934d20073adb more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents: 1471
diff changeset
   537
    builder scanFile:aStream do:[:change | changeSet add: change. ].
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   538
    ^ changeSet
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   539
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   540
    "
1247
be7277706e48 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1232
diff changeset
   541
     ChangeSet fromXMLStream:('../../goodies/xml/vw/xmlFileInTests/XMLParser.xml' asFilename readStream)
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   542
     ChangeSetBrowser 
1247
be7277706e48 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1232
diff changeset
   543
        openOn:(ChangeSet fromXMLStream:('../../goodies/xml/vw/xmlFileInTests/XMLParser.xml' asFilename readStream))
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   544
    "
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   545
! !
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   546
1281
6aeafe46d0ad category;
Claus Gittinger <cg@exept.de>
parents: 1264
diff changeset
   547
!ChangeSet class methodsFor:'Compatibility-ST80'!
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   548
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   549
patches
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   550
    ^ #()
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   551
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   552
    "Created: / 27.10.1997 / 13:52:54 / cg"
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   553
! !
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   554
3073
921dc719ceda - ChangeSet
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3072
diff changeset
   555
1281
6aeafe46d0ad category;
Claus Gittinger <cg@exept.de>
parents: 1264
diff changeset
   556
!ChangeSet class methodsFor:'Compatibility-VW'!
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   557
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   558
component: component definition: anObject change: changeSymbol
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   559
    "Include indication that a class/namespace was added or removed
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   560
     from a CodeComponent." 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   561
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   562
    self 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   563
        changed:#'component:definition:change:'
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   564
        with:
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   565
            ( Array 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   566
                    with: component
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   567
                    with: anObject
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   568
                    with: changeSymbol
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   569
            )
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   570
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   571
! !
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   572
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   573
!ChangeSet class methodsFor:'instance creation-private'!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   574
1191
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   575
changesFromStream:aStream do:aBlock
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   576
    "enumerate changes from a stream and invoke aBlock on each.
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   577
     The block is invoked with the change, a lineNumberOrNil and streamPosition arguments. 
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   578
     The lineNumber is only valid, if the underlying stream 
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   579
     provides line-numbers; otherwise, nil is passed."
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   580
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   581
    ^ self
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   582
        changesFromStream:aStream 
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   583
        for:(self new) 
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   584
        reader:nil
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   585
        do:aBlock
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   586
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   587
    "
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   588
     ChangeSet 
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   589
        changesFromStream:('changes' asFilename readStream) 
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   590
        do:[:chg | Transcript showCR:chg]
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   591
    "
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   592
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   593
    "Created: / 16.2.1998 / 12:19:34 / cg"
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   594
    "Modified: / 14.12.1999 / 15:23:16 / cg"
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   595
!
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   596
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   597
changesFromStream:aStream for:aChangeSet reader:aReader do:aBlock
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   598
    "enumerate changes from a stream and invoke aBlock on each.
1191
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   599
     The block is invoked with the change, a lineNumberOrNil and streamPosition arguments. 
a63c8b5e4c6d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1190
diff changeset
   600
     The lineNumber is only valid, if the underlying stream 
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   601
     provides line-numbers; otherwise, nil is passed."
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   602
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   603
    |chunk s change nameSpace package
3017
114676d42a88 Added progress notifications during while reading changes from stream
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   604
     lineNumber pos reader size |
930
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   605
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   606
    nameSpace := Smalltalk.
1135
08323691c543 care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents: 1128
diff changeset
   607
    package := Class packageQuerySignal query.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   608
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   609
    (reader := aReader) isNil ifTrue:[
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   610
        reader := ChangeFileReader new.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   611
    ].
3072
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   612
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   613
    (aStream isKindOf: EncodedStream) ifTrue:[
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   614
        size := aStream stream size.
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   615
    ] ifFalse:[
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   616
        size := aStream size.
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   617
    ].
3017
114676d42a88 Added progress notifications during while reading changes from stream
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   618
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
   619
    reader changeSet:aChangeSet.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   620
    reader changeAction:aBlock.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
   621
    reader inputStream:aStream.
930
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   622
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   623
    [aStream atEnd] whileFalse:[
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
   624
        aStream skipSeparators.
930
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   625
        lineNumber := aStream lineNumber.
1209
f98d5eb855d3 code rewritten to be independent of stream zero-base
Claus Gittinger <cg@exept.de>
parents: 1200
diff changeset
   626
        pos := aStream position1Based.
3017
114676d42a88 Added progress notifications during while reading changes from stream
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   627
114676d42a88 Added progress notifications during while reading changes from stream
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   628
        ProgressNotification notify: nil progress:(100 / size) * pos.
114676d42a88 Added progress notifications during while reading changes from stream
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   629
930
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   630
        chunk := aStream nextChunk.
2056
b4bd1ff4709e refactored
Claus Gittinger <cg@exept.de>
parents: 2053
diff changeset
   631
1447
2ac1cf09722b isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents: 1428
diff changeset
   632
        (chunk notEmptyOrNil) ifTrue:[
2279
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   633
            Class nameSpaceQuerySignal handle:[:ex| ex proceedWith:nameSpace] do:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   634
                Class packageQuerySignal handle:[:ex| ex proceedWith:package] do:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   635
                    |parser tree ns pkg|
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   636
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   637
                    parser := Parser for:chunk.
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   638
                    tree := parser 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   639
                                parseExpressionWithSelf:nil 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   640
                                notifying:nil 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   641
                                ignoreErrors:true 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   642
                                ignoreWarnings:true 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   643
                                inNameSpace:nameSpace.
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   644
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   645
                    tree notNil ifTrue:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   646
                        tree == #Error ifTrue:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   647
                            change := DoItChange new.
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   648
                            change source:chunk.
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   649
                            aBlock valueWithOptionalArgument:change and:lineNumber and:pos.
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   650
                        ] ifFalse:[    
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   651
                            "/ if there is any nameSpace directive in there, extract it.
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   652
                            ((ns := parser currentNameSpace) notNil 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   653
                            and:[ns ~~ nameSpace]) ifTrue:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   654
                                nameSpace := ns
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   655
                            ].
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   656
                            "/ if there is any package directive in there, extract it.
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   657
                            ((pkg := parser currentPackage) notNil 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   658
                            and:[pkg ~~ package]) ifTrue:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   659
                                package := pkg
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   660
                            ].
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   661
                            "/
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   662
                            "/ what type of chunk is this ...
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   663
                            "/
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   664
                            tree isConstant ifTrue:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   665
                                (s := tree evaluate) isString ifTrue:[
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   666
                                    (s startsWith:'---- ') ifTrue:[
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   667
                                        reader inputStream: s readStream.
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   668
                                        reader processInfo: s.
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   669
                                        reader inputStream: aStream.
3042
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
   670
                                    ].
930
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   671
                                ] ifFalse:[
2279
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   672
                                    self error:'unexpected change-chunk' mayProceed:true
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   673
                                ]
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   674
                            ] ifFalse:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   675
                                tree isMessage ifTrue:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   676
                                    (reader 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   677
                                        changesFromParseTree:tree 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   678
                                        lineNumber:lineNumber
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   679
                                        position:pos
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
   680
                                        chunk: chunk
2279
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   681
                                    ) ifFalse:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   682
                                        change := DoItChange new.
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   683
                                        change source:chunk.
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   684
                                        aBlock valueWithOptionalArgument:change and:lineNumber and:pos.
930
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   685
                                    ]
2279
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   686
                                ] ifFalse:[
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   687
                                    InvalidChangeChunkError 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   688
                                        raiseRequestErrorString:'unexpected change-chunk' 
a85d31a33e57 changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents: 2256
diff changeset
   689
                                        "/ mayProceed:true.
930
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   690
                                ]
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   691
                            ]
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   692
                        ]
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   693
                    ]
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   694
                ]
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   695
            ]
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   696
        ]
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   697
    ].
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   698
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   699
    "
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   700
     ChangeSet fromStream:('changes' asFilename readStream)
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   701
     ChangeSet fromStream:('patches' asFilename readStream)
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   702
     ChangeSet fromStream:(Object source asString readStream)
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   703
    "
ca4ce60fea8b lineNumber support
Claus Gittinger <cg@exept.de>
parents: 924
diff changeset
   704
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
   705
    "Created: / 16-02-1998 / 12:19:34 / cg"
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
   706
    "Modified: / 14-12-1999 / 15:23:16 / cg"
3072
300c029115d6 - Updated from CVS
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3069
diff changeset
   707
    "Modified: / 31-07-2012 / 15:37:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1083
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   708
! !
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   709
625
06f4ed35832b added #patches for ST80 compatibility
Claus Gittinger <cg@exept.de>
parents: 378
diff changeset
   710
!ChangeSet class methodsFor:'queries'!
27
claus
parents: 16
diff changeset
   711
claus
parents: 16
diff changeset
   712
current
claus
parents: 16
diff changeset
   713
    "ST-80 compatibility: return the current changeSet"
claus
parents: 16
diff changeset
   714
claus
parents: 16
diff changeset
   715
    |p|
claus
parents: 16
diff changeset
   716
claus
parents: 16
diff changeset
   717
    (Project notNil and:[(p := Project current) notNil]) ifTrue:[
959
ca4fff926135 ChangeSet current: return empty collection if there is no changeSet
Claus Gittinger <cg@exept.de>
parents: 956
diff changeset
   718
        ^ p changeSet
ca4fff926135 ChangeSet current: return empty collection if there is no changeSet
Claus Gittinger <cg@exept.de>
parents: 956
diff changeset
   719
    ].
ca4fff926135 ChangeSet current: return empty collection if there is no changeSet
Claus Gittinger <cg@exept.de>
parents: 956
diff changeset
   720
    ^ #()
27
claus
parents: 16
diff changeset
   721
claus
parents: 16
diff changeset
   722
    "
claus
parents: 16
diff changeset
   723
     ChangeSet current 
claus
parents: 16
diff changeset
   724
    "
claus
parents: 16
diff changeset
   725
! !
claus
parents: 16
diff changeset
   726
2246
3ce37b8e4967 changed: #decodedStreamFor:
Claus Gittinger <cg@exept.de>
parents: 2244
diff changeset
   727
!ChangeSet class methodsFor:'utilities'!
3ce37b8e4967 changed: #decodedStreamFor:
Claus Gittinger <cg@exept.de>
parents: 2244
diff changeset
   728
3ce37b8e4967 changed: #decodedStreamFor:
Claus Gittinger <cg@exept.de>
parents: 2244
diff changeset
   729
decodedStreamFor:aStream
2247
1ff6d78eb96c code move
Claus Gittinger <cg@exept.de>
parents: 2246
diff changeset
   730
    <resource: #obsolete>
1ff6d78eb96c code move
Claus Gittinger <cg@exept.de>
parents: 2246
diff changeset
   731
    ^ EncodedStream decodedStreamFor:aStream
2246
3ce37b8e4967 changed: #decodedStreamFor:
Claus Gittinger <cg@exept.de>
parents: 2244
diff changeset
   732
! !
3ce37b8e4967 changed: #decodedStreamFor:
Claus Gittinger <cg@exept.de>
parents: 2244
diff changeset
   733
1264
3d1fc5d40ab4 method category rename
Claus Gittinger <cg@exept.de>
parents: 1263
diff changeset
   734
!ChangeSet methodsFor:'Compatibility-ST80'!
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
   735
899
7b65d6f2b0f0 more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 894
diff changeset
   736
changeClass:aClass
7b65d6f2b0f0 more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 894
diff changeset
   737
    "dummy here"
100
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   738
899
7b65d6f2b0f0 more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 894
diff changeset
   739
    "Created: / 4.2.2000 / 18:30:59 / cg"
901
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
   740
!
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
   741
1476
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   742
changeSelectors
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   743
    "return a collection of all selectors for which changes are in this changeSet"
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   744
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   745
    |selectors|
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   746
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   747
    changeSelectors isNil ifTrue:[
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   748
        selectors := IdentitySet new.
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   749
        self do:[:chg |
1967
18cf73f144e4 care for nil selectors.
Claus Gittinger <cg@exept.de>
parents: 1954
diff changeset
   750
            |sel|
1476
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   751
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   752
            chg notNil ifTrue:[
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   753
                chg isMethodChange ifTrue:[
1967
18cf73f144e4 care for nil selectors.
Claus Gittinger <cg@exept.de>
parents: 1954
diff changeset
   754
                    sel := chg selector.
18cf73f144e4 care for nil selectors.
Claus Gittinger <cg@exept.de>
parents: 1954
diff changeset
   755
                    sel notNil ifTrue:[
18cf73f144e4 care for nil selectors.
Claus Gittinger <cg@exept.de>
parents: 1954
diff changeset
   756
                        selectors add:sel
18cf73f144e4 care for nil selectors.
Claus Gittinger <cg@exept.de>
parents: 1954
diff changeset
   757
                    ]
1476
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   758
                ]
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   759
            ]
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   760
        ].
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   761
        changeSelectors := selectors.
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   762
    ].
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   763
    ^ changeSelectors.
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   764
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   765
    "
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   766
     ChangeSet current changeSelectors  
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   767
    "
1967
18cf73f144e4 care for nil selectors.
Claus Gittinger <cg@exept.de>
parents: 1954
diff changeset
   768
18cf73f144e4 care for nil selectors.
Claus Gittinger <cg@exept.de>
parents: 1954
diff changeset
   769
    "Modified: / 30-05-2007 / 12:12:32 / cg"
1476
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   770
!
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
   771
1102
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   772
changedClasses
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   773
    "return a collection of all classes for which changes are in this changeSet"
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   774
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   775
    |classes|
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   776
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   777
    changedClasses isNil ifTrue:[
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   778
        classes := IdentitySet new.
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   779
        self do:[:chg |
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   780
            |cls|
1102
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   781
1315
f0f764125625 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1313
diff changeset
   782
            chg notNil ifTrue:[
f0f764125625 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1313
diff changeset
   783
                cls := chg changeClass.
f0f764125625 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1313
diff changeset
   784
                cls notNil ifTrue:[
1898
325fa7fbb3e3 use isRealNameSpace
Claus Gittinger <cg@exept.de>
parents: 1885
diff changeset
   785
                    cls isRealNameSpace ifFalse:[
1315
f0f764125625 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1313
diff changeset
   786
                        classes add:cls
f0f764125625 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1313
diff changeset
   787
                    ]
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   788
                ]
1102
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   789
            ]
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   790
        ].
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   791
        changedClasses := classes.
1102
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   792
    ].
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   793
    ^ changedClasses.
1102
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   794
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   795
    "
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   796
     ChangeSet current changedClasses  
1791
746e0b3aa286 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1718
diff changeset
   797
     ChangeSet current flushChangedClassesCache
1102
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   798
    "
1791
746e0b3aa286 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1718
diff changeset
   799
1898
325fa7fbb3e3 use isRealNameSpace
Claus Gittinger <cg@exept.de>
parents: 1885
diff changeset
   800
    "Modified: / 10-11-2006 / 17:17:26 / cg"
1102
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   801
!
4763b34e4c0e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1099
diff changeset
   802
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   803
component:component definition:anObject change:changeSymbol
1083
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   804
    "Include indication that a class/namespace was added or removed
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   805
     from a CodeComponent." 
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   806
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   807
    self 
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   808
        changed:#'component:definition:change:'
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   809
        with:
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   810
            ( Array 
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   811
                    with: component
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   812
                    with: anObject
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   813
                    with: changeSymbol
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   814
            )
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   815
!
e3ac808d06e8 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1081
diff changeset
   816
901
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
   817
reorganizeSystem
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
   818
    "dummy here"
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
   819
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
   820
    "Created: / 6.2.2000 / 20:45:10 / cg"
889
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   821
! !
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   822
2235
3078dab499ca *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2234
diff changeset
   823
!ChangeSet methodsFor:'accessing'!
3078dab499ca *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2234
diff changeset
   824
3078dab499ca *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2234
diff changeset
   825
name
3078dab499ca *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2234
diff changeset
   826
    ^ name
3078dab499ca *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2234
diff changeset
   827
!
3078dab499ca *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2234
diff changeset
   828
3068
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
   829
name:aString
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
   830
    name := aString.
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
   831
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
   832
    "Modified (format): / 28-07-2012 / 09:34:52 / cg"
2235
3078dab499ca *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2234
diff changeset
   833
! !
2234
f5af55bd08cb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2186
diff changeset
   834
985
d6e52410ac8a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 965
diff changeset
   835
!ChangeSet methodsFor:'change & update'!
d6e52410ac8a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 965
diff changeset
   836
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   837
changed:anAspectSymbol with:aParameter 
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   838
    "Allow objects to depend on the ChangeSet class instead of a particular instance 
1099
bd76198721aa *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1098
diff changeset
   839
     of ChangeSet (which may be switched using projects)."
985
d6e52410ac8a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 965
diff changeset
   840
1475
934d20073adb more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents: 1471
diff changeset
   841
    self == ChangeSet current ifTrue:[
934d20073adb more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents: 1471
diff changeset
   842
        ChangeSet changed:anAspectSymbol with:aParameter.
934d20073adb more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents: 1471
diff changeset
   843
    ].
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   844
    super changed:anAspectSymbol with:aParameter
985
d6e52410ac8a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 965
diff changeset
   845
! !
d6e52410ac8a *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 965
diff changeset
   846
901
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
   847
!ChangeSet methodsFor:'changes management'!
889
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   848
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   849
addClassCommentChangeFor:aClass
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   850
    "add a classComment change to the receiver"
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   851
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   852
    |newChange|
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   853
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   854
    newChange := ClassCommentChange class:aClass.
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   855
    newChange comment:aClass comment.
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   856
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   857
    self addChange:newChange
889
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   858
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   859
    "Modified: / 14.11.2001 / 13:35:34 / cg"
100
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   860
!
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   861
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   862
addClassDefinitionChangeFor:aClass
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
   863
    "add a classDefinition change to the receiver"
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
   864
100
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   865
    |newChange|
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   866
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   867
    newChange := ClassDefinitionChange class:aClass source:(aClass definition).
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   868
    newChange package:aClass package.
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   869
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   870
    self addChange:newChange
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   871
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   872
    "
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   873
     (ChangeSet new addClassDefinitionChangeFor:ChangeSet) inspect
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   874
    "
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   875
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   876
    "Modified: / 12-10-2006 / 18:17:02 / cg"
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   877
!
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   878
1232
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
   879
addClassRemoveChange:oldClass 
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   880
    "add a classRemove change to the receiver"
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   881
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   882
    |newChange|
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   883
1232
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
   884
    newChange := ClassRemoveChange new className:oldClass name.
1281
6aeafe46d0ad category;
Claus Gittinger <cg@exept.de>
parents: 1264
diff changeset
   885
    self rememberChangedClass:oldClass.
1421
eeb8f1c9b6b4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1415
diff changeset
   886
    oldClass isPrivate ifTrue:[
eeb8f1c9b6b4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1415
diff changeset
   887
        self rememberChangedClass:oldClass topOwningClass.
eeb8f1c9b6b4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1415
diff changeset
   888
    ].
1232
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
   889
    ClassRemoveChange::ClassBeingRemovedQuery 
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
   890
        answer:oldClass
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
   891
        do:[
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
   892
            self addChange:newChange
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
   893
        ]
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   894
    "Modified: / 14.11.2001 / 13:35:39 / cg"
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   895
!
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   896
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   897
addClassRenameChangeFrom:oldName to:newName
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   898
    "add a classRename change to the receiver"
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   899
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   900
    |newChange|
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   901
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   902
    newChange := ClassRenameChange new oldName:oldName newName:newName.
1281
6aeafe46d0ad category;
Claus Gittinger <cg@exept.de>
parents: 1264
diff changeset
   903
    self rememberChangedClass:(Smalltalk at:newName).
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   904
    self addChange:newChange
100
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   905
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   906
    "Modified: / 14.11.2001 / 13:35:41 / cg"
100
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   907
!
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   908
1081
5d8001052312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1045
diff changeset
   909
addDoIt:aString
5d8001052312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1045
diff changeset
   910
    "add a doIt to the receiver"
5d8001052312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1045
diff changeset
   911
5d8001052312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1045
diff changeset
   912
    |newChange|
5d8001052312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1045
diff changeset
   913
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   914
    newChange := DoItChange new source:aString.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   915
    self addChange:newChange.
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   916
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   917
    "Modified: / 14.11.2001 / 13:35:44 / cg"
1081
5d8001052312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1045
diff changeset
   918
!
5d8001052312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1045
diff changeset
   919
889
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   920
addInstVarDefinitionChangeFor:aClass
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   921
    "add an instVarDefinition change to the receiver"
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   922
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   923
    |newChange|
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   924
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   925
    newChange := ClassInstVarDefinitionChange 
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   926
                        class:aClass
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   927
                        source:(aClass name , ' instanceVariableNames:' , aClass instanceVariableString storeString).
2617
a9e632776c57 visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents: 2524
diff changeset
   928
    newChange classInstVarNames:aClass instanceVariableString asCollectionOfWords.
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   929
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   930
    self addChange:newChange
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   931
2617
a9e632776c57 visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents: 2524
diff changeset
   932
    "Modified: / 25-11-2011 / 17:38:42 / cg"
889
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   933
!
6b05401d7184 more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents: 887
diff changeset
   934
16
fcbfbba03d49 *** empty log message ***
claus
parents: 10
diff changeset
   935
addMethodCategoryChange:aMethod category:newCategory in:aClass
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
   936
    "add a methodCategory change to the receiver"
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
   937
16
fcbfbba03d49 *** empty log message ***
claus
parents: 10
diff changeset
   938
    |newChange|
fcbfbba03d49 *** empty log message ***
claus
parents: 10
diff changeset
   939
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   940
    newChange := MethodCategoryChange 
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   941
                        class:aClass
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   942
                        selector:(aClass selectorAtMethod:aMethod)
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   943
                        category:newCategory.
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   944
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   945
    self addChange:newChange
16
fcbfbba03d49 *** empty log message ***
claus
parents: 10
diff changeset
   946
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   947
    "Modified: / 14.11.2001 / 13:35:48 / cg"
44
claus
parents: 39
diff changeset
   948
!
claus
parents: 39
diff changeset
   949
956
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   950
addMethodChange:aMethod fromOld:oldMethod in:aClass
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   951
    "add a method change to the receiver"
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   952
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   953
    |newChange|
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   954
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   955
    newChange := MethodChange 
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   956
                        class:aClass
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   957
                        selector:aMethod selector
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   958
                        source:aMethod source
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   959
                        category:aMethod category.
956
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   960
    oldMethod notNil ifTrue:[
1232
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
   961
        newChange previousVersion:oldMethod.
956
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   962
    ].
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   963
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   964
    self addChange:newChange.
956
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   965
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   966
    "Modified: / 14.11.2001 / 13:35:50 / cg"
956
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   967
!
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
   968
85
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
   969
addMethodChange:aMethod in:aClass
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
   970
    "add a method change to the receiver"
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
   971
85
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
   972
    |newChange|
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
   973
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   974
    newChange := MethodChange 
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   975
                        class:aClass
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   976
                        selector:aMethod selector
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   977
                        source:aMethod source
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
   978
                        category:aMethod category.
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   979
    newChange package:(aMethod package).
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
   980
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
   981
    self addChange:newChange
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
   982
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
   983
    "Modified: / 12-10-2006 / 18:15:28 / cg"
85
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
   984
!
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
   985
1842
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   986
addMethodPackageChange:aMethod package:newPackage in:aClass
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   987
    "add a methodPackage change to the receiver"
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   988
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   989
    |newChange|
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   990
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   991
    newChange := MethodPackageChange 
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   992
                        class:aClass
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   993
                        selector:(aClass selectorAtMethod:aMethod)
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   994
                        package:newPackage.
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   995
    self rememberChangedClass:aClass.
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   996
    self addChange:newChange
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   997
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   998
    "Created: / 09-10-2006 / 14:02:33 / cg"
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
   999
!
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
  1000
44
claus
parents: 39
diff changeset
  1001
addMethodPrivacyChange:aMethod in:aClass
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1002
    "add a methodPrivacy change to the receiver"
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1003
44
claus
parents: 39
diff changeset
  1004
    |newChange|
claus
parents: 39
diff changeset
  1005
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1006
    newChange := MethodPrivacyChange 
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1007
                        class:aClass
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1008
                        selector:(aClass selectorAtMethod:aMethod)
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1009
                        privacy:aMethod privacy.
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1010
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1011
    self addChange:newChange
44
claus
parents: 39
diff changeset
  1012
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1013
    "Modified: / 27.8.1995 / 22:55:22 / claus"
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1014
    "Modified: / 14.11.2001 / 13:35:55 / cg"
235
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1015
!
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1016
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1017
addPrimitiveDefinitionsChangeFor:aClass
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1018
    "add a primitiveDefinitions change to the receiver"
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1019
235
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1020
    |newChange|
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1021
783
90ffa6f0a86b checkin from browser
Claus Gittinger <cg@exept.de>
parents: 781
diff changeset
  1022
    newChange := ClassPrimitiveDefinitionsChange new
1287
faf72a0bc34a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1281
diff changeset
  1023
                        class:aClass source:(aClass primitiveDefinitionsString).
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1024
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1025
    self addChange:newChange
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1026
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1027
    "Modified: / 14.11.2001 / 13:35:57 / cg"
235
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1028
!
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1029
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1030
addPrimitiveFunctionsChangeFor:aClass
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1031
    "add a primitiveFunctions change to the receiver"
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1032
235
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1033
    |newChange|
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1034
783
90ffa6f0a86b checkin from browser
Claus Gittinger <cg@exept.de>
parents: 781
diff changeset
  1035
    newChange := ClassPrimitiveFunctionsChange new
1287
faf72a0bc34a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1281
diff changeset
  1036
                        class:aClass source:(aClass primitiveFunctionsString).
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1037
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1038
    self addChange:newChange
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1039
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1040
    "Modified: / 14.11.2001 / 13:35:59 / cg"
235
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1041
!
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1042
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1043
addPrimitiveVariablesChangeFor:aClass
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1044
    "add a primitiveVariables change to the receiver"
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1045
235
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1046
    |newChange|
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 102
diff changeset
  1047
783
90ffa6f0a86b checkin from browser
Claus Gittinger <cg@exept.de>
parents: 781
diff changeset
  1048
    newChange := ClassPrimitiveVariablesChange new
1287
faf72a0bc34a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1281
diff changeset
  1049
                         class:aClass source:(aClass primitiveVariablesString).
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1050
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1051
    self addChange:newChange
378
f106015c98a6 commentary
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
  1052
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1053
    "Modified: / 14.11.2001 / 13:36:01 / cg"
654
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
  1054
!
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
  1055
1164
cecaa2229cab removeSelector change: remember methods previous version
Claus Gittinger <cg@exept.de>
parents: 1156
diff changeset
  1056
addRemoveSelectorChange:aSelector fromOld:oldMethod in:aClass
654
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
  1057
    "add a method-remove change to the receiver"
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
  1058
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
  1059
    |newChange|
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
  1060
1081
5d8001052312 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1045
diff changeset
  1061
    newChange := MethodRemoveChange class:aClass selector:aSelector.
1164
cecaa2229cab removeSelector change: remember methods previous version
Claus Gittinger <cg@exept.de>
parents: 1156
diff changeset
  1062
    oldMethod notNil ifTrue:[
1232
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
  1063
        newChange previousVersion:oldMethod.
1164
cecaa2229cab removeSelector change: remember methods previous version
Claus Gittinger <cg@exept.de>
parents: 1156
diff changeset
  1064
    ].
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1065
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1066
    self addChange:newChange
654
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
  1067
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
  1068
    "Modified: / 27.8.1995 / 22:55:22 / claus"
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 625
diff changeset
  1069
    "Created: / 16.2.1998 / 12:47:07 / cg"
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1070
    "Modified: / 14.11.2001 / 13:36:04 / cg"
901
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
  1071
!
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
  1072
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
  1073
addRenameCategoryChangeIn:aClass from:oldCategory to:newCategory
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
  1074
    "add a category rename change to the receiver"
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
  1075
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
  1076
    |newChange|
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
  1077
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
  1078
    newChange := MethodCategoryRenameChange class:aClass.
8fd26c5e8e8f more VW compatibility
Claus Gittinger <cg@exept.de>
parents: 899
diff changeset
  1079
    newChange oldCategoryName:oldCategory newCategoryName:newCategory.
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1080
    self rememberChangedClass:aClass.
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1081
    self addChange:newChange
1105
b27c0d72d7d0 avoid useless change notifications from #collect:, #select: etc.
Claus Gittinger <cg@exept.de>
parents: 1102
diff changeset
  1082
1111
d4f353ffaa53 oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents: 1105
diff changeset
  1083
    "Modified: / 14.11.2001 / 13:36:06 / cg"
1105
b27c0d72d7d0 avoid useless change notifications from #collect:, #select: etc.
Claus Gittinger <cg@exept.de>
parents: 1102
diff changeset
  1084
! !
b27c0d72d7d0 avoid useless change notifications from #collect:, #select: etc.
Claus Gittinger <cg@exept.de>
parents: 1102
diff changeset
  1085
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1086
!ChangeSet methodsFor:'fileOut'!
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1087
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1088
fileOutAs: aStringOrFilename
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1089
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1090
    | stream |
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1091
    stream := aStringOrFilename asFilename writeStream.
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1092
    [ self fileOutOn: stream ]
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1093
        ensure: [stream close]
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1094
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1095
    "Created: / 05-12-2009 / 12:33:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1096
!
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1097
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1098
fileOutOn: stream
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1099
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1100
    self do:[:chg|chg fileOutOn: stream]
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1101
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1102
    "Created: / 05-12-2009 / 12:32:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1103
! !
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1104
3073
921dc719ceda - ChangeSet
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3072
diff changeset
  1105
85
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
  1106
!ChangeSet methodsFor:'misc'!
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
  1107
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
  1108
addPatch:nameOfPatch
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
  1109
    "ignored for now - allows fileIn of ST-80 patch stuff .."
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
  1110
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
  1111
    ^ self
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
  1112
! !
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
  1113
3073
921dc719ceda - ChangeSet
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3072
diff changeset
  1114
1263
14ef737d93a8 method category rename
Claus Gittinger <cg@exept.de>
parents: 1247
diff changeset
  1115
!ChangeSet methodsFor:'private-accessing'!
1098
420a868fd606 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1097
diff changeset
  1116
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1117
addChange:aChange
2053
590bf720dfd4 dont add nil to a set
Claus Gittinger <cg@exept.de>
parents: 2046
diff changeset
  1118
    |changeClass|
590bf720dfd4 dont add nil to a set
Claus Gittinger <cg@exept.de>
parents: 2046
diff changeset
  1119
1898
325fa7fbb3e3 use isRealNameSpace
Claus Gittinger <cg@exept.de>
parents: 1885
diff changeset
  1120
    aChange timeOfChangeIfKnown isNil ifTrue:[
325fa7fbb3e3 use isRealNameSpace
Claus Gittinger <cg@exept.de>
parents: 1885
diff changeset
  1121
        aChange timeStamp:(Timestamp now).
325fa7fbb3e3 use isRealNameSpace
Claus Gittinger <cg@exept.de>
parents: 1885
diff changeset
  1122
    ].
325fa7fbb3e3 use isRealNameSpace
Claus Gittinger <cg@exept.de>
parents: 1885
diff changeset
  1123
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1124
    self add:aChange.
1471
d3a32a4b689b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1453
diff changeset
  1125
    changedClasses notNil ifTrue:[
2053
590bf720dfd4 dont add nil to a set
Claus Gittinger <cg@exept.de>
parents: 2046
diff changeset
  1126
        (changeClass := aChange changeClass) notNil ifTrue:[      
590bf720dfd4 dont add nil to a set
Claus Gittinger <cg@exept.de>
parents: 2046
diff changeset
  1127
            changedClasses add:changeClass.
590bf720dfd4 dont add nil to a set
Claus Gittinger <cg@exept.de>
parents: 2046
diff changeset
  1128
        ].
1471
d3a32a4b689b *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1453
diff changeset
  1129
    ].
1476
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
  1130
    changeSelectors notNil ifTrue:[
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
  1131
        aChange isMethodChange ifTrue:[
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
  1132
            changeSelectors add:aChange selector.
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
  1133
        ].
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
  1134
    ].
1232
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
  1135
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
  1136
"/    aChange sendChangeNotificationThroughSmalltalk. 
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1137
    self changed:#addChange: with:aChange.
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1138
1898
325fa7fbb3e3 use isRealNameSpace
Claus Gittinger <cg@exept.de>
parents: 1885
diff changeset
  1139
    "Created: / 14-11-2001 / 13:35:11 / cg"
325fa7fbb3e3 use isRealNameSpace
Claus Gittinger <cg@exept.de>
parents: 1885
diff changeset
  1140
    "Modified: / 10-11-2006 / 16:47:13 / cg"
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1141
!
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1142
1479
Claus Gittinger <cg@exept.de>
parents: 1478
diff changeset
  1143
flushChangedClassesCache
Claus Gittinger <cg@exept.de>
parents: 1478
diff changeset
  1144
    changedClasses := changeSelectors := nil
Claus Gittinger <cg@exept.de>
parents: 1478
diff changeset
  1145
Claus Gittinger <cg@exept.de>
parents: 1478
diff changeset
  1146
    "
Claus Gittinger <cg@exept.de>
parents: 1478
diff changeset
  1147
     ChangeSet current flushChangedClassesCache
Claus Gittinger <cg@exept.de>
parents: 1478
diff changeset
  1148
    "
Claus Gittinger <cg@exept.de>
parents: 1478
diff changeset
  1149
!
Claus Gittinger <cg@exept.de>
parents: 1478
diff changeset
  1150
1128
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1151
rememberChangedClass:aClass
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1152
    changedClasses notNil ifTrue:[
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1153
        changedClasses add:aClass
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1154
    ].
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1155
!
9e213e86c212 cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents: 1127
diff changeset
  1156
1098
420a868fd606 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1097
diff changeset
  1157
removeAll:aCollection
1301
b747d11e7ff8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1292
diff changeset
  1158
    aCollection notEmpty ifTrue:[
b747d11e7ff8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1292
diff changeset
  1159
        super removeAll:aCollection.
1476
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
  1160
        changedClasses := changeSelectors := nil.
1301
b747d11e7ff8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1292
diff changeset
  1161
        self changed:#removeAll: with:aCollection.
b747d11e7ff8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1292
diff changeset
  1162
    ]
1421
eeb8f1c9b6b4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1415
diff changeset
  1163
!
eeb8f1c9b6b4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1415
diff changeset
  1164
eeb8f1c9b6b4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1415
diff changeset
  1165
unrememberChangedClasses
eeb8f1c9b6b4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1415
diff changeset
  1166
    changedClasses := nil
1098
420a868fd606 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1097
diff changeset
  1167
! !
420a868fd606 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1097
diff changeset
  1168
1034
cdc9ddc19155 added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents: 985
diff changeset
  1169
!ChangeSet methodsFor:'queries'!
cdc9ddc19155 added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents: 985
diff changeset
  1170
2160
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1171
changedPackages
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1172
    "return a collection of all packages for which changes are in this changeSet"
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1173
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1174
    |classes changedPackages|
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1175
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1176
    changedPackages := Set new.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1177
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1178
    self do:[:chg |
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1179
        |p mthd cls|
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1180
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1181
        p := chg package.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1182
        p isNil ifTrue:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1183
            chg isMethodChange ifTrue:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1184
                mthd := chg changeMethod.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1185
                mthd notNil ifTrue:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1186
                    p := mthd package.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1187
                ] ifFalse:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1188
                    cls := chg changeClass.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1189
                    cls notNil ifTrue:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1190
                        p := cls package.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1191
                    ]
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1192
                ]
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1193
            ] ifFalse:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1194
                chg isClassChange ifTrue:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1195
                    cls := chg changeClass.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1196
                    cls notNil ifTrue:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1197
                        p := cls package.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1198
                    ]
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1199
                ]
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1200
            ].
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1201
        ].
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1202
        p notNil ifTrue:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1203
            changedPackages add:p.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1204
        ]
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1205
    ].
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1206
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1207
"/    self changedClasses do:[:cls |
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1208
"/        |p|
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1209
"/
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1210
"/        (p := cls package) notNil ifTrue:[
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1211
"/            changedPackages add:p.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1212
"/        ]
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1213
"/    ].
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1214
    ^ changedPackages.
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1215
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1216
    "
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1217
     ChangeSet current changedPackages  
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1218
    "
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1219
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1220
    "Created: / 22-09-2006 / 16:37:40 / cg"
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1221
    "Modified: / 13-10-2006 / 01:20:48 / cg"
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1222
!
831832c4c164 oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents: 2138
diff changeset
  1223
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1224
changesForPackage:aPackageSymbol
3065
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1225
    ^(self select:[:aChange |
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1226
        |includeThis mClass mthd|
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1227
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1228
        includeThis := false.
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1229
        (aChange isMethodChange or:[aChange isMethodRemoveChange]) ifTrue:[
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1230
            mClass := aChange changeClass.
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1231
            mClass notNil ifTrue:[
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1232
                mthd := mClass compiledMethodAt:(aChange selector).
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1233
                mthd isNil ifTrue:[
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1234
                    aChange isMethodRemoveChange ifTrue:[
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1235
                        includeThis := (mClass package = aPackageSymbol)
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1236
                    ].
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1237
                ] ifFalse:[
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1238
                    includeThis := (mthd package = aPackageSymbol)
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1239
                ]
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1240
            ].
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1241
        ] ifFalse:[
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1242
            (aChange isClassChange) ifTrue:[
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1243
                (aChange changeClass notNil) ifTrue:[
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1244
                    includeThis := (aChange changeClass package = aPackageSymbol)
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1245
                ].
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1246
            ].
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1247
        ].
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1248
        includeThis
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1249
    ])
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1250
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1251
    "
3065
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1252
     ChangeSet current changesForPackage:#'stx:goodies/libsvn'
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1253
    "
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1254
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1255
    "Created: / 05-11-2001 / 14:21:17 / cg"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1256
    "Modified: / 12-10-2006 / 16:51:27 / cg"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1257
    "Modified: / 22-10-2008 / 13:25:02 / Jan Vrany <vranyj1@fel.cvut.cz>"
3065
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1258
    "Modified (comment): / 26-07-2012 / 11:54:00 / cg"
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1259
!
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1260
1034
cdc9ddc19155 added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents: 985
diff changeset
  1261
includesChangeForClass:aClass
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1262
    |nameOfClass|
1085
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1263
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1264
    nameOfClass := aClass theNonMetaclass name.
1918
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1265
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1266
    (self changedClasses contains:[:aClass | aClass theNonMetaclass name = nameOfClass]) ifFalse:[^ false].
1340
e5ccdb4c4efa checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1329
diff changeset
  1267
    ^ self contains:[:aChange | aChange className = nameOfClass]
1085
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1268
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1269
    "
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1270
     ChangeSet current includesChangeForClass:ChangeSet
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1271
     ChangeSet current includesChangeForClass:ChangeSet class
1686
7d2c1f9f63e9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1521
diff changeset
  1272
     ChangeSet current includesChangeForClass:SourceCodeManagerUtilities
1918
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1273
     ChangeSet current includesChangeForClass:(Expecco::ExpeccoXMLDecoder::ObjectCreator)
1085
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1274
    "
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1275
1842
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
  1276
    "Modified: / 09-10-2006 / 13:39:22 / cg"
1085
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1277
!
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1278
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1279
includesChangeForClass:aClass selector:selector
1918
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1280
    |nameOfNonMetaClass nameOfClass|
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1281
1478
400bfb0e4ea9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1282
    (self changeSelectors includes:selector) ifFalse:[^ false].
1476
d8938e5b253e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1475
diff changeset
  1283
1918
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1284
    nameOfNonMetaClass := aClass theNonMetaclass name.
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1285
    (self changedClasses contains:[:aClass | aClass theNonMetaclass name = nameOfNonMetaClass]) ifFalse:[^ false].
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1286
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1287
    nameOfClass := aClass name.
1085
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1288
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1289
    ^ self contains:[:aChange | 
1232
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
  1290
                        selector = aChange selector 
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1291
                        ifFalse:[
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1292
                            false
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1293
                        ] ifTrue:[
1232
58d1ebc59df5 added #addClassRemoveChange:
james
parents: 1209
diff changeset
  1294
                            nameOfClass = aChange className
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1295
                        ]
1085
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1296
                    ]
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1297
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1298
    "
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1299
     ChangeSet current includesChangeForClass:ChangeSet selector:#includesChangeForClass:
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1300
    "
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1301
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1302
    "Created: / 31.10.2001 / 10:26:31 / cg"
e4912b831447 includesChangeFor...
Claus Gittinger <cg@exept.de>
parents: 1083
diff changeset
  1303
    "Modified: / 31.10.2001 / 10:59:49 / cg"
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1304
!
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1305
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1306
includesChangeForClassOrMetaclass:aClass
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1307
    |nameOfClass nameOfMetaclass|
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1308
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1309
    nameOfClass := aClass theNonMetaclass name.
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1310
    nameOfMetaclass := aClass theMetaclass name.
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1311
1920
4365130e896f bad spelling of methodname
Stefan Vogel <sv@exept.de>
parents: 1918
diff changeset
  1312
    (self changedClasses contains:[:eachClass | eachClass theNonMetaclass name = nameOfClass]) ifFalse:[
1918
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1313
        ^ false.
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1314
    ].
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1315
1f3fcb411307 do not check for identical class being in changeSet -
boris
parents: 1898
diff changeset
  1316
1920
4365130e896f bad spelling of methodname
Stefan Vogel <sv@exept.de>
parents: 1918
diff changeset
  1317
    ^ self contains:[:eachChange | 
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1318
                        |changeClassName|
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1319
1920
4365130e896f bad spelling of methodname
Stefan Vogel <sv@exept.de>
parents: 1918
diff changeset
  1320
                        changeClassName := eachChange className.
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1321
                        changeClassName = nameOfClass or:[changeClassName = nameOfMetaclass]
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1322
                    ]
1842
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
  1323
6ca4e98df305 method-package change record added
Claus Gittinger <cg@exept.de>
parents: 1830
diff changeset
  1324
    "Modified: / 09-10-2006 / 13:40:29 / cg"
1127
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1325
!
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1326
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1327
includesChangeForClassOrMetaclassOrPrivateClassOf:aClass
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1328
    |nameOfClass nameOfMetaclass|
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1329
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1330
    nameOfClass := aClass theNonMetaclass name.
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1331
    nameOfMetaclass := aClass theMetaclass name.
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1332
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1333
    self do:[:aChange | 
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1334
        |changeClassName changeClass|
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1335
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1336
        changeClassName := aChange className.
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1337
        (changeClassName = nameOfClass) ifTrue:[^ true].
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1338
        (changeClassName = nameOfMetaclass) ifTrue:[^ true].
3065
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1339
1127
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1340
        changeClass := aChange changeClass.
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1341
        (changeClass notNil
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1342
        and:[changeClass isPrivate
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1343
        and:[changeClass owningClass == aClass]]) ifTrue:[
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1344
            ^ true
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1345
        ]
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1346
    ].
b009373b0feb +includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents: 1115
diff changeset
  1347
    ^ false
3065
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1348
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1349
    "Modified (format): / 25-07-2012 / 16:50:26 / cg"
1885
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1350
!
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1351
2519
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1352
includesChangeForClassOrMetaclassOrPrivateClassOfAny:aCollectionOfClasses
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1353
    |namesOfClasses namesOfMetaclasses|
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1354
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1355
    namesOfClasses := aCollectionOfClasses collect:[:eachClass | eachClass theNonMetaclass name] as:Array.
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1356
    namesOfMetaclasses := aCollectionOfClasses collect:[:eachClass | eachClass theMetaclass name] as:Array.
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1357
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1358
    self do:[:aChange | 
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1359
        |changeClassName changeClass|
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1360
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1361
        changeClassName := aChange className.
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1362
        (namesOfClasses includes:changeClassName) ifTrue:[^ true].
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1363
        (namesOfMetaclasses includes:changeClassName) ifTrue:[^ true].
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1364
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1365
        changeClass := aChange changeClass.
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1366
        (changeClass notNil and:[changeClass isPrivate]) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1367
            (aCollectionOfClasses includes:changeClass owningClass) ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1368
                ^ true
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1369
            ].
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1370
        ]
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1371
    ].
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1372
    ^ false
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1373
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1374
    "Created: / 08-09-2011 / 04:24:26 / cg"
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1375
!
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1376
1885
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1377
includesChangeForPackage:aPackageID
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1378
    ^ self changedPackages includes:aPackageID
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1379
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1380
"/    ^ self contains:[:aChange | aChange package = aPackageID]
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1381
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1382
    "
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1383
     ChangeSet current includesChangeForPackage:'stx:libbasic'
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1384
    "
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1385
b77dd687e497 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1883
diff changeset
  1386
    "Created: / 25-10-2006 / 18:06:55 / cg"
2519
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1387
!
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1388
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1389
selectForWhichIncludesChangeForClassOrMetaclassOrPrivateClassFrom:aCollectionOfClasses
3065
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1390
    |selected alreadyProcessed classes prev|
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1391
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1392
    classes := aCollectionOfClasses collect:[:eachClass | eachClass theNonMetaclass] as:Array.
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1393
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1394
    selected := Set new.
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1395
    alreadyProcessed := Set new.
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1396
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1397
    self do:[:eachChange | 
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1398
        |changeClassName changeClass isIn|
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1399
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1400
        changeClass := eachChange changeClass.
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1401
        (changeClass notNil and:[ changeClass ~~ prev ]) ifTrue:[
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1402
            changeClass := changeClass theNonMetaclass.
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1403
            (alreadyProcessed includes:changeClass) ifFalse:[            
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1404
                ((classes includes:changeClass)
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1405
                    or: [
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1406
                        changeClass isPrivate
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1407
                        and: [ (classes includes:changeClass owningClass) ]
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1408
                    ]
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1409
                ) ifTrue:[
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1410
                    selected add: changeClass
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1411
                ].
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1412
                alreadyProcessed add: changeClass
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1413
            ].
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1414
            prev := changeClass.
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1415
        ]
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1416
    ].
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1417
    ^ selected.
2519
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1418
Claus Gittinger <cg@exept.de>
parents: 2491
diff changeset
  1419
    "Created: / 08-09-2011 / 04:38:32 / cg"
1034
cdc9ddc19155 added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents: 985
diff changeset
  1420
! !
cdc9ddc19155 added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents: 985
diff changeset
  1421
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1422
!ChangeSet methodsFor:'utilities'!
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1423
878
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1424
apply
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1425
    "apply all changes in the receivers changeSet"
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1426
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1427
    self do:[:aChange |
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1428
        aChange apply
878
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1429
    ]
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1430
!
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1431
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1432
condenseChanges
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1433
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1434
    | changesToRemove changesToKeep |
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1435
    changesToKeep := self class new.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1436
    changesToRemove := self class new.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1437
    self reverseDo:
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1438
	[:change|
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1439
	(changesToKeep anySatisfy:[:each|each isForSameAs: change])
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1440
	    ifTrue:[changesToRemove add: change]
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1441
	    ifFalse:[changesToKeep add: change]
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1442
	].
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1443
    self condenseChanges: changesToRemove.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1444
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1445
    "Created: / 22-10-2008 / 13:05:13 / Jan Vrany <vranyj1@fel.cvut.cz>"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1446
!
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1447
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1448
condenseChanges:changesToRemove
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1449
    "remove the given changes - a helper for the rest of the condense protocol"
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1450
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1451
    changesToRemove notEmpty ifTrue:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1452
        changedClasses := changeSelectors := nil.
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1453
        self removeAll:changesToRemove.
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1454
        self changed.
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1455
        Smalltalk changed:#currentChangeSet with:self.
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1456
    ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1457
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1458
    "Created: / 12-10-2006 / 16:51:11 / cg"
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1459
!
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1460
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1461
condenseChangesForClass:aClass 
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1462
    "remove all changes for aClass
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1463
     (i.e. leave changes for other classes)."
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1464
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1465
    self condenseChangesForClass:aClass package:nil
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1466
!
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1467
878
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1468
condenseChangesForClass:aClass package:aPackageSymbol
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1469
    "remove all changes for aClass and aPackageSymbol
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1470
     (i.e. leave methodChanges for other packages).
956
0c6c209df4e9 keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents: 946
diff changeset
  1471
     This is invoked when a class is checked into the repository."
878
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1472
1186
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1473
    self condenseChangesForClass:aClass selector:nil package:aPackageSymbol
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1474
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1475
    "Modified: / 5.11.2001 / 14:29:22 / cg"
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1476
!
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1477
1830
a44c9beee9a6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1827
diff changeset
  1478
condenseChangesForClass:aClass selector:aSelector
a44c9beee9a6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1827
diff changeset
  1479
    "remove all changes for aClass >> selector."
a44c9beee9a6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1827
diff changeset
  1480
a44c9beee9a6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1827
diff changeset
  1481
    self condenseChangesForClass:aClass selector:aSelector package:nil
a44c9beee9a6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1827
diff changeset
  1482
a44c9beee9a6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1827
diff changeset
  1483
    "Created: / 26-09-2006 / 17:22:59 / cg"
a44c9beee9a6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1827
diff changeset
  1484
!
a44c9beee9a6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1827
diff changeset
  1485
1186
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1486
condenseChangesForClass:aClass selector:selectorOrNil package:aPackageSymbol
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1487
    "remove all changes for aClass/selector and aPackageSymbol
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1488
     (i.e. leave methodChanges for other packages).
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1489
     If selectorOrNil is nil, all changes for that class are removed;
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1490
     otherwise, only changes for the given selector.
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1491
     This is invoked when a class is checked into the repository."
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1492
945
f9e349d38d49 care for metaclasses when condensing changeSet
Claus Gittinger <cg@exept.de>
parents: 944
diff changeset
  1493
    |changesToRemove className metaClassName chgCls|
878
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1494
945
f9e349d38d49 care for metaclasses when condensing changeSet
Claus Gittinger <cg@exept.de>
parents: 944
diff changeset
  1495
    className := aClass theNonMetaclass name.
f9e349d38d49 care for metaclasses when condensing changeSet
Claus Gittinger <cg@exept.de>
parents: 944
diff changeset
  1496
    metaClassName := aClass theMetaclass name.
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1497
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1498
    changesToRemove := self select:[:aChange | 
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1499
        |chgClassName chgClass removeThis mClass mthd|
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1500
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1501
        removeThis := false.
945
f9e349d38d49 care for metaclasses when condensing changeSet
Claus Gittinger <cg@exept.de>
parents: 944
diff changeset
  1502
        chgClassName := aChange className.
1168
48ec2c3c4151 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
  1503
        (chgClassName = className or:[chgClassName = metaClassName]) ifTrue:[
1187
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1504
            removeThis := true
944
f4cb7e9b034b when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents: 939
diff changeset
  1505
        ] ifFalse:[
f4cb7e9b034b when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents: 939
diff changeset
  1506
            chgCls := aChange changeClass.
1718
c5b36c490912 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1686
diff changeset
  1507
            chgCls isNil ifTrue:[
c5b36c490912 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1686
diff changeset
  1508
                (chgClassName startsWith:(aClass name,':')) ifTrue:[
c5b36c490912 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1686
diff changeset
  1509
                    "a change for a private class of a no-longer present one..."
c5b36c490912 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1686
diff changeset
  1510
                        removeThis := true
c5b36c490912 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1686
diff changeset
  1511
                ].
c5b36c490912 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1686
diff changeset
  1512
            ].
c5b36c490912 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1686
diff changeset
  1513
944
f4cb7e9b034b when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents: 939
diff changeset
  1514
            (chgCls notNil
f4cb7e9b034b when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents: 939
diff changeset
  1515
            and:[chgCls isPrivate
1190
02e2436893b6 condense after checkin: also condense sub-sub-private classes
Claus Gittinger <cg@exept.de>
parents: 1188
diff changeset
  1516
            and:[chgCls topOwningClass == aClass]]) ifTrue:[
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1517
                removeThis := true
944
f4cb7e9b034b when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents: 939
diff changeset
  1518
            ]
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1519
        ].
1186
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1520
        selectorOrNil notNil ifTrue:[
1187
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1521
            (aChange isMethodChange or:[aChange isMethodRemoveChange]) ifFalse:[
1186
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1522
                removeThis := false.
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1523
            ] ifTrue:[
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1524
                aChange selector = selectorOrNil ifFalse:[
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1525
                    removeThis := false.
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1526
                ].
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1527
            ]
a47e1a5770c2 condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents: 1184
diff changeset
  1528
        ].
1187
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1529
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1530
        removeThis ifTrue:[
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1531
            aChange isMethodChange ifTrue:[
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1532
                mClass := aChange changeClass.
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1533
                mClass notNil ifTrue:[
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1534
                    mthd := mClass compiledMethodAt:(aChange selector).
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1535
                    mthd isNil ifTrue:[
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1536
                        "/ mthd does no longer exist
1168
48ec2c3c4151 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
  1537
"/ I no longer understand what this was meant for .. (sigh)
48ec2c3c4151 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
  1538
"/                        aPackageSymbol notNil ifTrue:[
48ec2c3c4151 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
  1539
"/                            removeThis := false
48ec2c3c4151 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
  1540
"/                        ]
1096
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1541
                    ] ifFalse:[
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1542
                        (aPackageSymbol notNil and:[mthd package ~= aPackageSymbol]) ifTrue:[
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1543
                            removeThis := false
4a949a840bb3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1088
diff changeset
  1544
                        ]
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1545
                    ]
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1546
                ]
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1547
            ].
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1548
        ].
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1549
        removeThis
1301
b747d11e7ff8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1292
diff changeset
  1550
    ].
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1551
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1552
    self condenseChanges:changesToRemove
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1553
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1554
    "Modified: / 12-10-2006 / 16:51:38 / cg"
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1555
!
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1556
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1557
condenseChangesForExtensionsInPackage:aPackageSymbol
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1558
    "remove all changes for aClass and aPackageSymbol
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1559
     (i.e. leave methodChanges for other packages).
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1560
     This is invoked when a class is checked into the repository."
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1561
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1562
    |changesToRemove|
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1563
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1564
    changesToRemove := OrderedCollection new.
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1565
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1566
    changesToRemove := self select:[:aChange | 
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1567
        |removeThis mClass mthd|
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1568
1187
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1569
        (aChange isMethodChange or:[aChange isMethodRemoveChange]) ifTrue:[
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1570
            removeThis := false.
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1571
            mClass := aChange changeClass.
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1572
            mClass notNil ifTrue:[
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1573
                mthd := mClass compiledMethodAt:(aChange selector).
1187
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1574
                mthd isNil ifTrue:[
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1575
                    aChange isMethodRemoveChange ifTrue:[
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1576
                        removeThis := true
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1577
                    ].
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1578
                ] ifFalse:[
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1579
                    mthd package = aPackageSymbol ifTrue:[
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1580
                        removeThis := true
f63ecc7dbaff condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents: 1186
diff changeset
  1581
                    ]
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1582
                ]
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1583
            ].
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1584
        ].
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1585
        removeThis
1087
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1586
    ].
5aaf7da2882d condense changes for extensions
Claus Gittinger <cg@exept.de>
parents: 1085
diff changeset
  1587
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1588
    self condenseChanges:changesToRemove
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1589
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1590
    "Created: / 05-11-2001 / 14:21:17 / cg"
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1591
    "Modified: / 12-10-2006 / 16:51:32 / cg"
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1592
!
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1593
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1594
condenseChangesForPackage:aPackageSymbol
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1595
    "remove all changes for aPackageSymbol
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1596
     This is invoked when a project is checked into the repository."
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1597
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1598
    |changesToRemove|
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1599
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1600
    changesToRemove := self select:[:aChange | 
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1601
        |removeThis mClass mthd|
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1602
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1603
        removeThis := false.
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1604
        (aChange isMethodChange or:[aChange isMethodRemoveChange]) ifTrue:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1605
            mClass := aChange changeClass.
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1606
            mClass notNil ifTrue:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1607
                mthd := mClass compiledMethodAt:(aChange selector).
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1608
                mthd isNil ifTrue:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1609
                    aChange isMethodRemoveChange ifTrue:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1610
                        removeThis := (mClass package = aPackageSymbol)
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1611
                    ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1612
                ] ifFalse:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1613
                    removeThis := (mthd package = aPackageSymbol)
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1614
                ]
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1615
            ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1616
        ] ifFalse:[
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1617
            (aChange isClassChange) ifTrue:[
1883
40975a15e85f *** empty log message ***
sr
parents: 1876
diff changeset
  1618
                (aChange changeClass notNil) ifTrue:[
40975a15e85f *** empty log message ***
sr
parents: 1876
diff changeset
  1619
                    removeThis := (aChange changeClass package = aPackageSymbol)     
40975a15e85f *** empty log message ***
sr
parents: 1876
diff changeset
  1620
                ].
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1621
            ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1622
        ].
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1623
        removeThis
1521
ea6cb41e4523 send out a change notification, when I condensed
Claus Gittinger <cg@exept.de>
parents: 1479
diff changeset
  1624
    ].
ea6cb41e4523 send out a change notification, when I condensed
Claus Gittinger <cg@exept.de>
parents: 1479
diff changeset
  1625
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1626
    self condenseChanges:changesToRemove
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1627
1521
ea6cb41e4523 send out a change notification, when I condensed
Claus Gittinger <cg@exept.de>
parents: 1479
diff changeset
  1628
    "Created: / 05-11-2001 / 14:21:17 / cg"
1865
89d9aef483b2 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1842
diff changeset
  1629
    "Modified: / 12-10-2006 / 16:51:27 / cg"
878
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1630
!
99583ccfe415 *** empty log message ***
ps
parents: 877
diff changeset
  1631
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1632
diffSetsAgainst:anotherChangeSet
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1633
    "walk over the receiver and anotherChangeSet,
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1634
     add all changes to one of the tree lists:
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1635
        onlyInReceiver, onlyInArg or changed,
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1636
     each being a changeSet containing corresponding changes.
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  1637
     WARNING: 
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  1638
        destructive; could modify both the receiver and the argument by possibly
2633
5a5460e5231a comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2626
diff changeset
  1639
        changing methodChanges into categoryChanges"
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1640
1200
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1641
    |otherChangeIndicesBySelector otherNonMethodChangeIndices changeIndicesBySelector nonMethodChangeIndices
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  1642
     onlyInReceiver onlyInArg changedMethods same
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1643
     indexFromChangedMethodsToA indexFromChangedMethodsToB
864
4f35b96a799e checkin from browser
ps
parents: 860
diff changeset
  1644
     "info" ret|
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1645
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1646
    onlyInReceiver := ChangeSet new.
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1647
    onlyInArg      := ChangeSet new.
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1648
    changedMethods := ChangeSet new.
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  1649
    same           := ChangeSet new.
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1650
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1651
    indexFromChangedMethodsToA := OrderedCollection new.
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1652
    indexFromChangedMethodsToB := OrderedCollection new.
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1653
1200
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1654
    otherChangeIndicesBySelector := Dictionary new.
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1655
    otherNonMethodChangeIndices := OrderedCollection new.
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1656
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1657
    "/ these caches reduces square runtime to almost linear...
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1658
    anotherChangeSet keysAndValuesDo:[:idxB :aChangeInB |
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1659
        |setOfOtherChangeIndicesForThisSelector|
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1660
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1661
        aChangeInB isMethodChange ifTrue:[
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1662
            setOfOtherChangeIndicesForThisSelector := otherChangeIndicesBySelector at:(aChangeInB selector) ifAbsentPut:[OrderedCollection new].
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1663
            setOfOtherChangeIndicesForThisSelector add:idxB.
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1664
        ] ifFalse:[
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1665
            otherNonMethodChangeIndices add:idxB
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1666
        ].
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1667
    ].
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1668
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1669
    self keysAndValuesDo:[:idxA :aChangeInA |
1200
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1670
        |indicesOfChangesToExplore anyFound ch|
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1671
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1672
        anyFound := false.
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1673
1200
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1674
        aChangeInA isMethodChange ifTrue:[
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1675
            indicesOfChangesToExplore := otherChangeIndicesBySelector at:(aChangeInA selector) ifAbsent:#()
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1676
        ] ifFalse:[
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1677
            indicesOfChangesToExplore := otherNonMethodChangeIndices.
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1678
        ].
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1679
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1680
        indicesOfChangesToExplore do:[:idxB |
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1681
            |aChangeInB|
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1682
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1683
            aChangeInB := anotherChangeSet at:idxB.
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1684
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1685
            (aChangeInA isForSameAs:aChangeInB) ifTrue:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1686
                anyFound := true.
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1687
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1688
                "/ also in B - is it different ?
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1689
                (aChangeInA sameAs:aChangeInB) ifFalse:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1690
                    changedMethods add:aChangeInA.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1691
                    indexFromChangedMethodsToA add:idxA.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1692
                    indexFromChangedMethodsToB add:idxB.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1693
                ] ifTrue:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1694
                    aChangeInA isMethodChange ifTrue:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1695
                        aChangeInA methodCategory ~= aChangeInB methodCategory ifTrue:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1696
                            "/ only the category is different;
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1697
                            "/ make it a MethodCategory changes.
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1698
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1699
                            ch := MethodCategoryChange new
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1700
                                    className:aChangeInA className
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1701
                                    selector:aChangeInA selector
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  1702
                                    category:aChangeInA methodCategory;
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  1703
                                    "JV@2012-03-20: Also keeps origin, required by merge tool"
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  1704
                                    origin: aChangeInA.
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1705
                            self at:idxA put:ch.
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1706
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1707
                            ch := MethodCategoryChange new
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1708
                                    className:aChangeInB className
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1709
                                    selector:aChangeInB selector
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  1710
                                    category:aChangeInB methodCategory;
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  1711
                                    "JV@2012-03-20: Also keeps origin, required by merge tool"
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  1712
                                    origin: aChangeInB.
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1713
                            anotherChangeSet at:idxB put:ch.
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1714
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1715
                            changedMethods add:aChangeInA.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1716
                            indexFromChangedMethodsToA add:idxA.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1717
                            indexFromChangedMethodsToB add:idxB.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1718
                        ]
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1719
                    ].
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1720
                ]
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1721
            ] ifFalse:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1722
                (aChangeInA sameAs:aChangeInB) ifTrue:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1723
                    anyFound := true.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1724
                ] ifFalse:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1725
                ]
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1726
            ]
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1727
        ].
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1728
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1729
        anyFound ifFalse:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1730
            onlyInReceiver add:aChangeInA.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1731
        ]
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1732
    ].
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1733
1200
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1734
    "/ these caches reduces square runtime to almost linear...
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1735
    changeIndicesBySelector := Dictionary new.
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1736
    nonMethodChangeIndices := OrderedCollection new.
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1737
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1738
    self keysAndValuesDo:[:idxA :aChangeInA |
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1739
        |setOfChangeIndicesForThisSelector|
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1740
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1741
        aChangeInA isMethodChange ifTrue:[
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1742
            setOfChangeIndicesForThisSelector := changeIndicesBySelector at:(aChangeInA selector) ifAbsentPut:[OrderedCollection new].
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1743
            setOfChangeIndicesForThisSelector add:idxA.
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1744
        ] ifFalse:[
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1745
            nonMethodChangeIndices add:idxA
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1746
        ].
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1747
    ].
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1748
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1749
    anotherChangeSet keysAndValuesDo:[:idxB :aChangeInB |
1200
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1750
        |anyFound indicesOfChangesToExplore|
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1751
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1752
        anyFound := false.
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1753
1200
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1754
        aChangeInB isMethodChange ifTrue:[
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1755
            indicesOfChangesToExplore := changeIndicesBySelector at:(aChangeInB selector) ifAbsent:#()
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1756
        ] ifFalse:[
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1757
            indicesOfChangesToExplore := nonMethodChangeIndices.
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1758
        ].
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1759
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1760
        indicesOfChangesToExplore do:[:idxA |
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1761
            |aChangeInA idxM|
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1762
2da3e026f94d much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents: 1191
diff changeset
  1763
            aChangeInA := self at:idxA.
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1764
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1765
            (aChangeInA isForSameAs:aChangeInB) ifTrue:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1766
                anyFound := true.
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1767
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1768
                "/ also in B - is it different ?
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1769
                (aChangeInA sameAs:aChangeInB) ifFalse:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1770
                    "/ already there ?
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1771
                    idxM := changedMethods findFirst:[:c | c isForSameAs:aChangeInB].
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1772
                    idxM == 0 ifTrue:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1773
                        changedMethods add:aChangeInB.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1774
                        indexFromChangedMethodsToB add:idxB.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1775
                    ] ifFalse:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1776
                        indexFromChangedMethodsToB at:idxM put:idxB
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1777
                    ]
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1778
                ]
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1779
            ] ifFalse:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1780
                (aChangeInA sameAs:aChangeInB) ifTrue:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1781
                    anyFound := true.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1782
                ] ifFalse:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1783
                ]
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1784
            ]
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1785
        ].
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1786
        anyFound ifFalse:[
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1787
            onlyInArg add:aChangeInB.
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1788
        ]
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1789
    ].
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1790
864
4f35b96a799e checkin from browser
ps
parents: 860
diff changeset
  1791
"/    info := OrderedCollection new:(changedMethods size).
4f35b96a799e checkin from browser
ps
parents: 860
diff changeset
  1792
"/    changedMethods keysAndValuesDo:[:idx :changedMethod |
4f35b96a799e checkin from browser
ps
parents: 860
diff changeset
  1793
"/        info add:(Array 
4f35b96a799e checkin from browser
ps
parents: 860
diff changeset
  1794
"/                        with:(indexFromChangedMethodsToA at:idx)
4f35b96a799e checkin from browser
ps
parents: 860
diff changeset
  1795
"/                        with:(indexFromChangedMethodsToB at:idx)
4f35b96a799e checkin from browser
ps
parents: 860
diff changeset
  1796
"/                 )
4f35b96a799e checkin from browser
ps
parents: 860
diff changeset
  1797
"/    ].
1450
0ec14b2064fb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1447
diff changeset
  1798
    changedMethods := (1 to:changedMethods size) asOrderedCollection collect:[:idx |
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1799
                        |cA cB|
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1800
946
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1801
                        cA := self at:(indexFromChangedMethodsToA at:idx).
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1802
                        cB := anotherChangeSet at:(indexFromChangedMethodsToB at:idx).
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1803
                        Array with:cA with:cB
11f09459b0f5 comment
Claus Gittinger <cg@exept.de>
parents: 945
diff changeset
  1804
                      ].
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  1805
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  1806
    same := self reject:[:chg|(changedMethods contains:[:pair|pair first == chg]) or:[onlyInReceiver includes: chg]].
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  1807
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  1808
    ret := DiffSet new
1450
0ec14b2064fb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1447
diff changeset
  1809
                changed:changedMethods
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  1810
                onlyInReceiver:onlyInReceiver
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  1811
                onlyInArg:onlyInArg
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  1812
                same: same.
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  1813
"/    ret info:info.
864
4f35b96a799e checkin from browser
ps
parents: 860
diff changeset
  1814
    ^ret
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  1815
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  1816
    "Modified: / 12-10-2006 / 22:22:39 / cg"
2633
5a5460e5231a comment/format in:
Claus Gittinger <cg@exept.de>
parents: 2626
diff changeset
  1817
    "Modified (comment): / 01-12-2011 / 19:12:55 / cg"
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  1818
    "Modified: / 20-03-2012 / 22:05:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1819
!
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1820
2412
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1821
diffSetsAgainstImage
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1822
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1823
    |imageChangeSet|
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1824
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1825
    imageChangeSet := self class new.
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1826
    self changedClasses do:
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1827
	[:class|
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1828
	(class isMetaclass or:[class isPrivate]) ifFalse:
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1829
	    [imageChangeSet addAll:
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1830
		(self class fromStream: class source asString readStream)]].
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1831
    ^self diffSetsAgainst: imageChangeSet
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1832
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1833
    "Created: / 04-12-2007 / 16:03:28 / janfrog"
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1834
!
13197e877a9e Extension methods from libsvn
vrany
parents: 2376
diff changeset
  1835
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1836
flatten
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1837
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1838
    | flatten |
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1839
    flatten := self class new: self size.
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1840
    self do:[:ea|ea do:[:ea2|flatten add: ea2]].
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1841
    ^flatten
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1842
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1843
    "Created: / 29-10-2010 / 14:40:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1844
!
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1845
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1846
groupBy: groupBlock labelAs: labelBlock
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1847
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1848
    "
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1849
        returns a new changeset consisting of CompositeChanges.
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1850
        Changes are grouped together by value (tag) of groupBlock.
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1851
        Each composite change is then labeled using label
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1852
        returned by labelBlock (called with the tag returned
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1853
        by groupBlock as arg)
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1854
    "
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1855
2491
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1856
    ^ self groupBy: groupBlock labelAs: labelBlock sort: false
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1857
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1858
    "Created: / 24-07-2009 / 23:17:38 / Jan Vrany <vranyj1@fel.cvut.cz>"
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1859
    "Modified: / 25-07-2009 / 19:40:16 / Jan Vrany <vranyj1@fel.cvut.cz>"
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1860
    "Modified: / 29-10-2010 / 12:45:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1861
    "Modified: / 30-08-2011 / 16:07:30 / cg"
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1862
!
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1863
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1864
groupBy: groupBlock labelAs: labelBlock sort: doSort
2626
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1865
    "returns a new changeset consisting of CompositeChanges.
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1866
     Changes are grouped together by value (tag) of groupBlock.
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1867
     Each composite change is then labeled using label
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1868
     returned by labelBlock (called with the tag returned
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1869
     by groupBlock as arg)"
2491
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1870
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1871
    | buckets newChangeset keys |
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1872
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1873
    buckets := OrderedDictionary new.
3065
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1874
    self do:[:change| 
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1875
        | tag |
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1876
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1877
        tag := groupBlock value: change.
3065
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1878
        (buckets at: tag ifAbsentPut: [self class new:4]) add: change
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1879
    ].
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1880
    newChangeset := self class new: buckets size.
2491
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1881
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1882
    keys := buckets keys select:[:k | k notNil].
3065
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1883
    doSort ifTrue:[ keys sort ].
2491
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1884
    keys do:[:tag |
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1885
        |changes classDefs|
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1886
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1887
        changes := buckets at:tag.
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1888
3065
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1889
        "Move class definition to the front"
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1890
        classDefs := changes select:[:chg|chg isClassDefinitionChange].
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1891
        changes removeAll: classDefs.
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1892
        changes addAllFirst: classDefs.
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1893
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1894
        tag notNil ifTrue:[
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1895
            newChangeset add:
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1896
                (CompositeChange 
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1897
                    name: (labelBlock value: tag)
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1898
                    changes: changes)
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1899
        ]
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1900
    ].
2626
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1901
    (buckets includesKey: nil) ifTrue:[
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1902
        newChangeset addAll: (buckets at: nil)
0ac000060c44 changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2617
diff changeset
  1903
    ].
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1904
    ^newChangeset
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1905
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1906
    "Created: / 24-07-2009 / 23:17:38 / Jan Vrany <vranyj1@fel.cvut.cz>"
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1907
    "Modified: / 25-07-2009 / 19:40:16 / Jan Vrany <vranyj1@fel.cvut.cz>"
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1908
    "Modified: / 29-10-2010 / 12:45:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2491
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1909
    "Created: / 30-08-2011 / 16:07:01 / cg"
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1910
!
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1911
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1912
groupByClass
2491
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1913
    |nm|
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1914
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1915
    ^self
2491
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1916
        groupBy: [:change|
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1917
            change isClassChange ifTrue: [
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1918
                nm := change className.
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1919
                (nm endsWith:' class') ifTrue:[nm := nm copyTo: nm size - 6].
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1920
                nm
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1921
            ] ifFalse: [
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1922
                nil
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1923
            ]
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1924
        ]
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1925
        labelAs: [:className|
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1926
            className
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1927
        ]
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1928
        sort: true
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1929
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1930
    "Created: / 25-07-2009 / 19:43:14 / Jan Vrany <vranyj1@fel.cvut.cz>"
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1931
    "Modified: / 24-10-2009 / 18:49:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2491
882e07ee86bd added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents: 2469
diff changeset
  1932
    "Modified: / 30-08-2011 / 16:08:38 / cg"
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1933
!
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  1934
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1935
saveSignedToFile:aFilename
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1936
    "write the changeSet to a signed file in chunk format"
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1937
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1938
    self saveSignedToFile:aFilename format:nil
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1939
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1940
    "Created: / 08-02-2011 / 11:18:54 / cg"
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1941
!
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1942
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1943
saveSignedToFile:aFilename format:formatSymbolOrNil
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1944
    "write the changeSet to a signed file in some format.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1945
     Sign with the exept key (which you do not have outside of exept!!).
3065
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1946
     Nil is chunk format (currently, the only supported)"
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1947
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1948
    |s pkcs7SignedData|
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1949
3065
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1950
    self assert: (Smalltalk at:#'Expecco::KeyFileGenerator') notNil.
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1951
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1952
    s := WriteStream on:(String new:2000).
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1953
    self saveToStream:s format:formatSymbolOrNil.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1954
3065
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1955
    pkcs7SignedData := (Smalltalk at:#'Expecco::KeyFileGenerator') new signExpeccoCode:s contents.
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1956
    aFilename asFilename contents:pkcs7SignedData.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1957
3065
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  1958
    "Modified (comment): / 26-07-2012 / 12:15:58 / cg"
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1959
!
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1960
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1961
saveToFile:aFilename
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1962
    "write the changeSet to a regular file in chunk format"
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1963
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1964
    self saveToFile:aFilename format:nil
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1965
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1966
    "Created: / 08-02-2011 / 11:18:46 / cg"
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1967
!
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1968
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1969
saveToFile:aFilename format:formatSymbolOrNil
3069
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  1970
    "Writes the changeSet to a regular file in some format.
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  1971
     Supported formats are:
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  1972
       nil ............ chunk changeset file
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  1973
       #classSource ... class fileout format, assumes that
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  1974
                        the receiver is a changeset containing
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  1975
                        single class (possibly with its private 
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  1976
                        classes)
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  1977
    "
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1978
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1979
    |s|
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1980
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1981
    s := aFilename asFilename writeStream.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1982
    self saveToStream:s format:formatSymbolOrNil.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1983
    s close.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1984
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1985
    "Created: / 08-02-2011 / 11:20:06 / cg"
3069
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  1986
    "Modified (comment): / 31-07-2012 / 13:38:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1987
!
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1988
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1989
saveToStream:aStream format:formatSymbolOrNil
3069
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  1990
    "Writes the changeSet to a stream in some format.
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  1991
     Supported formats are:
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  1992
       nil ............ chunk changeset file
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  1993
       #classSource ... class fileout format, assumes that
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  1994
                        the receiver is a changeset containing
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  1995
                        single class (possibly with its private 
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  1996
                        classes)
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  1997
    "
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  1998
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  1999
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  2000
    formatSymbolOrNil isNil ifTrue:[
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  2001
        self do:[:eachChange |
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  2002
            eachChange isMethodCodeChange ifTrue:[
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  2003
                aStream nextPutAll:'!!',(eachChange className),' methodsFor: '.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  2004
                aStream nextPutAll:(eachChange methodCategory storeString).
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  2005
                aStream nextPutLine:'!!'.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  2006
                aStream cr.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  2007
                aStream nextPutAll:(eachChange source).
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  2008
                aStream nextPutLine:'!! !!'.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  2009
           ] ifFalse:[
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  2010
                aStream nextPutAll:(eachChange source).
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  2011
                aStream nextPutLine:'!!'.
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  2012
            ].
2469
4a02caf1782d changed: #saveToStream:format:
Claus Gittinger <cg@exept.de>
parents: 2412
diff changeset
  2013
            aStream cr.
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  2014
        ].
3065
c60f15e53fce Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3053
diff changeset
  2015
        ^ self
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  2016
    ].
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  2017
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2018
    formatSymbolOrNil == #classSource ifTrue:[
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  2019
        ClassSourceWriter new 
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  2020
            fileOut:self 
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  2021
            on:aStream 
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  2022
            withTimeStamp:false 
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  2023
            withInitialize:true 
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  2024
            withDefinition:true
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  2025
            methodFilter:nil encoder:nil.
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2026
        ^self.
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2027
    ].
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2028
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2029
    self error:'Unknown format, possible formats are { nil, #classSource }'
2323
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  2030
3c9f00f9ca34 added:5 methods
Claus Gittinger <cg@exept.de>
parents: 2322
diff changeset
  2031
    "Created: / 08-02-2011 / 11:25:16 / cg"
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  2032
    "Modified: / 20-03-2012 / 14:06:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3069
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  2033
    "Modified (comment): / 31-07-2012 / 13:38:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
857
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  2034
! !
0a1a91c94e53 diff utility
Claus Gittinger <cg@exept.de>
parents: 829
diff changeset
  2035
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2036
!ChangeSet::ChangeFileReader methodsFor:'accessing'!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2037
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2038
changeAction:aBlock
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2039
    changeAction := aBlock.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2040
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2041
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2042
changeSet:something
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2043
    "set the value of the instance variable 'changeSet' (automatically generated)"
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2044
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2045
    changeSet := something.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2046
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2047
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2048
inputStream:aStream
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2049
    inputStream := aStream.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2050
! !
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2051
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2052
!ChangeSet::ChangeFileReader methodsFor:'helpers'!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2053
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2054
addChange:change
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2055
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2056
    timestamp notNil ifTrue:[change timeStamp: timestamp].
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2057
    timestamp := nil.
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2058
2008
204b171a553d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1977
diff changeset
  2059
    changeAction 
204b171a553d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1977
diff changeset
  2060
        valueWithOptionalArgument:change 
204b171a553d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1977
diff changeset
  2061
        and:lineNumber 
204b171a553d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1977
diff changeset
  2062
        and:position.
204b171a553d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1977
diff changeset
  2063
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2064
    "Modified: / 02-04-2012 / 19:09:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2065
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2066
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2067
checkReceiverIsGlobalNamed:expectedName
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2068
    ^ self variableNameOfReceiver = expectedName
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2069
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2070
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2071
classNameOf:aReceiver
2376
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2072
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2073
    | nameSpace clsName |
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2074
    nameSpace := Class nameSpaceQuerySignal query.
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2075
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2076
    (aReceiver isUnaryMessage and:[aReceiver selector == #class]) 
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2077
            ifTrue:[clsName := (aReceiver receiver name) , ' class'] 
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2078
            ifFalse:[clsName := aReceiver name].
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2079
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2080
    ^(nameSpace ~~ Smalltalk and:[(clsName startsWith: nameSpace name) not])
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2081
        ifTrue:[nameSpace name , '::' , clsName]
d7311cfb8a5f Jan's changes
vrany
parents: 2323
diff changeset
  2082
        ifFalse:[clsName].
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2083
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2084
    "Modified: / 24-01-2012 / 17:07:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2085
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2086
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2087
receiversClassName
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2088
    ^ self classNameOf:receiver
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2089
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2090
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2091
variableNameOfReceiver
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2092
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2093
    receiver isVariable ifFalse:[ ^ nil ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2094
    ^ receiver name
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2095
! !
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2096
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2097
!ChangeSet::ChangeFileReader methodsFor:'reading'!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2098
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2099
changesFromParseTree:aTree lineNumber:initialLineNumberOrNil position:initialPositionOrNil
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2100
    "given a parse-tree (from parsing some changes source/chunk),
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2101
     create changes and evaluate changeAction on each.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2102
     The chnageAction-block is invoked with the change and a lineNumberOrNil as
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2103
     arg; the lineNumber is only valid, if the underlying inputStream 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2104
     provides line-numbers; otherwise, nil is passed."
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2105
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2106
    ^self changesFromParseTree:aTree lineNumber:initialLineNumberOrNil position:initialPositionOrNil chunk: nil
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2107
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2108
    "Modified: / 24-01-2012 / 17:29:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2109
!
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2110
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2111
changesFromParseTree:aTree lineNumber:initialLineNumberOrNil position:initialPositionOrNil chunk: initialChunkOrNil
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2112
    "given a parse-tree (from parsing some changes source/chunk),
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2113
     create changes and evaluate changeAction on each.
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2114
     The chnageAction-block is invoked with the change and a lineNumberOrNil as
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2115
     arg; the lineNumber is only valid, if the underlying inputStream 
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2116
     provides line-numbers; otherwise, nil is passed."
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2117
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2118
    lineNumber := initialLineNumberOrNil.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2119
    position := initialPositionOrNil.
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2120
    chunk := initialChunkOrNil.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2121
    parseTree := aTree.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2122
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2123
    selector := aTree selector.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2124
    receiver := aTree receiver.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2125
    arguments := aTree arguments.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2126
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2127
    receiver isMessage ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2128
        receiverSelector := receiver selector.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2129
        receiverReceiver := receiver receiver.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2130
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2131
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2132
    ^ self processChange
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2133
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2134
    "Created: / 24-01-2012 / 17:28:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2135
! !
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2136
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2137
!ChangeSet::ChangeFileReader methodsFor:'reading-private'!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2138
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2139
handleCategoriesForChange
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2140
    |selector category categories attributes change|
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2141
2256
b98137d2aa30 changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents: 2247
diff changeset
  2142
    selector := arguments first value.
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2143
    className := self receiversClassName.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2144
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2145
    categories := OrderedCollection new.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2146
    attributes := OrderedCollection new.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2147
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2148
    [
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2149
        inputStream skipSeparators.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2150
        category := inputStream nextChunk.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2151
        category notEmptyOrNil
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2152
    ] whileTrue:[
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2153
        ( #( 'public' 'private' ) includes: category) ifTrue:[
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2154
            attributes add:category
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2155
        ] ifFalse:[
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2156
            categories add:category
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2157
        ].
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2158
    ].
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2159
    categories size == 1 ifTrue:[
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2160
        "/ easy
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2161
        change := MethodCategoryChange 
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2162
                        className:className
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2163
                        selector:selector
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2164
                        source:(parseTree printString)
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2165
                        category:(categories first).
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2166
        self addChange:change.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2167
    ] ifFalse:[
2298
Claus Gittinger <cg@exept.de>
parents: 2290
diff changeset
  2168
        self halt:'multiple/missing categories not supported'.
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2169
    ].
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2170
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2171
    attributes size == 1 ifTrue:[
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2172
        "/ easy
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2173
        (attributes first = 'public') ifTrue:[
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2174
            "/ default anyway - ignore
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2175
        ] ifFalse:[
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2176
            change := MethodPrivacyChange 
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2177
                        className:className
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2178
                        selector:selector
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2179
                        privacy:(attributes first asSymbol).
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2180
            change source:(parseTree printString).
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2181
            self addChange:change.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2182
        ].
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2183
    ] ifFalse:[
2298
Claus Gittinger <cg@exept.de>
parents: 2290
diff changeset
  2184
        self halt:'multiple/missing attributes not supported'.
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2185
    ].
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2186
    ^ true
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2187
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2188
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2189
handleClassCommentChange
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2190
    |change|
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2191
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2192
    className := self receiversClassName.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2193
"/        nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2194
"/            className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2195
"/        ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2196
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2197
    change := ClassCommentChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2198
    change className:className comment:(arguments at:1) evaluate.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2199
    change source:(parseTree printString).
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2200
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2201
    ^ true
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2202
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2203
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2204
handleClassDefinitionChange
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2205
    |nameSpace change|
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2206
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2207
    className := (arguments at:1) evaluate.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2208
"/        nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2209
"/            className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2210
"/        ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2211
    nameSpace := Class nameSpaceQuerySignal query.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2212
    nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2213
        className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2214
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2215
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2216
    change := ClassDefinitionChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2217
    change className:className; source:(parseTree printString).
1453
27882f000bc9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1450
diff changeset
  2218
    receiver isVariable ifTrue:[
27882f000bc9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1450
diff changeset
  2219
        change superClassName:receiver name.
27882f000bc9 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1450
diff changeset
  2220
    ].
1428
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2221
    selector keywords with:arguments do:[:kw :arg |
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2222
        kw = #'instanceVariableNames:' ifTrue:[
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2223
            change instanceVariableNames:arg evaluate.
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2224
        ].
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2225
        kw = #'classVariableNames:' ifTrue:[
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2226
            change classVariableNames:arg evaluate.
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2227
        ].
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2228
        kw = #'poolDictionaries:' ifTrue:[
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2229
            change poolDictionaries:arg evaluate.
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2230
        ].
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2231
        kw = #'category:' ifTrue:[
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2232
            change category:arg evaluate.
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2233
        ].
2125
3c071cecc2b0 changed: #handleClassDefinitionChange
fm
parents: 2122
diff changeset
  2234
        kw = #'privateIn:' ifTrue:[
2290
882d87800dea private class handling
Claus Gittinger <cg@exept.de>
parents: 2279
diff changeset
  2235
            change className:(arg name ,'::',change classNameWithoutNamespace).
882d87800dea private class handling
Claus Gittinger <cg@exept.de>
parents: 2279
diff changeset
  2236
            change owningClassName:(arg name).
882d87800dea private class handling
Claus Gittinger <cg@exept.de>
parents: 2279
diff changeset
  2237
            change private:true.
2125
3c071cecc2b0 changed: #handleClassDefinitionChange
fm
parents: 2122
diff changeset
  2238
        ].
1428
807f0bc05504 more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  2239
    ].
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2240
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2241
    change package:(Class packageQuerySignal query).
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2242
"/        nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2243
"/            change nameSpaceName:(nameSpace name).
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2244
"/        ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2245
"/
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2246
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2247
    ^ true
2290
882d87800dea private class handling
Claus Gittinger <cg@exept.de>
parents: 2279
diff changeset
  2248
882d87800dea private class handling
Claus Gittinger <cg@exept.de>
parents: 2279
diff changeset
  2249
    "Modified: / 30-08-2010 / 13:56:32 / cg"
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2250
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2251
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2252
handleClassInstanceVariableDefinitionChange
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2253
    |change|
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2254
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2255
    className := self receiversClassName.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2256
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2257
"/        nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2258
"/            className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2259
"/        ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2260
    change := ClassInstVarDefinitionChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2261
    change className:className.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2262
    change source:(parseTree printString).
2617
a9e632776c57 visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents: 2524
diff changeset
  2263
    change classInstVarNames:(parseTree arguments first value asCollectionOfWords asArray).
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2264
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2265
    ^ true
2617
a9e632776c57 visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents: 2524
diff changeset
  2266
a9e632776c57 visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents: 2524
diff changeset
  2267
    "Modified: / 25-11-2011 / 17:40:49 / cg"
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2268
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2269
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2270
handleMethodCategoryChange
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2271
    |change|
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2272
3068
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2273
    self extractMethodsClassAndSelectorFromReceiver ifFalse:[
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2274
        ^ false.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2275
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2276
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2277
    change := MethodCategoryChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2278
    change 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2279
        className:className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2280
        selector:methodSelector
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2281
        category:(arguments at:1) evaluate.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2282
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2283
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2284
    ^ true
3068
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2285
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2286
    "Modified: / 27-07-2012 / 21:34:42 / cg"
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2287
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2288
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2289
handleMethodCategoryRenameChange
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2290
    |change|
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2291
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2292
    className := self receiversClassName.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2293
"/        nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2294
"/            className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2295
"/        ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2296
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2297
    change := MethodCategoryRenameChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2298
    change 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2299
        className:className;
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2300
        oldCategoryName:(arguments at:1) evaluate
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2301
        newCategoryName:(arguments at:2) evaluate.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2302
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2303
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2304
    ^ true
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2305
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2306
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2307
handleMethodChange
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2308
    [
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2309
        ^ self handleMethodChangeUnsafe
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2310
    ] on: Error do:[:ex|
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2311
        | change |
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2312
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2313
        change := InvalidChange new source: chunk.
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2314
        self addChange: change.
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2315
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2316
        "Read methods that may follow"    
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2317
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2318
        [ (chunk := inputStream nextChunk) notEmptyOrNil ] whileTrue:[
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2319
            change := InvalidChange new source: chunk.
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2320
            self addChange: change.
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2321
        ]
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2322
    ].
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2323
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2324
    ^ true
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2325
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2326
    "Modified (comment): / 24-01-2012 / 17:32:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2327
!
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2328
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2329
handleMethodChangeUnsafe
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2330
    |priv categoryName methodSource changes change parser |
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2331
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2332
    (selector == #'ignoredMethodsFor:') ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2333
        priv := #ignored.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2334
    ] ifFalse:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2335
        priv := nil
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2336
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2337
    className := self receiversClassName.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2338
"/        nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2339
"/            className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2340
"/        ].
1977
3694111ead95 publicMethods & privateMethods detection
fm
parents: 1969
diff changeset
  2341
    ((selector == #'methods') 
3694111ead95 publicMethods & privateMethods detection
fm
parents: 1969
diff changeset
  2342
    or:[(selector == #'publicMethods')
3694111ead95 publicMethods & privateMethods detection
fm
parents: 1969
diff changeset
  2343
    or:[(selector == #'methodsFor')]]) ifTrue:[
3694111ead95 publicMethods & privateMethods detection
fm
parents: 1969
diff changeset
  2344
        categoryName := 'uncategorized public'
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2345
    ] ifFalse:[
1977
3694111ead95 publicMethods & privateMethods detection
fm
parents: 1969
diff changeset
  2346
        (selector == #'privateMethods') ifTrue:[
3694111ead95 publicMethods & privateMethods detection
fm
parents: 1969
diff changeset
  2347
            categoryName := 'uncategorized private'
3694111ead95 publicMethods & privateMethods detection
fm
parents: 1969
diff changeset
  2348
        ] ifFalse:[
3694111ead95 publicMethods & privateMethods detection
fm
parents: 1969
diff changeset
  2349
            categoryName := (arguments at:1) evaluate.
3694111ead95 publicMethods & privateMethods detection
fm
parents: 1969
diff changeset
  2350
        ]
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2351
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2352
    inputStream skipSeparators.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2353
    lineNumber := inputStream lineNumber.
1209
f98d5eb855d3 code rewritten to be independent of stream zero-base
Claus Gittinger <cg@exept.de>
parents: 1200
diff changeset
  2354
    position := inputStream position1Based.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2355
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2356
    methodSource := chunk := inputStream nextChunk.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2357
    changes := OrderedCollection new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2358
1395
6ea99b157f6b Use #setFilename:forClass:package: to define an abbreviation
Stefan Vogel <sv@exept.de>
parents: 1389
diff changeset
  2359
    [methodSource notEmptyOrNil] whileTrue:[
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2360
        parser := Parser
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2361
                    parseMethodArgAndVarSpecification:methodSource 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2362
                    in:nil 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2363
                    ignoreErrors:true 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2364
                    ignoreWarnings:true
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2365
                    parseBody:false.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2366
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2367
        parser isNil ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2368
            "/ something wierd ...
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2369
            methodSelector := '????'.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2370
        ] ifFalse:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2371
            methodSelector := parser selector.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2372
        ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2373
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2374
        change := MethodChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2375
        change 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2376
            className:className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2377
            selector:methodSelector
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2378
            source:methodSource
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2379
            category:categoryName
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2380
            privacy:priv.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2381
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2382
        self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2383
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2384
        inputStream skipSeparators.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2385
        lineNumber := inputStream lineNumber.
1209
f98d5eb855d3 code rewritten to be independent of stream zero-base
Claus Gittinger <cg@exept.de>
parents: 1200
diff changeset
  2386
        position := inputStream position1Based.
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2387
        methodSource := chunk := inputStream nextChunk.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2388
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2389
    ^ true
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2390
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2391
    "Created: / 24-01-2012 / 16:52:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2392
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2393
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2394
handleMethodPrivacyChange
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2395
    |change|
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2396
3068
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2397
    self extractMethodsClassAndSelectorFromReceiver ifFalse:[
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2398
        ^ false.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2399
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2400
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2401
    change := MethodPrivacyChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2402
    change 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2403
        className:className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2404
        selector:methodSelector
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2405
        privacy:(arguments at:1) evaluate.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2406
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2407
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2408
    ^ true
3068
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2409
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2410
    "Modified: / 27-07-2012 / 21:35:20 / cg"
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2411
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2412
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2413
handleNameSpaceCreationChange
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2414
    |change|
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2415
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2416
    (self checkReceiverIsGlobalNamed:#Namespace) ifFalse:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2417
        (self checkReceiverIsGlobalNamed:#NameSpace) ifFalse:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2418
            self error:'unexpected receiver in nameSpace message' mayProceed:true.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2419
            ^ false
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2420
        ].
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2421
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2422
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2423
    className := (arguments at:1) evaluate.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2424
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2425
    change := NameSpaceCreationChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2426
    change name:className.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2427
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2428
    ^ true
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2429
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2430
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2431
handlePrimitiveChange 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2432
    |change primSource|
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2433
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2434
    className := self receiversClassName.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2435
"/        nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2436
"/            className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2437
"/        ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2438
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2439
    inputStream skipSeparators.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2440
    primSource := inputStream nextChunk.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2441
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2442
    selector == #'primitiveDefinitions' ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2443
        change := ClassPrimitiveDefinitionsChange new
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2444
    ] ifFalse:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2445
        selector == #'primitiveFunctions' ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2446
            change := ClassPrimitiveFunctionsChange new
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2447
        ] ifFalse:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2448
            change := ClassPrimitiveVariablesChange new
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2449
        ]
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2450
    ].
1287
faf72a0bc34a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1281
diff changeset
  2451
    change className:className source:primSource.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2452
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2453
    ^ true
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2454
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2455
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2456
handleRemoveClassChange
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2457
    |change|
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2458
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2459
    (self checkReceiverIsGlobalNamed:#Smalltalk) ifFalse:[
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2460
        self error:'unexpected receiver in remove-class message' mayProceed:true.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2461
        ^ false
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2462
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2463
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2464
    className := (arguments at:1) name.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2465
"/            nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2466
"/                className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2467
"/            ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2468
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2469
    change := ClassRemoveChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2470
    change className:className.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2471
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2472
    ^ true
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2473
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2474
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2475
handleRemoveMethodChange
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2476
    |change|
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2477
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2478
    className := self receiversClassName.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2479
"/        nameSpace ~~ Smalltalk ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2480
"/            className := nameSpace name , '::' , className
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2481
"/        ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2482
    methodSelector := (arguments at:1) evaluate.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2483
    change := MethodRemoveChange new.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2484
    change className:className selector:methodSelector.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2485
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2486
    ^ true
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2487
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2488
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2489
handleRenameClassChange
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2490
    |oldName newName change|
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2491
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2492
    (self checkReceiverIsGlobalNamed:#Smalltalk) ifFalse:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2493
        self error:'unexpected receiver in rename-class message' mayProceed:true.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2494
        ^ false.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2495
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2496
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2497
    oldName := (arguments at:1) name.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2498
    newName := (arguments at:2) evaluate.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2499
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2500
    change := ClassRenameChange new oldName:oldName newName:newName.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  2501
    self addChange:change.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2502
    ^ true
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2503
!
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2504
1181
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2505
handleSqueakCommentStamp
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2506
    |comment change|
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2507
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2508
    inputStream skipSeparators.
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2509
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2510
    comment := inputStream nextChunk.
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2511
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2512
    className := self receiversClassName.
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2513
    change := ClassCommentChange new.
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2514
    change className:className comment:comment.
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2515
    change source:(parseTree printString).
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2516
    self addChange:change.
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2517
    ^ true
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2518
!
e13c86138164 more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents: 1176
diff changeset
  2519
1183
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2520
handleVW7ClassDefinitionChange
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2521
    |nameSpace change|
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2522
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2523
    nameSpace := receiver.
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2524
    className := (arguments at:1) evaluate.
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2525
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2526
"/    nameSpace := Class nameSpaceQuerySignal query.
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2527
"/    nameSpace ~~ Smalltalk ifTrue:[
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2528
"/        className := nameSpace name , '::' , className
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2529
"/    ].
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2530
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2531
    change := ClassDefinitionChange new.
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2532
    change className:className; source:(parseTree printString).
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2533
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2534
    change package:(Class packageQuerySignal query).
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2535
    self addChange:change.
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2536
    ^ true
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2537
!
419dc41ad796 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1182
diff changeset
  2538
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2539
processChange
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2540
    "given a parse-tree (from parsing some changes source/chunk),
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2541
     create changes and evaluate changeAction on each.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2542
     The block is invoked with the change and a lineNumberOrNil as
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2543
     arg; the lineNumber is only valid, if the underlying stream 
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2544
     provides line-numbers; otherwise, nil is passed."
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2545
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2546
    [
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2547
        ^ self processChangeUnsafe
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2548
    ] on: Error do:[:ex|
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2549
        | change |
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2550
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2551
        change := InvalidChange new source: chunk.
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2552
        self addChange: change.
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2553
    ].
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2554
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2555
    ^true
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2556
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2557
    "Modified: / 24-01-2012 / 17:34:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2558
!
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2559
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2560
processChangeUnsafe
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2561
    "given a parse-tree (from parsing some changes source/chunk),
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2562
     create changes and evaluate changeAction on each.
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2563
     The block is invoked with the change and a lineNumberOrNil as
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2564
     arg; the lineNumber is only valid, if the underlying stream 
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2565
     provides line-numbers; otherwise, nil is passed."
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2566
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2567
    |dispatchSelector|
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2568
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2569
    dispatchSelector := ('process_',(selector copyReplaceAll:$: with:$_)) asSymbol.
2122
3ffe8c94f2cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2117
diff changeset
  2570
"/ Transcript showCR:dispatchSelector.
2179
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  2571
    (self respondsTo:dispatchSelector) ifTrue:[
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2572
        ^ self perform:dispatchSelector.
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2573
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2574
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2575
    "/ any subclass definiton selector ?
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2576
    (Behavior definitionSelectors includes:selector)
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2577
    ifTrue:[
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2578
        ^ self handleClassDefinitionChange.
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2579
    ].
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2580
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2581
    ^ false
2745
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2582
c2f7200248e7 More robust changeset reading - creates InvalidChange when an error
vrany
parents: 2633
diff changeset
  2583
    "Created: / 24-01-2012 / 17:33:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2584
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2585
3042
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2586
processInfo: string
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2587
    "Processes 'info record' - an info record consist of a chunk containing
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2588
     single string literal starting with ----, such as:
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2589
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2590
    '---- timestamp jv@neso 12-03-2012 10:49:40 ----'
3042
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2591
    '---- snapshot st.img 30-03-2012 11:40:24 ----'
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2592
    '---- checkin SVN::ConfigurationApp into stx:libsvn (1.12) 12-03-2012 10:51:15 ----'
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2593
    '---- rake update 30-03-2012 11:40:24 ----'
3053
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2594
    '---- start 30-03-2012 11:40:24 ----'
3042
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2595
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2596
    timestamp info records are (for historical reasons) processed in ChangeSet
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2597
    "
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2598
3067
580931ccfea6 fixed bug in changeset reading (info changes were lost)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3065
diff changeset
  2599
    | kind sel |
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2600
    inputStream skip: 5.
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2601
    kind := inputStream upTo: Character space.
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2602
    sel := ('process_', kind) asSymbolIfInterned.
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2603
    sel notNil ifTrue:[
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2604
        MessageNotUnderstood handle:[
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2605
            "/Unknown info record, do nothing"
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2606
        ] do:[
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2607
            self perform: sel.
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2608
        ]
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2609
    ]
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2610
3042
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2611
    "Created: / 30-03-2012 / 16:44:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2612
!
48e76977cdc3 Added info-record processing support into changeset reader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3036
diff changeset
  2613
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2614
process_categoriesFor_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2615
    "'categoriesFor:' chunk (Dolphin)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2616
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2617
    ^ self handleCategoriesForChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2618
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2619
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2620
process_category_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2621
    "'category:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2622
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2623
    ^ self handleMethodCategoryChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2624
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2625
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2626
process_commentStamp_prior_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2627
    "'commentStamp:prior::' chunk (Squeak)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2628
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2629
    ^ self handleSqueakCommentStamp.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2630
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2631
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2632
process_comment_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2633
    "'comment:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2634
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2635
    ^ self handleClassCommentChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2636
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2637
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2638
process_ignoredMethodsFor_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2639
    "'ignoredMethodsFor:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2640
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2641
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2642
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2643
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2644
process_instanceVariableNames_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2645
    "'instanceVariableNames:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2646
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2647
    ^ self handleClassInstanceVariableDefinitionChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2648
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2649
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2650
process_methods
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2651
    "'methods' chunk (ST/V and dolphin)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2652
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2653
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2654
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2655
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2656
process_methodsFor
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2657
    "'methodsFor' chunk (ST/V and dolphin)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2658
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2659
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2660
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2661
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2662
process_methodsForUndefined_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2663
    "'methodsForUndefined:' chunk (?)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2664
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2665
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2666
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2667
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2668
process_methodsFor_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2669
    "'methodsFor:' chunk (ST/80, Squeak, ST/X, VW, ...)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2670
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2671
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2672
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2673
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2674
process_methodsFor_stamp_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2675
    "'methodsFor:stamp:' chunk (Squeak)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2676
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2677
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2678
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2679
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2680
process_name_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2681
    "'name:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2682
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2683
    ^ self handleNameSpaceCreationChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2684
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2685
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2686
process_primitiveDefinitions
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2687
    "'primitiveDefinitions' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2688
3068
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2689
    ^ self handlePrimitiveChange:nil.
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2690
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2691
    "Modified: / 27-07-2012 / 21:40:33 / cg"
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2692
!
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2693
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2694
process_primitiveFunctions
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2695
    "'primitiveFunctions' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2696
3068
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2697
    ^ self handlePrimitiveChange:nil.
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2698
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2699
    "Modified: / 27-07-2012 / 21:40:23 / cg"
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2700
!
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2701
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2702
process_primitiveVariables
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2703
    "'primitiveVariables' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2704
3068
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2705
    ^ self handlePrimitiveChange:nil.
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2706
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2707
    "Modified: / 27-07-2012 / 21:40:35 / cg"
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2708
!
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  2709
2117
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2710
process_privacy_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2711
    "'privacy:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2712
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2713
    ^ self handleMethodPrivacyChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2714
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2715
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2716
process_privateMethods
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2717
    "'privateMethods' chunk (ST/V and dolphin)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2718
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2719
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2720
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2721
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2722
process_privateMethodsFor_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2723
    "'privateMethodsFor:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2724
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2725
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2726
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2727
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2728
process_protectedMethodsFor_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2729
    "'protectedMethodsFor:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2730
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2731
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2732
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2733
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2734
process_publicMethods
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2735
    "'publicMethods' chunk (ST/V and dolphin)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2736
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2737
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2738
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2739
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2740
process_publicMethodsFor_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2741
    "'publicMethodsFor:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2742
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2743
    ^ self handleMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2744
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2745
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2746
process_removeClass_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2747
    "'removeClass:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2748
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2749
    ^ self handleRemoveClassChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2750
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2751
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2752
process_removeSelector_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2753
    "'removeSelector:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2754
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2755
    ^ self handleRemoveMethodChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2756
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2757
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2758
process_renameCategory_to_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2759
    "'renameCategory:to:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2760
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2761
    ^ self handleMethodCategoryRenameChange.
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2762
!
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2763
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2764
process_renameClass_to_
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2765
    "'renameClass:to:' chunk (ST/X)"
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2766
4ff77bbf9f89 refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents: 2080
diff changeset
  2767
    ^ self handleRenameClassChange.
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2768
!
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2769
3053
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2770
process_snapshot
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2771
    "St/X system start info record
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2772
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2773
    '---- snapshot st.img 12-03-2012 10:49:40 ----'!!
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2774
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2775
    'start' is already read from inputStream.
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2776
    "
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2777
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2778
    | ts file |
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2779
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2780
    inputStream skipSeparators.
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2781
    file := inputStream through: Character space. "/read snapshot name
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2782
    ts := Timestamp readFrom: inputStream.
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2783
    self addChange: (InfoChange type: #snapshot data: file timestamp: ts)
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2784
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2785
    "Created: / 18-05-2012 / 17:04:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2786
!
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2787
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2788
process_start
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2789
    "St/X system start info record
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2790
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2791
    '---- start 12-03-2012 10:49:40 ----'!!
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2792
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2793
    'start' is already read from inputStream.
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2794
    "
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2795
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2796
    | ts |
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2797
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2798
    inputStream skipSeparators.
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2799
    ts := Timestamp readFrom: inputStream.
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2800
    self addChange: (InfoChange type: #start data: nil timestamp: ts)
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2801
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2802
    "Created: / 18-05-2012 / 17:03:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2803
!
a7b0d2594279 - InfoChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3050
diff changeset
  2804
3043
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2805
process_timestamp
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2806
    "St/X timestamp info record. Example:
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2807
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2808
    '---- timestamp jv@neso 12-03-2012 10:49:40 ----'!!
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2809
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2810
    'timestamp' is already read from inputStream.
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2811
    "
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2812
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2813
    inputStream skipSeparators; through: Character space. "/read username@host
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2814
    timestamp := Timestamp readFrom: inputStream.
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2815
a13599b9f7e6 Added timestamp processing
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
  2816
    "Created: / 02-04-2012 / 19:08:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1174
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2817
! !
f4794940b620 new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents: 1169
diff changeset
  2818
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2819
!ChangeSet::ClassSourceWriter methodsFor:'private'!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2820
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2821
analyze
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2822
    "Analyzes changeset an build some index"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2823
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2824
    classInfos := Dictionary new.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2825
    metaInfos := Dictionary new.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2826
    topClassName := nil.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2827
    "Pass 1 - collect classes"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2828
    changeSetBeingSaved do:[:change|
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2829
        change isClassDefinitionChange ifTrue:[
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  2830
            | nm ns |
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2831
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2832
            nm := change className.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2833
            (nm endsWith:' class') ifFalse:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2834
                (classInfos includesKey: nm) ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2835
                    self error:'Multiple definitions of class ', nm.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2836
                    ^self.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2837
                ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2838
                classInfos at: nm put: (ClassInfo new name: nm).
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2839
                metaInfos at: nm put: (ClassInfo new name: nm , ' class').
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2840
                change isPrivateClassDefinitionChange ifFalse:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2841
                    topClassName notNil ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2842
                        self error: ('Multiple top class definitions (%1 vs %2)' bindWith: topClassName with: nm).
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  2843
                        ^self.
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2844
                    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2845
                    topClassName := nm.
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2846
                    namespaceName := change nameSpaceName.
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2847
                ]
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2848
            ]            .
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2849
        ]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2850
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2851
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2852
    "Pass 2: fill in infos"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2853
    changeSetBeingSaved do:[:change|
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2854
        change isClassChange ifTrue:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2855
            | nm info |
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2856
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2857
            nm := change className.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2858
            (nm endsWith: ' class') ifTrue:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2859
                info := metaInfos at: (nm copyTo:(nm size - 6)).
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2860
            ] ifFalse:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2861
                info := classInfos at: nm.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2862
                "Fill superclass info..."                
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2863
                change isClassDefinitionChange ifTrue:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2864
                    | superNm |
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2865
                    superNm := change superClassName.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2866
                    (classInfos includesKey: superNm) ifTrue:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2867
                        info superclass: (classInfos at: superNm).
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2868
                        (metaInfos at: nm) superclass: (classInfos at: superNm).
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2869
                    ].
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2870
                ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2871
            ].
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2872
            info addChange: change.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2873
        ]
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2874
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2875
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2876
    classInfos do:[:info|info namespace: namespaceName].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2877
    metaInfos  do:[:info|info namespace: namespaceName].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  2878
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2879
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2880
    "
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2881
        ChangeSet::ClassSourceWriter new
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2882
            changeSetBeingSaved: (ChangeSet forExistingClass: ChangeSet);
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2883
            analyze;
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2884
            yourself
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2885
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2886
    "
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2887
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2888
    "Created: / 15-03-2012 / 17:51:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2889
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2890
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2891
changeSetBeingSaved:something
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2892
    changeSetBeingSaved := something.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2893
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2894
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2895
privateClassesOf: classInfo
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2896
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2897
    | classInfoNameSz |
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2898
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2899
    classInfoNameSz := classInfo name size.
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2900
    ^classInfos values select:[:info|
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2901
        info name size > classInfoNameSz and:[
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2902
            (info name startsWith: classInfo name)
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2903
                and:[(info name at:classInfoNameSz + 1) == $:
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2904
                    and:[(info name at:classInfoNameSz + 2) == $:
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2905
                        and:[(info name indexOf: $: startingAt: classInfo name size + 3) == 0]]]]
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2906
    ]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2907
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2908
    "Created: / 15-03-2012 / 19:31:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2909
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2910
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2911
privateClassesSortedOf: classInfo
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2912
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2913
    |classes|
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2914
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2915
    classes := self privateClassesOf: classInfo.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2916
    (classes size > 0) ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2917
        classes := classes asOrderedCollection.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2918
        classes sort:[:a :b | a name < b name].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2919
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2920
        classes topologicalSort:[:a :b |
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2921
            "/ a must come before b iff:
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2922
            "/    b is a subclass of a
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2923
            "/    b has a private class which is a subclass of a
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2924
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  2925
            |mustComeBefore privateClassesOfB|
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2926
            mustComeBefore := (b isSubclassOf:a) or:[b isPrivateClassOf: a].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2927
            mustComeBefore
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2928
        ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2929
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2930
    ^ classes.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2931
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2932
    "
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2933
     Object privateClassesSorted
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2934
     NewSystemBrowser privateClassesSorted
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2935
     NewSystemBrowser privateClasses
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2936
    "
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2937
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2938
    "Created: / 15-03-2012 / 19:45:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2939
! !
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2940
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2941
!ChangeSet::ClassSourceWriter methodsFor:'source writing'!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2942
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2943
fileOut:aChangeSet on:outStreamArg withTimeStamp:stampIt withInitialize:initIt withDefinition:withDefinition methodFilter:methodFilter encoder:encoderOrNil
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2944
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2945
    |collectionOfCategories versionMethods
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2946
     nonMeta meta classesImplementingInitialize outStream|
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2947
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2948
    changeSetBeingSaved := aChangeSet.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2949
    self analyze.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2950
    nonMeta := classInfos at: topClassName.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2951
       meta :=  metaInfos at: topClassName.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2952
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2953
    methodsAlreadySaved := Set new.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2954
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2955
    encoderOrNil isNil ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2956
        outStream := outStreamArg.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2957
    ] ifFalse:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2958
        outStream := EncodedStream stream:outStreamArg encoder:encoderOrNil.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2959
        outStream nextPutAll:'"{ Encoding: ' , encoderOrNil nameOfEncoding , ' }"'; cr; cr.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2960
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2961
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2962
    "
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2963
     if there is a copyright method, add a copyright comment
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2964
     at the beginning, taking the string from the copyright method.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2965
     We cannot do this unconditionally - that would lead to my copyrights
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2966
     being put on your code ;-).
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2967
     On the other hand: I want every file created by myself to have the
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2968
     copyright string at the beginning be preserved .... even if the
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2969
     code was edited in the browser and filedOut.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2970
    "
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2971
    self generateHeaderWithCopyrightOn:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2972
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2973
    stampIt ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2974
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2975
        "/ first, a timestamp
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2976
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2977
        outStream nextPutAll:(Smalltalk timeStamp).
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2978
        outStream nextPutChunkSeparator. 
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2979
        outStream cr; cr.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2980
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2981
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2982
    withDefinition ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2983
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2984
        "/ then the definition(s)
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2985
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2986
        self fileOutAllDefinitionsOf:nonMeta on:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2987
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2988
        "/ a comment - if any
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2989
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2990
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2991
"/        (comment := nonMeta comment) notNil ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2992
"/            nonMeta fileOutCommentOn:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2993
"/            outStream cr.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2994
"/        ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2995
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2996
        "/ ST/X primitive definitions - if any
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2997
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2998
        self fileOutPrimitiveSpecsOf: nonMeta on:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  2999
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3000
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3001
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3002
    "/ methods from all categories in metaclass (i.e. class methods)
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3003
    "/ EXCEPT: the version method is placed at the very end, to
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3004
    "/         avoid sourcePosition-shifts when checked out later.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3005
    "/         (RCS expands this string, so its size is not constant)
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3006
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3007
    collectionOfCategories := meta categories asSortedCollection.
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3008
    versionMethods := meta methods select:[:change |AbstractSourceCodeManager isVersionMethodSelector:change selector].
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3009
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3010
    collectionOfCategories notNil ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3011
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3012
        "/ documentation first (if any), but not the version method
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3013
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3014
        (collectionOfCategories includes:'documentation') ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3015
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3016
"/            versionMethods do:[:versionMethod |
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3017
"/                |source|
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3018
"/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3019
"/                source := versionMethod source.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3020
"/                (source isEmptyOrNil or:[(source startsWith:nonMeta nameOfOldVersionMethod) not]) ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3021
"/                    "something bad happend to the classes code"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3022
"/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3023
"/                    Class fileOutErrorSignal 
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3024
"/                        raiseRequestWith:aClass
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3025
"/                        errorString:' - bad source for version method (uncompiled class file?): ', (versionMethod displayString)
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3026
"/                ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3027
"/            ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3029
            self fileOutCategory:'documentation' of:meta except:versionMethods only:nil methodFilter:methodFilter on:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3030
            outStream cr.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3031
        ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3032
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3033
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3034
        "/ initialization next (if any)
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3035
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3036
        (collectionOfCategories includes:'initialization') ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3037
            self fileOutCategory:'initialization' of:meta methodFilter:methodFilter on:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3038
            outStream cr.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3039
        ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3040
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3041
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3042
        "/ instance creation next (if any)
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3043
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3044
        (collectionOfCategories includes:'instance creation') ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3045
            self fileOutCategory:'instance creation' of:meta methodFilter:methodFilter on:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3046
            outStream cr.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3047
        ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3048
        collectionOfCategories do:[:aCategory |
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3049
            ((aCategory ~= 'documentation')
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3050
            and:[(aCategory ~= 'initialization')
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3051
            and:[aCategory ~= 'instance creation']]) ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3052
                self fileOutCategory:aCategory of:meta methodFilter:methodFilter on:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3053
                outStream cr
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3054
            ]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3055
        ]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3056
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3057
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3058
    "/ if there are any primitive definitions (vw-like ffi-primitives),
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3059
    "/ file them out first in the order: defines, types.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3060
    "/ Otherwise, we might have trouble when filing in later, because the types are needed
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3061
    "/ for the primitive calls.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3062
    nonMeta methodDictionary keysAndValuesDo:[:sel :m |
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3063
        m isVisualWorksTypedef ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3064
            self fileOutCategory:m category of:nonMeta except:nil only:(Array with:m) methodFilter:methodFilter on:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3065
        ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3066
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3067
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3068
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3069
    "/ methods from all categories
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3070
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3071
    collectionOfCategories := nonMeta categories asSortedCollection.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3072
    collectionOfCategories notNil ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3073
        collectionOfCategories do:[:aCategory |
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3074
            self fileOutCategory:aCategory of:nonMeta methodFilter:methodFilter on:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3075
            outStream cr
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3076
        ]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3077
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3078
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3079
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3080
    "/ any private classes' methods
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3081
    "/
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3082
    (self privateClassesSortedOf: nonMeta) do:[:aClass |
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3083
        self fileOutAllMethodsOf:aClass on:outStream methodFilter:methodFilter
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3084
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3085
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3086
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3087
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3088
    "/ finally, the previously skipped version method
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3089
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3090
    versionMethods notEmpty ifTrue: [
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3091
        self fileOutCategory:'documentation' of:meta except:nil only:versionMethods methodFilter:methodFilter on:outStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3092
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3093
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3094
    initIt ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3095
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3096
        "/ optionally an initialize message
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3097
        "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3098
        classesImplementingInitialize := OrderedCollection new.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3099
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3100
        classInfos values with: metaInfos values do:[:class :meta|
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3101
            (meta includesSelector: #initialize) ifTrue:[
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3102
                classesImplementingInitialize add: class.
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3103
            ]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3104
        ].
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3105
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3106
        classesImplementingInitialize size ~~ 0 ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3107
            classesImplementingInitialize topologicalSort:[:a :b | b isSubclassOf:a].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3108
            outStream cr.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3109
            classesImplementingInitialize do:[:eachClass |
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3110
                eachClass printClassNameOn:outStream. outStream nextPutAll:' initialize'.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3111
                outStream nextPutChunkSeparator.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3112
                outStream cr.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3113
            ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3114
        ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3115
    ]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3116
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3117
    "Created: / 15-11-1995 / 12:53:06 / cg"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3118
    "Modified: / 01-04-1997 / 16:01:05 / stefan"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3119
    "Modified: / 29-09-2011 / 14:53:49 / cg"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3120
    "Created: / 15-03-2012 / 17:39:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3121
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3122
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3123
fileOutAllDefinitionsOf:nonMetaInfo on:aStream
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3124
    "append expressions on aStream, which defines myself and all of my private classes."
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3125
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3126
    | metaInfo |
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3127
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3128
    nonMetaInfo definition isPrivateClassDefinitionChange ifFalse:[
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3129
        nonMetaInfo definition package notNil ifTrue:[
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3130
            aStream nextPutAll: ('"{ Package: ''%1'' }"' bindWith: nonMetaInfo definition package).
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3131
            aStream cr; cr.
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3132
        ].
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3133
        namespaceName notNil ifTrue:[
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3134
            aStream nextPutAll: ('"{ NameSpace: %1 }"' bindWith: namespaceName).
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3135
            aStream cr; cr.
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3136
        ].
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3137
    ].
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3138
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3139
    aStream nextPutAll: (nonMetaInfo definition definitionStringInNamespace: namespaceName).
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3140
    aStream nextPutChunkSeparator. 
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3141
    aStream cr; cr.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3142
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3143
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3144
    "/ optional classInstanceVariables
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3145
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3146
    metaInfo := metaInfos at: nonMetaInfo name.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3147
    metaInfo definition notNil ifTrue:[
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3148
        | anySuperClassInstVar myClass |
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3149
        aStream 
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3150
            nextPutAll: metaInfo definition className; 
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3151
            nextPutAll:' instanceVariableNames:';
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3152
            nextPutAll: (metaInfo definition classInstVarNames asStringWith:' ') storeString.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3153
        "mhmh - good idea; saw this in SmallDraw sourcecode ..."
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3154
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3155
        anySuperClassInstVar := false.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3156
        myClass := metaInfo definition changeClass.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3157
        myClass notNil ifTrue:[myClass := myClass theNonMetaclass].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3158
        myClass notNil ifTrue:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3159
            myClass allSuperclassesDo:[:aSuperClass |
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3160
                aSuperClass class instVarNames do:[:ignored | anySuperClassInstVar := true].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3161
            ].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3162
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3163
            aStream cr; cr; nextPut:(Character doubleQuote); cr; space.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3164
            anySuperClassInstVar ifFalse:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3165
                aStream
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3166
                    nextPutLine:'No other class instance variables are inherited by this class.'.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3167
            ] ifTrue:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3168
                aStream
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3169
                    nextPutLine:'The following class instance variables are inherited by this class:'.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3170
                aStream cr.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3171
                myClass allSuperclassesDo:[:aSuperClass |
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3172
                    aStream tab; nextPutAll:aSuperClass name; nextPutAll:' - '.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3173
                    aStream nextPutLine:(aSuperClass class instanceVariableString).
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3174
                ].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3175
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3176
            ].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3177
        ].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3178
        aStream nextPut:(Character doubleQuote); cr.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3179
        aStream nextPut:$!!; cr; cr
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3180
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3181
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3182
    "/ here, the full nameSpace prefixes are output,
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3183
    "/ to avoid confusing stc 
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3184
    "/ (which otherwise could not find the correct superclass)
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3185
    "/
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3186
    Class fileOutNameSpaceQuerySignal answer:false do:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3187
        Class forceNoNameSpaceQuerySignal answer:true do:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3188
            (self privateClassesSortedOf: nonMetaInfo) do:[:i |
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3189
                 self fileOutAllDefinitionsOf:i on:aStream
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3190
            ]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3191
        ]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3192
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3193
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3194
    "Created: / 15-10-1996 / 11:15:19 / cg"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3195
    "Modified: / 22-03-1997 / 16:11:56 / cg"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3196
    "Created: / 15-03-2012 / 19:18:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3197
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3198
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3199
fileOutAllMethodsOf:aClass on:aStream methodFilter:methodFilter
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3200
    | collectionOfCategories meta |
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3201
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3202
    meta := metaInfos at: aClass name.
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3203
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3204
    collectionOfCategories := meta categories asSortedCollection.
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3205
    collectionOfCategories notNil ifTrue:[
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3206
        collectionOfCategories do:[:aCategory |
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3207
            self fileOutCategory:aCategory of:meta  methodFilter:methodFilter on:aStream.
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3208
            aStream cr
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3209
        ]
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3210
    ].
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3211
    collectionOfCategories := aClass categories asSortedCollection.
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3212
    collectionOfCategories notNil ifTrue:[
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3213
        collectionOfCategories do:[:aCategory |
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3214
            self fileOutCategory:aCategory of:aClass methodFilter:methodFilter on:aStream.
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3215
            aStream cr
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3216
        ]
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3217
    ].
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3218
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3219
    (self privateClassesSortedOf: aClass) do:[:privateClass |
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3220
        self fileOutAllMethodsOf:privateClass on:aStream methodFilter:methodFilter
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3221
    ].
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3222
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3223
    "Created: / 15-10-1996 / 11:13:00 / cg"
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3224
    "Modified: / 22-03-1997 / 16:12:17 / cg"
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3225
    "Created: / 19-03-2012 / 18:21:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3226
!
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3227
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3228
fileOutMethod:change on:aStream
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3229
    "file a single method onto aStream."
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3230
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3231
    | changeToFileOut |
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3232
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3233
    change isMethodCategoryChange ifTrue:[
3036
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3234
        self assert: change origin notNil.
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3235
        changeToFileOut := change origin copy.
3036
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3236
        changeToFileOut category: change category.
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3237
    ] ifFalse:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3238
        changeToFileOut := change.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3239
    ].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3240
    changeToFileOut source notEmptyOrNil ifTrue:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3241
        super fileOutMethod:changeToFileOut on:aStream
3036
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3242
    ] ifFalse:[
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3243
"/        self error: 'Should not happen' mayProceed: true.
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3244
    ]
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3245
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3246
    "Created: / 20-03-2012 / 22:33:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3247
!
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3248
3049
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3249
fileOutPrimitiveSpecsOf: nonMeta on:aStream
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3250
    "append primitive defs (if any) to aStream."
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3251
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3252
    |s|
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3253
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3254
    "
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3255
     primitive definitions - if any
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3256
    "
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3257
    (s := nonMeta primitiveDefinitionsString) notNil ifTrue:[
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3258
        aStream nextPutChunkSeparator.
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3259
        nonMeta printClassNameOn:aStream.
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3260
        aStream nextPutAll:' primitiveDefinitions';
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3261
                nextPutChunkSeparator;
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3262
                cr.
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3263
        aStream nextPutAll:s.
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3264
        aStream nextPutChunkSeparator; space; nextPutChunkSeparator; cr; cr
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3265
    ].
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3266
    (s := nonMeta primitiveVariablesString) notNil ifTrue:[
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3267
        aStream nextPutChunkSeparator.
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3268
        nonMeta printClassNameOn:aStream.
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3269
        aStream nextPutAll:' primitiveVariables';
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3270
                nextPutChunkSeparator;
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3271
                cr.
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3272
        aStream nextPutAll:s.
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3273
        aStream nextPutChunkSeparator; space; nextPutChunkSeparator; cr; cr
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3274
    ].
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3275
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3276
    "Created: / 15-03-2012 / 19:48:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3277
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3278
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3279
generateHeaderWithCopyrightOn:outStream
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3280
    |copyrightChange copyrightText|
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3281
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3282
    copyrightChange :=
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3283
        (metaInfos at: topClassName) methodAt: #copyright.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3284
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3285
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3286
    copyrightChange notNil ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3287
        "
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3288
         get the copyright method's comment-text, strip off empty and blank lines
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3289
         and insert at beginning.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3290
        "
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3291
        copyrightText := Parser methodCommentFromSource: copyrightChange source.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3292
        copyrightText notEmptyOrNil ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3293
            copyrightText := copyrightText asCollectionOfLines asStringCollection.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3294
            copyrightText := copyrightText withoutLeadingBlankLines.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3295
            copyrightText := copyrightText withoutTrailingBlankLines.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3296
            copyrightText notEmpty ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3297
                copyrightText addFirst:'"'.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3298
                copyrightText addLast:'"'.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3299
                copyrightText := copyrightText asString.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3300
                outStream nextPutAllAsChunk:copyrightText.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3301
            ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3302
        ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3303
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3304
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3305
    "Created: / 15-03-2012 / 19:01:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3306
! !
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3307
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3308
!ChangeSet::ClassSourceWriter::ClassInfo class methodsFor:'instance creation'!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3309
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3310
new
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3311
    "return an initialized instance"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3312
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3313
    ^ self basicNew initialize.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3314
! !
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3315
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3316
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'accessing'!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3317
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3318
categories
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3319
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3320
    ^ (methods collect:[:e|e category]) asSet
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3321
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3322
    "Created: / 19-03-2012 / 18:03:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3323
!
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3324
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3325
definition
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3326
    ^ definition
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3327
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3328
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3329
definition:something
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3330
    definition := something.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3331
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3332
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3333
methodAt: selector 
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3334
    ^methods detect:[:each|each selector == selector] ifNone:[nil].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3335
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3336
    "Created: / 15-03-2012 / 19:11:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3337
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3338
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3339
methodDictionary
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3340
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3341
    methodDictionary isNil ifTrue:[
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3342
        methodDictionary := Dictionary new.
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3343
    ].
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3344
    ^methodDictionary
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3345
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3346
    "Created: / 19-03-2012 / 18:11:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3347
!
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3348
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3349
methods
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3350
    ^ methods
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3351
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3352
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3353
methods:something
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3354
    methods := something.
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3355
    methodDictionary := Dictionary new.
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3356
    methods do:[:m|methodDictionary at: m selector put: m].
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3357
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3358
    "Modified: / 19-03-2012 / 18:12:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3359
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3360
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3361
name
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3362
    ^ name
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3363
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3364
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3365
name:something
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3366
    name := something.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3367
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3368
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3369
namespace
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3370
    ^ namespace
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3371
!
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3372
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3373
namespace:aString
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3374
    namespace := aString.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3375
!
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3376
3049
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3377
primitiveDefinitions
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3378
    ^ primitiveDefinitions
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3379
!
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3380
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3381
primitiveDefinitionsString
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3382
    ^ primitiveDefinitions isNil 
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3383
        ifTrue:[nil]
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3384
        ifFalse:[primitiveDefinitions source]
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3385
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3386
    "Created: / 13-04-2012 / 13:14:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3387
!
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3388
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3389
primitiveFunctions
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3390
    ^ primitiveFunctions
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3391
!
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3392
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3393
primitiveFunctionsString
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3394
    ^ primitiveFunctions isNil 
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3395
        ifTrue:[nil]
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3396
        ifFalse:[primitiveFunctions source]
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3397
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3398
    "Created: / 13-04-2012 / 13:15:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3399
!
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3400
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3401
primitiveVariables
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3402
    ^ primitiveVariables
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3403
!
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3404
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3405
primitiveVariablesString
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3406
    ^ primitiveVariables isNil 
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3407
        ifTrue:[nil]
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3408
        ifFalse:[primitiveVariables source]
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3409
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3410
    "Created: / 13-04-2012 / 13:15:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3411
!
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3412
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3413
selectorAtMethod: m
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3414
    ^m selector
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3415
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3416
    "Created: / 19-03-2012 / 18:14:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3417
!
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3418
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3419
superclass
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3420
    ^ superclass
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3421
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3422
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3423
superclass:something
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3424
    superclass := something.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3425
! !
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3426
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3427
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'adding'!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3428
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3429
addChange: change
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3430
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3431
    change isClassDefinitionChange ifTrue:[
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3432
        self assert: definition isNil.
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3433
        definition := change.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3434
        ^self.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3435
    ].
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3436
    change isMethodCodeChange ifTrue:[
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3437
        methods add: change.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3438
        ^self.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3439
    ].
3036
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3440
    change isMethodCategoryChange ifTrue:[
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3441
        methods add: change.
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3442
        ^self.
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3443
    ].
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3444
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3445
    change isClassInstVarDefinitionChange ifTrue:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3446
        self assert: definition isNil.
3036
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3447
        definition := change.
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3448
        ^self
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3449
    ].
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3450
3049
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3451
    change isPrimitiveDefinitionsChange ifTrue:[
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3452
        primitiveDefinitions := change.
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3453
        ^self
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3454
    ].
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3455
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3456
    change isPrimitiveVariablesChange ifTrue:[
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3457
        primitiveVariables := change.
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3458
        ^self
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3459
    ].
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3460
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3461
    change isPrimitiveFunctionsChange ifTrue:[
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3462
        primitiveFunctions := change.
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3463
        ^self
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3464
    ].
b920db5cdeb3 ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3043
diff changeset
  3465
3036
7be02f89af2b Fixes in merging category changes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3034
diff changeset
  3466
    self error: 'Unknown change'
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3467
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3468
    "Created: / 15-03-2012 / 19:12:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3469
! !
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3470
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3471
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'enumerating'!
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3472
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3473
methodsDo: aBlock
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3474
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3475
    methods do: aBlock
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3476
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3477
    "Created: / 19-03-2012 / 18:14:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3478
! !
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3479
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3480
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'initialization'!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3481
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3482
initialize
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3483
    "Invoked when a new instance is created."
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3484
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3485
    "/ please change as required (and remove this comment)
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3486
    "/ name := nil.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3487
    "/ instDefinition := nil.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3488
    "/ classDefinition := nil.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3489
    methods := OrderedCollection new.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3490
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3491
    "/ super initialize.   -- commented since inherited method does nothing
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3492
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3493
    "Modified: / 15-03-2012 / 19:12:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3494
! !
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3495
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3496
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'printing & storing'!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3497
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3498
printClassNameOn:aStream
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3499
    | nameWithoutNs |
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3500
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3501
    nameWithoutNs := name.
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3502
    namespace notNil ifTrue:[
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3503
        self assert: (name startsWith:namespace).
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3504
        nameWithoutNs := nameWithoutNs copyFrom: namespace size + 3.
3033
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3505
    ].
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3506
8964521a2c1b Fixes for mergetool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3032
diff changeset
  3507
    aStream nextPutAll: nameWithoutNs
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3508
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3509
    "Created: / 19-03-2012 / 18:17:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3510
!
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3511
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3512
printOn:aStream
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3513
    "append a printed representation if the receiver to the argument, aStream"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3514
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3515
    aStream nextPutAll: self class nameWithoutPrefix.
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3516
    aStream nextPutAll:'('.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3517
    name printOn:aStream.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3518
    aStream nextPutAll:')'.
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3519
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3520
    "Modified: / 19-03-2012 / 19:43:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3521
! !
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3522
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3523
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'queries'!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3524
3031
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3525
includesSelector: selector
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3526
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3527
    ^methods anySatisfy:[:m|m selector == selector].
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3528
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3529
    "Created: / 19-03-2012 / 18:22:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3530
!
66f3216e3ea5 Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3029
diff changeset
  3531
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3532
isPrivateClassOf: classInfo
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3533
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3534
    ^(name startsWith: classInfo name)
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3535
        and:[ (name at: (classInfo name size + 1)) == $:
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3033
diff changeset
  3536
            and:[ (name at: (classInfo name size + 2)) == $:]]
3028
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3537
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3538
    "Created: / 15-03-2012 / 19:42:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3539
!
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3540
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3541
isSubclassOf: classInfo
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3542
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3543
    ^superclass notNil and:
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3544
        [superclass == classInfo or:[superclass isSubclassOf: classInfo]]
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3545
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3546
    "Created: / 15-03-2012 / 19:41:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3547
! !
679feb681da5 Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3017
diff changeset
  3548
2321
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
  3549
!ChangeSet::DiffSet class methodsFor:'documentation'!
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
  3550
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
  3551
documentation
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
  3552
"
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
  3553
    I represent the differences between two change sets.
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
  3554
    As such, I can be used by a VersionDiffBrowser and to generate patchSets.
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
  3555
"
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
  3556
! !
cdba8ed97ed6 added: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents: 2298
diff changeset
  3557
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3558
!ChangeSet::DiffSet methodsFor:'accessing'!
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3559
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3560
changed
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3561
    "return the set of methods which were different"
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3562
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3563
    ^ changed
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3564
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3565
    "Modified: / 12-10-2006 / 22:06:55 / cg"
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3566
!
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3567
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3568
changed:something
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3569
    "set the set of changed methods"
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3570
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3571
    changed := something.
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3572
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3573
    "Modified: / 12-10-2006 / 22:06:03 / cg"
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3574
!
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3575
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3576
changed:changedArg onlyInReceiver:onlyInReceiverArg onlyInArg:onlyInArgArg 
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3577
    "set instance variables (automatically generated)"
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3578
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3579
    changed := changedArg.
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3580
    changed isNil ifTrue:[changed := OrderedCollection new].
1450
0ec14b2064fb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1447
diff changeset
  3581
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3582
    onlyInReceiver := onlyInReceiverArg.
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3583
    onlyInReceiver isNil ifTrue:[onlyInReceiver := ChangeSet new].
1450
0ec14b2064fb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1447
diff changeset
  3584
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3585
    onlyInArg := onlyInArgArg.
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3586
    onlyInArg isNil ifTrue:[onlyInArg := ChangeSet new].
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3587
!
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3588
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3589
changed:changedArg onlyInReceiver:onlyInReceiverArg onlyInArg:onlyInArgArg same: sameArg
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3590
    "set instance variables (automatically generated)"
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3591
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3592
    changed := changedArg.
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3593
    changed isNil ifTrue:[changed := OrderedCollection new].
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3594
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3595
    onlyInReceiver := onlyInReceiverArg.
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3596
    onlyInReceiver isNil ifTrue:[onlyInReceiver := ChangeSet new].
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3597
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3598
    onlyInArg := onlyInArgArg.
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3599
    onlyInArg isNil ifTrue:[onlyInArg := ChangeSet new].
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3600
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3601
    same := sameArg.
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3602
    same isNil ifTrue:[same := ChangeSet new].
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3603
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3604
    "Created: / 19-03-2012 / 21:35:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3605
!
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3606
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3607
onlyInArg
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3608
    "return the set of methods which were only present in the argument of the diffset"
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3609
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3610
    ^ onlyInArg
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3611
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3612
    "Modified: / 12-10-2006 / 22:07:02 / cg"
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3613
!
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3614
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3615
onlyInArg:something
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3616
    onlyInArg := something.
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3617
!
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3618
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3619
onlyInReceiver
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3620
    "return the set of methods which were only present in the receiver of the diffset"
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3621
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3622
    ^ onlyInReceiver
1867
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3623
dad9e13fba4c comments
Claus Gittinger <cg@exept.de>
parents: 1865
diff changeset
  3624
    "Modified: / 12-10-2006 / 22:07:12 / cg"
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3625
!
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3626
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3627
onlyInReceiver:something
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3628
    onlyInReceiver := something.
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3629
!
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3630
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3631
same
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3632
    ^ same
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3633
!
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3634
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3635
same:something
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3636
    same := something.
1156
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3637
! !
29fb7d77797d use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents: 1147
diff changeset
  3638
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3639
!ChangeSet::DiffSet methodsFor:'merging'!
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3640
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3641
addDiffSet:anotherDiffset
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3642
    changed addAll:(anotherDiffset changed).
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3643
    onlyInReceiver addAll:(anotherDiffset onlyInReceiver).
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3644
    onlyInArg addAll:(anotherDiffset onlyInArg).
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3645
    same addAll: (anotherDiffset same).
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3646
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3647
    "Created: / 12-10-2006 / 22:49:30 / cg"
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3648
    "Modified: / 19-03-2012 / 21:36:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3649
!
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3650
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3651
copy
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3652
    ^ self class new
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3653
        changed:changed copy
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3654
        onlyInReceiver:onlyInReceiver copy
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3655
        onlyInArg:onlyInArg copy
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3656
        same:same copy
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3657
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3658
    "Created: / 12-10-2006 / 22:50:56 / cg"
3032
f8b04203694b ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3031
diff changeset
  3659
    "Modified: / 19-03-2012 / 21:36:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3660
! !
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3661
2186
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3662
!ChangeSet::DiffSet methodsFor:'misc'!
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3663
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3664
removeAllVersionMethods
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3665
    changed := changed 
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3666
                    reject:[:pair |
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3667
                        pair first isMethodChangeForVersionMethod
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3668
                    ].
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3669
    onlyInReceiver := onlyInReceiver 
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3670
                    reject:[:chg |
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3671
                        chg isMethodChangeForVersionMethod
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3672
                    ].
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3673
    onlyInArg := onlyInArg 
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3674
                    reject:[:chg |
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3675
                        chg isMethodChangeForVersionMethod
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3676
                    ].
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3677
! !
3cbd8cb9e36e removeAllVersionMethods in DiffSet
fm
parents: 2179
diff changeset
  3678
1292
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
  3679
!ChangeSet::DiffSet methodsFor:'queries'!
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
  3680
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
  3681
isEmpty
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
  3682
    ^ changed isEmpty
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
  3683
    and:[ onlyInReceiver isEmpty
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
  3684
    and:[ onlyInArg isEmpty ] ]
1869
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3685
!
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3686
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3687
notEmpty
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3688
    ^ self isEmpty not
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3689
988269721678 +isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents: 1867
diff changeset
  3690
    "Created: / 12-10-2006 / 23:12:27 / cg"
1292
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
  3691
! !
4f2a8ea516fa category & comments
Claus Gittinger <cg@exept.de>
parents: 1287
diff changeset
  3692
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3693
!ChangeSet::DolphinPACFileReader methodsFor:'reading-private'!
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3694
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3695
handleCategoriesForClass
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3696
    |category change|
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3697
2179
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3698
    [
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3699
        inputStream skipSeparators.
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3700
        category := inputStream nextChunk.
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3701
        category notEmpty
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3702
    ] whileTrue:[
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3703
        change := ClassCategoryChange new.
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3704
        change 
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3705
            className:className
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3706
            category:category.
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3707
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3708
        self addChange:change.
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3709
    ].
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3710
    ^ true
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3711
!
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3712
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3713
handleCategoriesForMethod
2179
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3714
    |methodSelector categories change isPrivate isPublic category|
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3715
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3716
    methodSelector := (arguments at:1) evaluate.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3717
    inputStream skipSeparators.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3718
    isPrivate := false.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3719
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3720
    categories := OrderedCollection new.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3721
    [
2179
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3722
        |done category |
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3723
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3724
        category := inputStream nextChunk withoutSeparators.
2179
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3725
        done := category isEmpty.
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3726
        done ifFalse:[
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3727
            categories add:category
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3728
        ].
2179
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3729
        done
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3730
    ] whileFalse.
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3731
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3732
    categories size > 1 ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3733
        isPrivate := categories includes:'private'.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3734
        categories remove:'private' ifAbsent:nil.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3735
    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3736
    categories size > 1 ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3737
        isPublic := categories includes:'public'.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3738
        categories remove:'public' ifAbsent:nil.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3739
    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3740
"/    categories size > 1 ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3741
"/        self halt.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3742
"/    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3743
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3744
    category := categories first.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3745
    isPrivate ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3746
        category := category , '-private'. 
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3747
    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3748
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3749
    change := MethodCategoryChange new.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3750
    change 
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3751
        className:className
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3752
        selector:methodSelector
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3753
        category:category.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3754
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3755
    self addChange:change.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3756
    ^ true
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3757
!
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3758
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3759
processChange
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3760
    "given a parse-tree (from parsing some changes source/chunk),
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3761
     create changes and evaluate changeAction on each.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3762
     The block is invoked with the change and a lineNumberOrNil as
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3763
     arg; the lineNumber is only valid, if the underlying stream 
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3764
     provides line-numbers; otherwise, nil is passed."
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3765
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3766
    (selector == #'categoriesForClass') ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3767
        ^ self handleCategoriesForClass.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3768
    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3769
    (selector == #'categoriesFor:') ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3770
        ^ self handleCategoriesForMethod.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3771
    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3772
    selector == #'subclass:instanceVariableNames:classVariableNames:poolDictionaries:classInstanceVariableNames:' ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3773
        ^ self handleClassDefinitionChange.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3774
    ].
2179
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3775
"/    selector == #'guid:' ifTrue:[
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3776
"/        ^ self handleGUIDChange.
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3777
"/    ].
1182
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3778
    ^ super processChange
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3779
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3780
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3781
"/    selector == #named:superclass:indexedInstanceVariables:instanceVariableNames:classVariableNames:sharedPools:classInstanceVariableNames: ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3782
"/        ^ self handleClassDefinitionChange.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3783
"/    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3784
"/    (selector == #'key:value:') ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3785
"/        (self checkReceiverIsGlobalNamed:'Annotation') ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3786
"/            ^ self handleAnnotation.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3787
"/        ]
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3788
"/    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3789
"/    selector == #'method' ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3790
"/        ^ self handleMethodChange:false.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3791
"/    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3792
"/    selector == #'classMethod' ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3793
"/        ^ self handleMethodChange:true.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3794
"/    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3795
"/
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3796
"/    selector == #'initializer' ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3797
"/        ^ true
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3798
"/    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3799
"/    selector == #'initialize' ifTrue:[
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3800
"/        ^ true
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3801
"/    ].
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3802
"/self halt.
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3803
"/
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3804
"/    ^ false
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3805
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3806
    "Created: / 16.2.1998 / 13:42:40 / cg"
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3807
    "Modified: / 15.12.1999 / 00:29:06 / cg"
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3808
! !
5963a5799b4e dolphin pac-file reading
Claus Gittinger <cg@exept.de>
parents: 1181
diff changeset
  3809
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3810
!ChangeSet::SIFChangeFileReader methodsFor:'reading-private'!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3811
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3812
handleAnnotation
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3813
    |key value lastChange change|
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3814
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3815
    key := (arguments at:1) evaluate.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3816
    value := (arguments at:2) evaluate.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3817
1422
6871068da880 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1421
diff changeset
  3818
    key = 'Prerequisite' ifTrue:[
6871068da880 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1421
diff changeset
  3819
"/        change := SIFPrerequisiteChange new prerequisiteFileName:value.
6871068da880 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1421
diff changeset
  3820
"/        self addChange:change.
6871068da880 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1421
diff changeset
  3821
        ^ true
6871068da880 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1421
diff changeset
  3822
    ].
6871068da880 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1421
diff changeset
  3823
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3824
    lastChange := changeSet last.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3825
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3826
    key = 'package' ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3827
        change := ClassCategoryChange new className:(lastChange className) category:value.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3828
        self addChange:change.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3829
        ^ true
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3830
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3831
    key = 'category' ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3832
"/        change := MethodCategoryChange new className:(lastChange className) selector:(lastChange selector) category:value.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3833
"/        self addChange:change.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3834
        lastChange category:value.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3835
        ^ true
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3836
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3837
    key = 'stamp' ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3838
        "/ lastChange timeStamp:value.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3839
        ^ true
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3840
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3841
    ^ false
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3842
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3843
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3844
handleClassDefinitionChange
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3845
    |nameSpace change|
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3846
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3847
    (self checkReceiverIsGlobalNamed:#Class) ifFalse:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3848
        self error:'unexpected receiver in classDefinition message' mayProceed:true.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3849
        ^ false.
1313
8aceccee1eaf *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1301
diff changeset
  3850
    ].
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3851
    className := (arguments at:1) evaluate.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3852
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3853
    nameSpace := Class nameSpaceQuerySignal query.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3854
    nameSpace ~~ Smalltalk ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3855
        className := nameSpace name , '::' , className
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3856
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3857
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3858
    change := ClassDefinitionChange new.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3859
    change className:className; source:(parseTree printString).
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3860
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3861
    change package:(Class packageQuerySignal query).
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3862
    self addChange:change.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3863
    ^ true
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3864
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3865
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3866
handleMethodChange:isMeta
1188
a4594193f884 Remove unused method variables
Stefan Vogel <sv@exept.de>
parents: 1187
diff changeset
  3867
    |categoryName methodSource change parser |
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3868
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3869
    className := self receiversClassName.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3870
    isMeta ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3871
        className := className , ' class'
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3872
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3873
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3874
    categoryName := 'uncategorized'.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3875
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3876
    inputStream skipSeparators.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3877
    lineNumber := inputStream lineNumber.
1209
f98d5eb855d3 code rewritten to be independent of stream zero-base
Claus Gittinger <cg@exept.de>
parents: 1200
diff changeset
  3878
    position := inputStream position1Based.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3879
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3880
    methodSource := inputStream nextChunk.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3881
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3882
    parser := Parser
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3883
                parseMethodArgAndVarSpecification:methodSource 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3884
                in:nil 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3885
                ignoreErrors:true 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3886
                ignoreWarnings:true
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3887
                parseBody:false.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3888
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3889
    parser isNil ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3890
        "/ something wierd ...
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3891
        methodSelector := '????'.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3892
    ] ifFalse:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3893
        methodSelector := parser selector.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3894
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3895
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3896
    change := MethodChange new.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3897
    change 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3898
        className:className
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3899
        selector:methodSelector
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3900
        source:methodSource
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3901
        category:categoryName
1188
a4594193f884 Remove unused method variables
Stefan Vogel <sv@exept.de>
parents: 1187
diff changeset
  3902
        privacy:nil.
1176
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3903
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3904
    self addChange:change.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3905
    ^ true
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3906
!
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3907
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3908
processChange
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3909
    "given a parse-tree (from parsing some changes source/chunk),
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3910
     create changes and evaluate changeAction on each.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3911
     The block is invoked with the change and a lineNumberOrNil as
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3912
     arg; the lineNumber is only valid, if the underlying stream 
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3913
     provides line-numbers; otherwise, nil is passed."
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3914
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3915
    (selector == #'interchangeVersion:') ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3916
        ^ true
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3917
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3918
    selector == #named:superclass:indexedInstanceVariables:instanceVariableNames:classVariableNames:sharedPools:classInstanceVariableNames: ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3919
        ^ self handleClassDefinitionChange.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3920
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3921
    (selector == #'key:value:') ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3922
        (self checkReceiverIsGlobalNamed:'Annotation') ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3923
            ^ self handleAnnotation.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3924
        ]
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3925
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3926
    selector == #'method' ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3927
        ^ self handleMethodChange:false.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3928
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3929
    selector == #'classMethod' ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3930
        ^ self handleMethodChange:true.
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3931
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3932
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3933
    selector == #'initializer' ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3934
        ^ true
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3935
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3936
    selector == #'initialize' ifTrue:[
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3937
        ^ true
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3938
    ].
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3939
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3940
    ^ false
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3941
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3942
    "Created: / 16.2.1998 / 13:42:40 / cg"
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3943
    "Modified: / 15.12.1999 / 00:29:06 / cg"
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3944
! !
6c65f871a3bc added SIF reading
Claus Gittinger <cg@exept.de>
parents: 1174
diff changeset
  3945
625
06f4ed35832b added #patches for ST80 compatibility
Claus Gittinger <cg@exept.de>
parents: 378
diff changeset
  3946
!ChangeSet class methodsFor:'documentation'!
100
d09e51d14901 project changeSet fixes
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
  3947
3068
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  3948
version
3073
921dc719ceda - ChangeSet
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3072
diff changeset
  3949
    ^ '$Id: ChangeSet.st 1950 2012-08-01 14:21:03Z vranyj1 $'
3068
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  3950
!
f92b042b8470 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3067
diff changeset
  3951
2179
Claus Gittinger <cg@exept.de>
parents: 2160
diff changeset
  3952
version_CVS
3069
89d2cfee177f - stx_libbasic3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3068
diff changeset
  3953
    ^ '§Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.193 2012-07-31 13:41:14 +0100 vrany Exp §'
3012
4f40b8304d54 Added InvalidChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3011
diff changeset
  3954
!
4f40b8304d54 Added InvalidChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3011
diff changeset
  3955
4f40b8304d54 Added InvalidChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3011
diff changeset
  3956
version_SVN
3073
921dc719ceda - ChangeSet
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3072
diff changeset
  3957
    ^ '$Id: ChangeSet.st 1950 2012-08-01 14:21:03Z vranyj1 $'
3012
4f40b8304d54 Added InvalidChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3011
diff changeset
  3958
! !