ChangeSetDiffComponent.st
author Claus Gittinger <cg@exept.de>
Thu, 05 Mar 2020 11:17:28 +0100
changeset 4561 eace75531554
parent 4479 3f1a6fafa0ba
permissions -rw-r--r--
#UI_ENHANCEMENT by cg class: SourceCodeManagerUtilities changed: #compareClassWithRepository:askForRevision: typos: genitive of class is class's - not classes.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4478
7ae834471dde #QUALITY by exept
Claus Gittinger <cg@exept.de>
parents: 4069
diff changeset
     1
"{ Encoding: utf8 }"
7ae834471dde #QUALITY by exept
Claus Gittinger <cg@exept.de>
parents: 4069
diff changeset
     2
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     3
"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     4
 Copyright (c) 2007-2010 Jan Vrany, SWING Research Group,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     5
                           Czech Technical University in Prague
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     6
 Copyright (c) 2009-2010 eXept Software AG
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     7
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     8
 Permission is hereby granted, free of charge, to any person
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     9
 obtaining a copy of this software and associated documentation
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    10
 files (the 'Software'), to deal in the Software without
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    11
 restriction, including without limitation the rights to use,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    12
 copy, modify, merge, publish, distribute, sublicense, and/or sell
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    13
 copies of the Software, and to permit persons to whom the
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    14
 Software is furnished to do so, subject to the following
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    15
 conditions:
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    16
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    17
 The above copyright notice and this permission notice shall be
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    18
 included in all copies or substantial portions of the Software.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    19
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    20
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    21
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    22
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    23
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    24
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    25
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    26
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    27
 OTHER DEALINGS IN THE SOFTWARE.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    28
"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    29
"{ Package: 'stx:libbasic3' }"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    30
4017
e816f4b73919 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3457
diff changeset
    31
"{ NameSpace: Smalltalk }"
e816f4b73919 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3457
diff changeset
    32
2424
bc7e320cec40 Inherit from object, not Model (to fix dependencies)
vrany
parents: 2406
diff changeset
    33
Object subclass:#ChangeSetDiffComponent
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    34
	instanceVariableNames:'parent'
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    35
	classVariableNames:''
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    36
	poolDictionaries:''
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    37
	category:'System-Changes-Diff'
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    38
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    39
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    40
!ChangeSetDiffComponent class methodsFor:'documentation'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    41
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    42
copyright
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    43
"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    44
 Copyright (c) 2007-2010 Jan Vrany, SWING Research Group,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    45
                           Czech Technical University in Prague
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    46
 Copyright (c) 2009-2010 eXept Software AG
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    47
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    48
 Permission is hereby granted, free of charge, to any person
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    49
 obtaining a copy of this software and associated documentation
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    50
 files (the 'Software'), to deal in the Software without
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    51
 restriction, including without limitation the rights to use,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    52
 copy, modify, merge, publish, distribute, sublicense, and/or sell
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    53
 copies of the Software, and to permit persons to whom the
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    54
 Software is furnished to do so, subject to the following
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    55
 conditions:
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    56
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    57
 The above copyright notice and this permission notice shall be
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    58
 included in all copies or substantial portions of the Software.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    59
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    60
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    61
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    62
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    63
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    64
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    65
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    66
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    67
 OTHER DEALINGS IN THE SOFTWARE.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    68
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    69
"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    70
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    71
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    72
!ChangeSetDiffComponent methodsFor:'accessing'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    73
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    74
changesetA
2643
vrany
parents: 2424
diff changeset
    75
    "Answers a changeset with containing all versionA changes"
vrany
parents: 2424
diff changeset
    76
    | cs |
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    77
2643
vrany
parents: 2424
diff changeset
    78
    cs := ChangeSet new name: self versionALabel.
vrany
parents: 2424
diff changeset
    79
    self do:[:item|
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
    80
        (item versionA notNil" and:[item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]]") ifTrue:[
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
    81
            cs add: item versionA
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
    82
        ]
2643
vrany
parents: 2424
diff changeset
    83
    ].
