Tools__ChangeSetDiffList.st
author Claus Gittinger <cg@exept.de>
Wed, 05 Jun 2019 14:16:59 +0200
changeset 18805 f6df57c6dbfb
parent 18689 6afc138dedfd
permissions -rw-r--r--
#BUGFIX by cg class: AbstractFileBrowser changed: #currentFileNameHolder endless loop if file not present.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18689
6afc138dedfd #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 14115
diff changeset
     1
"{ Encoding: utf8 }"
6afc138dedfd #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 14115
diff changeset
     2
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
     3
"
f898a869986e initial checkin
vrany
parents:
diff changeset
     4
 Copyright (c) 2007-2010 Jan Vrany
f898a869986e initial checkin
vrany
parents:
diff changeset
     5
 Copyright (c) 2009-2010 eXept Software AG
f898a869986e initial checkin
vrany
parents:
diff changeset
     6
f898a869986e initial checkin
vrany
parents:
diff changeset
     7
 Permission is hereby granted, free of charge, to any person
f898a869986e initial checkin
vrany
parents:
diff changeset
     8
 obtaining a copy of this software and associated documentation
f898a869986e initial checkin
vrany
parents:
diff changeset
     9
 files (the 'Software'), to deal in the Software without
f898a869986e initial checkin
vrany
parents:
diff changeset
    10
 restriction, including without limitation the rights to use,
f898a869986e initial checkin
vrany
parents:
diff changeset
    11
 copy, modify, merge, publish, distribute, sublicense, and/or sell
f898a869986e initial checkin
vrany
parents:
diff changeset
    12
 copies of the Software, and to permit persons to whom the
f898a869986e initial checkin
vrany
parents:
diff changeset
    13
 Software is furnished to do so, subject to the following
f898a869986e initial checkin
vrany
parents:
diff changeset
    14
 conditions:
f898a869986e initial checkin
vrany
parents:
diff changeset
    15
f898a869986e initial checkin
vrany
parents:
diff changeset
    16
 The above copyright notice and this permission notice shall be
f898a869986e initial checkin
vrany
parents:
diff changeset
    17
 included in all copies or substantial portions of the Software.
f898a869986e initial checkin
vrany
parents:
diff changeset
    18
f898a869986e initial checkin
vrany
parents:
diff changeset
    19
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
f898a869986e initial checkin
vrany
parents:
diff changeset
    20
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
f898a869986e initial checkin
vrany
parents:
diff changeset
    21
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
f898a869986e initial checkin
vrany
parents:
diff changeset
    22
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
f898a869986e initial checkin
vrany
parents:
diff changeset
    23
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
f898a869986e initial checkin
vrany
parents:
diff changeset
    24
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
f898a869986e initial checkin
vrany
parents:
diff changeset
    25
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
f898a869986e initial checkin
vrany
parents:
diff changeset
    26
 OTHER DEALINGS IN THE SOFTWARE.
f898a869986e initial checkin
vrany
parents:
diff changeset
    27
"
10217
fcb21281008f changed: #listEntryIconFor:
vrany
parents: 10192
diff changeset
    28
"{ Package: 'stx:libtool' }"
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
    29
f898a869986e initial checkin
vrany
parents:
diff changeset
    30
"{ NameSpace: Tools }"
f898a869986e initial checkin
vrany
parents:
diff changeset
    31
10926
1e1743c017c6 inherits from BrowserListWithFilter
vrany
parents: 10251
diff changeset
    32
BrowserListWithFilter subclass:#ChangeSetDiffList
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
    33
	instanceVariableNames:'listHolder listSelectionHolder listEntryLabelGenerator
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
    34
		listEntryIconGenerator showVersionMethodDiffsHolder
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
    35
		showCopyrightMethodDiffsHolder highlightConflictsHolder'
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
    36
	classVariableNames:''
f898a869986e initial checkin
vrany
parents:
diff changeset
    37
	poolDictionaries:''
f898a869986e initial checkin
vrany
parents:
diff changeset
    38
	category:'Interface-Diff'
f898a869986e initial checkin
vrany
parents:
diff changeset
    39
!
f898a869986e initial checkin
vrany
parents:
diff changeset
    40
f898a869986e initial checkin
vrany
parents:
diff changeset
    41
Object subclass:#ListEntry
f898a869986e initial checkin
vrany
parents:
diff changeset
    42
	instanceVariableNames:'model application'
f898a869986e initial checkin
vrany
parents:
diff changeset
    43
	classVariableNames:''
f898a869986e initial checkin
vrany
parents:
diff changeset
    44
	poolDictionaries:''
f898a869986e initial checkin
vrany
parents:
diff changeset
    45
	privateIn:ChangeSetDiffList
f898a869986e initial checkin
vrany
parents:
diff changeset
    46
!
f898a869986e initial checkin
vrany
parents:
diff changeset
    47
f898a869986e initial checkin
vrany
parents:
diff changeset
    48
!ChangeSetDiffList class methodsFor:'documentation'!
f898a869986e initial checkin
vrany
parents:
diff changeset
    49
f898a869986e initial checkin
vrany
parents:
diff changeset
    50
copyright
f898a869986e initial checkin
vrany
parents:
diff changeset
    51
