Tools__ChangeSetDiffList.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Wed, 18 Apr 2012 21:29:40 +0100
branchjv
changeset 12232 4d9b62c111fc
parent 12202 eaa1f6cb6ce8
child 12274 1e0599b8a007
permissions -rw-r--r--
- Tools::ChangeSetDiffList class definition added: #showVersionMethodDiffsHolder #showVersionMethodDiffsHolder: changed: #aspectSelectors #update:with:from: #updateList - Tools::ChangeSetDiffTool class definition added: #showVersionMethodDiffsHolder #showVersionMethodDiffsHolder: changed: #mainMenu #oneColumnNavigatorSpec #twoColumnNavigatorSpec #windowSpec - Tools::TextDiff2Tool added: #textAViewSpec #textBViewSpec changed: #versionAOnlySpec #versionBOnlySpec - extensions ...
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
     1
"
f898a869986e initial checkin
vrany
parents:
diff changeset
     2
 Copyright (c) 2007-2010 Jan Vrany
f898a869986e initial checkin
vrany
parents:
diff changeset
     3
 Copyright (c) 2009-2010 eXept Software AG
f898a869986e initial checkin
vrany
parents:
diff changeset
     4
f898a869986e initial checkin
vrany
parents:
diff changeset
     5
 Permission is hereby granted, free of charge, to any person
f898a869986e initial checkin
vrany
parents:
diff changeset
     6
 obtaining a copy of this software and associated documentation
f898a869986e initial checkin
vrany
parents:
diff changeset
     7
 files (the 'Software'), to deal in the Software without
f898a869986e initial checkin
vrany
parents:
diff changeset
     8
 restriction, including without limitation the rights to use,
f898a869986e initial checkin
vrany
parents:
diff changeset
     9
 copy, modify, merge, publish, distribute, sublicense, and/or sell
f898a869986e initial checkin
vrany
parents:
diff changeset
    10
 copies of the Software, and to permit persons to whom the
f898a869986e initial checkin
vrany
parents:
diff changeset
    11
 Software is furnished to do so, subject to the following
f898a869986e initial checkin
vrany
parents:
diff changeset
    12
 conditions:
f898a869986e initial checkin
vrany
parents:
diff changeset
    13
f898a869986e initial checkin
vrany
parents:
diff changeset
    14
 The above copyright notice and this permission notice shall be
f898a869986e initial checkin
vrany
parents:
diff changeset
    15
 included in all copies or substantial portions of the Software.
f898a869986e initial checkin
vrany
parents:
diff changeset
    16
f898a869986e initial checkin
vrany
parents:
diff changeset
    17
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
f898a869986e initial checkin
vrany
parents:
diff changeset
    18
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
f898a869986e initial checkin
vrany
parents:
diff changeset
    19
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
f898a869986e initial checkin
vrany
parents:
diff changeset
    20
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
f898a869986e initial checkin
vrany
parents:
diff changeset
    21
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
f898a869986e initial checkin
vrany
parents:
diff changeset
    22
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
f898a869986e initial checkin
vrany
parents:
diff changeset
    23
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
f898a869986e initial checkin
vrany
parents:
diff changeset
    24
 OTHER DEALINGS IN THE SOFTWARE.
f898a869986e initial checkin
vrany
parents:
diff changeset
    25
"
10217
fcb21281008f changed: #listEntryIconFor:
vrany
parents: 10192
diff changeset
    26
"{ Package: 'stx:libtool' }"
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
    27
f898a869986e initial checkin
vrany
parents:
diff changeset
    28
"{ NameSpace: Tools }"
f898a869986e initial checkin
vrany
parents:
diff changeset
    29
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
    30
BrowserListWithFilter subclass:#ChangeSetDiffList
12232
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
    31
	instanceVariableNames:'listHolder listEntryLabelGenerator listEntryIconGenerator
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
    32
		showVersionMethodDiffsHolder'
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
    33
	classVariableNames:''
f898a869986e initial checkin
vrany
parents:
diff changeset
    34
	poolDictionaries:''
f898a869986e initial checkin
vrany
parents:
diff changeset
    35
	category:'Interface-Diff'
f898a869986e initial checkin
vrany
parents:
diff changeset
    36
