ChangeSetDiffSet.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Wed, 18 Apr 2012 21:21:56 +0100
branchjv
changeset 3051 e056039b3a1b
parent 3042 48e76977cdc3
child 3069 89d2cfee177f
permissions -rw-r--r--
- ChangeSetDiffEntry added: #isForVersionMethod - ChangeSetDiffComponent added: #isForVersionMethod - ChangeSetDiffSet added: #isForVersionMethod - extensions ...
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
     1
"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
     2
 Copyright (c) 2007-2010 Jan Vrany, SWING Research Group,
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
     3
                           Czech Technical University in Prague
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
     4
 Copyright (c) 2009-2010 eXept Software AG
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
     5
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
     6
 Permission is hereby granted, free of charge, to any person
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
     7
 obtaining a copy of this software and associated documentation
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
     8
 files (the 'Software'), to deal in the Software without
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
     9
 restriction, including without limitation the rights to use,
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    10
 copy, modify, merge, publish, distribute, sublicense, and/or sell
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    11
 copies of the Software, and to permit persons to whom the
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    12
 Software is furnished to do so, subject to the following
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    13
 conditions:
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    14
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    15
 The above copyright notice and this permission notice shall be
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    16
 included in all copies or substantial portions of the Software.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    17
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    18
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    19
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    20
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    21
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    22
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    23
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    24
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    25
 OTHER DEALINGS IN THE SOFTWARE.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    26
"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    27
"{ Package: 'stx:libbasic3' }"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    28
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    29
ChangeSetDiffComponent subclass:#ChangeSetDiffSet
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    30
	instanceVariableNames:'name versionALabel versionBLabel versionBaseLabel diffs'
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    31
	classVariableNames:''
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    32
	poolDictionaries:''
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    33
	category:'System-Changes-Diff'
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    34
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    35
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    36
!ChangeSetDiffSet class methodsFor:'documentation'!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    37
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    38
copyright
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    39
"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    40
 Copyright (c) 2007-2010 Jan Vrany, SWING Research Group,
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    41
                           Czech Technical University in Prague
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    42
 Copyright (c) 2009-2010 eXept Software AG
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    43
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    44
 Permission is hereby granted, free of charge, to any person
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    45
 obtaining a copy of this software and associated documentation
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    46
 files (the 'Software'), to deal in the Software without
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    47
 restriction, including without limitation the rights to use,
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    48
 copy, modify, merge, publish, distribute, sublicense, and/or sell
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    49
 copies of the Software, and to permit persons to whom the
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    50
 Software is furnished to do so, subject to the following
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    51
 conditions:
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    52
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    53
 The above copyright notice and this permission notice shall be
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    54
 included in all copies or substantial portions of the Software.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    55
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    56
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    57
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    58
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    59
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    60
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    61
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    62
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    63
 OTHER DEALINGS IN THE SOFTWARE.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    64
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    65
"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    66
! !
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    67
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    68
!ChangeSetDiffSet class methodsFor:'instance creation'!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    69
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    70
new
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    71
    ^ self basicNew initialize.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    72
! !
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    73
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    74
!ChangeSetDiffSet methodsFor:'accessing'!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    75
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    76
diffs
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    77
    ^ diffs
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    78
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    79
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    80
flattened
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    81
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    82
    | flattened s |
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    83
    flattened := self copy.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    84
    s := (OrderedCollection new: diffs size) writeStream.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    85
    self flattenOn: s.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    86
    flattened setDiffs: s contents.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    87
    ^flattened
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    88
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    89
    "Created: / 05-12-2009 / 11:09:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    90
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    91
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    92
merged
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    93
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    94
    ^diffs allSatisfy:[:e|e merged]
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    95
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    96
    "Created: / 24-11-2009 / 10:04:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    97
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    98
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
    99
name
2427
8a55734614cb Display number of changes
vrany
parents: 2408
diff changeset
   100
8a55734614cb Display number of changes
vrany
parents: 2408
diff changeset
   101
    ^ '%1 (%2)' bindWith: (name ? '<unnamed>') with: diffs size
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   102
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   103
    "Modified: / 26-11-2009 / 16:26:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2427
