ChangeSetDiffComponent.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Sun, 29 Jan 2012 12:51:41 +0000
branchjv
changeset 3011 1997ff6e7e55
parent 2643 faaf64df2524
child 3012 4f40b8304d54
permissions -rw-r--r--
trunk branched into /branches/jv
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     1
"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     2
 Copyright (c) 2007-2010 Jan Vrany, SWING Research Group,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     3
                           Czech Technical University in Prague
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     4
 Copyright (c) 2009-2010 eXept Software AG
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     5
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     6
 Permission is hereby granted, free of charge, to any person
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     7
 obtaining a copy of this software and associated documentation
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     8
 files (the 'Software'), to deal in the Software without
cf06c39b234c initial checkin
vrany
parents:
diff changeset
     9
 restriction, including without limitation the rights to use,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    10
 copy, modify, merge, publish, distribute, sublicense, and/or sell
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    11
 copies of the Software, and to permit persons to whom the
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    12
 Software is furnished to do so, subject to the following
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    13
 conditions:
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    14
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    15
 The above copyright notice and this permission notice shall be
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    16
 included in all copies or substantial portions of the Software.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    17
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    18
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    19
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    20
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    21
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    22
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    23
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    24
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    25
 OTHER DEALINGS IN THE SOFTWARE.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    26
"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    27
"{ Package: 'stx:libbasic3' }"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    28
2424
bc7e320cec40 Inherit from object, not Model (to fix dependencies)
vrany
parents: 2406
diff changeset
    29
Object subclass:#ChangeSetDiffComponent
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    30
	instanceVariableNames:'parent'
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    31
	classVariableNames:''
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    32
	poolDictionaries:''
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    33
	category:'System-Changes-Diff'
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    34
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    35
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    36
!ChangeSetDiffComponent class methodsFor:'documentation'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    37
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    38
copyright
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    39
"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    40
 Copyright (c) 2007-2010 Jan Vrany, SWING Research Group,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    41
                           Czech Technical University in Prague
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    42
 Copyright (c) 2009-2010 eXept Software AG
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    43
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    44
 Permission is hereby granted, free of charge, to any person
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    45
 obtaining a copy of this software and associated documentation
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    46
 files (the 'Software'), to deal in the Software without
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    47
 restriction, including without limitation the rights to use,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    48
 copy, modify, merge, publish, distribute, sublicense, and/or sell
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    49
 copies of the Software, and to permit persons to whom the
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    50
 Software is furnished to do so, subject to the following
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    51
 conditions:
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    52
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    53
 The above copyright notice and this permission notice shall be
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    54
 included in all copies or substantial portions of the Software.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    55
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    56
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    57
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    58
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    59
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    60
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    61
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    62
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    63
 OTHER DEALINGS IN THE SOFTWARE.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    64
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    65
"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    66
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    67
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    68
!ChangeSetDiffComponent methodsFor:'accessing'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    69
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    70
changesetA
2643
vrany
parents: 2424
diff changeset
    71
    "Answers a changeset with containing all versionA changes"
vrany
parents: 2424
diff changeset
    72
    | cs |
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    73
2643
vrany
parents: 2424
diff changeset
    74
    cs := ChangeSet new name: self versionALabel.
vrany
parents: 2424
diff changeset
    75
    self do:[:item|
vrany
parents: 2424
diff changeset
    76
        cs add: item versionA
vrany
parents: 2424
diff changeset
    77
    ].
vrany
parents: 2424
diff changeset
    78
    ^cs
vrany
parents: 2424
diff changeset
    79
vrany
parents: 2424
diff changeset
    80
    "Modified: / 16-12-2011 / 14:35:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    81
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    82
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    83
changesetB
2643
vrany
parents: 2424
diff changeset
    84
    "Answers a changeset with containing all versionB changes"
vrany
parents: 2424
diff changeset
    85
    | cs |
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    86
2643
vrany
parents: 2424
diff changeset
    87
    cs := ChangeSet new name: self versionBLabel.
vrany
parents: 2424
diff changeset
    88
    self do:[:item|
vrany
parents: 2424
diff changeset
    89
        cs add: item versionB
vrany
parents: 2424
diff changeset
    90
    ].