!
f898a869986e initial checkin
vrany
parents:
diff changeset
    37
f898a869986e initial checkin
vrany
parents:
diff changeset
    38
Object subclass:#ListEntry
f898a869986e initial checkin
vrany
parents:
diff changeset
    39
	instanceVariableNames:'model application'
f898a869986e initial checkin
vrany
parents:
diff changeset
    40
	classVariableNames:''
f898a869986e initial checkin
vrany
parents:
diff changeset
    41
	poolDictionaries:''
f898a869986e initial checkin
vrany
parents:
diff changeset
    42
	privateIn:ChangeSetDiffList
f898a869986e initial checkin
vrany
parents:
diff changeset
    43
!
f898a869986e initial checkin
vrany
parents:
diff changeset
    44
f898a869986e initial checkin
vrany
parents:
diff changeset
    45
!ChangeSetDiffList class methodsFor:'documentation'!
f898a869986e initial checkin
vrany
parents:
diff changeset
    46
f898a869986e initial checkin
vrany
parents:
diff changeset
    47
copyright
f898a869986e initial checkin
vrany
parents:
diff changeset
    48
"
f898a869986e initial checkin
vrany
parents:
diff changeset
    49
 Copyright (c) 2007-2010 Jan Vrany
f898a869986e initial checkin
vrany
parents:
diff changeset
    50
 Copyright (c) 2009-2010 eXept Software AG
f898a869986e initial checkin
vrany
parents:
diff changeset
    51
f898a869986e initial checkin
vrany
parents:
diff changeset
    52
 Permission is hereby granted, free of charge, to any person
f898a869986e initial checkin
vrany
parents:
diff changeset
    53
 obtaining a copy of this software and associated documentation
f898a869986e initial checkin
vrany
parents:
diff changeset
    54
 files (the 'Software'), to deal in the Software without
f898a869986e initial checkin
vrany
parents:
diff changeset
    55
 restriction, including without limitation the rights to use,
f898a869986e initial checkin
vrany
parents:
diff changeset
    56
 copy, modify, merge, publish, distribute, sublicense, and/or sell
f898a869986e initial checkin
vrany
parents:
diff changeset
    57
 copies of the Software, and to permit persons to whom the
f898a869986e initial checkin
vrany
parents:
diff changeset
    58
 Software is furnished to do so, subject to the following
f898a869986e initial checkin
vrany
parents:
diff changeset
    59
 conditions:
f898a869986e initial checkin
vrany
parents:
diff changeset
    60
f898a869986e initial checkin
vrany
parents:
diff changeset
    61
 The above copyright notice and this permission notice shall be
f898a869986e initial checkin
vrany
parents:
diff changeset
    62
 included in all copies or substantial portions of the Software.
f898a869986e initial checkin
vrany
parents:
diff changeset
    63
f898a869986e initial checkin
vrany
parents:
diff changeset
    64
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
f898a869986e initial checkin
vrany
parents:
diff changeset
    65
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
f898a869986e initial checkin
vrany
parents:
diff changeset
    66
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
f898a869986e initial checkin
vrany
parents:
diff changeset
    67
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
f898a869986e initial checkin
vrany
parents:
diff changeset
    68
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
f898a869986e initial checkin
vrany
parents:
diff changeset
    69
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
f898a869986e initial checkin
vrany
parents:
diff changeset
    70
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
f898a869986e initial checkin
vrany
parents:
diff changeset
    71
 OTHER DEALINGS IN THE SOFTWARE.
f898a869986e initial checkin
vrany
parents:
diff changeset
    72
f898a869986e initial checkin
vrany
parents:
diff changeset
    73
"
f898a869986e initial checkin
vrany
parents:
diff changeset
    74
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
    75
f898a869986e initial checkin
vrany
parents:
diff changeset
    76
!ChangeSetDiffList class methodsFor:'interface specs'!
f898a869986e initial checkin
vrany
parents:
diff changeset
    77
f898a869986e initial checkin
vrany
parents:
diff changeset
    78
windowSpec
f898a869986e initial checkin
vrany
parents:
diff changeset
    79
    "This resource specification was automatically generated
f898a869986e initial checkin
vrany
parents:
diff changeset
    80
     by the UIPainter of ST/X."
