MethodCategoryChange.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Wed, 21 Mar 2012 01:53:44 +0000
branchjv
changeset 3034 c892671f3e2a
parent 3012 4f40b8304d54
child 3042 48e76977cdc3
permissions -rw-r--r--
Improvements in merge tool - npw it could merge libtool3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
25
claus
parents: 15
diff changeset
     1
"
claus
parents: 15
diff changeset
     2
 COPYRIGHT (c) 1993 by Claus Gittinger
claus
parents: 15
diff changeset
     3
	       All Rights Reserved
claus
parents: 15
diff changeset
     4
claus
parents: 15
diff changeset
     5
 This software is furnished under a license and may be used
claus
parents: 15
diff changeset
     6
 only in accordance with the terms of that license and with the
claus
parents: 15
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
claus
parents: 15
diff changeset
     8
 be provided or otherwise made available to, or used by, any
claus
parents: 15
diff changeset
     9
 other person.  No title to or ownership of the software is
claus
parents: 15
diff changeset
    10
 hereby transferred.
claus
parents: 15
diff changeset
    11
"
957
54dade11e57f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 852
diff changeset
    12
"{ Package: 'stx:libbasic3' }"
54dade11e57f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 852
diff changeset
    13
15
639ae882da27 Initial revision
claus
parents:
diff changeset
    14
MethodChange subclass:#MethodCategoryChange
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    15
	instanceVariableNames:'origin'
235
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
    16
	classVariableNames:''
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
    17
	poolDictionaries:''
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
    18
	category:'System-Changes'
15
639ae882da27 Initial revision
claus
parents:
diff changeset
    19
!
639ae882da27 Initial revision
claus
parents:
diff changeset
    20
25
claus
parents: 15
diff changeset
    21
!MethodCategoryChange class methodsFor:'documentation'!
claus
parents: 15
diff changeset
    22
claus
parents: 15
diff changeset
    23
copyright
claus
parents: 15
diff changeset
    24
"
claus
parents: 15
diff changeset
    25
 COPYRIGHT (c) 1993 by Claus Gittinger
claus
parents: 15
diff changeset
    26
	       All Rights Reserved
claus
parents: 15
diff changeset
    27
claus
parents: 15
diff changeset
    28
 This software is furnished under a license and may be used
claus
parents: 15
diff changeset
    29
 only in accordance with the terms of that license and with the
claus
parents: 15
diff changeset
    30
 inclusion of the above copyright notice.   This software may not
claus
parents: 15
diff changeset
    31
 be provided or otherwise made available to, or used by, any
claus
parents: 15
diff changeset
    32
 other person.  No title to or ownership of the software is
claus
parents: 15
diff changeset
    33
 hereby transferred.
claus
parents: 15
diff changeset
    34
"
claus
parents: 15
diff changeset
    35
!
claus
parents: 15
diff changeset
    36
45
claus
parents: 39
diff changeset
    37
documentation
claus
parents: 39
diff changeset
    38
"
claus
parents: 39
diff changeset
    39
    instances represent method-category changes (as done in the browser). 
claus
parents: 39
diff changeset
    40
    They are typically held in a ChangeSet.
235
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
    41
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    42
    Change origin.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    43
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    44
    When a changeset diff is generated, two MethodChanges that 
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    45
    represent the same method (code is the same) but differ in
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    46
    category, those two methods are transformed to MethodCategoruChanges.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    47
    In that case, origin keeps the reference to original MethodChange.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    48
235
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
    49
    [author:]
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
    50
        Claus Gittinger
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    51
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    52
    [instance variables:]
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    53
        origin      <MethodChange>  Change that cause this category
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    54
                                    change to be created. See comment.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    55
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    56
45
claus
parents: 39
diff changeset
    57
"
25
claus
parents: 15
diff changeset
    58
! !
claus
parents: 15
diff changeset
    59
15
639ae882da27 Initial revision
claus
parents:
diff changeset
    60
!MethodCategoryChange methodsFor:'accessing'!
639ae882da27 Initial revision
claus
parents:
diff changeset
    61
639ae882da27 Initial revision
claus
parents:
diff changeset
    62
class:cls selector:sel category:cat
1902
20db5f942dbd changed #class:selector:category:
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
    63
    self className:cls name selector:sel category:cat
15
639ae882da27 Initial revision
claus
parents:
diff changeset
    64