"
f898a869986e initial checkin
vrany
parents:
diff changeset
    52
 Copyright (c) 2007-2010 Jan Vrany
f898a869986e initial checkin
vrany
parents:
diff changeset
    53
 Copyright (c) 2009-2010 eXept Software AG
f898a869986e initial checkin
vrany
parents:
diff changeset
    54
f898a869986e initial checkin
vrany
parents:
diff changeset
    55
 Permission is hereby granted, free of charge, to any person
f898a869986e initial checkin
vrany
parents:
diff changeset
    56
 obtaining a copy of this software and associated documentation
f898a869986e initial checkin
vrany
parents:
diff changeset
    57
 files (the 'Software'), to deal in the Software without
f898a869986e initial checkin
vrany
parents:
diff changeset
    58
 restriction, including without limitation the rights to use,
f898a869986e initial checkin
vrany
parents:
diff changeset
    59
 copy, modify, merge, publish, distribute, sublicense, and/or sell
f898a869986e initial checkin
vrany
parents:
diff changeset
    60
 copies of the Software, and to permit persons to whom the
f898a869986e initial checkin
vrany
parents:
diff changeset
    61
 Software is furnished to do so, subject to the following
f898a869986e initial checkin
vrany
parents:
diff changeset
    62
 conditions:
f898a869986e initial checkin
vrany
parents:
diff changeset
    63
f898a869986e initial checkin
vrany
parents:
diff changeset
    64
 The above copyright notice and this permission notice shall be
f898a869986e initial checkin
vrany
parents:
diff changeset
    65
 included in all copies or substantial portions of the Software.
f898a869986e initial checkin
vrany
parents:
diff changeset
    66
f898a869986e initial checkin
vrany
parents:
diff changeset
    67
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
f898a869986e initial checkin
vrany
parents:
diff changeset
    68
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
f898a869986e initial checkin
vrany
parents:
diff changeset
    69
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
f898a869986e initial checkin
vrany
parents:
diff changeset
    70
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
f898a869986e initial checkin
vrany
parents:
diff changeset
    71
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
f898a869986e initial checkin
vrany
parents:
diff changeset
    72
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
f898a869986e initial checkin
vrany
parents:
diff changeset
    73
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
f898a869986e initial checkin
vrany
parents:
diff changeset
    74
 OTHER DEALINGS IN THE SOFTWARE.
f898a869986e initial checkin
vrany
parents:
diff changeset
    75
f898a869986e initial checkin
vrany
parents:
diff changeset
    76
"
f898a869986e initial checkin
vrany
parents:
diff changeset
    77
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
    78
f898a869986e initial checkin
vrany
parents:
diff changeset
    79
!ChangeSetDiffList class methodsFor:'interface specs'!
f898a869986e initial checkin
vrany
parents:
diff changeset
    80
f898a869986e initial checkin
vrany
parents:
diff changeset
    81
windowSpec
f898a869986e initial checkin
vrany
parents:
diff changeset
    82
    "This resource specification was automatically generated
f898a869986e initial checkin
vrany
parents:
diff changeset
    83
     by the UIPainter of ST/X."
f898a869986e initial checkin
vrany
parents:
diff changeset
    84
f898a869986e initial checkin
vrany
parents:
diff changeset
    85
    "Do not manually edit this!! If it is corrupted,
f898a869986e initial checkin
vrany
parents:
diff changeset
    86
     the UIPainter may not be able to read the specification."
f898a869986e initial checkin
vrany
parents:
diff changeset
    87
f898a869986e initial checkin
vrany
parents:
diff changeset
    88
    "
10938
2afa554b0227 - added filter support
vrany
parents: 10926
diff changeset
    89
     UIPainter new openOnClass:Tools::ChangeSetDiffList andSelector:#windowSpec
2afa554b0227 - added filter support
vrany
parents: 10926
diff changeset
    90
     Tools::ChangeSetDiffList new openInterface:#windowSpec
2afa554b0227 - added filter support
vrany
parents: 10926
diff changeset
    91
     Tools::ChangeSetDiffList open
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
    92
    "
f898a869986e initial checkin
vrany
parents:
diff changeset
    93
f898a869986e initial checkin
vrany
parents:
diff changeset
    94
    <resource: #canvas>
f898a869986e initial checkin
vrany
parents:
diff changeset
    95
f898a869986e initial checkin
vrany
parents:
diff changeset
    96
    ^ 
f898a869986e initial checkin
vrany
parents:
diff changeset
    97
     #(FullSpec
f898a869986e initial checkin
vrany
parents:
diff changeset
    98
        name: windowSpec
f898a869986e initial checkin
vrany
parents:
diff changeset
    99
        window: 
f898a869986e initial checkin
vrany
parents:
diff changeset
   100
       (WindowSpec
f898a869986e initial checkin
vrany
parents:
diff changeset
   101
          label: 'Diff List'
f898a869986e initial checkin
vrany
parents:
diff changeset
   102
          name: 'Diff List'
f898a869986e initial checkin
vrany
parents:
diff changeset
   103
          min: (Point 10 10)
f898a869986e initial checkin
vrany
parents:
diff changeset
   104
          bounds: (Rectangle 0 0 300 300)
f898a869986e initial checkin
vrany
parents:
diff changeset
   105
        )