f898a869986e initial checkin
vrany
parents:
diff changeset
    81
f898a869986e initial checkin
vrany
parents:
diff changeset
    82
    "Do not manually edit this!! If it is corrupted,
f898a869986e initial checkin
vrany
parents:
diff changeset
    83
     the UIPainter may not be able to read the specification."
f898a869986e initial checkin
vrany
parents:
diff changeset
    84
f898a869986e initial checkin
vrany
parents:
diff changeset
    85
    "
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
    86
     UIPainter new openOnClass:Tools::ChangeSetDiffList andSelector:#windowSpec
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
    87
     Tools::ChangeSetDiffList new openInterface:#windowSpec
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
    88
     Tools::ChangeSetDiffList open
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
    89
    "
f898a869986e initial checkin
vrany
parents:
diff changeset
    90
f898a869986e initial checkin
vrany
parents:
diff changeset
    91
    <resource: #canvas>
f898a869986e initial checkin
vrany
parents:
diff changeset
    92
f898a869986e initial checkin
vrany
parents:
diff changeset
    93
    ^ 
f898a869986e initial checkin
vrany
parents:
diff changeset
    94
     #(FullSpec
f898a869986e initial checkin
vrany
parents:
diff changeset
    95
        name: windowSpec
f898a869986e initial checkin
vrany
parents:
diff changeset
    96
        window: 
f898a869986e initial checkin
vrany
parents:
diff changeset
    97
       (WindowSpec
f898a869986e initial checkin
vrany
parents:
diff changeset
    98
          label: 'Diff List'
f898a869986e initial checkin
vrany
parents:
diff changeset
    99
          name: 'Diff List'
f898a869986e initial checkin
vrany
parents:
diff changeset
   100
          min: (Point 10 10)
f898a869986e initial checkin
vrany
parents:
diff changeset
   101
          bounds: (Rectangle 0 0 300 300)
f898a869986e initial checkin
vrany
parents:
diff changeset
   102
        )
f898a869986e initial checkin
vrany
parents:
diff changeset
   103
        component: 
f898a869986e initial checkin
vrany
parents:
diff changeset
   104
       (SpecCollection
f898a869986e initial checkin
vrany
parents:
diff changeset
   105
          collection: (
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   106
           (InputFieldSpec
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   107
              name: 'Filter'
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   108
              layout: (LayoutFrame 0 0 0 0 0 1 25 0)
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   109
              initiallyInvisible: true
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   110
              model: filterPatternHolder
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   111
              immediateAccept: true
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   112
              acceptOnLeave: false
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   113
              acceptOnReturn: false
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   114
              acceptOnTab: false
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   115
              acceptOnPointerLeave: false
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   116
              emptyFieldReplacementText: 'Search Filter...'
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   117
              usePreferredHeight: true
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   118
              useDynamicPreferredHeight: true
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   119
              postBuildCallback: postBuildFilterView:
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   120
            )
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   121
           (SelectionInListModelViewSpec
f898a869986e initial checkin
vrany
parents:
diff changeset
   122
              name: 'List'
f898a869986e initial checkin
vrany
parents:
diff changeset
   123
              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
f898a869986e initial checkin
vrany
parents:
diff changeset
   124
              model: selectionHolder
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   125
              menu: menuHolderWithShowFilter
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   126
              hasHorizontalScrollBar: true
f898a869986e initial checkin
vrany
parents:
diff changeset
   127
              hasVerticalScrollBar: true
f898a869986e initial checkin
vrany
parents:
diff changeset
   128
              listModel: listHolder
f898a869986e initial checkin
vrany
parents:
diff changeset
   129
              multipleSelectOk: true
f898a869986e initial checkin
vrany
parents:
diff changeset
   130
              useIndex: false
f898a869986e initial checkin
vrany
parents:
diff changeset
   131
              highlightMode: line
f898a869986e initial checkin
vrany
parents:
diff changeset
   132
            )
f898a869986e initial checkin
vrany
parents:
diff changeset
   133
           )
f898a869986e initial checkin
vrany
parents:
diff changeset
   134
         
f898a869986e initial checkin
vrany
parents:
diff changeset
   135
        )
f898a869986e initial checkin
vrany
parents:
diff changeset
   136
      )