vrany
parents: 2424
diff changeset
    84
    ^cs
vrany
parents: 2424
diff changeset
    85
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
    86
    "Modified: / 18-12-2013 / 20:55:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    87
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    88
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    89
changesetB
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
    90
    "Answers a changeset with containing all versionA changes"
2643
vrany
parents: 2424
diff changeset
    91
    | cs |
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    92
2643
vrany
parents: 2424
diff changeset
    93
    cs := ChangeSet new name: self versionBLabel.
vrany
parents: 2424
diff changeset
    94
    self do:[:item|
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
    95
        (item versionB notNil" and:[item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]]") ifTrue:[
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
    96
            cs add: item versionB
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
    97
        ]
2643
vrany
parents: 2424
diff changeset
    98
    ].
vrany
parents: 2424
diff changeset
    99
    ^cs
vrany
parents: 2424
diff changeset
   100
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   101
    "Modified: / 18-12-2013 / 20:55:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   102
!
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   103
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   104
changesetBase
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   105
    "Answers a changeset with containing all versionA changes"
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   106
    | cs |
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   107
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   108
    cs := ChangeSet new name: self versionBaseLabel.
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   109
    self do:[:item|
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   110
        (item versionBase notNil" and:[item versionBase isClassDefinitionChange or:[item versionBase isMethodCodeChange]]") ifTrue:[
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   111
            cs add: item versionBase
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   112
        ]
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   113
    ].
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   114
    ^cs
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   115
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   116
    "Created: / 20-03-2012 / 13:31:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   117
    "Modified: / 13-11-2013 / 11:47:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   118
!
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   119
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   120
changesetMerged
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   121
    "Answers a changeset with containing all versionA changes"
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   122
    | cs |
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   123
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   124
    cs := ChangeSet new name: 'Merged'.
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   125
    self do:[:item|
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   126
        (item versionMerged notNil "and:[item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]]") ifTrue:[
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   127
            cs add: item versionMerged
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   128
        ]
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   129
    ].
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   130
    ^cs
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   131
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   132
    "Created: / 20-03-2012 / 13:32:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   133
    "Modified: / 13-11-2013 / 11:47:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   134
!
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   135
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   136
depth
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   137
    "Return the depth if diff component hierarchy, 0 if there is no nesting at all"
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   138
    ^0
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   139
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   140
    "Created: / 15-01-2013 / 11:26:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   141
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   142
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   143
diffs
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   144
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   145
    ^#()
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   146
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   147
    "Created: / 10-11-2009 / 11:29:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   148
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   149
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   150
flattened
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   151
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   152
    ^ChangeSetDiffSet new add: self
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   153
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   154
    "Created: / 05-12-2009 / 11:07:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   155
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   156
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   157
name
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   158
    "raise an error: must be redefined in concrete subclass(es)"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   159
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   160
    ^ self subclassResponsibility
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   161
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   162
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   163
parent
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   164
    ^ parent
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   165
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   166
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   167
parent:aDiffSet
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   168
    parent := aDiffSet.
2643
vrany
parents: 2424
diff changeset
   169
!
vrany
parents: 2424
diff changeset
   170
vrany
parents: 2424
diff changeset
   171
versionALabel
vrany
parents: 2424
diff changeset
   172
    ^ parent versionALabel
vrany
parents: 2424
diff changeset
   173
vrany
parents: 2424
diff changeset
   174
    "Created: / 09-11-2009 / 12:38:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
vrany
parents: 2424
diff changeset
   175
!
vrany
parents: 2424
diff changeset
   176
vrany
parents: 2424
diff changeset
   177
versionBLabel
vrany
parents: 2424
diff changeset
   178
    ^ parent versionBLabel
vrany
parents: 2424
diff changeset
   179
vrany
parents: 2424
diff changeset
   180
    "Created: / 09-11-2009 / 12:38:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   181