f898a869986e initial checkin
vrany
parents:
diff changeset
   106
        component: 
f898a869986e initial checkin
vrany
parents:
diff changeset
   107
       (SpecCollection
f898a869986e initial checkin
vrany
parents:
diff changeset
   108
          collection: (
10938
2afa554b0227 - added filter support
vrany
parents: 10926
diff changeset
   109
           (InputFieldSpec
2afa554b0227 - added filter support
vrany
parents: 10926
diff changeset
   110
              name: 'Filter'
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   111
              layout: (LayoutFrame 0 0 0 0 0 1 22 0)
10938
2afa554b0227 - added filter support
vrany
parents: 10926
diff changeset
   112
              initiallyInvisible: true
2afa554b0227 - added filter support
vrany
parents: 10926
diff changeset
   113
              model: filterPatternHolder
2afa554b0227 - added filter support
vrany
parents: 10926
diff changeset
   114
              immediateAccept: true
2afa554b0227 - added filter support
vrany
parents: 10926
diff changeset
   115
              acceptOnLeave: false
2afa554b0227 - added filter support
vrany
parents: 10926
diff changeset
   116
              acceptOnReturn: false
2afa554b0227 - added filter support
vrany
parents: 10926
diff changeset
   117
              acceptOnTab: false
2afa554b0227 - added filter support
vrany
parents: 10926
diff changeset
   118
              acceptOnPointerLeave: false
2afa554b0227 - added filter support
vrany
parents: 10926
diff changeset
   119
              emptyFieldReplacementText: 'Search Filter...'
2afa554b0227 - added filter support
vrany
parents: 10926
diff changeset
   120
              postBuildCallback: postBuildFilterView:
2afa554b0227 - added filter support
vrany
parents: 10926
diff changeset
   121
            )
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   122
           (SelectionInListModelViewSpec
f898a869986e initial checkin
vrany
parents:
diff changeset
   123
              name: 'List'
f898a869986e initial checkin
vrany
parents:
diff changeset
   124
              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   125
              model: listSelectionHolder
10926
1e1743c017c6 inherits from BrowserListWithFilter
vrany
parents: 10251
diff changeset
   126
              menu: menuHolderWithShowFilter
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   127
              hasHorizontalScrollBar: true
f898a869986e initial checkin
vrany
parents:
diff changeset
   128
              hasVerticalScrollBar: true
f898a869986e initial checkin
vrany
parents:
diff changeset
   129
              listModel: listHolder
f898a869986e initial checkin
vrany
parents:
diff changeset
   130
              multipleSelectOk: true
f898a869986e initial checkin
vrany
parents:
diff changeset
   131
              useIndex: false
f898a869986e initial checkin
vrany
parents:
diff changeset
   132
              highlightMode: line
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   133
              ignoreReselect: false
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   134
              postBuildCallback: postBuildListView:
10192
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
      )
f898a869986e initial checkin
vrany
parents:
diff changeset
   140
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   141
f898a869986e initial checkin
vrany
parents:
diff changeset
   142
!ChangeSetDiffList class methodsFor:'plugIn spec'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   143
f898a869986e initial checkin
vrany
parents:
diff changeset
   144
aspectSelectors
f898a869986e initial checkin
vrany
parents:
diff changeset
   145
    "This resource specification was automatically generated
f898a869986e initial checkin
vrany
parents:
diff changeset
   146
     by the UIPainter of ST/X."
f898a869986e initial checkin
vrany
parents:
diff changeset
   147
f898a869986e initial checkin
vrany
parents:
diff changeset
   148
    "Do not manually edit this. If it is corrupted,
f898a869986e initial checkin
vrany
parents:
diff changeset
   149
     the UIPainter may not be able to read the specification."
f898a869986e initial checkin
vrany
parents:
diff changeset
   150
f898a869986e initial checkin
vrany
parents:
diff changeset
   151
    "Return a description of exported aspects;
f898a869986e initial checkin
vrany
parents:
diff changeset
   152
     these can be connected to aspects of an embedding application
f898a869986e initial checkin
vrany
parents:
diff changeset
   153
     (if this app is embedded in a subCanvas)."
f898a869986e initial checkin
vrany
parents:
diff changeset
   154
f898a869986e initial checkin
vrany
parents:
diff changeset
   155
    ^ #(
14014
e58870fa0034 Refactoring of NavigatorModel's environment.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13863
diff changeset
   156
        environmentHolder
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   157
        #highlightConflictsHolder
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   158
        #inGeneratorHolder
10938
2afa554b0227 - added filter support
vrany
parents: 10926
diff changeset
   159
        #listEntryIconGenerator
2afa554b0227 - added filter support
vrany
parents: 10926
diff changeset
   160
        #listEntryLabelGenerator
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   161
        #menuHolder
10938
2afa554b0227 - added filter support
vrany
parents: 10926
diff changeset
   162
        #outGeneratorHolder
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   163
        #showCopyrightMethodDiffsHolder
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   164
        #showFilterHolder
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   165
        #showVersionMethodDiffsHolder
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   166
      ).
f898a869986e initial checkin
vrany
parents:
diff changeset
   167
14014
e58870fa0034 Refactoring of NavigatorModel's environment.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 13863
diff changeset
   168
    "Modified: / 24-02-2014 / 10:37:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   169
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   170
f898a869986e initial checkin
vrany
parents:
diff changeset
   171
!ChangeSetDiffList methodsFor:'accessing'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   172
f898a869986e initial checkin
vrany
parents:
diff changeset
   173
listEntryIconGenerator
f898a869986e initial checkin
vrany
parents:
diff changeset
   174
    ^ listEntryIconGenerator
f898a869986e initial checkin
vrany
parents:
diff changeset
   175
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   176
f898a869986e initial checkin
vrany
parents:
diff changeset
   177
listEntryIconGenerator:aBlock
f898a869986e initial checkin
vrany
parents:
diff changeset
   178
    listEntryIconGenerator := aBlock.
f898a869986e initial checkin
vrany
parents:
diff changeset
   179
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   180
f898a869986e initial checkin
vrany
parents:
diff changeset
   181
listEntryLabelGenerator
f898a869986e initial checkin
vrany
parents:
diff changeset
   182
    ^ listEntryLabelGenerator
f898a869986e initial checkin
vrany
parents:
diff changeset
   183
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   184
f898a869986e initial checkin
vrany
parents:
diff changeset
   185
listEntryLabelGenerator:aBlock
f898a869986e initial checkin
vrany
parents:
diff changeset
   186
    listEntryLabelGenerator := aBlock.
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   187
!
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   188
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   189
selection: entry
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   190
    self updateList.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   191
    self selectionHolder value: (Array with: entry).
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   192
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   193
    "Created: / 17-01-2013 / 13:41:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   194
    "Modified: / 17-01-2013 / 16:37:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   195
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   196
f898a869986e initial checkin
vrany
parents:
diff changeset
   197
!ChangeSetDiffList methodsFor:'aspects'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   198
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   199
highlightConflictsHolder
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   200
    "return/create the 'highlightConflictsHolder' value holder (automatically generated)"
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   201
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   202
    highlightConflictsHolder isNil ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   203
        highlightConflictsHolder := ValueHolder new.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   204
        highlightConflictsHolder addDependent:self.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   205
    ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   206
    ^ highlightConflictsHolder
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   207
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   208
    "Modified (format): / 03-08-2012 / 14:02:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   209
!
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   210
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   211
highlightConflictsHolder:something
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   212
    "set the 'highlightConflictsHolder' value holder (automatically generated)"
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   213
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   214
    |oldValue newValue|
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   215
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   216
    highlightConflictsHolder notNil ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   217
        oldValue := highlightConflictsHolder value.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   218
        highlightConflictsHolder removeDependent:self.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   219
    ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   220
    highlightConflictsHolder := something.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   221
    highlightConflictsHolder notNil ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   222
        highlightConflictsHolder addDependent:self.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   223
    ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   224
    newValue := highlightConflictsHolder value.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   225
    oldValue ~~ newValue ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   226
        self update:#value with:newValue from:highlightConflictsHolder.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   227
    ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   228
!
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   229
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   230
listHolder
f898a869986e initial checkin
vrany
parents:
diff changeset
   231
    "return/create the 'difflistHolder' value holder (automatically generated)"
f898a869986e initial checkin
vrany
parents:
diff changeset
   232
f898a869986e initial checkin
vrany
parents:
diff changeset
   233
    listHolder isNil ifTrue:[
f898a869986e initial checkin
vrany
parents:
diff changeset
   234
        listHolder := ValueHolder new.
f898a869986e initial checkin
vrany
parents:
diff changeset
   235
    ].
f898a869986e initial checkin
vrany
parents:
diff changeset
   236
    ^ listHolder
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   237
!
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   238
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   239
listSelectionHolder
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   240
    "return/create the 'listSelectionHolder' value holder (automatically generated)"
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   241
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   242
    listSelectionHolder isNil ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   243
        listSelectionHolder := ValueHolder new.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   244
        listSelectionHolder addDependent:self.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   245
    ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   246
    ^ listSelectionHolder
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   247
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   248
    "Modified: / 17-01-2013 / 16:51:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   249
!
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   250
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   251
showCopyrightMethodDiffsHolder
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   252
    "return/create the 'showCopyrightMethodDiffsHolder' value holder (automatically generated)"
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   253
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   254
    showCopyrightMethodDiffsHolder isNil ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   255
        showCopyrightMethodDiffsHolder := ValueHolder new.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   256
        showCopyrightMethodDiffsHolder addDependent:self.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   257
    ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   258
    ^ showCopyrightMethodDiffsHolder
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   259
!
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   260
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   261
showCopyrightMethodDiffsHolder:something
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   262
    "set the 'showCopyrightMethodDiffsHolder' value holder (automatically generated)"
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   263
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   264
    |oldValue newValue|
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   265
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   266
    showCopyrightMethodDiffsHolder notNil ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   267
        oldValue := showCopyrightMethodDiffsHolder value.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   268
        showCopyrightMethodDiffsHolder removeDependent:self.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   269
    ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   270
    showCopyrightMethodDiffsHolder := something.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   271
    showCopyrightMethodDiffsHolder notNil ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   272
        showCopyrightMethodDiffsHolder addDependent:self.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   273
    ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   274
    newValue := showCopyrightMethodDiffsHolder value.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   275
    oldValue ~~ newValue ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   276
        self update:#value with:newValue from:showCopyrightMethodDiffsHolder.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   277
    ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   278
!
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   279
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   280
showVersionMethodDiffsHolder
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   281
    "return/create the 'showVersionMethodDiffsHolder' value holder (automatically generated)"
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   282
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   283
    showVersionMethodDiffsHolder isNil ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   284
        showVersionMethodDiffsHolder := ValueHolder new.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   285
        showVersionMethodDiffsHolder addDependent:self.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   286
    ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   287
    ^ showVersionMethodDiffsHolder
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   288
!
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   289
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   290
showVersionMethodDiffsHolder:something
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   291
    "set the 'showVersionMethodDiffsHolder' value holder (automatically generated)"
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   292
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   293
    |oldValue newValue|
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   294
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   295
    showVersionMethodDiffsHolder notNil ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   296
        oldValue := showVersionMethodDiffsHolder value.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   297
        showVersionMethodDiffsHolder removeDependent:self.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   298
    ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   299
    showVersionMethodDiffsHolder := something.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   300
    showVersionMethodDiffsHolder notNil ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   301
        showVersionMethodDiffsHolder addDependent:self.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   302
    ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   303
    newValue := showVersionMethodDiffsHolder value.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   304
    oldValue ~~ newValue ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   305
        self update:#value with:newValue from:showVersionMethodDiffsHolder.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   306
    ].
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   307
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   308
f898a869986e initial checkin
vrany
parents:
diff changeset
   309