f898a869986e initial checkin
vrany
parents:
diff changeset
   137
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   138
f898a869986e initial checkin
vrany
parents:
diff changeset
   139
!ChangeSetDiffList class methodsFor:'plugIn spec'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   140
f898a869986e initial checkin
vrany
parents:
diff changeset
   141
aspectSelectors
f898a869986e initial checkin
vrany
parents:
diff changeset
   142
    "This resource specification was automatically generated
f898a869986e initial checkin
vrany
parents:
diff changeset
   143
     by the UIPainter of ST/X."
f898a869986e initial checkin
vrany
parents:
diff changeset
   144
f898a869986e initial checkin
vrany
parents:
diff changeset
   145
    "Do not manually edit this. If it is corrupted,
f898a869986e initial checkin
vrany
parents:
diff changeset
   146
     the UIPainter may not be able to read the specification."
f898a869986e initial checkin
vrany
parents:
diff changeset
   147
f898a869986e initial checkin
vrany
parents:
diff changeset
   148
    "Return a description of exported aspects;
f898a869986e initial checkin
vrany
parents:
diff changeset
   149
     these can be connected to aspects of an embedding application
f898a869986e initial checkin
vrany
parents:
diff changeset
   150
     (if this app is embedded in a subCanvas)."
f898a869986e initial checkin
vrany
parents:
diff changeset
   151
f898a869986e initial checkin
vrany
parents:
diff changeset
   152
    ^ #(
f898a869986e initial checkin
vrany
parents:
diff changeset
   153
        #inGeneratorHolder
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   154
        #listEntryIconGenerator
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   155
        #listEntryLabelGenerator
12123
4bde08cebd48 trunk branched into /branches/jv
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 10938
diff changeset
   156
        #menuHolder
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   157
        #outGeneratorHolder
12232
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   158
        #showVersionMethodDiffsHolder
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   159
      ).
f898a869986e initial checkin
vrany
parents:
diff changeset
   160
12232
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   161
    "Modified: / 18-04-2012 / 19:01:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   162
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   163
f898a869986e initial checkin
vrany
parents:
diff changeset
   164
!ChangeSetDiffList methodsFor:'accessing'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   165
f898a869986e initial checkin
vrany
parents:
diff changeset
   166
listEntryIconGenerator
f898a869986e initial checkin
vrany
parents:
diff changeset
   167
    ^ listEntryIconGenerator
f898a869986e initial checkin
vrany
parents:
diff changeset
   168
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   169
f898a869986e initial checkin
vrany
parents:
diff changeset
   170
listEntryIconGenerator:aBlock
f898a869986e initial checkin
vrany
parents:
diff changeset
   171
    listEntryIconGenerator := aBlock.
f898a869986e initial checkin
vrany
parents:
diff changeset
   172
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   173
f898a869986e initial checkin
vrany
parents:
diff changeset
   174
listEntryLabelGenerator
f898a869986e initial checkin
vrany
parents:
diff changeset
   175
    ^ listEntryLabelGenerator
f898a869986e initial checkin
vrany
parents:
diff changeset
   176
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   177
f898a869986e initial checkin
vrany
parents:
diff changeset
   178
listEntryLabelGenerator:aBlock
f898a869986e initial checkin
vrany
parents:
diff changeset
   179
    listEntryLabelGenerator := aBlock.
f898a869986e initial checkin
vrany
parents:
diff changeset
   180
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   181
f898a869986e initial checkin
vrany
parents:
diff changeset
   182
!ChangeSetDiffList methodsFor:'aspects'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   183
f898a869986e initial checkin
vrany
parents:
diff changeset
   184
listHolder
f898a869986e initial checkin
vrany
parents:
diff changeset
   185
    "return/create the 'difflistHolder' value holder (automatically generated)"
f898a869986e initial checkin
vrany
parents:
diff changeset
   186
f898a869986e initial checkin
vrany
parents:
diff changeset
   187
    listHolder isNil ifTrue:[
f898a869986e initial checkin
vrany
parents:
diff changeset
   188
        listHolder := ValueHolder new.
f898a869986e initial checkin
vrany
parents:
diff changeset
   189
    ].
f898a869986e initial checkin
vrany
parents:
diff changeset
   190
    ^ listHolder