!
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   182
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   183
versionBaseLabel
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   184
    ^ parent versionBaseLabel
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   185
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   186
    "Created: / 20-03-2012 / 13:31:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   187
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   188
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   189
!ChangeSetDiffComponent methodsFor:'change & update'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   190
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   191
changed: aspect with: param
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   192
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   193
    (aspect = #resolution and:[parent notNil])
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   194
        ifTrue:[parent changed: aspect with: param].
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   195
    super changed: aspect with: param.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   196
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   197
    "Created: / 24-11-2009 / 12:58:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   198
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   199
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   200
!ChangeSetDiffComponent methodsFor:'enumerating'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   201
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   202
do: aBlock
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   203
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   204
    self subclassResponsibility
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   205
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   206
    "Created: / 25-11-2009 / 10:22:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   207
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   208
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   209
!ChangeSetDiffComponent methodsFor:'printing & storing'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   210
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   211
printOn:aStream
4069
b9b7b32895f5 #OTHER by mawalch
mawalch
parents: 4017
diff changeset
   212
    "append a printed representation of the receiver to the argument, aStream"
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   213
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   214
    super printOn:aStream.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   215
    aStream nextPut:$(.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   216
    self name printOn: aStream.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   217
    aStream nextPut:$).
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   218
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   219
    "Modified: / 26-11-2009 / 16:25:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   220
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   221
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   222
!ChangeSetDiffComponent methodsFor:'private'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   223
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   224
flattenOn: stream
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   225
4479
3f1a6fafa0ba #QUALITY by exept
Claus Gittinger <cg@exept.de>
parents: 4478
diff changeset
   226
    "cg changed: return the receiver; not the stream."
4478
7ae834471dde #QUALITY by exept
Claus Gittinger <cg@exept.de>
parents: 4069
diff changeset
   227
    stream nextPut: self
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   228
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   229
    "Created: / 05-12-2009 / 11:06:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   230
!
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   231
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   232
sort
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   233
    self sort: [:a :b|a printString < b printString ].
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   234
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   235
    "Created: / 17-01-2013 / 13:56:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   236
!
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   237
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   238
sort: sortBlock
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   239
    self subclassResponsibility
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   240
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   241
    "Created: / 17-01-2013 / 13:57:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   242
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   243
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   244
!ChangeSetDiffComponent methodsFor:'testing'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   245
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   246
isConflict
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   247
    "Return true, if there is a conflict."
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   248
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   249
    ^ self subclassResponsibility
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   250
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   251
    "Modified (comment): / 01-08-2012 / 17:11:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   252
!
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   253
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   254
isDiffItem
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   255
    ^ false
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   256
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   257
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   258
isDiffSet
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   259
    ^ false
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   260
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   261
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   262
isEmpty
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   263
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   264
    ^false
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   265
!
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   266
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   267
isForCopyrightMethod
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   268
    "Returns true, if this is an entry for #copyright method"
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   269
    ^self subclassResponsibility
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   270
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   271
    "Created: / 01-08-2012 / 16:37:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   272
!
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   273
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   274
isForVersionMethod
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   275
    "Returns true, if this is an entry for version method"
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   276
    ^self subclassResponsibility
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   277
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   278
    "Created: / 18-04-2012 / 19:04:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   279
!
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   280
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   281
isMerged
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   282
    "raise an error: must be redefined in concrete subclass(es)"
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   283
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   284
    ^ self subclassResponsibility
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   285
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   286
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   287
!ChangeSetDiffComponent class methodsFor:'documentation'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   288
4017
e816f4b73919 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3457
diff changeset
   289
version_CVS
e816f4b73919 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3457
diff changeset
   290
    ^ '$Header$'
e816f4b73919 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3457
diff changeset
   291
!
e816f4b73919 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3457
diff changeset
   292
2880
0072cabff85a Merged from SVN
vrany
parents: 2643
diff changeset
   293
version_SVN
4017
e816f4b73919 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 3457
diff changeset
   294
    ^ '$Id$'
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   295
! !
3457
5fa7f02eea95 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 2880
diff changeset
   296