!ChangeSetDiffList methodsFor:'change & update'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   310
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   311
enqueueDelayedUpdate:something with:aParameter from:changedObject
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   312
    immediateUpdate value ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   313
        self delayedUpdate:something with:aParameter from:changedObject
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   314
    ] ifFalse:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   315
        super enqueueDelayedUpdate:something with:aParameter from:changedObject
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   316
    ]
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   317
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   318
    "Created: / 17-01-2013 / 16:25:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   319
!
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   320
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   321
listSelectionChanged
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   322
    | lsel |
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   323
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   324
    lsel := listSelectionHolder value ? #().
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   325
    self selectionHolder 
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   326
        removeDependent: self;
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   327
        value: (lsel collect:[:e | e model ]);
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   328
        addDependent: self.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   329
    self enqueueDelayedUpdateOutputGenerator
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   330
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   331
    "Created: / 17-01-2013 / 14:26:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   332
    "Modified: / 17-01-2013 / 16:23:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   333
!
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   334
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   335
selectionChanged
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   336
    | sel lsel llist |
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   337
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   338
    listSelectionHolder isNil ifTrue:[ ^ self ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   339
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   340
    listSelectionHolder removeDependent: self.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   341
    sel := (self selectionHolder value) ? #().
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   342
    llist := self listHolder value.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   343
    lsel := llist select:[:leach | sel includesIdentical: leach model].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   344
    listSelectionHolder value: lsel.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   345
    listSelectionHolder addDependent: self.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   346
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   347
    super selectionChanged.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   348
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   349
    "Created: / 17-01-2013 / 14:11:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   350
    "Modified: / 17-01-2013 / 16:36:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   351
!
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   352
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   353
update: aspect with: param from: sender
f898a869986e initial checkin
vrany
parents:
diff changeset
   354
f898a869986e initial checkin
vrany
parents:
diff changeset
   355
    aspect == #resolution ifTrue:[^(self componentAt: #List) invalidateRepairNow: true].
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   356
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   357
    sender == listSelectionHolder ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   358
        self listSelectionChanged.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   359
        ^self
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   360
    ].
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   361
        
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   362
    sender == selectionHolder ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   363
        self selectionChanged.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   364
        ^self.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   365
    ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   366
    sender == showVersionMethodDiffsHolder ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   367
        ^self updateList.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   368
        self.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   369
    ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   370
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   371
    sender == showCopyrightMethodDiffsHolder ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   372
        ^self updateList.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   373
        self.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   374
    ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   375
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   376
    sender == highlightConflictsHolder ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   377
        listView notNil ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   378
            listView scrolledView invalidate.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   379
        ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   380
        ^self.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   381
    ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   382
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   383
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   384
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   385
    super update: aspect with: param from: sender.