12232
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   191
!
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   192
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   193
showVersionMethodDiffsHolder
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   194
    "return/create the 'showVersionMethodDiffsHolder' value holder (automatically generated)"
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   195
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   196
    showVersionMethodDiffsHolder isNil ifTrue:[
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   197
        showVersionMethodDiffsHolder := ValueHolder new.
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   198
        showVersionMethodDiffsHolder addDependent:self.
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   199
    ].
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   200
    ^ showVersionMethodDiffsHolder
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   201
!
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   202
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   203
showVersionMethodDiffsHolder:something
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   204
    "set the 'showVersionMethodDiffsHolder' value holder (automatically generated)"
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   205
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   206
    |oldValue newValue|
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   207
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   208
    showVersionMethodDiffsHolder notNil ifTrue:[
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   209
        oldValue := showVersionMethodDiffsHolder value.
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   210
        showVersionMethodDiffsHolder removeDependent:self.
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   211
    ].
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   212
    showVersionMethodDiffsHolder := something.
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   213
    showVersionMethodDiffsHolder notNil ifTrue:[
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   214
        showVersionMethodDiffsHolder addDependent:self.
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   215
    ].
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   216
    newValue := showVersionMethodDiffsHolder value.
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   217
    oldValue ~~ newValue ifTrue:[
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   218
        self update:#value with:newValue from:showVersionMethodDiffsHolder.
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   219
    ].
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   220
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   221
f898a869986e initial checkin
vrany
parents:
diff changeset
   222
!ChangeSetDiffList methodsFor:'change & update'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   223
f898a869986e initial checkin
vrany
parents:
diff changeset
   224
update: aspect with: param from: sender
f898a869986e initial checkin
vrany
parents:
diff changeset
   225
f898a869986e initial checkin
vrany
parents:
diff changeset
   226
    aspect == #resolution ifTrue:[^(self componentAt: #List) invalidateRepairNow: true].
f898a869986e initial checkin
vrany
parents:
diff changeset
   227
        
12232
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   228
    sender == selectionHolder ifTrue:[
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   229
        self selectionChanged.
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   230
        ^self.
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   231
    ].
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   232
    sender == showVersionMethodDiffsHolder ifTrue:[
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   233
        ^self updateList.
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   234
        self.
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   235
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   236
    ].
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   237
    super update: aspect with: param from: sender.
f898a869986e initial checkin
vrany
parents:
diff changeset
   238
12232
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   239
    "Modified: / 18-04-2012 / 18:57:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   240
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   241
f898a869986e initial checkin
vrany
parents:
diff changeset
   242
!ChangeSetDiffList methodsFor:'generators'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   243
f898a869986e initial checkin
vrany
parents:
diff changeset
   244
makeGenerator
f898a869986e initial checkin
vrany
parents:
diff changeset
   245
f898a869986e initial checkin
vrany
parents:
diff changeset
   246
    ^Iterator on:
f898a869986e initial checkin
vrany
parents:
diff changeset
   247
        [:whatToDo|
f898a869986e initial checkin
vrany
parents:
diff changeset
   248
        self selectionHolder value do:
f898a869986e initial checkin
vrany
parents:
diff changeset
   249
            [:each|each model do: whatToDo]]
f898a869986e initial checkin
vrany
parents:
diff changeset
   250
f898a869986e initial checkin
vrany
parents:
diff changeset
   251
    "Modified: / 26-11-2009 / 17:23:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin
vrany
parents:
diff changeset
   252
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   253
f898a869986e initial checkin
vrany
parents:
diff changeset
   254
!ChangeSetDiffList methodsFor:'private'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   255
f898a869986e initial checkin
vrany
parents:
diff changeset
   256
listEntryIconFor:aDiffComponent 
f898a869986e initial checkin
vrany
parents:
diff changeset
   257
    |a hasA b hasB hasBase|
f898a869986e initial checkin
vrany
parents:
diff changeset
   258
f898a869986e initial checkin
vrany
parents:
diff changeset
   259
    aDiffComponent isDiffSet ifTrue:[
f898a869986e initial checkin
vrany
parents:
diff changeset
   260
        ^ nil
f898a869986e initial checkin
vrany
parents:
diff changeset
   261
    ].
