hg/stx-libtool: Tools__SmalltalkDiffTool.st@82d9e1236f1f (annotated)

8774 c0c5b0ed124f initial checkin fm parents: diff changeset	1	"{ Package: 'cvut:stx/goodies/libtool3' }"
c0c5b0ed124f initial checkin fm parents: diff changeset	2
c0c5b0ed124f initial checkin fm parents: diff changeset	3	"{ NameSpace: Tools }"
c0c5b0ed124f initial checkin fm parents: diff changeset	4
c0c5b0ed124f initial checkin fm parents: diff changeset	5	ApplicationModel subclass:#SmalltalkDiffTool
c0c5b0ed124f initial checkin fm parents: diff changeset	6	instanceVariableNames:'diffSetHolder changeSetA changeSetB selectionHolder titleHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	7	showMergingChangeSetHolder versionsViewHolder'
c0c5b0ed124f initial checkin fm parents: diff changeset	8	classVariableNames:''
c0c5b0ed124f initial checkin fm parents: diff changeset	9	poolDictionaries:''
c0c5b0ed124f initial checkin fm parents: diff changeset	10	category:'Interface-Diff & Merge tool'
c0c5b0ed124f initial checkin fm parents: diff changeset	11	!
c0c5b0ed124f initial checkin fm parents: diff changeset	12
c0c5b0ed124f initial checkin fm parents: diff changeset	13
c0c5b0ed124f initial checkin fm parents: diff changeset	14	!SmalltalkDiffTool class methodsFor:'interface opening'!
c0c5b0ed124f initial checkin fm parents: diff changeset	15
c0c5b0ed124f initial checkin fm parents: diff changeset	16	openOnDiffSet:diffSet labelA:labelA labelB: labelB title: title
c0c5b0ed124f initial checkin fm parents: diff changeset	17
c0c5b0ed124f initial checkin fm parents: diff changeset	18	^self new
c0c5b0ed124f initial checkin fm parents: diff changeset	19	diffSet: diffSet labelA: labelA labelB: labelB;
c0c5b0ed124f initial checkin fm parents: diff changeset	20	title: title;
c0c5b0ed124f initial checkin fm parents: diff changeset	21	open
c0c5b0ed124f initial checkin fm parents: diff changeset	22
c0c5b0ed124f initial checkin fm parents: diff changeset	23	"Created: / 19-04-2008 / 12:52:12 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	24	! !
c0c5b0ed124f initial checkin fm parents: diff changeset	25
c0c5b0ed124f initial checkin fm parents: diff changeset	26	!SmalltalkDiffTool class methodsFor:'interface specs'!
c0c5b0ed124f initial checkin fm parents: diff changeset	27
c0c5b0ed124f initial checkin fm parents: diff changeset	28	conflictsListSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	29	"This resource specification was automatically generated
c0c5b0ed124f initial checkin fm parents: diff changeset	30	by the UIPainter of ST/X."
c0c5b0ed124f initial checkin fm parents: diff changeset	31
c0c5b0ed124f initial checkin fm parents: diff changeset	32	"Do not manually edit this!! If it is corrupted,
c0c5b0ed124f initial checkin fm parents: diff changeset	33	the UIPainter may not be able to read the specification."
c0c5b0ed124f initial checkin fm parents: diff changeset	34
c0c5b0ed124f initial checkin fm parents: diff changeset	35	"
c0c5b0ed124f initial checkin fm parents: diff changeset	36	UIPainter new openOnClass:Tools::DiffTool andSelector:#conflictsListSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	37	Tools::DiffTool new openInterface:#conflictsListSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	38	"
c0c5b0ed124f initial checkin fm parents: diff changeset	39
c0c5b0ed124f initial checkin fm parents: diff changeset	40	<resource: #canvas>
c0c5b0ed124f initial checkin fm parents: diff changeset	41
c0c5b0ed124f initial checkin fm parents: diff changeset	42	^
c0c5b0ed124f initial checkin fm parents: diff changeset	43	#(FullSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	44	name: conflictsListSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	45	window:
c0c5b0ed124f initial checkin fm parents: diff changeset	46	(WindowSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	47	label: 'VersionBothListSpec'
c0c5b0ed124f initial checkin fm parents: diff changeset	48	name: 'VersionBothListSpec'
c0c5b0ed124f initial checkin fm parents: diff changeset	49	min: (Point 10 10)
c0c5b0ed124f initial checkin fm parents: diff changeset	50	bounds: (Rectangle 0 0 306 406)
c0c5b0ed124f initial checkin fm parents: diff changeset	51	)
c0c5b0ed124f initial checkin fm parents: diff changeset	52	component:
c0c5b0ed124f initial checkin fm parents: diff changeset	53	(SpecCollection
c0c5b0ed124f initial checkin fm parents: diff changeset	54	collection: (
c0c5b0ed124f initial checkin fm parents: diff changeset	55	(LabelSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	56	label: 'Conflicts (present in both A and B)'
c0c5b0ed124f initial checkin fm parents: diff changeset	57	name: 'VersionBothLabel'
c0c5b0ed124f initial checkin fm parents: diff changeset	58	layout: (LayoutFrame 0 0 0 0 0 1 30 0)
c0c5b0ed124f initial checkin fm parents: diff changeset	59	translateLabel: true
c0c5b0ed124f initial checkin fm parents: diff changeset	60	labelChannel: conflictsLabelHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	61	)
c0c5b0ed124f initial checkin fm parents: diff changeset	62	(SelectionInListModelViewSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	63	name: 'VersionBothList'
c0c5b0ed124f initial checkin fm parents: diff changeset	64	layout: (LayoutFrame 0 0 30 0 0 1 0 1)
c0c5b0ed124f initial checkin fm parents: diff changeset	65	model: selectionHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	66	hasHorizontalScrollBar: true
c0c5b0ed124f initial checkin fm parents: diff changeset	67	hasVerticalScrollBar: true
c0c5b0ed124f initial checkin fm parents: diff changeset	68	listModel: conflictsListHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	69	useIndex: false
c0c5b0ed124f initial checkin fm parents: diff changeset	70	highlightMode: line
c0c5b0ed124f initial checkin fm parents: diff changeset	71	)
c0c5b0ed124f initial checkin fm parents: diff changeset	72	)
c0c5b0ed124f initial checkin fm parents: diff changeset	73
c0c5b0ed124f initial checkin fm parents: diff changeset	74	)
c0c5b0ed124f initial checkin fm parents: diff changeset	75	)
c0c5b0ed124f initial checkin fm parents: diff changeset	76
c0c5b0ed124f initial checkin fm parents: diff changeset	77	"Modified: / 21-05-2008 / 14:20:31 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	78	!
c0c5b0ed124f initial checkin fm parents: diff changeset	79
c0c5b0ed124f initial checkin fm parents: diff changeset	80	inAOnlyListSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	81	"This resource specification was automatically generated
c0c5b0ed124f initial checkin fm parents: diff changeset	82	by the UIPainter of ST/X."
c0c5b0ed124f initial checkin fm parents: diff changeset	83
c0c5b0ed124f initial checkin fm parents: diff changeset	84	"Do not manually edit this!! If it is corrupted,
c0c5b0ed124f initial checkin fm parents: diff changeset	85	the UIPainter may not be able to read the specification."
c0c5b0ed124f initial checkin fm parents: diff changeset	86
c0c5b0ed124f initial checkin fm parents: diff changeset	87	"
c0c5b0ed124f initial checkin fm parents: diff changeset	88	UIPainter new openOnClass:MergeTool andSelector:#inAOnlyListSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	89	MergeTool new openInterface:#inAOnlyListSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	90	"
c0c5b0ed124f initial checkin fm parents: diff changeset	91
c0c5b0ed124f initial checkin fm parents: diff changeset	92	<resource: #canvas>
c0c5b0ed124f initial checkin fm parents: diff changeset	93
c0c5b0ed124f initial checkin fm parents: diff changeset	94	^
c0c5b0ed124f initial checkin fm parents: diff changeset	95	#(FullSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	96	name: inAOnlyListSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	97	window:
c0c5b0ed124f initial checkin fm parents: diff changeset	98	(WindowSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	99	label: 'VersionAOnlyListSpec'
c0c5b0ed124f initial checkin fm parents: diff changeset	100	name: 'VersionAOnlyListSpec'
c0c5b0ed124f initial checkin fm parents: diff changeset	101	min: (Point 10 10)
c0c5b0ed124f initial checkin fm parents: diff changeset	102	bounds: (Rectangle 0 0 306 406)
c0c5b0ed124f initial checkin fm parents: diff changeset	103	)
c0c5b0ed124f initial checkin fm parents: diff changeset	104	component:
c0c5b0ed124f initial checkin fm parents: diff changeset	105	(SpecCollection
c0c5b0ed124f initial checkin fm parents: diff changeset	106	collection: (
c0c5b0ed124f initial checkin fm parents: diff changeset	107	(LabelSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	108	label: 'In A only'
c0c5b0ed124f initial checkin fm parents: diff changeset	109	name: 'VersionAOnlyLabel'
c0c5b0ed124f initial checkin fm parents: diff changeset	110	layout: (LayoutFrame 0 0 0 0 0 1 30 0)
c0c5b0ed124f initial checkin fm parents: diff changeset	111	translateLabel: true
c0c5b0ed124f initial checkin fm parents: diff changeset	112	labelChannel: inAOnlyLabelHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	113	)
c0c5b0ed124f initial checkin fm parents: diff changeset	114	(SelectionInListModelViewSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	115	name: 'VersionAOnlyList'
c0c5b0ed124f initial checkin fm parents: diff changeset	116	layout: (LayoutFrame 0 0 30 0 0 1 0 1)
c0c5b0ed124f initial checkin fm parents: diff changeset	117	model: selectionHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	118	hasHorizontalScrollBar: true
c0c5b0ed124f initial checkin fm parents: diff changeset	119	hasVerticalScrollBar: true
c0c5b0ed124f initial checkin fm parents: diff changeset	120	listModel: inAOnlyListHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	121	useIndex: false
c0c5b0ed124f initial checkin fm parents: diff changeset	122	highlightMode: line
c0c5b0ed124f initial checkin fm parents: diff changeset	123	postBuildCallback: postBuildVersionAListWidget:
c0c5b0ed124f initial checkin fm parents: diff changeset	124	)
c0c5b0ed124f initial checkin fm parents: diff changeset	125	)
c0c5b0ed124f initial checkin fm parents: diff changeset	126
c0c5b0ed124f initial checkin fm parents: diff changeset	127	)
c0c5b0ed124f initial checkin fm parents: diff changeset	128	)
c0c5b0ed124f initial checkin fm parents: diff changeset	129
c0c5b0ed124f initial checkin fm parents: diff changeset	130	"Modified: / 11-12-2007 / 16:46:29 / janfrog"
c0c5b0ed124f initial checkin fm parents: diff changeset	131	"Created: / 19-04-2008 / 12:52:08 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	132	"Modified: / 21-05-2008 / 14:20:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	133	!
c0c5b0ed124f initial checkin fm parents: diff changeset	134
c0c5b0ed124f initial checkin fm parents: diff changeset	135	inBOnlyListSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	136	"This resource specification was automatically generated
c0c5b0ed124f initial checkin fm parents: diff changeset	137	by the UIPainter of ST/X."
c0c5b0ed124f initial checkin fm parents: diff changeset	138
c0c5b0ed124f initial checkin fm parents: diff changeset	139	"Do not manually edit this!! If it is corrupted,
c0c5b0ed124f initial checkin fm parents: diff changeset	140	the UIPainter may not be able to read the specification."
c0c5b0ed124f initial checkin fm parents: diff changeset	141
c0c5b0ed124f initial checkin fm parents: diff changeset	142	"
c0c5b0ed124f initial checkin fm parents: diff changeset	143	UIPainter new openOnClass:MergeTool andSelector:#inBOnlyListSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	144	MergeTool new openInterface:#inBOnlyListSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	145	"
c0c5b0ed124f initial checkin fm parents: diff changeset	146
c0c5b0ed124f initial checkin fm parents: diff changeset	147	<resource: #canvas>
c0c5b0ed124f initial checkin fm parents: diff changeset	148
c0c5b0ed124f initial checkin fm parents: diff changeset	149	^
c0c5b0ed124f initial checkin fm parents: diff changeset	150	#(FullSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	151	name: inBOnlyListSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	152	window:
c0c5b0ed124f initial checkin fm parents: diff changeset	153	(WindowSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	154	label: 'VersionBOnlyListSpec'
c0c5b0ed124f initial checkin fm parents: diff changeset	155	name: 'VersionBOnlyListSpec'
c0c5b0ed124f initial checkin fm parents: diff changeset	156	min: (Point 10 10)
c0c5b0ed124f initial checkin fm parents: diff changeset	157	bounds: (Rectangle 0 0 306 406)
c0c5b0ed124f initial checkin fm parents: diff changeset	158	)
c0c5b0ed124f initial checkin fm parents: diff changeset	159	component:
c0c5b0ed124f initial checkin fm parents: diff changeset	160	(SpecCollection
c0c5b0ed124f initial checkin fm parents: diff changeset	161	collection: (
c0c5b0ed124f initial checkin fm parents: diff changeset	162	(LabelSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	163	label: 'In B only'
c0c5b0ed124f initial checkin fm parents: diff changeset	164	name: 'VersionBOnlyLabel'
c0c5b0ed124f initial checkin fm parents: diff changeset	165	layout: (LayoutFrame 0 0 0 0 0 1 30 0)
c0c5b0ed124f initial checkin fm parents: diff changeset	166	translateLabel: true
c0c5b0ed124f initial checkin fm parents: diff changeset	167	labelChannel: inBOnlyLabelHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	168	)
c0c5b0ed124f initial checkin fm parents: diff changeset	169	(SelectionInListModelViewSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	170	name: 'VersionBOnlyList'
c0c5b0ed124f initial checkin fm parents: diff changeset	171	layout: (LayoutFrame 0 0 30 0 0 1 0 1)
c0c5b0ed124f initial checkin fm parents: diff changeset	172	model: selectionHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	173	hasHorizontalScrollBar: true
c0c5b0ed124f initial checkin fm parents: diff changeset	174	hasVerticalScrollBar: true
c0c5b0ed124f initial checkin fm parents: diff changeset	175	listModel: inBOnlyListHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	176	postBuildCallback: postBuildVersionBListWidget:
c0c5b0ed124f initial checkin fm parents: diff changeset	177	useIndex: false
c0c5b0ed124f initial checkin fm parents: diff changeset	178	highlightMode: line
c0c5b0ed124f initial checkin fm parents: diff changeset	179	)
c0c5b0ed124f initial checkin fm parents: diff changeset	180	)
c0c5b0ed124f initial checkin fm parents: diff changeset	181
c0c5b0ed124f initial checkin fm parents: diff changeset	182	)
c0c5b0ed124f initial checkin fm parents: diff changeset	183	)
c0c5b0ed124f initial checkin fm parents: diff changeset	184
c0c5b0ed124f initial checkin fm parents: diff changeset	185	"Modified: / 11-12-2007 / 16:46:33 / janfrog"
c0c5b0ed124f initial checkin fm parents: diff changeset	186	"Created: / 19-04-2008 / 12:52:08 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	187	"Modified: / 21-05-2008 / 14:20:56 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	188	!
c0c5b0ed124f initial checkin fm parents: diff changeset	189
c0c5b0ed124f initial checkin fm parents: diff changeset	190	windowSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	191	"This resource specification was automatically generated
c0c5b0ed124f initial checkin fm parents: diff changeset	192	by the UIPainter of ST/X."
c0c5b0ed124f initial checkin fm parents: diff changeset	193
c0c5b0ed124f initial checkin fm parents: diff changeset	194	"Do not manually edit this!! If it is corrupted,
c0c5b0ed124f initial checkin fm parents: diff changeset	195	the UIPainter may not be able to read the specification."
c0c5b0ed124f initial checkin fm parents: diff changeset	196
c0c5b0ed124f initial checkin fm parents: diff changeset	197	"
c0c5b0ed124f initial checkin fm parents: diff changeset	198	UIPainter new openOnClass:Tools::DiffTool andSelector:#windowSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	199	Tools::DiffTool new openInterface:#windowSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	200	Tools::DiffTool open
c0c5b0ed124f initial checkin fm parents: diff changeset	201	"
c0c5b0ed124f initial checkin fm parents: diff changeset	202
c0c5b0ed124f initial checkin fm parents: diff changeset	203	<resource: #canvas>
c0c5b0ed124f initial checkin fm parents: diff changeset	204
c0c5b0ed124f initial checkin fm parents: diff changeset	205	^
c0c5b0ed124f initial checkin fm parents: diff changeset	206	#(FullSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	207	name: windowSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	208	window:
c0c5b0ed124f initial checkin fm parents: diff changeset	209	(WindowSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	210	label: 'MergeTool'
c0c5b0ed124f initial checkin fm parents: diff changeset	211	name: 'MergeTool'
c0c5b0ed124f initial checkin fm parents: diff changeset	212	labelChannel: titleHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	213	min: (Point 10 10)
c0c5b0ed124f initial checkin fm parents: diff changeset	214	max: (Point 1024 768)
c0c5b0ed124f initial checkin fm parents: diff changeset	215	bounds: (Rectangle 0 0 602 508)
c0c5b0ed124f initial checkin fm parents: diff changeset	216	menu: mainMenu
c0c5b0ed124f initial checkin fm parents: diff changeset	217	)
c0c5b0ed124f initial checkin fm parents: diff changeset	218	component:
c0c5b0ed124f initial checkin fm parents: diff changeset	219	(SpecCollection
c0c5b0ed124f initial checkin fm parents: diff changeset	220	collection: (
c0c5b0ed124f initial checkin fm parents: diff changeset	221	(VariableVerticalPanelSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	222	name: 'ContentPanel'
c0c5b0ed124f initial checkin fm parents: diff changeset	223	layout: (LayoutFrame 0 0 0 0 0 1 0 1)
c0c5b0ed124f initial checkin fm parents: diff changeset	224	showHandle: true
c0c5b0ed124f initial checkin fm parents: diff changeset	225	snapMode: both
c0c5b0ed124f initial checkin fm parents: diff changeset	226	component:
c0c5b0ed124f initial checkin fm parents: diff changeset	227	(SpecCollection
c0c5b0ed124f initial checkin fm parents: diff changeset	228	collection: (
c0c5b0ed124f initial checkin fm parents: diff changeset	229	(VariableHorizontalPanelSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	230	name: 'VersionListPanel'
c0c5b0ed124f initial checkin fm parents: diff changeset	231	component:
c0c5b0ed124f initial checkin fm parents: diff changeset	232	(SpecCollection
c0c5b0ed124f initial checkin fm parents: diff changeset	233	collection: (
c0c5b0ed124f initial checkin fm parents: diff changeset	234	(UISubSpecification
c0c5b0ed124f initial checkin fm parents: diff changeset	235	name: 'VersionAOnlyListSpec'
c0c5b0ed124f initial checkin fm parents: diff changeset	236	minorKey: inAOnlyListSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	237	)
c0c5b0ed124f initial checkin fm parents: diff changeset	238	(UISubSpecification
c0c5b0ed124f initial checkin fm parents: diff changeset	239	name: 'VersionBothListSpec'
c0c5b0ed124f initial checkin fm parents: diff changeset	240	minorKey: conflictsListSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	241	)
c0c5b0ed124f initial checkin fm parents: diff changeset	242	(UISubSpecification
c0c5b0ed124f initial checkin fm parents: diff changeset	243	name: 'VersionBOnlyListSpec'
c0c5b0ed124f initial checkin fm parents: diff changeset	244	minorKey: inBOnlyListSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	245	)
c0c5b0ed124f initial checkin fm parents: diff changeset	246	)
c0c5b0ed124f initial checkin fm parents: diff changeset	247
c0c5b0ed124f initial checkin fm parents: diff changeset	248	)
c0c5b0ed124f initial checkin fm parents: diff changeset	249	handles: (Any 0.33333333333333 0.66666666666667 1.0)
c0c5b0ed124f initial checkin fm parents: diff changeset	250	)
c0c5b0ed124f initial checkin fm parents: diff changeset	251	(ArbitraryComponentSpec
c0c5b0ed124f initial checkin fm parents: diff changeset	252	name: 'ArbitraryComponent1'
c0c5b0ed124f initial checkin fm parents: diff changeset	253	hasBorder: false
c0c5b0ed124f initial checkin fm parents: diff changeset	254	viewChannel: versionsViewHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	255	)
c0c5b0ed124f initial checkin fm parents: diff changeset	256	)
c0c5b0ed124f initial checkin fm parents: diff changeset	257
c0c5b0ed124f initial checkin fm parents: diff changeset	258	)
c0c5b0ed124f initial checkin fm parents: diff changeset	259	handles: (Any 0.5 1.0)
c0c5b0ed124f initial checkin fm parents: diff changeset	260	)
c0c5b0ed124f initial checkin fm parents: diff changeset	261	)
c0c5b0ed124f initial checkin fm parents: diff changeset	262
c0c5b0ed124f initial checkin fm parents: diff changeset	263	)
c0c5b0ed124f initial checkin fm parents: diff changeset	264	)
c0c5b0ed124f initial checkin fm parents: diff changeset	265
c0c5b0ed124f initial checkin fm parents: diff changeset	266	"Modified: / 07-10-2008 / 11:03:45 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	267	! !
c0c5b0ed124f initial checkin fm parents: diff changeset	268
c0c5b0ed124f initial checkin fm parents: diff changeset	269	!SmalltalkDiffTool class methodsFor:'plugIn spec'!
c0c5b0ed124f initial checkin fm parents: diff changeset	270
c0c5b0ed124f initial checkin fm parents: diff changeset	271	aspectSelectors
c0c5b0ed124f initial checkin fm parents: diff changeset	272
c0c5b0ed124f initial checkin fm parents: diff changeset	273	^ #(
c0c5b0ed124f initial checkin fm parents: diff changeset	274	#diffSetHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	275	#inAOnlyLabelHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	276	#inBOnlyLabelHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	277	).
c0c5b0ed124f initial checkin fm parents: diff changeset	278
c0c5b0ed124f initial checkin fm parents: diff changeset	279	"Created: / 02-04-2009 / 16:07:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	280	"Modified: / 09-04-2009 / 09:19:57 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	281	! !
c0c5b0ed124f initial checkin fm parents: diff changeset	282
c0c5b0ed124f initial checkin fm parents: diff changeset	283	!SmalltalkDiffTool methodsFor:'accessing'!
c0c5b0ed124f initial checkin fm parents: diff changeset	284
c0c5b0ed124f initial checkin fm parents: diff changeset	285	changeSetA
c0c5b0ed124f initial checkin fm parents: diff changeset	286	^ changeSetA
c0c5b0ed124f initial checkin fm parents: diff changeset	287
c0c5b0ed124f initial checkin fm parents: diff changeset	288	"Created: / 07-10-2008 / 10:38:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	289	!
c0c5b0ed124f initial checkin fm parents: diff changeset	290
c0c5b0ed124f initial checkin fm parents: diff changeset	291	changeSetA:aChangeSet
c0c5b0ed124f initial checkin fm parents: diff changeset	292	changeSetA := aChangeSet.
c0c5b0ed124f initial checkin fm parents: diff changeset	293
c0c5b0ed124f initial checkin fm parents: diff changeset	294	"Created: / 07-10-2008 / 10:38:54 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	295	!
c0c5b0ed124f initial checkin fm parents: diff changeset	296
c0c5b0ed124f initial checkin fm parents: diff changeset	297	changeSetB
c0c5b0ed124f initial checkin fm parents: diff changeset	298	^ changeSetB
c0c5b0ed124f initial checkin fm parents: diff changeset	299
c0c5b0ed124f initial checkin fm parents: diff changeset	300	"Created: / 07-10-2008 / 10:38:57 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	301	!
c0c5b0ed124f initial checkin fm parents: diff changeset	302
c0c5b0ed124f initial checkin fm parents: diff changeset	303	changeSetB:aChangeSet
c0c5b0ed124f initial checkin fm parents: diff changeset	304	changeSetB := aChangeSet.
c0c5b0ed124f initial checkin fm parents: diff changeset	305	self changeSetsChanged.
c0c5b0ed124f initial checkin fm parents: diff changeset	306
c0c5b0ed124f initial checkin fm parents: diff changeset	307	"Created: / 07-10-2008 / 10:38:57 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	308	!
c0c5b0ed124f initial checkin fm parents: diff changeset	309
c0c5b0ed124f initial checkin fm parents: diff changeset	310	diffItemClass
8875 ddee2038db1e changed: #diffItemClass fm parents: 8820 diff changeset	311	^ SmalltalkDiffItem
8774 c0c5b0ed124f initial checkin fm parents: diff changeset	312
c0c5b0ed124f initial checkin fm parents: diff changeset	313	"Created: / 21-05-2008 / 14:38:26 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	314	"Modified: / 09-08-2009 / 14:57:37 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	315	!
c0c5b0ed124f initial checkin fm parents: diff changeset	316
c0c5b0ed124f initial checkin fm parents: diff changeset	317	diffSet
c0c5b0ed124f initial checkin fm parents: diff changeset	318	^ diffSetHolder value
c0c5b0ed124f initial checkin fm parents: diff changeset	319
c0c5b0ed124f initial checkin fm parents: diff changeset	320	"Created: / 07-10-2008 / 10:39:02 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	321	"Modified: / 02-04-2009 / 16:10:20 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	322	!
c0c5b0ed124f initial checkin fm parents: diff changeset	323
c0c5b0ed124f initial checkin fm parents: diff changeset	324	diffSet:aDiffSet
c0c5b0ed124f initial checkin fm parents: diff changeset	325
c0c5b0ed124f initial checkin fm parents: diff changeset	326	self diffSetHolder value: aDiffSet
c0c5b0ed124f initial checkin fm parents: diff changeset	327
c0c5b0ed124f initial checkin fm parents: diff changeset	328	"Modified: / 07-12-2007 / 11:39:15 / janfrog"
c0c5b0ed124f initial checkin fm parents: diff changeset	329	"Created: / 19-04-2008 / 12:58:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	330	"Modified: / 07-04-2009 / 23:45:48 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	331	!
c0c5b0ed124f initial checkin fm parents: diff changeset	332
c0c5b0ed124f initial checkin fm parents: diff changeset	333	diffSet:aDiffSet labelA:labelA labelB:labelB
c0c5b0ed124f initial checkin fm parents: diff changeset	334	self onlyInALabel:labelA.
c0c5b0ed124f initial checkin fm parents: diff changeset	335	self onlyInBLabel:labelB.
c0c5b0ed124f initial checkin fm parents: diff changeset	336	self diffSet:aDiffSet
c0c5b0ed124f initial checkin fm parents: diff changeset	337
c0c5b0ed124f initial checkin fm parents: diff changeset	338	"Modified: / 11-12-2007 / 17:10:49 / janfrog"
c0c5b0ed124f initial checkin fm parents: diff changeset	339	"Created: / 19-04-2008 / 12:58:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	340	"Modified: / 07-10-2008 / 10:24:24 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	341	!
c0c5b0ed124f initial checkin fm parents: diff changeset	342
c0c5b0ed124f initial checkin fm parents: diff changeset	343	onlyInALabel:labelA
c0c5b0ed124f initial checkin fm parents: diff changeset	344	self inAOnlyLabelHolder value:'Only in ', labelA
c0c5b0ed124f initial checkin fm parents: diff changeset	345
c0c5b0ed124f initial checkin fm parents: diff changeset	346	"Created: / 07-10-2008 / 10:24:10 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	347	!
c0c5b0ed124f initial checkin fm parents: diff changeset	348
c0c5b0ed124f initial checkin fm parents: diff changeset	349	onlyInBLabel:labelB
c0c5b0ed124f initial checkin fm parents: diff changeset	350	self inBOnlyLabelHolder value:'Only in ', labelB
c0c5b0ed124f initial checkin fm parents: diff changeset	351
c0c5b0ed124f initial checkin fm parents: diff changeset	352	"Created: / 07-10-2008 / 10:24:24 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	353	!
c0c5b0ed124f initial checkin fm parents: diff changeset	354
c0c5b0ed124f initial checkin fm parents: diff changeset	355	selection
c0c5b0ed124f initial checkin fm parents: diff changeset	356
c0c5b0ed124f initial checkin fm parents: diff changeset	357	^self selectionHolder value asCollection
c0c5b0ed124f initial checkin fm parents: diff changeset	358
c0c5b0ed124f initial checkin fm parents: diff changeset	359	"Created: / 21-10-2008 / 09:32:15 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	360	!
c0c5b0ed124f initial checkin fm parents: diff changeset	361
c0c5b0ed124f initial checkin fm parents: diff changeset	362	selectionIsNonEmpty
c0c5b0ed124f initial checkin fm parents: diff changeset	363
c0c5b0ed124f initial checkin fm parents: diff changeset	364	^[self selection isNilOrEmptyCollection not]
c0c5b0ed124f initial checkin fm parents: diff changeset	365
c0c5b0ed124f initial checkin fm parents: diff changeset	366	"Created: / 19-04-2008 / 12:58:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	367	"Modified: / 22-10-2008 / 13:14:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	368	!
c0c5b0ed124f initial checkin fm parents: diff changeset	369
c0c5b0ed124f initial checkin fm parents: diff changeset	370	selectionIsNonEmptyAndAllHasVersionA
c0c5b0ed124f initial checkin fm parents: diff changeset	371
c0c5b0ed124f initial checkin fm parents: diff changeset	372	^[self selection isNilOrEmptyCollection not
c0c5b0ed124f initial checkin fm parents: diff changeset	373	and:[self selection allSatisfy:[:mergeItem\|mergeItem hasVersionA]]]
c0c5b0ed124f initial checkin fm parents: diff changeset	374
c0c5b0ed124f initial checkin fm parents: diff changeset	375	"Created: / 19-04-2008 / 12:58:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	376	"Modified: / 22-10-2008 / 13:14:32 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	377	!
c0c5b0ed124f initial checkin fm parents: diff changeset	378
c0c5b0ed124f initial checkin fm parents: diff changeset	379	selectionIsNonEmptyAndAllHasVersionB
c0c5b0ed124f initial checkin fm parents: diff changeset	380
c0c5b0ed124f initial checkin fm parents: diff changeset	381	^[self selection isNilOrEmptyCollection not
c0c5b0ed124f initial checkin fm parents: diff changeset	382	and:[self selection allSatisfy:[:mergeItem\|mergeItem hasVersionB]]]
c0c5b0ed124f initial checkin fm parents: diff changeset	383
c0c5b0ed124f initial checkin fm parents: diff changeset	384	"Created: / 19-04-2008 / 12:58:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	385	"Modified: / 22-10-2008 / 13:14:42 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	386	!
c0c5b0ed124f initial checkin fm parents: diff changeset	387
c0c5b0ed124f initial checkin fm parents: diff changeset	388	title
c0c5b0ed124f initial checkin fm parents: diff changeset	389
c0c5b0ed124f initial checkin fm parents: diff changeset	390	self titleHolder value
c0c5b0ed124f initial checkin fm parents: diff changeset	391
c0c5b0ed124f initial checkin fm parents: diff changeset	392	"Created: / 19-04-2008 / 12:58:07 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	393	!
c0c5b0ed124f initial checkin fm parents: diff changeset	394
c0c5b0ed124f initial checkin fm parents: diff changeset	395	title: aString
c0c5b0ed124f initial checkin fm parents: diff changeset	396
c0c5b0ed124f initial checkin fm parents: diff changeset	397	self titleHolder value: aString
c0c5b0ed124f initial checkin fm parents: diff changeset	398
c0c5b0ed124f initial checkin fm parents: diff changeset	399	"Created: / 19-04-2008 / 12:58:07 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	400	!
c0c5b0ed124f initial checkin fm parents: diff changeset	401
c0c5b0ed124f initial checkin fm parents: diff changeset	402	versionAColor
c0c5b0ed124f initial checkin fm parents: diff changeset	403
c0c5b0ed124f initial checkin fm parents: diff changeset	404	^Color green lightened lightened
c0c5b0ed124f initial checkin fm parents: diff changeset	405
c0c5b0ed124f initial checkin fm parents: diff changeset	406	"Created: / 19-04-2008 / 12:58:07 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	407	!
c0c5b0ed124f initial checkin fm parents: diff changeset	408
c0c5b0ed124f initial checkin fm parents: diff changeset	409	versionBColor
c0c5b0ed124f initial checkin fm parents: diff changeset	410
c0c5b0ed124f initial checkin fm parents: diff changeset	411	^Color red lightened lightened
c0c5b0ed124f initial checkin fm parents: diff changeset	412
c0c5b0ed124f initial checkin fm parents: diff changeset	413	"Created: / 19-04-2008 / 12:58:07 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	414	! !
c0c5b0ed124f initial checkin fm parents: diff changeset	415
c0c5b0ed124f initial checkin fm parents: diff changeset	416	!SmalltalkDiffTool methodsFor:'aspects'!
c0c5b0ed124f initial checkin fm parents: diff changeset	417
c0c5b0ed124f initial checkin fm parents: diff changeset	418	conflictsLabelHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	419
c0c5b0ed124f initial checkin fm parents: diff changeset	420	\|holder\|
c0c5b0ed124f initial checkin fm parents: diff changeset	421
c0c5b0ed124f initial checkin fm parents: diff changeset	422	(holder := builder bindingAt:#conflictsLabelHolder) isNil ifTrue:[
c0c5b0ed124f initial checkin fm parents: diff changeset	423	holder := 'Conflicts' asValue.
c0c5b0ed124f initial checkin fm parents: diff changeset	424	builder aspectAt:#conflictsLabelHolder put:holder.
c0c5b0ed124f initial checkin fm parents: diff changeset	425	].
c0c5b0ed124f initial checkin fm parents: diff changeset	426	^ holder.
c0c5b0ed124f initial checkin fm parents: diff changeset	427
c0c5b0ed124f initial checkin fm parents: diff changeset	428	"Created: / 19-04-2008 / 12:57:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	429	"Modified: / 07-10-2008 / 10:36:36 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	430	!
c0c5b0ed124f initial checkin fm parents: diff changeset	431
c0c5b0ed124f initial checkin fm parents: diff changeset	432	conflictsListHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	433
c0c5b0ed124f initial checkin fm parents: diff changeset	434	\|holder\|
c0c5b0ed124f initial checkin fm parents: diff changeset	435
c0c5b0ed124f initial checkin fm parents: diff changeset	436	(holder := builder bindingAt:#conflictsListHolder) isNil ifTrue:[
c0c5b0ed124f initial checkin fm parents: diff changeset	437	holder := #() asValue.
c0c5b0ed124f initial checkin fm parents: diff changeset	438	builder aspectAt:#conflictsListHolder put:holder.
c0c5b0ed124f initial checkin fm parents: diff changeset	439	].
c0c5b0ed124f initial checkin fm parents: diff changeset	440	^ holder.
c0c5b0ed124f initial checkin fm parents: diff changeset	441
c0c5b0ed124f initial checkin fm parents: diff changeset	442	"Created: / 19-04-2008 / 12:57:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	443	"Modified: / 07-10-2008 / 10:36:59 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	444	!
c0c5b0ed124f initial checkin fm parents: diff changeset	445
c0c5b0ed124f initial checkin fm parents: diff changeset	446	diffSetHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	447
c0c5b0ed124f initial checkin fm parents: diff changeset	448	diffSetHolder ifNil:
c0c5b0ed124f initial checkin fm parents: diff changeset	449	[self diffSetHolder: ChangeSet::DiffSet new asValue].
c0c5b0ed124f initial checkin fm parents: diff changeset	450	^diffSetHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	451
c0c5b0ed124f initial checkin fm parents: diff changeset	452	"Created: / 02-04-2009 / 16:09:30 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	453	"Modified: / 02-04-2009 / 18:01:37 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	454	!
c0c5b0ed124f initial checkin fm parents: diff changeset	455
c0c5b0ed124f initial checkin fm parents: diff changeset	456	diffSetHolder:aValueHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	457	diffSetHolder := aValueHolder.
c0c5b0ed124f initial checkin fm parents: diff changeset	458	diffSetHolder onChangeSend: #diffSetChanged to: self
c0c5b0ed124f initial checkin fm parents: diff changeset	459
c0c5b0ed124f initial checkin fm parents: diff changeset	460	"Modified: / 02-04-2009 / 18:01:23 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	461	!
c0c5b0ed124f initial checkin fm parents: diff changeset	462
c0c5b0ed124f initial checkin fm parents: diff changeset	463	inAOnlyLabelHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	464
c0c5b0ed124f initial checkin fm parents: diff changeset	465	\|holder\|
c0c5b0ed124f initial checkin fm parents: diff changeset	466
c0c5b0ed124f initial checkin fm parents: diff changeset	467	(holder := builder bindingAt:#inAOnlyLabelHolder) isNil ifTrue:[
c0c5b0ed124f initial checkin fm parents: diff changeset	468	holder := 'Only in A' asValue.
c0c5b0ed124f initial checkin fm parents: diff changeset	469	builder aspectAt:#inAOnlyLabelHolder put:holder.
c0c5b0ed124f initial checkin fm parents: diff changeset	470	].
c0c5b0ed124f initial checkin fm parents: diff changeset	471	^ holder.
c0c5b0ed124f initial checkin fm parents: diff changeset	472
c0c5b0ed124f initial checkin fm parents: diff changeset	473	"Created: / 19-04-2008 / 12:57:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	474	"Modified: / 07-10-2008 / 10:48:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	475	!
c0c5b0ed124f initial checkin fm parents: diff changeset	476
c0c5b0ed124f initial checkin fm parents: diff changeset	477	inAOnlyLabelHolder: anValueHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	478
c0c5b0ed124f initial checkin fm parents: diff changeset	479	builder aspectAt:#inAOnlyLabelHolder put:anValueHolder.
c0c5b0ed124f initial checkin fm parents: diff changeset	480
c0c5b0ed124f initial checkin fm parents: diff changeset	481	"Created: / 09-04-2009 / 09:19:38 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	482	!
c0c5b0ed124f initial checkin fm parents: diff changeset	483
c0c5b0ed124f initial checkin fm parents: diff changeset	484	inAOnlyListHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	485
c0c5b0ed124f initial checkin fm parents: diff changeset	486	\|holder\|
c0c5b0ed124f initial checkin fm parents: diff changeset	487
c0c5b0ed124f initial checkin fm parents: diff changeset	488	(holder := builder bindingAt:#inAOnlyListHolder) isNil ifTrue:[
c0c5b0ed124f initial checkin fm parents: diff changeset	489	holder :=#() asValue.
c0c5b0ed124f initial checkin fm parents: diff changeset	490	builder aspectAt:#inAOnlyListHolder put:holder.
c0c5b0ed124f initial checkin fm parents: diff changeset	491	].
c0c5b0ed124f initial checkin fm parents: diff changeset	492	^ holder.
c0c5b0ed124f initial checkin fm parents: diff changeset	493
c0c5b0ed124f initial checkin fm parents: diff changeset	494	"Created: / 19-04-2008 / 12:57:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	495	"Modified: / 07-10-2008 / 10:48:37 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	496	!
c0c5b0ed124f initial checkin fm parents: diff changeset	497
c0c5b0ed124f initial checkin fm parents: diff changeset	498	inBOnlyLabelHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	499
c0c5b0ed124f initial checkin fm parents: diff changeset	500	\|holder\|
c0c5b0ed124f initial checkin fm parents: diff changeset	501
c0c5b0ed124f initial checkin fm parents: diff changeset	502	(holder := builder bindingAt:#inBOnlyLabelHolder) isNil ifTrue:[
c0c5b0ed124f initial checkin fm parents: diff changeset	503	holder := 'Only in B' asValue.
c0c5b0ed124f initial checkin fm parents: diff changeset	504	builder aspectAt:#inBOnlyLabelHolder put:holder.
c0c5b0ed124f initial checkin fm parents: diff changeset	505	].
c0c5b0ed124f initial checkin fm parents: diff changeset	506	^ holder.
c0c5b0ed124f initial checkin fm parents: diff changeset	507
c0c5b0ed124f initial checkin fm parents: diff changeset	508	"Created: / 19-04-2008 / 12:57:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	509	"Modified: / 07-10-2008 / 10:48:16 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	510	!
c0c5b0ed124f initial checkin fm parents: diff changeset	511
c0c5b0ed124f initial checkin fm parents: diff changeset	512	inBOnlyLabelHolder: anValueHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	513
c0c5b0ed124f initial checkin fm parents: diff changeset	514	builder aspectAt:#inBOnlyLabelHolder put:anValueHolder.
c0c5b0ed124f initial checkin fm parents: diff changeset	515
c0c5b0ed124f initial checkin fm parents: diff changeset	516	"Created: / 09-04-2009 / 09:19:41 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	517	!
c0c5b0ed124f initial checkin fm parents: diff changeset	518
c0c5b0ed124f initial checkin fm parents: diff changeset	519	inBOnlyListHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	520
c0c5b0ed124f initial checkin fm parents: diff changeset	521	\|holder\|
c0c5b0ed124f initial checkin fm parents: diff changeset	522
c0c5b0ed124f initial checkin fm parents: diff changeset	523	(holder := builder bindingAt:#inBOnlyListHolder) isNil ifTrue:[
c0c5b0ed124f initial checkin fm parents: diff changeset	524	holder :=#() asValue.
c0c5b0ed124f initial checkin fm parents: diff changeset	525	builder aspectAt:#inBOnlyListHolder put:holder.
c0c5b0ed124f initial checkin fm parents: diff changeset	526	].
c0c5b0ed124f initial checkin fm parents: diff changeset	527	^ holder.
c0c5b0ed124f initial checkin fm parents: diff changeset	528
c0c5b0ed124f initial checkin fm parents: diff changeset	529	"Created: / 19-04-2008 / 12:57:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	530	"Modified: / 07-10-2008 / 10:48:49 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	531	!
c0c5b0ed124f initial checkin fm parents: diff changeset	532
c0c5b0ed124f initial checkin fm parents: diff changeset	533	selectionHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	534
c0c5b0ed124f initial checkin fm parents: diff changeset	535	selectionHolder ifNil:
c0c5b0ed124f initial checkin fm parents: diff changeset	536	[selectionHolder := nil asValue.
c0c5b0ed124f initial checkin fm parents: diff changeset	537	selectionHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	538	onChangeSend:#selectionChanged to: self].
c0c5b0ed124f initial checkin fm parents: diff changeset	539	^selectionHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	540
c0c5b0ed124f initial checkin fm parents: diff changeset	541	"Created: / 19-04-2008 / 12:57:04 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	542	"Modified: / 21-05-2008 / 19:30:49 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	543	!
c0c5b0ed124f initial checkin fm parents: diff changeset	544
c0c5b0ed124f initial checkin fm parents: diff changeset	545	showMergingChangeSetHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	546	"return/create the 'showMergingChangeSetHolder' value holder (automatically generated)"
c0c5b0ed124f initial checkin fm parents: diff changeset	547
c0c5b0ed124f initial checkin fm parents: diff changeset	548	showMergingChangeSetHolder isNil ifTrue:[
c0c5b0ed124f initial checkin fm parents: diff changeset	549	showMergingChangeSetHolder := false asValue
c0c5b0ed124f initial checkin fm parents: diff changeset	550	].
c0c5b0ed124f initial checkin fm parents: diff changeset	551	^ showMergingChangeSetHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	552
c0c5b0ed124f initial checkin fm parents: diff changeset	553	"Created: / 19-04-2008 / 12:57:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	554	!
c0c5b0ed124f initial checkin fm parents: diff changeset	555
c0c5b0ed124f initial checkin fm parents: diff changeset	556	titleHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	557	"return/create the 'titleHolder' value holder (automatically generated)"
c0c5b0ed124f initial checkin fm parents: diff changeset	558
c0c5b0ed124f initial checkin fm parents: diff changeset	559	titleHolder isNil ifTrue:[
c0c5b0ed124f initial checkin fm parents: diff changeset	560	titleHolder := 'Merge tool' asValue
c0c5b0ed124f initial checkin fm parents: diff changeset	561	].
c0c5b0ed124f initial checkin fm parents: diff changeset	562	^ titleHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	563
c0c5b0ed124f initial checkin fm parents: diff changeset	564	"Created: / 19-04-2008 / 12:57:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	565	!
c0c5b0ed124f initial checkin fm parents: diff changeset	566
c0c5b0ed124f initial checkin fm parents: diff changeset	567	versionsViewHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	568	"return/create the 'versionsViewHolder' value holder (automatically generated)"
c0c5b0ed124f initial checkin fm parents: diff changeset	569
c0c5b0ed124f initial checkin fm parents: diff changeset	570	versionsViewHolder isNil ifTrue:[
c0c5b0ed124f initial checkin fm parents: diff changeset	571	versionsViewHolder := HVScrollableView new.
c0c5b0ed124f initial checkin fm parents: diff changeset	572	].
c0c5b0ed124f initial checkin fm parents: diff changeset	573	^ versionsViewHolder
c0c5b0ed124f initial checkin fm parents: diff changeset	574
c0c5b0ed124f initial checkin fm parents: diff changeset	575	"Created: / 07-10-2008 / 08:58:08 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	576	"Modified: / 06-11-2008 / 14:49:40 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	577	! !
c0c5b0ed124f initial checkin fm parents: diff changeset	578
c0c5b0ed124f initial checkin fm parents: diff changeset	579	!SmalltalkDiffTool methodsFor:'change & update'!
c0c5b0ed124f initial checkin fm parents: diff changeset	580
c0c5b0ed124f initial checkin fm parents: diff changeset	581	changeSetsChanged
c0c5b0ed124f initial checkin fm parents: diff changeset	582
c0c5b0ed124f initial checkin fm parents: diff changeset	583	self diffSet:
c0c5b0ed124f initial checkin fm parents: diff changeset	584	((changeSetA notNil and:[changeSetB notNil])
c0c5b0ed124f initial checkin fm parents: diff changeset	585	ifTrue:[changeSetA diffSetsAgainst: changeSetB]
c0c5b0ed124f initial checkin fm parents: diff changeset	586	ifFalse:[ChangeSet::DiffSet new])
c0c5b0ed124f initial checkin fm parents: diff changeset	587
c0c5b0ed124f initial checkin fm parents: diff changeset	588	"Created: / 07-10-2008 / 10:42:33 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	589	!
c0c5b0ed124f initial checkin fm parents: diff changeset	590
c0c5b0ed124f initial checkin fm parents: diff changeset	591	diffSetChanged
c0c5b0ed124f initial checkin fm parents: diff changeset	592
c0c5b0ed124f initial checkin fm parents: diff changeset	593	\|onlyInA changed onlyInB\|
c0c5b0ed124f initial checkin fm parents: diff changeset	594
c0c5b0ed124f initial checkin fm parents: diff changeset	595	self builder ifNil:[^self].
c0c5b0ed124f initial checkin fm parents: diff changeset	596	self diffSet ifNil:[^self].
c0c5b0ed124f initial checkin fm parents: diff changeset	597	onlyInA := self diffSet onlyInReceiver ? #()
c0c5b0ed124f initial checkin fm parents: diff changeset	598	collect:[:change \| self diffItemClass versionA:change ].
c0c5b0ed124f initial checkin fm parents: diff changeset	599	changed := self diffSet changed ? #()
c0c5b0ed124f initial checkin fm parents: diff changeset	600	collect:[:changes \| self diffItemClass versionA:changes first versionB:changes second ].
c0c5b0ed124f initial checkin fm parents: diff changeset	601	onlyInB := self diffSet onlyInArg ? #()
c0c5b0ed124f initial checkin fm parents: diff changeset	602	collect:[:change \| self diffItemClass versionB:change ].
c0c5b0ed124f initial checkin fm parents: diff changeset	603	self inAOnlyListHolder value:onlyInA.
c0c5b0ed124f initial checkin fm parents: diff changeset	604	self conflictsListHolder value:changed.
c0c5b0ed124f initial checkin fm parents: diff changeset	605	self inBOnlyListHolder value:onlyInB.
c0c5b0ed124f initial checkin fm parents: diff changeset	606	self resolutionChanged
c0c5b0ed124f initial checkin fm parents: diff changeset	607
c0c5b0ed124f initial checkin fm parents: diff changeset	608	"Created: / 07-10-2008 / 10:42:45 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	609	"Modified: / 02-04-2009 / 16:43:52 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	610	!
c0c5b0ed124f initial checkin fm parents: diff changeset	611
c0c5b0ed124f initial checkin fm parents: diff changeset	612	resolutionChanged
c0c5b0ed124f initial checkin fm parents: diff changeset	613
c0c5b0ed124f initial checkin fm parents: diff changeset	614	self inAOnlyListHolder changed.
c0c5b0ed124f initial checkin fm parents: diff changeset	615	self conflictsListHolder changed.
c0c5b0ed124f initial checkin fm parents: diff changeset	616	self inBOnlyListHolder changed.
c0c5b0ed124f initial checkin fm parents: diff changeset	617
c0c5b0ed124f initial checkin fm parents: diff changeset	618	"Created: / 19-04-2008 / 12:57:20 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	619	!
c0c5b0ed124f initial checkin fm parents: diff changeset	620
c0c5b0ed124f initial checkin fm parents: diff changeset	621	selectionChanged
c0c5b0ed124f initial checkin fm parents: diff changeset	622
c0c5b0ed124f initial checkin fm parents: diff changeset	623	self showVersionsFor:
c0c5b0ed124f initial checkin fm parents: diff changeset	624	(self selection size = 1 ifTrue:[self selection anyOne] ifFalse:[nil])
c0c5b0ed124f initial checkin fm parents: diff changeset	625
c0c5b0ed124f initial checkin fm parents: diff changeset	626	"Created: / 19-04-2008 / 12:57:21 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	627	"Modified: / 21-10-2008 / 09:31:53 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	628	! !
c0c5b0ed124f initial checkin fm parents: diff changeset	629
c0c5b0ed124f initial checkin fm parents: diff changeset	630	!SmalltalkDiffTool methodsFor:'hooks'!
c0c5b0ed124f initial checkin fm parents: diff changeset	631
c0c5b0ed124f initial checkin fm parents: diff changeset	632	commonPostBuild
c0c5b0ed124f initial checkin fm parents: diff changeset	633
c0c5b0ed124f initial checkin fm parents: diff changeset	634	self diffSetChanged
c0c5b0ed124f initial checkin fm parents: diff changeset	635
c0c5b0ed124f initial checkin fm parents: diff changeset	636	"Created: / 07-10-2008 / 10:47:10 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	637	!
c0c5b0ed124f initial checkin fm parents: diff changeset	638
c0c5b0ed124f initial checkin fm parents: diff changeset	639	postBuildVersionAListWidget: widget
c0c5b0ed124f initial checkin fm parents: diff changeset	640
c0c5b0ed124f initial checkin fm parents: diff changeset	641	widget scrolledView backgroundColor: self versionAColor
c0c5b0ed124f initial checkin fm parents: diff changeset	642
c0c5b0ed124f initial checkin fm parents: diff changeset	643	"Created: / 19-04-2008 / 12:57:36 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	644	!
c0c5b0ed124f initial checkin fm parents: diff changeset	645
c0c5b0ed124f initial checkin fm parents: diff changeset	646	postBuildVersionBListWidget: widget
c0c5b0ed124f initial checkin fm parents: diff changeset	647
c0c5b0ed124f initial checkin fm parents: diff changeset	648	widget scrolledView backgroundColor: self versionBColor
c0c5b0ed124f initial checkin fm parents: diff changeset	649
c0c5b0ed124f initial checkin fm parents: diff changeset	650	"Created: / 19-04-2008 / 12:57:37 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	651	! !
c0c5b0ed124f initial checkin fm parents: diff changeset	652
c0c5b0ed124f initial checkin fm parents: diff changeset	653	!SmalltalkDiffTool methodsFor:'initialization'!
c0c5b0ed124f initial checkin fm parents: diff changeset	654
c0c5b0ed124f initial checkin fm parents: diff changeset	655	initialize
c0c5b0ed124f initial checkin fm parents: diff changeset	656
c0c5b0ed124f initial checkin fm parents: diff changeset	657	super initialize.
c0c5b0ed124f initial checkin fm parents: diff changeset	658	self createBuilder.
c0c5b0ed124f initial checkin fm parents: diff changeset	659
c0c5b0ed124f initial checkin fm parents: diff changeset	660	"Created: / 07-10-2008 / 10:57:27 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	661	"Modified: / 02-04-2009 / 16:10:12 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	662	! !
c0c5b0ed124f initial checkin fm parents: diff changeset	663
c0c5b0ed124f initial checkin fm parents: diff changeset	664	!SmalltalkDiffTool methodsFor:'private'!
c0c5b0ed124f initial checkin fm parents: diff changeset	665
c0c5b0ed124f initial checkin fm parents: diff changeset	666	showVersionAAndBAndMergedFor: mergeItem
c0c5b0ed124f initial checkin fm parents: diff changeset	667
c0c5b0ed124f initial checkin fm parents: diff changeset	668	^self showVersionAAndBFor: mergeItem
c0c5b0ed124f initial checkin fm parents: diff changeset	669
c0c5b0ed124f initial checkin fm parents: diff changeset	670	"Created: / 19-04-2008 / 12:56:09 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	671	!
c0c5b0ed124f initial checkin fm parents: diff changeset	672
c0c5b0ed124f initial checkin fm parents: diff changeset	673	showVersionAAndBFor: mergeItem
c0c5b0ed124f initial checkin fm parents: diff changeset	674
c0c5b0ed124f initial checkin fm parents: diff changeset	675	\| diffView \|
c0c5b0ed124f initial checkin fm parents: diff changeset	676
c0c5b0ed124f initial checkin fm parents: diff changeset	677	diffView := (self versionsView isKindOf:DiffTextView)
c0c5b0ed124f initial checkin fm parents: diff changeset	678	ifFalse:[DiffTextView new]
c0c5b0ed124f initial checkin fm parents: diff changeset	679	ifTrue:[self versionsView].
c0c5b0ed124f initial checkin fm parents: diff changeset	680
c0c5b0ed124f initial checkin fm parents: diff changeset	681	"/self diff2TextView initialize.
c0c5b0ed124f initial checkin fm parents: diff changeset	682	diffView
c0c5b0ed124f initial checkin fm parents: diff changeset	683	text1: mergeItem versionASource
c0c5b0ed124f initial checkin fm parents: diff changeset	684	text2: mergeItem versionBSource.
c0c5b0ed124f initial checkin fm parents: diff changeset	685	diffView leftTextView backgroundColor: self versionAColor.
c0c5b0ed124f initial checkin fm parents: diff changeset	686	diffView rightTextView backgroundColor: self versionBColor.
c0c5b0ed124f initial checkin fm parents: diff changeset	687	self versionsView: diffView
c0c5b0ed124f initial checkin fm parents: diff changeset	688
c0c5b0ed124f initial checkin fm parents: diff changeset	689	"Modified: / 07-12-2007 / 21:31:12 / janfrog"
c0c5b0ed124f initial checkin fm parents: diff changeset	690	"Created: / 19-04-2008 / 12:56:07 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	691	"Modified: / 07-10-2008 / 10:28:40 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	692	!
c0c5b0ed124f initial checkin fm parents: diff changeset	693
c0c5b0ed124f initial checkin fm parents: diff changeset	694	showVersionAAndMergedFor: mergeItem
c0c5b0ed124f initial checkin fm parents: diff changeset	695
c0c5b0ed124f initial checkin fm parents: diff changeset	696	^self showVersionAFor: mergeItem
c0c5b0ed124f initial checkin fm parents: diff changeset	697
c0c5b0ed124f initial checkin fm parents: diff changeset	698	"Created: / 19-04-2008 / 12:56:08 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	699	!
c0c5b0ed124f initial checkin fm parents: diff changeset	700
c0c5b0ed124f initial checkin fm parents: diff changeset	701	showVersionAFor: aMergeItem
c0c5b0ed124f initial checkin fm parents: diff changeset	702
c0c5b0ed124f initial checkin fm parents: diff changeset	703	\| textView \|
c0c5b0ed124f initial checkin fm parents: diff changeset	704
c0c5b0ed124f initial checkin fm parents: diff changeset	705	textView := (self versionsView isKindOf:TextView)
c0c5b0ed124f initial checkin fm parents: diff changeset	706	ifFalse:[TextView new]
c0c5b0ed124f initial checkin fm parents: diff changeset	707	ifTrue:[self versionsView].
c0c5b0ed124f initial checkin fm parents: diff changeset	708
c0c5b0ed124f initial checkin fm parents: diff changeset	709	textView contents: aMergeItem versionASource.
c0c5b0ed124f initial checkin fm parents: diff changeset	710	textView backgroundColor: self versionAColor.
c0c5b0ed124f initial checkin fm parents: diff changeset	711	self versionsView: textView.
c0c5b0ed124f initial checkin fm parents: diff changeset	712
c0c5b0ed124f initial checkin fm parents: diff changeset	713	"Created: / 19-04-2008 / 12:56:08 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	714	"Modified: / 07-10-2008 / 10:29:21 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	715	!
c0c5b0ed124f initial checkin fm parents: diff changeset	716
c0c5b0ed124f initial checkin fm parents: diff changeset	717	showVersionBAndMergedFor: mergeItem
c0c5b0ed124f initial checkin fm parents: diff changeset	718
c0c5b0ed124f initial checkin fm parents: diff changeset	719	^self showVersionBFor: mergeItem
c0c5b0ed124f initial checkin fm parents: diff changeset	720
c0c5b0ed124f initial checkin fm parents: diff changeset	721	"Created: / 19-04-2008 / 12:56:08 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	722	!
c0c5b0ed124f initial checkin fm parents: diff changeset	723
c0c5b0ed124f initial checkin fm parents: diff changeset	724	showVersionBFor: aMergeItem
c0c5b0ed124f initial checkin fm parents: diff changeset	725
c0c5b0ed124f initial checkin fm parents: diff changeset	726	\| textView \|
c0c5b0ed124f initial checkin fm parents: diff changeset	727
c0c5b0ed124f initial checkin fm parents: diff changeset	728	textView := (self versionsView isKindOf:TextView)
c0c5b0ed124f initial checkin fm parents: diff changeset	729	ifFalse:[TextView new]
c0c5b0ed124f initial checkin fm parents: diff changeset	730	ifTrue:[self versionsView].
c0c5b0ed124f initial checkin fm parents: diff changeset	731
c0c5b0ed124f initial checkin fm parents: diff changeset	732	textView contents: aMergeItem versionBSource.
c0c5b0ed124f initial checkin fm parents: diff changeset	733	textView backgroundColor: self versionBColor.
c0c5b0ed124f initial checkin fm parents: diff changeset	734	self versionsView: textView.
c0c5b0ed124f initial checkin fm parents: diff changeset	735
c0c5b0ed124f initial checkin fm parents: diff changeset	736	"Created: / 19-04-2008 / 12:56:08 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	737	"Modified: / 07-10-2008 / 10:29:33 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	738	!
c0c5b0ed124f initial checkin fm parents: diff changeset	739
c0c5b0ed124f initial checkin fm parents: diff changeset	740	showVersionsFor: mergeItem
c0c5b0ed124f initial checkin fm parents: diff changeset	741
c0c5b0ed124f initial checkin fm parents: diff changeset	742	mergeItem ifNil:[^self versionsView: nil].
c0c5b0ed124f initial checkin fm parents: diff changeset	743	mergeItem showVersionsIn: self.
c0c5b0ed124f initial checkin fm parents: diff changeset	744
c0c5b0ed124f initial checkin fm parents: diff changeset	745	"Created: / 19-04-2008 / 12:56:08 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	746	"Modified: / 07-10-2008 / 09:03:12 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	747	!
c0c5b0ed124f initial checkin fm parents: diff changeset	748
c0c5b0ed124f initial checkin fm parents: diff changeset	749	versionsView
c0c5b0ed124f initial checkin fm parents: diff changeset	750
c0c5b0ed124f initial checkin fm parents: diff changeset	751	^self versionsViewHolder value scrolledView
c0c5b0ed124f initial checkin fm parents: diff changeset	752
c0c5b0ed124f initial checkin fm parents: diff changeset	753	"Created: / 07-10-2008 / 09:59:52 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	754	"Modified: / 07-10-2008 / 11:05:26 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	755	!
c0c5b0ed124f initial checkin fm parents: diff changeset	756
c0c5b0ed124f initial checkin fm parents: diff changeset	757	versionsView: aView
c0c5b0ed124f initial checkin fm parents: diff changeset	758
c0c5b0ed124f initial checkin fm parents: diff changeset	759	self versionsViewHolder value scrolledView:aView
c0c5b0ed124f initial checkin fm parents: diff changeset	760
c0c5b0ed124f initial checkin fm parents: diff changeset	761	"Created: / 07-10-2008 / 08:58:48 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	762	"Modified: / 07-10-2008 / 11:05:42 / Jan Vrany <vranyj1@fel.cvut.cz>"
c0c5b0ed124f initial checkin fm parents: diff changeset	763	! !
c0c5b0ed124f initial checkin fm parents: diff changeset	764
c0c5b0ed124f initial checkin fm parents: diff changeset	765	!SmalltalkDiffTool class methodsFor:'documentation'!
c0c5b0ed124f initial checkin fm parents: diff changeset	766
c0c5b0ed124f initial checkin fm parents: diff changeset	767	version
8905 0c1d8d4dcce7 update #version_SVN with § as keyword expansion character fm parents: 8875 diff changeset	768	^ '$Header: /cvs/stx/stx/libtool/Tools__SmalltalkDiffTool.st,v 1.5 2009-10-08 12:01:26 fm Exp $'
8805 c5a11707730d changed: #version_SVN fm parents: 8774 diff changeset	769	!
c5a11707730d changed: #version_SVN fm parents: 8774 diff changeset	770
c5a11707730d changed: #version_SVN fm parents: 8774 diff changeset	771	version_CVS
8905 0c1d8d4dcce7 update #version_SVN with § as keyword expansion character fm parents: 8875 diff changeset	772	^ '$Header: /cvs/stx/stx/libtool/Tools__SmalltalkDiffTool.st,v 1.5 2009-10-08 12:01:26 fm Exp $'
8805 c5a11707730d changed: #version_SVN fm parents: 8774 diff changeset	773	!
c5a11707730d changed: #version_SVN fm parents: 8774 diff changeset	774
c5a11707730d changed: #version_SVN fm parents: 8774 diff changeset	775	version_SVN
8905 0c1d8d4dcce7 update #version_SVN with § as keyword expansion character fm parents: 8875 diff changeset	776	^'�Id: Tools__SmalltalkDiffTool.st 117 2009-08-09 13:16:11Z vranyj1 �'
8774 c0c5b0ed124f initial checkin fm parents: diff changeset	777	! !

author	Claus Gittinger <cg@exept.de>
	Mon, 14 Feb 2011 18:16:36 +0100
branch	initialV
changeset 9777	82d9e1236f1f
parent 8905	0c1d8d4dcce7
child 10018	112ce09e7f81
permissions	-rw-r--r--