f898a869986e initial checkin
vrany
parents:
diff changeset
   386
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   387
    "Modified: / 17-01-2013 / 15:26:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   388
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   389
f898a869986e initial checkin
vrany
parents:
diff changeset
   390
!ChangeSetDiffList methodsFor:'generators'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   391
f898a869986e initial checkin
vrany
parents:
diff changeset
   392
makeGenerator
f898a869986e initial checkin
vrany
parents:
diff changeset
   393
f898a869986e initial checkin
vrany
parents:
diff changeset
   394
    ^Iterator on:
f898a869986e initial checkin
vrany
parents:
diff changeset
   395
        [:whatToDo|
f898a869986e initial checkin
vrany
parents:
diff changeset
   396
        self selectionHolder value do:
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   397
            [:each|each notNil ifTrue:[each do: whatToDo]]]
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   398
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   399
    "Modified: / 17-01-2013 / 17:12:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   400
! !
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   401
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   402
!ChangeSetDiffList methodsFor:'initialization'!
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   403
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   404
initialize
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   405
    "Invoked when a new instance is created."
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   406
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   407
    "/ please change as required (and remove this comment)
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   408
    "/ listHolder := nil.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   409
    "/ listSelectionHolder := nil.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   410
    "/ listEntryLabelGenerator := nil.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   411
    "/ listEntryIconGenerator := nil.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   412
    "/ showVersionMethodDiffsHolder := nil.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   413
    "/ showCopyrightMethodDiffsHolder := nil.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   414
    "/ highlightConflictsHolder := nil.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   415
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   416
    super initialize.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   417
    immediateUpdate := true asValue.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   418
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   419
    "Modified: / 17-01-2013 / 16:51:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   420
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   421
f898a869986e initial checkin
vrany
parents:
diff changeset
   422