f898a869986e initial checkin
vrany
parents:
diff changeset
   262
    hasA := (a := aDiffComponent versionA) notNil and:[a isMethodRemoveChange not].
f898a869986e initial checkin
vrany
parents:
diff changeset
   263
    hasB := (b := aDiffComponent versionB) notNil and:[b isMethodRemoveChange not].
f898a869986e initial checkin
vrany
parents:
diff changeset
   264
    hasBase := aDiffComponent versionBase notNil.
f898a869986e initial checkin
vrany
parents:
diff changeset
   265
    (hasA & hasB & hasBase) ifTrue:[
10217
fcb21281008f changed: #listEntryIconFor:
vrany
parents: 10192
diff changeset
   266
        ^ ToolbarIconLibrary versionABBase12x12 
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   267
    ].
f898a869986e initial checkin
vrany
parents:
diff changeset
   268
    (hasA & hasB) ifTrue:[
10217
fcb21281008f changed: #listEntryIconFor:
vrany
parents: 10192
diff changeset
   269
        ^ ToolbarIconLibrary versionAB12x12
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   270
    ].
f898a869986e initial checkin
vrany
parents:
diff changeset
   271
    (hasA & hasBase) ifTrue:[
10217
fcb21281008f changed: #listEntryIconFor:
vrany
parents: 10192
diff changeset
   272
        ^ ToolbarIconLibrary versionABase12x12
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   273
    ].
f898a869986e initial checkin
vrany
parents:
diff changeset
   274
    (hasA) ifTrue:[
10217
fcb21281008f changed: #listEntryIconFor:
vrany
parents: 10192
diff changeset
   275
        ^ ToolbarIconLibrary versionA12x12
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   276
    ].
f898a869986e initial checkin
vrany
parents:
diff changeset
   277
    (hasB & hasBase) ifTrue:[
10217
fcb21281008f changed: #listEntryIconFor:
vrany
parents: 10192
diff changeset
   278
        ^ ToolbarIconLibrary versionBBase12x12
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   279
    ].
f898a869986e initial checkin
vrany
parents:
diff changeset
   280
    (hasB) ifTrue:[
10217
fcb21281008f changed: #listEntryIconFor:
vrany
parents: 10192
diff changeset
   281
        ^ ToolbarIconLibrary versionB12x12
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   282
    ].
f898a869986e initial checkin
vrany
parents:
diff changeset
   283
    ^ nil
f898a869986e initial checkin
vrany
parents:
diff changeset
   284
f898a869986e initial checkin
vrany
parents:
diff changeset
   285
    "Created: / 21-11-2009 / 21:58:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin
vrany
parents:
diff changeset
   286
    "Modified: / 09-06-2011 / 08:19:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10217
fcb21281008f changed: #listEntryIconFor:
vrany
parents: 10192
diff changeset
   287
    "Modified: / 06-07-2011 / 16:38:33 / jv"
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   288
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   289
f898a869986e initial checkin
vrany
parents:
diff changeset
   290
listEntryLabelFor:diff 
f898a869986e initial checkin
vrany
parents:
diff changeset
   291
f898a869986e initial checkin
vrany
parents:
diff changeset
   292
    ^listEntryLabelGenerator 
f898a869986e initial checkin
vrany
parents:
diff changeset
   293
        ifNotNil: [listEntryLabelGenerator value: diff]
f898a869986e initial checkin
vrany
parents:
diff changeset
   294
        ifNil:[diff name]
f898a869986e initial checkin
vrany
parents:
diff changeset
   295
f898a869986e initial checkin
vrany
parents:
diff changeset
   296
    "Modified: / 24-11-2009 / 10:00:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin
vrany
parents:
diff changeset
   297
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   298
f898a869986e initial checkin
vrany
parents:
diff changeset
   299
makeDependent
f898a869986e initial checkin
vrany
parents:
diff changeset
   300
f898a869986e initial checkin
vrany
parents:
diff changeset
   301
    "Nothing to do"
f898a869986e initial checkin
vrany
parents:
diff changeset
   302
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   303
f898a869986e initial checkin
vrany
parents:
diff changeset
   304
makeIndependent
f898a869986e initial checkin
vrany
parents:
diff changeset
   305