8a55734614cb Display number of changes
vrany
parents: 2408
diff changeset
   104
    "Modified: / 07-07-2011 / 14:15:12 / jv"
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   105
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   106
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   107
name:aString
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   108
    name := aString.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   109
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   110
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   111
resolution
2627
ca1a4b2b0f53 changed:
Claus Gittinger <cg@exept.de>
parents: 2427
diff changeset
   112
    | changeset |
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   113
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   114
    changeset := ChangeSet new.
2627
ca1a4b2b0f53 changed:
Claus Gittinger <cg@exept.de>
parents: 2427
diff changeset
   115
    self do:[:diff|
ca1a4b2b0f53 changed:
Claus Gittinger <cg@exept.de>
parents: 2427
diff changeset
   116
        diff versionMerged notNil ifTrue:[
ca1a4b2b0f53 changed:
Claus Gittinger <cg@exept.de>
parents: 2427
diff changeset
   117
            changeset add: diff versionMerged
ca1a4b2b0f53 changed:
Claus Gittinger <cg@exept.de>
parents: 2427
diff changeset
   118
        ]
ca1a4b2b0f53 changed:
Claus Gittinger <cg@exept.de>
parents: 2427
diff changeset
   119
    ].
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   120
    ^changeset
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   121
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   122
    "Created: / 26-11-2009 / 08:44:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2627
ca1a4b2b0f53 changed:
Claus Gittinger <cg@exept.de>
parents: 2427
diff changeset
   123
    "Modified: / 29-11-2011 / 11:25:02 / cg"
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   124
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   125
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   126
versionALabel
2628
7a777cdf027f changed:
Claus Gittinger <cg@exept.de>
parents: 2627
diff changeset
   127
    ^ versionALabel ifNil:[parent ifNotNil:[parent versionALabel]]
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   128
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   129
    "Modified: / 21-11-2009 / 07:50:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2628
7a777cdf027f changed:
Claus Gittinger <cg@exept.de>
parents: 2627
diff changeset
   130
    "Modified: / 29-11-2011 / 11:26:15 / cg"
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   131
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   132
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   133
versionALabel:aString
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   134
    versionALabel := aString.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   135
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   136
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   137
versionBLabel
2628
7a777cdf027f changed:
Claus Gittinger <cg@exept.de>
parents: 2627
diff changeset
   138
    ^ versionBLabel ifNil:[parent ifNotNil:[parent versionBLabel]]
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   139
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   140
    "Modified: / 21-11-2009 / 07:51:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2628
7a777cdf027f changed:
Claus Gittinger <cg@exept.de>
parents: 2627
diff changeset
   141
    "Modified: / 29-11-2011 / 11:26:19 / cg"
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   142
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   143
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   144
versionBLabel:aString
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   145
    versionBLabel := aString.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   146
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   147
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   148
versionBaseLabel
2628
7a777cdf027f changed:
Claus Gittinger <cg@exept.de>
parents: 2627
diff changeset
   149
    ^ versionBaseLabel ifNil:[parent ifNotNil:[parent versionBaseLabel]]
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   150
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   151
    "Created: / 23-11-2009 / 22:54:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   152
    "Modified: / 24-11-2009 / 09:21:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2628
7a777cdf027f changed:
Claus Gittinger <cg@exept.de>
parents: 2627
diff changeset
   153
    "Modified (format): / 29-11-2011 / 11:26:37 / cg"
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   154
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   155
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   156
versionBaseLabel:aString
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   157
    versionBaseLabel := aString.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   158
! !
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   159
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   160
!ChangeSetDiffSet methodsFor:'adding & removing'!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   161
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   162
add: anObject
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   163
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   164
    anObject parent: self.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   165
    ^diffs add: anObject
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   166
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   167
    "Created: / 09-11-2009 / 12:36:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   168
    "Modified: / 10-11-2009 / 11:26:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   169
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   170
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   171
addAll: aCollection
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   172
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   173
    aCollection do:[:e|self add:e]
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   174
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   175
    "Created: / 10-11-2009 / 11:27:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   176
! !
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   177
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   178
!ChangeSetDiffSet methodsFor:'enumerating'!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   179
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   180
collect: aBlock
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   181
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   182
    ^diffs collect: aBlock
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   183
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   184
    "Created: / 10-11-2009 / 11:26:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   185
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   186
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   187
do: aBlock
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   188
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   189
    ^diffs do: [:each|each do:aBlock]
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   190
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   191
    "Created: / 10-11-2009 / 11:26:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   192
    "Modified: / 25-11-2009 / 10:30:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   193