vrany
parents: 2424
diff changeset
    91
    ^cs
vrany
parents: 2424
diff changeset
    92
vrany
parents: 2424
diff changeset
    93
    "Modified: / 16-12-2011 / 14:35:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    94
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    95
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    96
diffs
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    97
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    98
    ^#()
cf06c39b234c initial checkin
vrany
parents:
diff changeset
    99
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   100
    "Created: / 10-11-2009 / 11:29:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   101
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   102
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   103
flattened
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   104
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   105
    ^ChangeSetDiffSet new add: self
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   106
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   107
    "Created: / 05-12-2009 / 11:07:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   108
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   109
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   110
merged
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   111
    "raise an error: must be redefined in concrete subclass(es)"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   112
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   113
    ^ self subclassResponsibility
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   114
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   115
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   116
name
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   117
    "raise an error: must be redefined in concrete subclass(es)"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   118
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   119
    ^ self subclassResponsibility
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   120
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   121
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   122
parent
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   123
    ^ parent
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   124
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   125
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   126
parent:aDiffSet
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   127
    parent := aDiffSet.
2643
vrany
parents: 2424
diff changeset
   128
!
vrany
parents: 2424
diff changeset
   129
vrany
parents: 2424
diff changeset
   130
versionALabel
vrany
parents: 2424
diff changeset
   131
    ^ parent versionALabel
vrany
parents: 2424
diff changeset
   132
vrany
parents: 2424
diff changeset
   133
    "Created: / 09-11-2009 / 12:38:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
vrany
parents: 2424
diff changeset
   134
!
vrany
parents: 2424
diff changeset
   135
vrany
parents: 2424
diff changeset
   136
versionBLabel
vrany
parents: 2424
diff changeset
   137
    ^ parent versionBLabel
vrany
parents: 2424
diff changeset
   138
vrany
parents: 2424
diff changeset
   139
    "Created: / 09-11-2009 / 12:38:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2406
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   140
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   141
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   142
!ChangeSetDiffComponent methodsFor:'change & update'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   143
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   144
changed: aspect with: param
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   145
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   146
    (aspect = #resolution and:[parent notNil])
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   147
        ifTrue:[parent changed: aspect with: param].
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   148
    super changed: aspect with: param.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   149
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   150
    "Created: / 24-11-2009 / 12:58:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   151
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   152
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   153
!ChangeSetDiffComponent methodsFor:'enumerating'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   154
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   155
do: aBlock
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   156
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   157
    self subclassResponsibility
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   158
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   159
    "Created: / 25-11-2009 / 10:22:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   160
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   161
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   162
!ChangeSetDiffComponent methodsFor:'printing & storing'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   163
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   164
printOn:aStream
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   165
    "append a printed representation if the receiver to the argument, aStream"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   166
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   167
    super printOn:aStream.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   168
    aStream nextPut:$(.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   169
    self name printOn: aStream.
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   170
    aStream nextPut:$).
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   171
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   172
    "Modified: / 26-11-2009 / 16:25:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   173
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   174
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   175
!ChangeSetDiffComponent methodsFor:'private'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   176
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   177
flattenOn: stream
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   178
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   179
    ^stream nextPut: self
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   180
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   181
    "Created: / 05-12-2009 / 11:06:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   182
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   183
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   184
!ChangeSetDiffComponent methodsFor:'testing'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   185
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   186
isDiffItem
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   187
    ^ false
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   188
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   189
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   190
isDiffSet
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   191
    ^ false
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   192
!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   193
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   194
isEmpty
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   195
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   196
    ^false
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   197
! !
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   198
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   199
!ChangeSetDiffComponent class methodsFor:'documentation'!
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   200
cf06c39b234c initial checkin
vrany
parents:
diff changeset
   201
version_CVS
3011
1997ff6e7e55 trunk branched into /branches/jv
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2643
diff changeset
   202
    ^ '§Header: /cvs/stx/stx/libbasic3/ChangeSetDiffComponent.st,v 1.3 2011/12/19 08:37:48 vrany Exp §'
1997ff6e7e55 trunk branched into /branches/jv
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2643
diff changeset
   203
! !