f898a869986e initial checkin
vrany
parents:
diff changeset
   306
    "Nothing to do"
f898a869986e initial checkin
vrany
parents:
diff changeset
   307
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   308
f898a869986e initial checkin
vrany
parents:
diff changeset
   309
updateList
f898a869986e initial checkin
vrany
parents:
diff changeset
   310
    "Superclass Tools::BrowserList says that I am responsible to implement this method"
f898a869986e initial checkin
vrany
parents:
diff changeset
   311
    
f898a869986e initial checkin
vrany
parents:
diff changeset
   312
    | newDiffs newList |
f898a869986e initial checkin
vrany
parents:
diff changeset
   313
    self listHolder value ? #() do: [:entry|entry model removeDependent: self].
f898a869986e initial checkin
vrany
parents:
diff changeset
   314
f898a869986e initial checkin
vrany
parents:
diff changeset
   315
    newDiffs := self inGeneratorHolder value ? #().
10246
0a4d2feea6a3 Bug fix for two-column changeset diff
vrany
parents: 10217
diff changeset
   316
    (newDiffs isKindOf: ChangeSetDiffComponent) ifTrue:
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   317
        [newDiffs := newDiffs diffs].
12232
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   318
    showVersionMethodDiffsHolder value ifFalse:[
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   319
        newDiffs := newDiffs reject:[:diff|diff isForVersionMethod]
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   320
    ].
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   321
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   322
    newDiffs := self filterList: newDiffs.
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   323
    newList := OrderedCollection new:16.    
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   324
    newDiffs do:
f898a869986e initial checkin
vrany
parents:
diff changeset
   325
        [:item|
f898a869986e initial checkin
vrany
parents:
diff changeset
   326
        newList add:(ListEntry model: item application: self).
f898a869986e initial checkin
vrany
parents:
diff changeset
   327
        item addDependent: self].
10251
a6eb247b3746 Merged with JV's branch
vrany
parents: 10246
diff changeset
   328
a6eb247b3746 Merged with JV's branch
vrany
parents: 10246
diff changeset
   329
    newList sort:[:a :b|a label < b label].
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   330
    self listHolder value:newList
f898a869986e initial checkin
vrany
parents:
diff changeset
   331
10251
a6eb247b3746 Merged with JV's branch
vrany
parents: 10246
diff changeset
   332
    "Modified: / 07-07-2011 / 14:17:26 / jv"
12232
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   333
    "Modified: / 18-04-2012 / 19:01:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   334
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   335
f898a869986e initial checkin
vrany
parents:
diff changeset
   336
!ChangeSetDiffList::ListEntry class methodsFor:'instance creation'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   337
f898a869986e initial checkin
vrany
parents:
diff changeset
   338
model: model application: application
f898a869986e initial checkin
vrany
parents:
diff changeset
   339
f898a869986e initial checkin
vrany
parents:
diff changeset
   340
    ^self new
f898a869986e initial checkin
vrany
parents:
diff changeset
   341
        model: model;
f898a869986e initial checkin
vrany
parents:
diff changeset
   342
        application: application
f898a869986e initial checkin
vrany
parents:
diff changeset
   343
f898a869986e initial checkin
vrany
parents:
diff changeset
   344
    "Created: / 24-11-2009 / 18:29:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin
vrany
parents:
diff changeset
   345
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   346
f898a869986e initial checkin
vrany
parents:
diff changeset
   347
!ChangeSetDiffList::ListEntry methodsFor:'accessing'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   348
f898a869986e initial checkin
vrany
parents:
diff changeset
   349
application
f898a869986e initial checkin
vrany
parents:
diff changeset
   350
    ^ application
f898a869986e initial checkin
vrany
parents:
diff changeset
   351
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   352
f898a869986e initial checkin
vrany
parents:
diff changeset
   353
application:aDiffList
f898a869986e initial checkin
vrany
parents:
diff changeset
   354
    application := aDiffList.
f898a869986e initial checkin
vrany
parents:
diff changeset
   355
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   356
f898a869986e initial checkin
vrany
parents:
diff changeset
   357
icon
f898a869986e initial checkin
vrany
parents:
diff changeset
   358