! !
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   194
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   195
!ChangeSetDiffSet methodsFor:'initialization'!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   196
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   197
initialize
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   198
    "Invoked when a new instance is created."
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   199
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   200
    "/ please change as required (and remove this comment)
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   201
    "/ name := nil.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   202
    "/ versionALabel := nil.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   203
    "/ versionBLabel := nil.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   204
    diffs := OrderedCollection new:4.
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   205
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   206
    "/ super initialize.   -- commented since inherited method does nothing
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   207
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   208
    "Modified: / 10-11-2009 / 11:25:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   209
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   210
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   211
setDiffs: aCollection
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   212
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   213
    diffs := aCollection
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   214
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   215
    "Created: / 05-12-2009 / 11:09:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   216
! !
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   217
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   218
!ChangeSetDiffSet methodsFor:'private'!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   219
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   220
flattenOn: stream
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   221
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   222
    diffs do:[:diff|diff flattenOn: stream]
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   223
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   224
    "Created: / 05-12-2009 / 11:07:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   225
! !
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   226
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   227
!ChangeSetDiffSet methodsFor:'testing'!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   228
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   229
isDiffSet
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   230
    ^ true
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   231
!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   232
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   233
isEmpty
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   234
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   235
    ^diffs isEmpty or:[diffs allSatisfy: [:diff|diff isEmpty]]
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   236
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   237
    "Created: / 25-11-2009 / 20:37:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   238
    "Modified: / 09-12-2009 / 17:43:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3030
f89aa3cfedde Merge support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   239
!
f89aa3cfedde Merge support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   240
3051
e056039b3a1b - ChangeSetDiffEntry
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   241
isForVersionMethod
e056039b3a1b - ChangeSetDiffEntry
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   242
    "Returns true, if this is an entry for version method"
e056039b3a1b - ChangeSetDiffEntry
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   243
e056039b3a1b - ChangeSetDiffEntry
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   244
    ^diffs allSatisfy:[:each|each isForVersionMethod]
e056039b3a1b - ChangeSetDiffEntry
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   245
e056039b3a1b - ChangeSetDiffEntry
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   246
    "Created: / 18-04-2012 / 19:05:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
e056039b3a1b - ChangeSetDiffEntry
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   247
!
e056039b3a1b - ChangeSetDiffEntry
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   248
3030
f89aa3cfedde Merge support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   249
isMerged
f89aa3cfedde Merge support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   250
    "raise an error: must be redefined in concrete subclass(es)"
f89aa3cfedde Merge support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   251
f89aa3cfedde Merge support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   252
    ^ self diffs allSatisfy:[:e|e isMerged].
f89aa3cfedde Merge support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   253
f89aa3cfedde Merge support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3012
diff changeset
   254
    "Created: / 19-03-2012 / 15:15:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   255
! !
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   256
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   257
!ChangeSetDiffSet class methodsFor:'documentation'!
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   258
2628
7a777cdf027f changed:
Claus Gittinger <cg@exept.de>
parents: 2627
diff changeset
   259
version
3051
e056039b3a1b - ChangeSetDiffEntry
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   260
    ^ '$Id: ChangeSetDiffSet.st 1920 2012-04-18 20:21:56Z vranyj1 $'
2628
7a777cdf027f changed:
Claus Gittinger <cg@exept.de>
parents: 2627
diff changeset
   261
!
7a777cdf027f changed:
Claus Gittinger <cg@exept.de>
parents: 2627
diff changeset
   262
2408
c5c99ce9ab0d initial checkin
vrany
parents:
diff changeset
   263
version_CVS
3011
1997ff6e7e55 trunk branched into /branches/jv
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2628
diff changeset
   264
    ^ '§Header: /cvs/stx/stx/libbasic3/ChangeSetDiffSet.st,v 1.4 2011/11/29 10:26:48 cg Exp §'
3012
4f40b8304d54 Added InvalidChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3011
diff changeset
   265
!
4f40b8304d54 Added InvalidChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3011
diff changeset
   266
4f40b8304d54 Added InvalidChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3011
diff changeset
   267
version_SVN
3051
e056039b3a1b - ChangeSetDiffEntry
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3042
diff changeset
   268
    ^ '$Id: ChangeSetDiffSet.st 1920 2012-04-18 20:21:56Z vranyj1 $'
3012
4f40b8304d54 Added InvalidChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3011
diff changeset
   269
! !