!ChangeSetDiffList methodsFor:'private'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   423
f898a869986e initial checkin
vrany
parents:
diff changeset
   424
listEntryIconFor:aDiffComponent 
f898a869986e initial checkin
vrany
parents:
diff changeset
   425
    |a hasA b hasB hasBase|
f898a869986e initial checkin
vrany
parents:
diff changeset
   426
f898a869986e initial checkin
vrany
parents:
diff changeset
   427
    aDiffComponent isDiffSet ifTrue:[
f898a869986e initial checkin
vrany
parents:
diff changeset
   428
        ^ nil
f898a869986e initial checkin
vrany
parents:
diff changeset
   429
    ].
f898a869986e initial checkin
vrany
parents:
diff changeset
   430
    hasA := (a := aDiffComponent versionA) notNil and:[a isMethodRemoveChange not].
f898a869986e initial checkin
vrany
parents:
diff changeset
   431
    hasB := (b := aDiffComponent versionB) notNil and:[b isMethodRemoveChange not].
f898a869986e initial checkin
vrany
parents:
diff changeset
   432
    hasBase := aDiffComponent versionBase notNil.
f898a869986e initial checkin
vrany
parents:
diff changeset
   433
    (hasA & hasB & hasBase) ifTrue:[
10217
fcb21281008f changed: #listEntryIconFor:
vrany
parents: 10192
diff changeset
   434
        ^ ToolbarIconLibrary versionABBase12x12 
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   435
    ].
f898a869986e initial checkin
vrany
parents:
diff changeset
   436
    (hasA & hasB) ifTrue:[
10217
fcb21281008f changed: #listEntryIconFor:
vrany
parents: 10192
diff changeset
   437
        ^ ToolbarIconLibrary versionAB12x12
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   438
    ].
f898a869986e initial checkin
vrany
parents:
diff changeset
   439
    (hasA & hasBase) ifTrue:[
10217
fcb21281008f changed: #listEntryIconFor:
vrany
parents: 10192
diff changeset
   440
        ^ ToolbarIconLibrary versionABase12x12
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   441
    ].
f898a869986e initial checkin
vrany
parents:
diff changeset
   442
    (hasA) ifTrue:[
10217
fcb21281008f changed: #listEntryIconFor:
vrany
parents: 10192
diff changeset
   443
        ^ ToolbarIconLibrary versionA12x12
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   444
    ].
f898a869986e initial checkin
vrany
parents:
diff changeset
   445
    (hasB & hasBase) ifTrue:[
10217
fcb21281008f changed: #listEntryIconFor:
vrany
parents: 10192
diff changeset
   446
        ^ ToolbarIconLibrary versionBBase12x12
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   447
    ].
f898a869986e initial checkin
vrany
parents:
diff changeset
   448
    (hasB) ifTrue:[
10217
fcb21281008f changed: #listEntryIconFor:
vrany
parents: 10192
diff changeset
   449
        ^ ToolbarIconLibrary versionB12x12
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   450
    ].
f898a869986e initial checkin
vrany
parents:
diff changeset
   451
    ^ nil
f898a869986e initial checkin
vrany
parents:
diff changeset
   452
f898a869986e initial checkin
vrany
parents:
diff changeset
   453
    "Created: / 21-11-2009 / 21:58:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin
vrany
parents:
diff changeset
   454
    "Modified: / 09-06-2011 / 08:19:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10217
fcb21281008f changed: #listEntryIconFor:
vrany
parents: 10192
diff changeset
   455
    "Modified: / 06-07-2011 / 16:38:33 / jv"
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   456
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   457
f898a869986e initial checkin
vrany
parents:
diff changeset
   458
listEntryLabelFor:diff 
f898a869986e initial checkin
vrany
parents:
diff changeset
   459
f898a869986e initial checkin
vrany
parents:
diff changeset
   460
    ^listEntryLabelGenerator 
f898a869986e initial checkin
vrany
parents:
diff changeset
   461
        ifNotNil: [listEntryLabelGenerator value: diff]
f898a869986e initial checkin
vrany
parents:
diff changeset
   462
        ifNil:[diff name]
f898a869986e initial checkin
vrany
parents:
diff changeset
   463