1902
20db5f942dbd changed #class:selector:category:
Claus Gittinger <cg@exept.de>
parents: 1846
diff changeset
    65
    "Modified: / 12-11-2006 / 15:55:11 / cg"
85
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
    66
!
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
    67
654
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
    68
className:clsName selector:sel category:cat
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
    69
    className := clsName.
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
    70
    selector := sel.
852
1acd7d3ed3fc checkin from browser
Claus Gittinger <cg@exept.de>
parents: 654
diff changeset
    71
    methodCategory := cat
654
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
    72
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
    73
    "Created: / 16.2.1998 / 14:14:16 / cg"
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
    74
!
edeb63d98088 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 235
diff changeset
    75
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    76
origin
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    77
    ^ origin
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    78
!
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    79
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    80
origin:aMethodChange
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    81
    origin := aMethodChange.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    82
!
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    83
1052
cc84f5e27bb5 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1009
diff changeset
    84
prettyPrintedSource
1846
c0f8e12c9611 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1052
diff changeset
    85
    ^ self sourceForMethod, Character cr 
1052
cc84f5e27bb5 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1009
diff changeset
    86
          , '    category:' , methodCategory storeString
1846
c0f8e12c9611 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1052
diff changeset
    87
c0f8e12c9611 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1052
diff changeset
    88
    "Modified: / 09-10-2006 / 13:59:15 / cg"
1052
cc84f5e27bb5 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1009
diff changeset
    89
!
cc84f5e27bb5 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1009
diff changeset
    90
85
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
    91
source
1846
c0f8e12c9611 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1052
diff changeset
    92
    ^ self sourceForMethod , ' category:' , methodCategory storeString
852
1acd7d3ed3fc checkin from browser
Claus Gittinger <cg@exept.de>
parents: 654
diff changeset
    93
1846
c0f8e12c9611 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1052
diff changeset
    94
    "Modified: / 09-10-2006 / 13:59:10 / cg"
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    95
!
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    96
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    97
source: aString
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    98
    | expr |
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
    99
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   100
    expr := Parser parseExpression: aString onError: [ self error: 'Invalid source'].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   101
    expr isMessage ifFalse:[ self error: 'Invalid source' ].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   102
    expr selector == #'category:' ifFalse:[ self error: 'Invalid source' ].
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   103
    methodCategory := expr arguments first value.
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   104
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   105
    "Created: / 20-03-2012 / 22:26:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
852
1acd7d3ed3fc checkin from browser
Claus Gittinger <cg@exept.de>
parents: 654
diff changeset
   106
! !
1acd7d3ed3fc checkin from browser
Claus Gittinger <cg@exept.de>
parents: 654
diff changeset
   107
1acd7d3ed3fc checkin from browser
Claus Gittinger <cg@exept.de>
parents: 654
diff changeset
   108
!MethodCategoryChange methodsFor:'applying'!
1acd7d3ed3fc checkin from browser
Claus Gittinger <cg@exept.de>
parents: 654
diff changeset
   109
1acd7d3ed3fc checkin from browser
Claus Gittinger <cg@exept.de>
parents: 654
diff changeset
   110
apply
1acd7d3ed3fc checkin from browser
Claus Gittinger <cg@exept.de>
parents: 654
diff changeset
   111
    "apply the change"
85
c354e2f81394 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 68
diff changeset
   112
1915
d23534c8ab03 the method does the change-file-update; NOT me
Claus Gittinger <cg@exept.de>
parents: 1902
diff changeset
   113
    |mthd|
852
1acd7d3ed3fc checkin from browser
Claus Gittinger <cg@exept.de>
parents: 654
diff changeset
   114
1acd7d3ed3fc checkin from browser
Claus Gittinger <cg@exept.de>
parents: 654
diff changeset
   115
    mthd := self changeMethod.
1915
d23534c8ab03 the method does the change-file-update; NOT me
Claus Gittinger <cg@exept.de>
parents: 1902
diff changeset
   116
    mthd category:methodCategory asSymbol.
852
1acd7d3ed3fc checkin from browser
Claus Gittinger <cg@exept.de>
parents: 654
diff changeset
   117
1915
d23534c8ab03 the method does the change-file-update; NOT me
Claus Gittinger <cg@exept.de>
parents: 1902
diff changeset
   118
    "Modified: / 23-11-2006 / 16:59:09 / cg"
15
639ae882da27 Initial revision
claus
parents:
diff changeset
   119
