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