f898a869986e initial checkin
vrany
parents:
diff changeset
   359
    ^application 
f898a869986e initial checkin
vrany
parents:
diff changeset
   360
        ifNotNil:[application listEntryIconFor: model]
f898a869986e initial checkin
vrany
parents:
diff changeset
   361
        ifNil:[nil]
f898a869986e initial checkin
vrany
parents:
diff changeset
   362
f898a869986e initial checkin
vrany
parents:
diff changeset
   363
    "Created: / 24-11-2009 / 18:26:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin
vrany
parents:
diff changeset
   364
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   365
f898a869986e initial checkin
vrany
parents:
diff changeset
   366
label
f898a869986e initial checkin
vrany
parents:
diff changeset
   367
f898a869986e initial checkin
vrany
parents:
diff changeset
   368
    ^application 
f898a869986e initial checkin
vrany
parents:
diff changeset
   369
        ifNotNil:[application listEntryLabelFor: model]
f898a869986e initial checkin
vrany
parents:
diff changeset
   370
        ifNil:[model displayString]
f898a869986e initial checkin
vrany
parents:
diff changeset
   371
f898a869986e initial checkin
vrany
parents:
diff changeset
   372
    "Created: / 24-11-2009 / 18:26:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin
vrany
parents:
diff changeset
   373
    "Modified: / 26-11-2009 / 17:33:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin
vrany
parents:
diff changeset
   374
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   375
f898a869986e initial checkin
vrany
parents:
diff changeset
   376
model
f898a869986e initial checkin
vrany
parents:
diff changeset
   377
    ^ model
f898a869986e initial checkin
vrany
parents:
diff changeset
   378
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   379
f898a869986e initial checkin
vrany
parents:
diff changeset
   380
model:aDiffComponent
f898a869986e initial checkin
vrany
parents:
diff changeset
   381
    model := aDiffComponent.
f898a869986e initial checkin
vrany
parents:
diff changeset
   382
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   383
f898a869986e initial checkin
vrany
parents:
diff changeset
   384
!ChangeSetDiffList::ListEntry methodsFor:'displaying'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   385
f898a869986e initial checkin
vrany
parents:
diff changeset
   386
displayOn: aGC x: x y: y opaque: opaque
f898a869986e initial checkin
vrany
parents:
diff changeset
   387
12202
eaa1f6cb6ce8 Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12198
diff changeset
   388
    | label icon oldPaint |
eaa1f6cb6ce8 Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12198
diff changeset
   389
    label := self label.
12198
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   390
    ((application topApplication askFor:#isMerge) and:[model isMerged not]) ifTrue:[
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   391
        oldPaint := aGC paint.
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   392
        aGC paint: TextDiff3Tool colorConflict.
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   393
        '!!' displayOn: aGC x: x  y:y opaque: opaque.
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   394
        aGC paint: oldPaint.
12202
eaa1f6cb6ce8 Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12198
diff changeset
   395
        label := label asText allBold"/ colorizeAllWith: Color red darker
12198
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   396
    ].
414e7b69ecda Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12128
diff changeset
   397
    (icon := self icon) ifNotNil:[icon displayOn: aGC x: x + 10 y: y - icon height opaque: opaque].
12202
eaa1f6cb6ce8 Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12198
diff changeset
   398
    label displayOn: aGC x: x + 10 + 16 y:y opaque: opaque
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   399
f898a869986e initial checkin
vrany
parents:
diff changeset
   400
    "Created: / 24-11-2009 / 18:21:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin
vrany
parents:
diff changeset
   401
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   402
f898a869986e initial checkin
vrany
parents:
diff changeset
   403
!ChangeSetDiffList class methodsFor:'documentation'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   404
f898a869986e initial checkin
vrany
parents:
diff changeset
   405
version_CVS
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   406
    ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffList.st,v 1.6 2011/11/30 11:14:53 vrany Exp §'
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   407
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   408
f898a869986e initial checkin
vrany
parents:
diff changeset
   409
version_SVN
12232
4d9b62c111fc - Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12202
diff changeset
   410
    ^ '$Id: Tools__ChangeSetDiffList.st 7981 2012-04-18 20:29:40Z vranyj1 $'
12125
0c49a3b13e43 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 12123
diff changeset
   411
! !