f898a869986e initial checkin
vrany
parents:
diff changeset
   464
    "Modified: / 24-11-2009 / 10:00:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin
vrany
parents:
diff changeset
   465
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   466
f898a869986e initial checkin
vrany
parents:
diff changeset
   467
makeDependent
f898a869986e initial checkin
vrany
parents:
diff changeset
   468
f898a869986e initial checkin
vrany
parents:
diff changeset
   469
    "Nothing to do"
f898a869986e initial checkin
vrany
parents:
diff changeset
   470
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   471
f898a869986e initial checkin
vrany
parents:
diff changeset
   472
makeIndependent
f898a869986e initial checkin
vrany
parents:
diff changeset
   473
f898a869986e initial checkin
vrany
parents:
diff changeset
   474
    "Nothing to do"
f898a869986e initial checkin
vrany
parents:
diff changeset
   475
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   476
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   477
shouldDisplayDiff: aDiffCompoment
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   478
    "Return true if given diff component should be displayed"
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   479
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   480
    (showVersionMethodDiffsHolder value not and:[aDiffCompoment isForVersionMethod])
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   481
        ifTrue:[ ^ false ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   482
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   483
    (showCopyrightMethodDiffsHolder value not and:[aDiffCompoment isForCopyrightMethod])
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   484
        ifTrue:[ ^ false ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   485
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   486
    aDiffCompoment isDiffSet 
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   487
        ifTrue:[ ^ aDiffCompoment diffs anySatisfy:[:diff|self shouldDisplayDiff: diff]].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   488
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   489
    ^true
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   490
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   491
    "Created: / 03-08-2012 / 14:38:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   492
!
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   493
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   494
updateList
f898a869986e initial checkin
vrany
parents:
diff changeset
   495
    "Superclass Tools::BrowserList says that I am responsible to implement this method"
f898a869986e initial checkin
vrany
parents:
diff changeset
   496
    
f898a869986e initial checkin
vrany
parents:
diff changeset
   497
    | newDiffs newList |
f898a869986e initial checkin
vrany
parents:
diff changeset
   498
    self listHolder value ? #() do: [:entry|entry model removeDependent: self].
f898a869986e initial checkin
vrany
parents:
diff changeset
   499
f898a869986e initial checkin
vrany
parents:
diff changeset
   500
    newDiffs := self inGeneratorHolder value ? #().
10246
0a4d2feea6a3 Bug fix for two-column changeset diff
vrany
parents: 10217
diff changeset
   501
    (newDiffs isKindOf: ChangeSetDiffComponent) ifTrue:
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   502
        [newDiffs := newDiffs diffs].
10926
1e1743c017c6 inherits from BrowserListWithFilter
vrany
parents: 10251
diff changeset
   503
    newDiffs := self filterList: newDiffs.
13264
4a0cdaf356ec class: Tools::ChangeSetDiffList
Claus Gittinger <cg@exept.de>
parents: 10938
diff changeset
   504
    newList := OrderedCollection new.    
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   505
    newDiffs do: [:item|
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   506
        (self shouldDisplayDiff: item) ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   507
            newList add:(ListEntry model: item application: self).
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   508
            item addDependent: self
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   509
        ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   510
    ].
10251
a6eb247b3746 Merged with JV's branch
vrany
parents: 10246
diff changeset
   511
a6eb247b3746 Merged with JV's branch
vrany
parents: 10246
diff changeset
   512
    newList sort:[:a :b|a label < b label].
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   513
    self listHolder value:newList
f898a869986e initial checkin
vrany
parents:
diff changeset
   514
10251
a6eb247b3746 Merged with JV's branch
vrany
parents: 10246
diff changeset
   515
    "Modified: / 07-07-2011 / 14:17:26 / jv"
13264
4a0cdaf356ec class: Tools::ChangeSetDiffList
Claus Gittinger <cg@exept.de>
parents: 10938
diff changeset
   516
    "Modified: / 30-07-2013 / 19:30:18 / cg"
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   517
    "Modified: / 11-11-2013 / 11:00:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   518
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   519
f898a869986e initial checkin
vrany
parents:
diff changeset
   520
!ChangeSetDiffList::ListEntry class methodsFor:'instance creation'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   521
f898a869986e initial checkin
vrany
parents:
diff changeset
   522
model: model application: application
f898a869986e initial checkin
vrany
parents:
diff changeset
   523
f898a869986e initial checkin
vrany
parents:
diff changeset
   524
    ^self new
f898a869986e initial checkin
vrany
parents:
diff changeset
   525
        model: model;
f898a869986e initial checkin
vrany
parents:
diff changeset
   526
        application: application
f898a869986e initial checkin
vrany
parents:
diff changeset
   527
f898a869986e initial checkin
vrany
parents:
diff changeset
   528
    "Created: / 24-11-2009 / 18:29:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin
vrany
parents:
diff changeset
   529
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   530
f898a869986e initial checkin
vrany
parents:
diff changeset
   531
!ChangeSetDiffList::ListEntry methodsFor:'accessing'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   532
f898a869986e initial checkin
vrany
parents:
diff changeset
   533
application
f898a869986e initial checkin
vrany
parents:
diff changeset
   534
    ^ application
f898a869986e initial checkin
vrany
parents:
diff changeset
   535
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   536
f898a869986e initial checkin
vrany
parents:
diff changeset
   537
application:aDiffList
f898a869986e initial checkin
vrany
parents:
diff changeset
   538
    application := aDiffList.
f898a869986e initial checkin
vrany
parents:
diff changeset
   539
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   540
f898a869986e initial checkin
vrany
parents:
diff changeset
   541
icon
f898a869986e initial checkin
vrany
parents:
diff changeset
   542
f898a869986e initial checkin
vrany
parents:
diff changeset
   543
    ^application 
f898a869986e initial checkin
vrany
parents:
diff changeset
   544
        ifNotNil:[application listEntryIconFor: model]
f898a869986e initial checkin
vrany
parents:
diff changeset
   545
        ifNil:[nil]
f898a869986e initial checkin
vrany
parents:
diff changeset
   546
f898a869986e initial checkin
vrany
parents:
diff changeset
   547
    "Created: / 24-11-2009 / 18:26:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin
vrany
parents:
diff changeset
   548
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   549
f898a869986e initial checkin
vrany
parents:
diff changeset
   550
label
f898a869986e initial checkin
vrany
parents:
diff changeset
   551
f898a869986e initial checkin
vrany
parents:
diff changeset
   552
    ^application 
f898a869986e initial checkin
vrany
parents:
diff changeset
   553
        ifNotNil:[application listEntryLabelFor: model]
f898a869986e initial checkin
vrany
parents:
diff changeset
   554
        ifNil:[model displayString]
f898a869986e initial checkin
vrany
parents:
diff changeset
   555
f898a869986e initial checkin
vrany
parents:
diff changeset
   556
    "Created: / 24-11-2009 / 18:26:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin
vrany
parents:
diff changeset
   557
    "Modified: / 26-11-2009 / 17:33:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin
vrany
parents:
diff changeset
   558
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   559
f898a869986e initial checkin
vrany
parents:
diff changeset
   560
model
f898a869986e initial checkin
vrany
parents:
diff changeset
   561
    ^ model
f898a869986e initial checkin
vrany
parents:
diff changeset
   562
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   563
f898a869986e initial checkin
vrany
parents:
diff changeset
   564
model:aDiffComponent
f898a869986e initial checkin
vrany
parents:
diff changeset
   565
    model := aDiffComponent.
f898a869986e initial checkin
vrany
parents:
diff changeset
   566
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   567
f898a869986e initial checkin
vrany
parents:
diff changeset
   568
!ChangeSetDiffList::ListEntry methodsFor:'displaying'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   569
f898a869986e initial checkin
vrany
parents:
diff changeset
   570
displayOn: aGC x: x y: y opaque: opaque
f898a869986e initial checkin
vrany
parents:
diff changeset
   571
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   572
    | label icon oldPaint |
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   573
    label := self label.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   574
"/    ((application topApplication askFor:#isMerge) and:[model isMerged not]) ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   575
    (application highlightConflictsHolder value and:[model "isConflict"isMerged not]) ifTrue:[
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   576
        oldPaint := aGC paint.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   577
        aGC paint: TextDiff3Tool colorConflict.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   578
        '!!' displayOn: aGC x: x  y:y opaque: opaque.
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   579
        aGC paint: oldPaint.
18689
6afc138dedfd #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 14115
diff changeset
   580
        label := label allBold"/; colorizeAllWith: Color red darker.
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   581
    ].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   582
    (icon := self icon) notNil ifTrue:[icon displayOn: aGC x: x + 10 y: y - icon height opaque: opaque].
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   583
    label displayOn: aGC x: x + 10 + 16 y:y opaque: opaque
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   584
f898a869986e initial checkin
vrany
parents:
diff changeset
   585
    "Created: / 24-11-2009 / 18:21:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
13863
481f2981e611 merged in jv's chenges
Claus Gittinger <cg@exept.de>
parents: 13264
diff changeset
   586
    "Modified: / 15-01-2013 / 11:35:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
18689
6afc138dedfd #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 14115
diff changeset
   587
    "Modified: / 13-03-2019 / 22:06:45 / Claus Gittinger"
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   588
! !
f898a869986e initial checkin
vrany
parents:
diff changeset
   589
f898a869986e initial checkin
vrany
parents:
diff changeset
   590
!ChangeSetDiffList class methodsFor:'documentation'!
f898a869986e initial checkin
vrany
parents:
diff changeset
   591
f898a869986e initial checkin
vrany
parents:
diff changeset
   592
version_CVS
18689
6afc138dedfd #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 14115
diff changeset
   593
    ^ '$Header$'
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   594
!
f898a869986e initial checkin
vrany
parents:
diff changeset
   595
f898a869986e initial checkin
vrany
parents:
diff changeset
   596
version_SVN
18689
6afc138dedfd #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 14115
diff changeset
   597
    ^ '$Id$'
10192
f898a869986e initial checkin
vrany
parents:
diff changeset
   598
! !
13264
4a0cdaf356ec class: Tools::ChangeSetDiffList
Claus Gittinger <cg@exept.de>
parents: 10938
diff changeset
   599