hg/stx-libtool: Tools__ChangeSetDiffList.st@481f2981e611 (annotated)

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	^ #(
13863 481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	154	#highlightConflictsHolder
10192 f898a869986e initial checkin vrany parents: diff changeset	155	#inGeneratorHolder
10938 2afa554b0227 - added filter support vrany parents: 10926 diff changeset	156	#listEntryIconGenerator
2afa554b0227 - added filter support vrany parents: 10926 diff changeset	157	#listEntryLabelGenerator
10192 f898a869986e initial checkin vrany parents: diff changeset	158	#menuHolder
10938 2afa554b0227 - added filter support vrany parents: 10926 diff changeset	159	#outGeneratorHolder
13863 481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	160	#showCopyrightMethodDiffsHolder
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	161	#showFilterHolder
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	162	#showVersionMethodDiffsHolder
10192 f898a869986e initial checkin vrany parents: diff changeset	163	).
f898a869986e initial checkin vrany parents: diff changeset	164
f898a869986e initial checkin vrany parents: diff changeset	165	! !
f898a869986e initial checkin vrany parents: diff changeset	166
f898a869986e initial checkin vrany parents: diff changeset	167	!ChangeSetDiffList methodsFor:'accessing'!
f898a869986e initial checkin vrany parents: diff changeset	168
f898a869986e initial checkin vrany parents: diff changeset	169	listEntryIconGenerator
f898a869986e initial checkin vrany parents: diff changeset	170	^ listEntryIconGenerator
f898a869986e initial checkin vrany parents: diff changeset	171	!
f898a869986e initial checkin vrany parents: diff changeset	172
f898a869986e initial checkin vrany parents: diff changeset	173	listEntryIconGenerator:aBlock
f898a869986e initial checkin vrany parents: diff changeset	174	listEntryIconGenerator := aBlock.
f898a869986e initial checkin vrany parents: diff changeset	175	!
f898a869986e initial checkin vrany parents: diff changeset	176
f898a869986e initial checkin vrany parents: diff changeset	177	listEntryLabelGenerator
f898a869986e initial checkin vrany parents: diff changeset	178	^ listEntryLabelGenerator
f898a869986e initial checkin vrany parents: diff changeset	179	!
f898a869986e initial checkin vrany parents: diff changeset	180
f898a869986e initial checkin vrany parents: diff changeset	181	listEntryLabelGenerator:aBlock
f898a869986e initial checkin vrany parents: diff changeset	182	listEntryLabelGenerator := aBlock.
13863 481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	183	!
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	184
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	185	selection: entry
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	186	self updateList.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	187	self selectionHolder value: (Array with: entry).
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	188
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	189	"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	190	"Modified: / 17-01-2013 / 16:37:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10192 f898a869986e initial checkin vrany parents: diff changeset	191	! !
f898a869986e initial checkin vrany parents: diff changeset	192
f898a869986e initial checkin vrany parents: diff changeset	193	!ChangeSetDiffList methodsFor:'aspects'!
f898a869986e initial checkin vrany parents: diff changeset	194
13863 481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	195	highlightConflictsHolder
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	196	"return/create the 'highlightConflictsHolder' value holder (automatically generated)"
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	197
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	198	highlightConflictsHolder isNil ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	199	highlightConflictsHolder := ValueHolder new.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	200	highlightConflictsHolder addDependent:self.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	201	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	202	^ highlightConflictsHolder
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	"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	205	!
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	206
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	207	highlightConflictsHolder:something
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	208	"set the 'highlightConflictsHolder' value holder (automatically generated)"
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	209
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	210	\|oldValue newValue\|
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	highlightConflictsHolder notNil ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	213	oldValue := highlightConflictsHolder value.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	214	highlightConflictsHolder removeDependent:self.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	215	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	216	highlightConflictsHolder := something.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	217	highlightConflictsHolder notNil ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	218	highlightConflictsHolder addDependent:self.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	219	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	220	newValue := highlightConflictsHolder value.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	221	oldValue ~~ newValue ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	222	self update:#value with:newValue from:highlightConflictsHolder.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	223	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	224	!
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	225
10192 f898a869986e initial checkin vrany parents: diff changeset	226	listHolder
f898a869986e initial checkin vrany parents: diff changeset	227	"return/create the 'difflistHolder' value holder (automatically generated)"
f898a869986e initial checkin vrany parents: diff changeset	228
f898a869986e initial checkin vrany parents: diff changeset	229	listHolder isNil ifTrue:[
f898a869986e initial checkin vrany parents: diff changeset	230	listHolder := ValueHolder new.
f898a869986e initial checkin vrany parents: diff changeset	231	].
f898a869986e initial checkin vrany parents: diff changeset	232	^ listHolder
13863 481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	233	!
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	234
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	235	listSelectionHolder
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	236	"return/create the 'listSelectionHolder' value holder (automatically generated)"
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	237
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	238	listSelectionHolder isNil ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	239	listSelectionHolder := ValueHolder new.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	240	listSelectionHolder addDependent:self.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	241	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	242	^ listSelectionHolder
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	"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	245	!
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	246
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	247	showCopyrightMethodDiffsHolder
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	248	"return/create the 'showCopyrightMethodDiffsHolder' value holder (automatically generated)"
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	249
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	250	showCopyrightMethodDiffsHolder isNil ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	251	showCopyrightMethodDiffsHolder := ValueHolder new.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	252	showCopyrightMethodDiffsHolder addDependent:self.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	253	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	254	^ showCopyrightMethodDiffsHolder
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
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	257	showCopyrightMethodDiffsHolder:something
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	258	"set the 'showCopyrightMethodDiffsHolder' value holder (automatically generated)"
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	259
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	260	\|oldValue newValue\|
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	showCopyrightMethodDiffsHolder notNil ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	263	oldValue := showCopyrightMethodDiffsHolder value.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	264	showCopyrightMethodDiffsHolder removeDependent:self.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	265	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	266	showCopyrightMethodDiffsHolder := something.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	267	showCopyrightMethodDiffsHolder notNil ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	268	showCopyrightMethodDiffsHolder addDependent:self.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	269	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	270	newValue := showCopyrightMethodDiffsHolder value.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	271	oldValue ~~ newValue ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	272	self update:#value with:newValue from:showCopyrightMethodDiffsHolder.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	273	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	274	!
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	showVersionMethodDiffsHolder
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	277	"return/create the 'showVersionMethodDiffsHolder' value holder (automatically generated)"
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	278
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	279	showVersionMethodDiffsHolder isNil ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	280	showVersionMethodDiffsHolder := ValueHolder new.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	281	showVersionMethodDiffsHolder addDependent:self.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	282	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	283	^ showVersionMethodDiffsHolder
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
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	286	showVersionMethodDiffsHolder:something
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	287	"set the 'showVersionMethodDiffsHolder' value holder (automatically generated)"
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	288
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	289	\|oldValue newValue\|
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	showVersionMethodDiffsHolder notNil ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	292	oldValue := showVersionMethodDiffsHolder value.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	293	showVersionMethodDiffsHolder removeDependent:self.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	294	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	295	showVersionMethodDiffsHolder := something.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	296	showVersionMethodDiffsHolder notNil ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	297	showVersionMethodDiffsHolder addDependent:self.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	298	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	299	newValue := showVersionMethodDiffsHolder value.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	300	oldValue ~~ newValue ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	301	self update:#value with:newValue from:showVersionMethodDiffsHolder.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	302	].
10192 f898a869986e initial checkin vrany parents: diff changeset	303	! !
f898a869986e initial checkin vrany parents: diff changeset	304
f898a869986e initial checkin vrany parents: diff changeset	305	!ChangeSetDiffList methodsFor:'change & update'!
f898a869986e initial checkin vrany parents: diff changeset	306
13863 481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	307	enqueueDelayedUpdate:something with:aParameter from:changedObject
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	308	immediateUpdate value ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	309	self delayedUpdate:something with:aParameter from:changedObject
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	310	] ifFalse:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	311	super enqueueDelayedUpdate:something with:aParameter from:changedObject
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	312	]
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	313
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	314	"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	315	!
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	316
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	317	enqueueDelayedUpdateList
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	318	immediateUpdate value ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	319	self updateList
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	320	] ifFalse:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	321	super enqueueDelayedUpdateList
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	322	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	323
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	324	"Created: / 17-01-2013 / 16:44:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	325	!
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	326
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	327	listSelectionChanged
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	328	\| lsel \|
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	329
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	330	lsel := listSelectionHolder value ? #().
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	331	self selectionHolder
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	332	removeDependent: self;
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	333	value: (lsel collect:[:e \| e model ]);
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	334	addDependent: self.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	335	self enqueueDelayedUpdateOutputGenerator
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	336
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	337	"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	338	"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	339	!
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	340
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	341	selectionChanged
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	342	\| sel lsel llist \|
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	343
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	344	listSelectionHolder isNil ifTrue:[ ^ self ].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	345
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	346	listSelectionHolder removeDependent: self.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	347	sel := (self selectionHolder value) ? #().
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	348	llist := self listHolder value.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	349	lsel := llist select:[:leach \| sel includesIdentical: leach model].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	350	listSelectionHolder value: lsel.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	351	listSelectionHolder addDependent: self.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	352
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	353	super selectionChanged.
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	"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	356	"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	357	!
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	update: aspect with: param from: sender
f898a869986e initial checkin vrany parents: diff changeset	360
f898a869986e initial checkin vrany parents: diff changeset	361	aspect == #resolution ifTrue:[^(self componentAt: #List) invalidateRepairNow: true].
13863 481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	362
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	363	sender == listSelectionHolder ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	364	self listSelectionChanged.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	365	^self
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	366	].
10192 f898a869986e initial checkin vrany parents: diff changeset	367
13863 481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	368	sender == selectionHolder ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	369	self selectionChanged.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	370	^self.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	371	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	372	sender == showVersionMethodDiffsHolder ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	373	^self updateList.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	374	self.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	375	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	376
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	377	sender == showCopyrightMethodDiffsHolder ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	378	^self updateList.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	379	self.
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	sender == highlightConflictsHolder ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	383	listView notNil ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	384	listView scrolledView invalidate.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	385	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	386	^self.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	387	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	388
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	389
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	390
10192 f898a869986e initial checkin vrany parents: diff changeset	391	super update: aspect with: param from: sender.
f898a869986e initial checkin vrany parents: diff changeset	392
13863 481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	393	"Modified: / 17-01-2013 / 15:26:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10192 f898a869986e initial checkin vrany parents: diff changeset	394	! !
f898a869986e initial checkin vrany parents: diff changeset	395
f898a869986e initial checkin vrany parents: diff changeset	396	!ChangeSetDiffList methodsFor:'generators'!
f898a869986e initial checkin vrany parents: diff changeset	397
f898a869986e initial checkin vrany parents: diff changeset	398	makeGenerator
f898a869986e initial checkin vrany parents: diff changeset	399
f898a869986e initial checkin vrany parents: diff changeset	400	^Iterator on:
f898a869986e initial checkin vrany parents: diff changeset	401	[:whatToDo\|
f898a869986e initial checkin vrany parents: diff changeset	402	self selectionHolder value do:
13863 481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	403	[:each\|each notNil ifTrue:[each do: whatToDo]]]
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	404
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	405	"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	406	! !
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	407
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	408	!ChangeSetDiffList methodsFor:'initialization'!
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	409
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	410	initialize
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	411	"Invoked when a new instance is created."
10192 f898a869986e initial checkin vrany parents: diff changeset	412
13863 481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	413	"/ please change as required (and remove this comment)
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	414	"/ listHolder := nil.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	415	"/ listSelectionHolder := nil.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	416	"/ listEntryLabelGenerator := nil.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	417	"/ listEntryIconGenerator := nil.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	418	"/ showVersionMethodDiffsHolder := nil.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	419	"/ showCopyrightMethodDiffsHolder := nil.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	420	"/ highlightConflictsHolder := nil.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	421
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	422	super initialize.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	423	immediateUpdate := true asValue.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	424
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	425	"Modified: / 17-01-2013 / 16:51:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10192 f898a869986e initial checkin vrany parents: diff changeset	426	! !
f898a869986e initial checkin vrany parents: diff changeset	427
f898a869986e initial checkin vrany parents: diff changeset	428	!ChangeSetDiffList methodsFor:'private'!
f898a869986e initial checkin vrany parents: diff changeset	429
f898a869986e initial checkin vrany parents: diff changeset	430	listEntryIconFor:aDiffComponent
f898a869986e initial checkin vrany parents: diff changeset	431	\|a hasA b hasB hasBase\|
f898a869986e initial checkin vrany parents: diff changeset	432
f898a869986e initial checkin vrany parents: diff changeset	433	aDiffComponent isDiffSet ifTrue:[
f898a869986e initial checkin vrany parents: diff changeset	434	^ nil
f898a869986e initial checkin vrany parents: diff changeset	435	].
f898a869986e initial checkin vrany parents: diff changeset	436	hasA := (a := aDiffComponent versionA) notNil and:[a isMethodRemoveChange not].
f898a869986e initial checkin vrany parents: diff changeset	437	hasB := (b := aDiffComponent versionB) notNil and:[b isMethodRemoveChange not].
f898a869986e initial checkin vrany parents: diff changeset	438	hasBase := aDiffComponent versionBase notNil.
f898a869986e initial checkin vrany parents: diff changeset	439	(hasA & hasB & hasBase) ifTrue:[
10217 fcb21281008f changed: #listEntryIconFor: vrany parents: 10192 diff changeset	440	^ ToolbarIconLibrary versionABBase12x12
10192 f898a869986e initial checkin vrany parents: diff changeset	441	].
f898a869986e initial checkin vrany parents: diff changeset	442	(hasA & hasB) ifTrue:[
10217 fcb21281008f changed: #listEntryIconFor: vrany parents: 10192 diff changeset	443	^ ToolbarIconLibrary versionAB12x12
10192 f898a869986e initial checkin vrany parents: diff changeset	444	].
f898a869986e initial checkin vrany parents: diff changeset	445	(hasA & hasBase) ifTrue:[
10217 fcb21281008f changed: #listEntryIconFor: vrany parents: 10192 diff changeset	446	^ ToolbarIconLibrary versionABase12x12
10192 f898a869986e initial checkin vrany parents: diff changeset	447	].
f898a869986e initial checkin vrany parents: diff changeset	448	(hasA) ifTrue:[
10217 fcb21281008f changed: #listEntryIconFor: vrany parents: 10192 diff changeset	449	^ ToolbarIconLibrary versionA12x12
10192 f898a869986e initial checkin vrany parents: diff changeset	450	].
f898a869986e initial checkin vrany parents: diff changeset	451	(hasB & hasBase) ifTrue:[
10217 fcb21281008f changed: #listEntryIconFor: vrany parents: 10192 diff changeset	452	^ ToolbarIconLibrary versionBBase12x12
10192 f898a869986e initial checkin vrany parents: diff changeset	453	].
f898a869986e initial checkin vrany parents: diff changeset	454	(hasB) ifTrue:[
10217 fcb21281008f changed: #listEntryIconFor: vrany parents: 10192 diff changeset	455	^ ToolbarIconLibrary versionB12x12
10192 f898a869986e initial checkin vrany parents: diff changeset	456	].
f898a869986e initial checkin vrany parents: diff changeset	457	^ nil
f898a869986e initial checkin vrany parents: diff changeset	458
f898a869986e initial checkin vrany parents: diff changeset	459	"Created: / 21-11-2009 / 21:58:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin vrany parents: diff changeset	460	"Modified: / 09-06-2011 / 08:19:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10217 fcb21281008f changed: #listEntryIconFor: vrany parents: 10192 diff changeset	461	"Modified: / 06-07-2011 / 16:38:33 / jv"
10192 f898a869986e initial checkin vrany parents: diff changeset	462	!
f898a869986e initial checkin vrany parents: diff changeset	463
f898a869986e initial checkin vrany parents: diff changeset	464	listEntryLabelFor:diff
f898a869986e initial checkin vrany parents: diff changeset	465
f898a869986e initial checkin vrany parents: diff changeset	466	^listEntryLabelGenerator
f898a869986e initial checkin vrany parents: diff changeset	467	ifNotNil: [listEntryLabelGenerator value: diff]
f898a869986e initial checkin vrany parents: diff changeset	468	ifNil:[diff name]
f898a869986e initial checkin vrany parents: diff changeset	469
f898a869986e initial checkin vrany parents: diff changeset	470	"Modified: / 24-11-2009 / 10:00:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin vrany parents: diff changeset	471	!
f898a869986e initial checkin vrany parents: diff changeset	472
f898a869986e initial checkin vrany parents: diff changeset	473	makeDependent
f898a869986e initial checkin vrany parents: diff changeset	474
f898a869986e initial checkin vrany parents: diff changeset	475	"Nothing to do"
f898a869986e initial checkin vrany parents: diff changeset	476	!
f898a869986e initial checkin vrany parents: diff changeset	477
f898a869986e initial checkin vrany parents: diff changeset	478	makeIndependent
f898a869986e initial checkin vrany parents: diff changeset	479
f898a869986e initial checkin vrany parents: diff changeset	480	"Nothing to do"
f898a869986e initial checkin vrany parents: diff changeset	481	!
f898a869986e initial checkin vrany parents: diff changeset	482
13863 481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	483	shouldDisplayDiff: aDiffCompoment
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	484	"Return true if given diff component should be displayed"
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	485
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	486	(showVersionMethodDiffsHolder value not and:[aDiffCompoment isForVersionMethod])
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	487	ifTrue:[ ^ false ].
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	(showCopyrightMethodDiffsHolder value not and:[aDiffCompoment isForCopyrightMethod])
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	490	ifTrue:[ ^ false ].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	491
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	492	aDiffCompoment isDiffSet
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	493	ifTrue:[ ^ aDiffCompoment diffs anySatisfy:[:diff\|self shouldDisplayDiff: diff]].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	494
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	495	^true
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	496
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	497	"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	498	!
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	499
10192 f898a869986e initial checkin vrany parents: diff changeset	500	updateList
f898a869986e initial checkin vrany parents: diff changeset	501	"Superclass Tools::BrowserList says that I am responsible to implement this method"
f898a869986e initial checkin vrany parents: diff changeset	502
f898a869986e initial checkin vrany parents: diff changeset	503	\| newDiffs newList \|
f898a869986e initial checkin vrany parents: diff changeset	504	self listHolder value ? #() do: [:entry\|entry model removeDependent: self].
f898a869986e initial checkin vrany parents: diff changeset	505
f898a869986e initial checkin vrany parents: diff changeset	506	newDiffs := self inGeneratorHolder value ? #().
10246 0a4d2feea6a3 Bug fix for two-column changeset diff vrany parents: 10217 diff changeset	507	(newDiffs isKindOf: ChangeSetDiffComponent) ifTrue:
10192 f898a869986e initial checkin vrany parents: diff changeset	508	[newDiffs := newDiffs diffs].
10926 1e1743c017c6 inherits from BrowserListWithFilter vrany parents: 10251 diff changeset	509	newDiffs := self filterList: newDiffs.
13264 4a0cdaf356ec class: Tools::ChangeSetDiffList Claus Gittinger <cg@exept.de> parents: 10938 diff changeset	510	newList := OrderedCollection new.
13863 481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	511	newDiffs do: [:item\|
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	512	(self shouldDisplayDiff: item) ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	513	newList add:(ListEntry model: item application: self).
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	514	item addDependent: self
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	515	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	516	].
10251 a6eb247b3746 Merged with JV's branch vrany parents: 10246 diff changeset	517
a6eb247b3746 Merged with JV's branch vrany parents: 10246 diff changeset	518	newList sort:[:a :b\|a label < b label].
10192 f898a869986e initial checkin vrany parents: diff changeset	519	self listHolder value:newList
f898a869986e initial checkin vrany parents: diff changeset	520
10251 a6eb247b3746 Merged with JV's branch vrany parents: 10246 diff changeset	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"
13863 481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	523	"Modified: / 11-11-2013 / 11:00:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10192 f898a869986e initial checkin vrany parents: diff changeset	524	! !
f898a869986e initial checkin vrany parents: diff changeset	525
f898a869986e initial checkin vrany parents: diff changeset	526	!ChangeSetDiffList::ListEntry class methodsFor:'instance creation'!
f898a869986e initial checkin vrany parents: diff changeset	527
f898a869986e initial checkin vrany parents: diff changeset	528	model: model application: application
f898a869986e initial checkin vrany parents: diff changeset	529
f898a869986e initial checkin vrany parents: diff changeset	530	^self new
f898a869986e initial checkin vrany parents: diff changeset	531	model: model;
f898a869986e initial checkin vrany parents: diff changeset	532	application: application
f898a869986e initial checkin vrany parents: diff changeset	533
f898a869986e initial checkin vrany parents: diff changeset	534	"Created: / 24-11-2009 / 18:29:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin vrany parents: diff changeset	535	! !
f898a869986e initial checkin vrany parents: diff changeset	536
f898a869986e initial checkin vrany parents: diff changeset	537	!ChangeSetDiffList::ListEntry methodsFor:'accessing'!
f898a869986e initial checkin vrany parents: diff changeset	538
f898a869986e initial checkin vrany parents: diff changeset	539	application
f898a869986e initial checkin vrany parents: diff changeset	540	^ application
f898a869986e initial checkin vrany parents: diff changeset	541	!
f898a869986e initial checkin vrany parents: diff changeset	542
f898a869986e initial checkin vrany parents: diff changeset	543	application:aDiffList
f898a869986e initial checkin vrany parents: diff changeset	544	application := aDiffList.
f898a869986e initial checkin vrany parents: diff changeset	545	!
f898a869986e initial checkin vrany parents: diff changeset	546
f898a869986e initial checkin vrany parents: diff changeset	547	icon
f898a869986e initial checkin vrany parents: diff changeset	548
f898a869986e initial checkin vrany parents: diff changeset	549	^application
f898a869986e initial checkin vrany parents: diff changeset	550	ifNotNil:[application listEntryIconFor: model]
f898a869986e initial checkin vrany parents: diff changeset	551	ifNil:[nil]
f898a869986e initial checkin vrany parents: diff changeset	552
f898a869986e initial checkin vrany parents: diff changeset	553	"Created: / 24-11-2009 / 18:26:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin vrany parents: diff changeset	554	!
f898a869986e initial checkin vrany parents: diff changeset	555
f898a869986e initial checkin vrany parents: diff changeset	556	label
f898a869986e initial checkin vrany parents: diff changeset	557
f898a869986e initial checkin vrany parents: diff changeset	558	^application
f898a869986e initial checkin vrany parents: diff changeset	559	ifNotNil:[application listEntryLabelFor: model]
f898a869986e initial checkin vrany parents: diff changeset	560	ifNil:[model displayString]
f898a869986e initial checkin vrany parents: diff changeset	561
f898a869986e initial checkin vrany parents: diff changeset	562	"Created: / 24-11-2009 / 18:26:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin vrany parents: diff changeset	563	"Modified: / 26-11-2009 / 17:33:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
f898a869986e initial checkin vrany parents: diff changeset	564	!
f898a869986e initial checkin vrany parents: diff changeset	565
f898a869986e initial checkin vrany parents: diff changeset	566	model
f898a869986e initial checkin vrany parents: diff changeset	567	^ model
f898a869986e initial checkin vrany parents: diff changeset	568	!
f898a869986e initial checkin vrany parents: diff changeset	569
f898a869986e initial checkin vrany parents: diff changeset	570	model:aDiffComponent
f898a869986e initial checkin vrany parents: diff changeset	571	model := aDiffComponent.
f898a869986e initial checkin vrany parents: diff changeset	572	! !
f898a869986e initial checkin vrany parents: diff changeset	573
f898a869986e initial checkin vrany parents: diff changeset	574	!ChangeSetDiffList::ListEntry methodsFor:'displaying'!
f898a869986e initial checkin vrany parents: diff changeset	575
f898a869986e initial checkin vrany parents: diff changeset	576	displayOn: aGC x: x y: y opaque: opaque
f898a869986e initial checkin vrany parents: diff changeset	577
13863 481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	578	\| label icon oldPaint \|
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	579	label := self label.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	580	"/ ((application topApplication askFor:#isMerge) and:[model isMerged not]) ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	581	(application highlightConflictsHolder value and:[model "isConflict"isMerged not]) ifTrue:[
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	582	oldPaint := aGC paint.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	583	aGC paint: TextDiff3Tool colorConflict.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	584	'!!' displayOn: aGC x: x y:y opaque: opaque.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	585	aGC paint: oldPaint.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	586	label := label asText allBold"/; colorizeAllWith: Color red darker.
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	587	].
481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	588	(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	589	label displayOn: aGC x: x + 10 + 16 y:y opaque: opaque
10192 f898a869986e initial checkin vrany parents: diff changeset	590
f898a869986e initial checkin vrany parents: diff changeset	591	"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	592	"Modified: / 15-01-2013 / 11:35:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10192 f898a869986e initial checkin vrany parents: diff changeset	593	! !
f898a869986e initial checkin vrany parents: diff changeset	594
f898a869986e initial checkin vrany parents: diff changeset	595	!ChangeSetDiffList class methodsFor:'documentation'!
f898a869986e initial checkin vrany parents: diff changeset	596
f898a869986e initial checkin vrany parents: diff changeset	597	version_CVS
13863 481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	598	^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffList.st,v 1.8 2014-02-05 19:08:09 cg Exp $'
10192 f898a869986e initial checkin vrany parents: diff changeset	599	!
f898a869986e initial checkin vrany parents: diff changeset	600
f898a869986e initial checkin vrany parents: diff changeset	601	version_SVN
13863 481f2981e611 merged in jv's chenges Claus Gittinger <cg@exept.de> parents: 13264 diff changeset	602	^ '$Id: Tools__ChangeSetDiffList.st,v 1.8 2014-02-05 19:08:09 cg Exp $'
10192 f898a869986e initial checkin vrany parents: diff changeset	603	! !
13264 4a0cdaf356ec class: Tools::ChangeSetDiffList Claus Gittinger <cg@exept.de> parents: 10938 diff changeset	604

author	Claus Gittinger <cg@exept.de>
	Wed, 05 Feb 2014 20:08:09 +0100
changeset 13863	481f2981e611
parent 13264	4a0cdaf356ec
child 14014	e58870fa0034
permissions	-rw-r--r--