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