! !
639ae882da27 Initial revision
claus
parents:
diff changeset
   120
2131
0feb8bbb287d added: #isMethodCodeChange
Claus Gittinger <cg@exept.de>
parents: 2120
diff changeset
   121
!MethodCategoryChange methodsFor:'testing'!
964
64282b5e5c48 added #isMEthodCategoryChange
Claus Gittinger <cg@exept.de>
parents: 957
diff changeset
   122
64282b5e5c48 added #isMEthodCategoryChange
Claus Gittinger <cg@exept.de>
parents: 957
diff changeset
   123
isMethodCategoryChange
64282b5e5c48 added #isMEthodCategoryChange
Claus Gittinger <cg@exept.de>
parents: 957
diff changeset
   124
    ^ true
2263
c514b61ac1b2 fixed: #isMethodCodeChange
Claus Gittinger <cg@exept.de>
parents: 2131
diff changeset
   125
!
c514b61ac1b2 fixed: #isMethodCodeChange
Claus Gittinger <cg@exept.de>
parents: 2131
diff changeset
   126
c514b61ac1b2 fixed: #isMethodCodeChange
Claus Gittinger <cg@exept.de>
parents: 2131
diff changeset
   127
isMethodCodeChange
c514b61ac1b2 fixed: #isMethodCodeChange
Claus Gittinger <cg@exept.de>
parents: 2131
diff changeset
   128
    "true if this is a method's code change (not package, category etc.)"
c514b61ac1b2 fixed: #isMethodCodeChange
Claus Gittinger <cg@exept.de>
parents: 2131
diff changeset
   129
c514b61ac1b2 fixed: #isMethodCodeChange
Claus Gittinger <cg@exept.de>
parents: 2131
diff changeset
   130
    ^ false
964
64282b5e5c48 added #isMEthodCategoryChange
Claus Gittinger <cg@exept.de>
parents: 957
diff changeset
   131
! !
64282b5e5c48 added #isMEthodCategoryChange
Claus Gittinger <cg@exept.de>
parents: 957
diff changeset
   132
2622
853e24f6b303 visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents: 2263
diff changeset
   133
!MethodCategoryChange methodsFor:'visiting'!
853e24f6b303 visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents: 2263
diff changeset
   134
853e24f6b303 visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents: 2263
diff changeset
   135
acceptChangeVisitor:aVisitor
853e24f6b303 visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents: 2263
diff changeset
   136
    ^ aVisitor visitMethodCategoryChange:self.
853e24f6b303 visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents: 2263
diff changeset
   137
853e24f6b303 visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents: 2263
diff changeset
   138
    "Created: / 25-11-2011 / 17:13:58 / cg"
853e24f6b303 visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents: 2263
diff changeset
   139
! !
853e24f6b303 visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents: 2263
diff changeset
   140
235
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   141
!MethodCategoryChange class methodsFor:'documentation'!
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   142
3ebfdc6edab9 documentation
Claus Gittinger <cg@exept.de>
parents: 85
diff changeset
   143
version
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   144
    ^ '$Id: MethodCategoryChange.st 1900 2012-03-21 01:53:44Z vranyj1 $'
2263
c514b61ac1b2 fixed: #isMethodCodeChange
Claus Gittinger <cg@exept.de>
parents: 2131
diff changeset
   145
!
c514b61ac1b2 fixed: #isMethodCodeChange
Claus Gittinger <cg@exept.de>
parents: 2131
diff changeset
   146
c514b61ac1b2 fixed: #isMethodCodeChange
Claus Gittinger <cg@exept.de>
parents: 2131
diff changeset
   147
version_CVS
3011
1997ff6e7e55 trunk branched into /branches/jv
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2622
diff changeset
   148
    ^ '§Header: /cvs/stx/stx/libbasic3/MethodCategoryChange.st,v 1.21 2011/11/25 16:45:29 cg Exp §'
3012
4f40b8304d54 Added InvalidChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3011
diff changeset
   149
!
4f40b8304d54 Added InvalidChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3011
diff changeset
   150
4f40b8304d54 Added InvalidChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3011
diff changeset
   151
version_SVN
3034
c892671f3e2a Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   152
    ^ '$Id: MethodCategoryChange.st 1900 2012-03-21 01:53:44Z vranyj1 $'
3012
4f40b8304d54 Added InvalidChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3011
diff changeset
   153
! !