hg/stx-libtool: VersionDiffBrowser.st@5c129972b1fd (annotated)

2626 4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	1	"
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	2	COPYRIGHT (c) 2000 by eXept Software AG
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	3	All Rights Reserved
2626 4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	4
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	5	This software is furnished under a license and may be used
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	6	only in accordance with the terms of that license and with the
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	7	inclusion of the above copyright notice. This software may not
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	8	be provided or otherwise made available to, or used by, any
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	9	other person. No title to or ownership of the software is
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	10	hereby transferred.
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	11	"
2650 447c99ac6f76 oops - inspect & browse menu was broken. Claus Gittinger <cg@exept.de> parents: 2626 diff changeset	12	"{ Package: 'stx:libtool' }"
447c99ac6f76 oops - inspect & browse menu was broken. Claus Gittinger <cg@exept.de> parents: 2626 diff changeset	13
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	14	ApplicationModel subclass:#VersionDiffBrowser
2856 754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	15	instanceVariableNames:'classChangeSet diffTextView boxAVisible boxBVisible boxMVisible
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	16	classIfSingleClassDiff versionAIfSingleClassDiff
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	17	versionBIfSingleClassDiff changedLabelHolder diffTextLabelA
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	18	diffTextLabelB methodText methodsChanged methodsChangedSelection
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	19	methodsOnlyInA methodsOnlyInASelection methodsOnlyInB
5182 0b3ecd84056a * empty log message * Claus Gittinger <cg@exept.de> parents: 5150 diff changeset	20	methodsOnlyInBSelection onlyInALabelHolder onlyInBLabelHolder
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	21	classHolder versionAHolder versionBHolder infoHolder
12205 f210b6224ef0 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	22	includeExtensionsHolder canIncludeExtensionsHolder'
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	23	classVariableNames:''
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	24	poolDictionaries:''
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	25	category:'Interface-Browsers'
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	26	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	27
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	28	HierarchicalItem subclass:#ClassChangeSet
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	29	instanceVariableNames:'classBeingCompared labelA labelB diffSet versionA versionB'
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	30	classVariableNames:''
ef306e387021 checkin from browser ps parents: 2486 diff changeset	31	poolDictionaries:''
ef306e387021 checkin from browser ps parents: 2486 diff changeset	32	privateIn:VersionDiffBrowser
ef306e387021 checkin from browser ps parents: 2486 diff changeset	33	!
ef306e387021 checkin from browser ps parents: 2486 diff changeset	34
2626 4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	35	!VersionDiffBrowser class methodsFor:'documentation'!
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	36
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	37	copyright
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	38	"
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	39	COPYRIGHT (c) 2000 by eXept Software AG
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	40	All Rights Reserved
2626 4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	41
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	42	This software is furnished under a license and may be used
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	43	only in accordance with the terms of that license and with the
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	44	inclusion of the above copyright notice. This software may not
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	45	be provided or otherwise made available to, or used by, any
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	46	other person. No title to or ownership of the software is
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	47	hereby transferred.
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	48	"
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	49
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	50	!
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	51
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	52	documentation
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	53	"
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	54	This is not yet finished (work in progress).
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	55
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	56	A browser to show differences between class versions,
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	57	allowing easy comparison; will also eventually add capabilities
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	58	to checkIn / load classes into / from the repository.
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	59
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	60	[see also:]
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	61
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	62	[instance variables:]
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	63
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	64	[class variables:]
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	65	"
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	66
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	67
4ee750caddab doc Claus Gittinger <cg@exept.de> parents: 2585 diff changeset	68	! !
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	69
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	70	!VersionDiffBrowser class methodsFor:'interface specs'!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	71
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	72	windowSpec
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	73	"This resource specification was automatically generated
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	74	by the UIPainter of ST/X."
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	75
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	76	"Do not manually edit this!! If it is corrupted,
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	77	the UIPainter may not be able to read the specification."
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	78
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	79	"
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	80	UIPainter new openOnClass:VersionDiffBrowser andSelector:#windowSpec
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	81	VersionDiffBrowser new openInterface:#windowSpec
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	82	VersionDiffBrowser open
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	83	"
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	84
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	85	<resource: #canvas>
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	86
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	87	^
5150 4a469455c4b4 Remove max windowsize constraint from windowSpecs. Stefan Vogel <sv@exept.de> parents: 4653 diff changeset	88	#(FullSpec
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	89	name: windowSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	90	window:
5150 4a469455c4b4 Remove max windowsize constraint from windowSpecs. Stefan Vogel <sv@exept.de> parents: 4653 diff changeset	91	(WindowSpec
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	92	label: 'Version DiffBrowser'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	93	name: 'Version DiffBrowser'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	94	min: (Point 10 10)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	95	bounds: (Rectangle 0 0 865 504)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	96	menu: mainMenu
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	97	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	98	component:
5150 4a469455c4b4 Remove max windowsize constraint from windowSpecs. Stefan Vogel <sv@exept.de> parents: 4653 diff changeset	99	(SpecCollection
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	100	collection: (
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	101	(VariableVerticalPanelSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	102	name: 'VariableVerticalPanel1'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	103	layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 -25 1.0)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	104	component:
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	105	(SpecCollection
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	106	collection: (
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	107	(HorizontalPanelViewSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	108	name: 'TopHorizontalPanel'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	109	horizontalLayout: fit
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	110	verticalLayout: fit
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	111	horizontalSpace: 3
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	112	verticalSpace: 3
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	113	component:
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	114	(SpecCollection
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	115	collection: (
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	116	(ViewSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	117	name: 'BoxA'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	118	level: 0
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	119	visibilityChannel: boxAVisible
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	120	component:
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	121	(SpecCollection
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	122	collection: (
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	123	(LabelSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	124	label: 'Only in A'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	125	name: 'OnlyInALabel'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	126	layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	127	translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	128	labelChannel: onlyInALabelHolder
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	129	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	130	(SequenceViewSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	131	name: 'ListA'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	132	layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	133	model: methodsOnlyInASelection
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	134	menu: menuA
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	135	hasHorizontalScrollBar: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	136	hasVerticalScrollBar: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	137	miniScrollerHorizontal: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	138	doubleClickSelector: methodInADoubleClicked:
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	139	valueChangeSelector: methodsOnlyInASelectionChanged
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	140	useIndex: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	141	sequenceList: methodsOnlyInA
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	142	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	143	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	144
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	145	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	146	extent: (Point 286 199)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	147	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	148	(ViewSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	149	name: 'BoxM'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	150	visibilityChannel: boxMVisible
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	151	component:
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	152	(SpecCollection
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	153	collection: (
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	154	(LabelSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	155	label: 'Changed'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	156	name: 'ChangedLabel'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	157	layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	158	translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	159	labelChannel: changedLabelHolder
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	160	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	161	(SequenceViewSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	162	name: 'ListM'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	163	layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	164	model: methodsChangedSelection
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	165	menu: menuM
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	166	hasHorizontalScrollBar: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	167	hasVerticalScrollBar: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	168	miniScrollerHorizontal: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	169	doubleClickSelector: methodInChangedDoubleClicked:
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	170	valueChangeSelector: methodsChangedSelectionChanged
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	171	useIndex: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	172	sequenceList: methodsChanged
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	173	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	174	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	175
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	176	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	177	extent: (Point 286 199)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	178	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	179	(ViewSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	180	name: 'BoxB'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	181	visibilityChannel: boxBVisible
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	182	component:
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	183	(SpecCollection
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	184	collection: (
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	185	(LabelSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	186	label: 'Only in B'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	187	name: 'OnlyInBLabel'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	188	layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 20 0)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	189	translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	190	labelChannel: onlyInBLabelHolder
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	191	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	192	(SequenceViewSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	193	name: 'ListB'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	194	layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 -3 1.0)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	195	model: methodsOnlyInBSelection
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	196	menu: menuB
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	197	hasHorizontalScrollBar: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	198	hasVerticalScrollBar: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	199	miniScrollerHorizontal: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	200	doubleClickSelector: methodInBDoubleClicked:
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	201	valueChangeSelector: methodsOnlyInBSelectionChanged
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	202	useIndex: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	203	sequenceList: methodsOnlyInB
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	204	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	205	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	206
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	207	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	208	extent: (Point 287 199)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	209	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	210	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	211
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	212	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	213	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	214	(ViewSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	215	name: 'Box4'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	216	component:
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	217	(SpecCollection
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	218	collection: (
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	219	(ViewSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	220	name: 'diffTextViewBox'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	221	layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	222	initiallyInvisible: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	223	component:
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	224	(SpecCollection
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	225	collection: (
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	226	(LabelSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	227	label: 'A'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	228	name: 'DiffTextLabelA'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	229	layout: (LayoutFrame 0 0 0 0 0 0.5 20 0)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	230	translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	231	labelChannel: diffTextLabelA
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	232	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	233	(LabelSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	234	label: 'B'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	235	name: 'DiffTextLabelB'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	236	layout: (LayoutFrame 0 0.5 0 0 0 1 20 0)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	237	translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	238	labelChannel: diffTextLabelB
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	239	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	240	(ArbitraryComponentSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	241	name: 'diffTextView'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	242	layout: (LayoutFrame 0 0.0 20 0.0 0 1.0 0 1.0)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	243	hasBorder: false
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	244	component: diffTextView
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	245	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	246	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	247
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	248	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	249	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	250	(CodeViewSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	251	name: 'singleTextView'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	252	layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	253	model: methodText
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	254	hasHorizontalScrollBar: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	255	hasVerticalScrollBar: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	256	miniScrollerHorizontal: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	257	isReadOnly: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	258	hasKeyboardFocusInitially: false
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	259	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	260	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	261
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	262	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	263	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	264	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	265
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	266	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	267	handles: (Any 0.42379958246347 1.0)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	268	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	269	(LabelSpec
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	270	name: 'InfoLabel'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	271	layout: (LayoutFrame 0 0 -25 1 0 1 0 1)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	272	level: -1
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	273	translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	274	labelChannel: infoHolder
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	275	adjust: left
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	276	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	277	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	278
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	279	)
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	280	)
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	281	! !
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	282
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	283	!VersionDiffBrowser class methodsFor:'menu specs'!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	284
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	285	mainMenu
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	286	"This resource specification was automatically generated
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	287	by the MenuEditor of ST/X."
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	288
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	289	"Do not manually edit this!! If it is corrupted,
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	290	the MenuEditor may not be able to read the specification."
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	291
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	292
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	293	"
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	294	MenuEditor new openOnClass:VersionDiffBrowser andSelector:#mainMenu
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	295	(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser mainMenu)) startUp
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	296	"
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	297
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	298	<resource: #menu>
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	299
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	300	^
7419 e4e108674fe6 conditionalRight in startGroup Claus Gittinger <cg@exept.de> parents: 7396 diff changeset	301	#(Menu
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	302	(
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	303	(MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	304	label: 'File'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	305	translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	306	submenu:
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	307	(Menu
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	308	(
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	309	(MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	310	label: 'Create PatchFile...'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	311	itemValue: createPatchFile
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	312	translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	313	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	314	(MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	315	label: '-'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	316	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	317	(MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	318	label: 'Exit'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	319	itemValue: closeRequest
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	320	translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	321	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	322	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	323	nil
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	324	nil
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	325	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	326	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	327	(MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	328	label: 'View'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	329	translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	330	submenu:
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	331	(Menu
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	332	(
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	333	(MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	334	enabled: canIncludeExtensionsHolder
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	335	label: 'Include Extensions'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	336	itemValue: includeExtensions:
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	337	translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	338	indication: includeExtensionsHolder
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	339	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	340	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	341	nil
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	342	nil
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	343	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	344	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	345	(MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	346	label: 'Help'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	347	translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	348	startGroup: conditionalRight
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	349	submenu:
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	350	(Menu
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	351	(
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	352	(MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	353	label: 'Documentation'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	354	itemValue: openDocumentation
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	355	translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	356	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	357	(MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	358	label: '-'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	359	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	360	(MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	361	label: 'About this Application...'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	362	itemValue: openAboutThisApplication
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	363	translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	364	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	365	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	366	nil
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	367	nil
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	368	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	369	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	370	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	371	nil
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	372	nil
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	373	)
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	374	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	375
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	376	menuA
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	377	"This resource specification was automatically generated
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	378	by the MenuEditor of ST/X."
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	379
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	380	"Do not manually edit this!! If it is corrupted,
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	381	the MenuEditor may not be able to read the specification."
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	382
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	383	"
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	384	MenuEditor new openOnClass:VersionDiffBrowser andSelector:#menu1
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	385	(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser menu1)) startUp
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	386	"
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	387
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	388	<resource: #menu>
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	389
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	390	^
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	391	#(#Menu
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	392	#(
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	393	#(#MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	394	#label: 'Apply'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	395	#translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	396	#value: #applySelectedChangeInA
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	397	#enabled: #hasChangeSelectedInA
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	398	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	399	#(#MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	400	#label: 'Browse'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	401	#translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	402	#value: #browseClassInA
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	403	#enabled: #hasChangeSelectedInA
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	404	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	405	#(#MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	406	#label: '-'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	407	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	408	#(#MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	409	#label: 'Inspect'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	410	#translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	411	#value: #inspectSelectedChangeInA
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	412	#choiceValue: 'nil "UndefinedObject" '
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	413	#enabled: #hasChangeSelectedInA
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	414	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	415	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	416	nil
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	417	nil
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	418	)
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	419	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	420
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	421	menuB
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	422	"This resource specification was automatically generated
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	423	by the MenuEditor of ST/X."
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	424
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	425	"Do not manually edit this!! If it is corrupted,
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	426	the MenuEditor may not be able to read the specification."
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	427
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	428	"
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	429	MenuEditor new openOnClass:VersionDiffBrowser andSelector:#menuB
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	430	(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser menuB)) startUp
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	431	"
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	432
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	433	<resource: #menu>
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	434
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	435	^
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	436	#(#Menu
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	437	#(
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	438	#(#MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	439	#label: 'Apply'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	440	#translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	441	#value: #applySelectedChangeInB
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	442	#enabled: #hasChangeSelectedInB
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	443	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	444	#(#MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	445	#label: 'Browse'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	446	#translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	447	#value: #browseClassInB
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	448	#enabled: #hasChangeSelectedInB
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	449	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	450	#(#MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	451	#label: '-'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	452	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	453	#(#MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	454	#label: 'Remove in Image'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	455	#translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	456	#value: #removeSelectedChangeInBFromImage
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	457	#enabled: #hasChangeSelectedInB
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	458	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	459	#(#MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	460	#label: '-'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	461	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	462	#(#MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	463	#label: 'Inspect'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	464	#translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	465	#value: #inspectSelectedChangeInB
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	466	#choiceValue: 'nil "UndefinedObject" '
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	467	#enabled: #hasChangeSelectedInB
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	468	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	469	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	470	nil
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	471	nil
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	472	)
9550 531c77d5d3e3 added: #removeSelectedChangeInBFromImage Claus Gittinger <cg@exept.de> parents: 9383 diff changeset	473
531c77d5d3e3 added: #removeSelectedChangeInBFromImage Claus Gittinger <cg@exept.de> parents: 9383 diff changeset	474	"Modified: / 15-08-2010 / 21:24:49 / cg"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	475	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	476
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	477	menuM
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	478	"This resource specification was automatically generated
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	479	by the MenuEditor of ST/X."
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	480
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	481	"Do not manually edit this!! If it is corrupted,
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	482	the MenuEditor may not be able to read the specification."
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	483
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	484	"
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	485	MenuEditor new openOnClass:VersionDiffBrowser andSelector:#menu1
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	486	(Menu new fromLiteralArrayEncoding:(VersionDiffBrowser menu1)) startUp
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	487	"
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	488
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	489	<resource: #menu>
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	490
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	491	^
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	492	#(#Menu
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	493	#(
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	494	#(#MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	495	#label: 'Browse'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	496	#translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	497	#value: #browseClassInM
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	498	#enabled: #hasChangeSelectedInM
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	499	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	500	#(#MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	501	#label: '-'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	502	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	503	#(#MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	504	#label: 'Apply Left Version'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	505	#translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	506	#value: #acceptInLeftView
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	507	#enabled: #hasChangeSelectedInM
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	508	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	509	#(#MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	510	#label: 'Apply Right Version'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	511	#translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	512	#value: #acceptInRightView
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	513	#enabled: #hasChangeSelectedInM
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	514	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	515	#(#MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	516	#label: '-'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	517	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	518	#(#MenuItem
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	519	#label: 'Inspect both'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	520	#translateLabel: true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	521	#value: #inspectSelectedChangeInM
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	522	#choiceValue: 'nil "UndefinedObject" '
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	523	#enabled: #hasChangeSelectedInM
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	524	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	525	)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	526	nil
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	527	nil
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	528	)
7833 75997a5142bb * empty log message * Claus Gittinger <cg@exept.de> parents: 7499 diff changeset	529
75997a5142bb * empty log message * Claus Gittinger <cg@exept.de> parents: 7499 diff changeset	530	"Modified: / 31-08-2007 / 14:16:39 / cg"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	531	! !
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	532
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	533	!VersionDiffBrowser class methodsFor:'plugIn spec'!
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	534
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	535	aspectSelectors
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	536	"This resource specification was automatically generated
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	537	by the UIPainter of ST/X."
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	538
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	539	"Do not manually edit this. If it is corrupted,
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	540	the UIPainter may not be able to read the specification."
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	541
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	542	"Return a description of exported aspects;
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	543	these can be connected to aspects of an embedding application
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	544	(if this app is embedded in a subCanvas)."
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	545
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	546	^ #(
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	547	#changedLabelHolder
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	548	#onlyInALabelHolder
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	549	#onlyInBLabelHolder
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	550	).
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	551
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	552	! !
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	553
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	554	!VersionDiffBrowser class methodsFor:'startup'!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	555
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	556	openOnClass:aClass againstVersion:aVersionA
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	557	"create a VersionDiffBrowser instance and set the class change set of the
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	558	browser. The class diff set is generated from aClasses current against some version
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	559	via the source code manager."
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	560
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	561	\|theBrowser\|
2224 0e4250930948 checkin from browser Claus Gittinger <cg@exept.de> parents: 2221 diff changeset	562
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	563	theBrowser := self new.
ef306e387021 checkin from browser ps parents: 2486 diff changeset	564	theBrowser allButOpen.
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	565	theBrowser setupForClass:aClass againstVersion:aVersionA.
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	566	theBrowser openWindow.
ef306e387021 checkin from browser ps parents: 2486 diff changeset	567	^ theBrowser.
2224 0e4250930948 checkin from browser Claus Gittinger <cg@exept.de> parents: 2221 diff changeset	568
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	569	"
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	570	self openOnClass:Array againstVersion:'1.116'
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	571	self openOnClass:Array againstVersion:nil - against the version on which Array is based upon
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	572	self openOnClass:Array againstVersion:#newest - against the newest repository version
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	573
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	574	self openOnClass:VersionDiffBrowser againstVersion:nil
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	575	self openOnClass:VersionDiffBrowser againstVersion:#newest
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	576
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	577	(self openOnClass:ByteArray againstVersion:'1.116') includeExtensionsHolder value:true
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	578	"
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	579	!
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	580
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	581	openOnClass:classA labelA:aLabelA andClass:classB labelB:aLabelB title:ignoredTitle
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	582	"create a VersionDiffBrowser instance and set the class change set of the
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	583	browser. The class diff set is generated from two classes."
2949 7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	584
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	585	^ self
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	586	openOnClass:classA labelA:aLabelA
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	587	andClass:classB labelB:aLabelB
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	588	title:ignoredTitle ifSame:nil
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	589
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	590	"
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	591	self
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	592	openOnClass:Array labelA:'Array'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	593	andClass:Collection labelB:'Collection'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	594	title:'Array vs. Collection'
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	595	"
2949 7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	596	!
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	597
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	598	openOnClass:classA labelA:aLabelA andClass:classB labelB:aLabelB title:ignoredTitle ifSame:sameAction
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	599	"create a VersionDiffBrowser instance and set the class change set of the
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	600	browser. The class diff set is generated from two classes."
2949 7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	601
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	602	\|classChangeSet\|
2949 7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	603
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	604	classChangeSet := ClassChangeSet newForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB.
05cf7ae53ada added: fm parents: 8811 diff changeset	605	classChangeSet removeAllVersionMethods.
2949 7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	606	sameAction notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	607	"/ check if same ...
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	608	(classChangeSet methodsOnlyInA isEmpty
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	609	and:[classChangeSet methodsOnlyInB isEmpty
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	610	and:[classChangeSet diffSet isEmpty]]) ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	611	sameAction value.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	612	^ self "/ do not open
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	613	]
2949 7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	614	].
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	615
05cf7ae53ada added: fm parents: 8811 diff changeset	616	^ self openOnClassChangeSet:classChangeSet title:ignoredTitle
2949 7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	617	!
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	618
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	619	openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	620	"create a VersionDiffBrowser instance and set the class change set of the
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	621	browser. The class diff set is generated from two source files."
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	622
2716 8451e7057f00 some common startup protocol between DiffViewer and VersionDiffBrowser Claus Gittinger <cg@exept.de> parents: 2714 diff changeset	623	^ self
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	624	openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	625	title:nil
2716 8451e7057f00 some common startup protocol between DiffViewer and VersionDiffBrowser Claus Gittinger <cg@exept.de> parents: 2714 diff changeset	626	!
8451e7057f00 some common startup protocol between DiffViewer and VersionDiffBrowser Claus Gittinger <cg@exept.de> parents: 2714 diff changeset	627
8451e7057f00 some common startup protocol between DiffViewer and VersionDiffBrowser Claus Gittinger <cg@exept.de> parents: 2714 diff changeset	628	openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB title:ignoredTitle
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	629	"create a VersionDiffBrowser instance and set the class change set of the
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	630	browser. The class diff set is generated from two source files."
2716 8451e7057f00 some common startup protocol between DiffViewer and VersionDiffBrowser Claus Gittinger <cg@exept.de> parents: 2714 diff changeset	631
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	632	^ self
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	633	openOnClass:aClass labelA:aLabelA sourceA:aSourceA
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	634	labelB:aLabelB sourceB:aSourceB
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	635	title:ignoredTitle ifSame:nil
2849 08085872d08f * empty log message * Claus Gittinger <cg@exept.de> parents: 2776 diff changeset	636	!
08085872d08f * empty log message * Claus Gittinger <cg@exept.de> parents: 2776 diff changeset	637
08085872d08f * empty log message * Claus Gittinger <cg@exept.de> parents: 2776 diff changeset	638	openOnClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB title:ignoredTitle ifSame:sameAction
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	639	"create a VersionDiffBrowser instance and set the class change set of the
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	640	browser. The class diff set is generated from two source files."
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	641
05cf7ae53ada added: fm parents: 8811 diff changeset	642	\|diffs hasChangedMethods classChangeSet versionMethodChanges\|
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	643
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	644	classChangeSet := ClassChangeSet newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB.
05cf7ae53ada added: fm parents: 8811 diff changeset	645	classChangeSet removeAllVersionMethods.
2849 08085872d08f * empty log message * Claus Gittinger <cg@exept.de> parents: 2776 diff changeset	646	sameAction notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	647	"/ check if same ...
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	648	(classChangeSet methodsOnlyInA isEmpty
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	649	and:[classChangeSet methodsOnlyInB isEmpty]) ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	650	diffs := classChangeSet diffSet.
3853 f3ce00da9b68 ignore any changes in the version method, when compating Claus Gittinger <cg@exept.de> parents: 3843 diff changeset	651
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	652	hasChangedMethods := diffs changed notEmpty.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	653	hasChangedMethods ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	654	versionMethodChanges := diffs changed select:[:eachDifference \|
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	655	\|eachChange\|
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	656	eachChange := eachDifference first.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	657	(eachChange isMethodChange
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	658	and:[ (AbstractSourceCodeManager isVersionMethodSelector:eachChange selector)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	659	and:[ eachChange changeClass isMeta ]]).
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	660	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	661	diffs changed size == versionMethodChanges size ifTrue: [
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	662	hasChangedMethods := false.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	663	].
8811 65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame: fm parents: 8657 diff changeset	664	"/ diffs changed size == 1 ifTrue:[
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame: fm parents: 8657 diff changeset	665	"/ theOnlyDifference := diffs changed first.
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame: fm parents: 8657 diff changeset	666	"/ theOnlyChange := theOnlyDifference first.
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	667	"/ (theOnlyChange isMethodChange
8811 65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame: fm parents: 8657 diff changeset	668	"/ and:[ ((theOnlyChange selector == #version) or:[theOnlyChange selector startsWith:'version_'])
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame: fm parents: 8657 diff changeset	669	"/ and:[ theOnlyChange changeClass isMeta ]]) ifTrue:[
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame: fm parents: 8657 diff changeset	670	"/ hasChangedMethods := false
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame: fm parents: 8657 diff changeset	671	"/ ]
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame: fm parents: 8657 diff changeset	672	"/ ]
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	673	].
3853 f3ce00da9b68 ignore any changes in the version method, when compating Claus Gittinger <cg@exept.de> parents: 3843 diff changeset	674
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	675	(hasChangedMethods not
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	676	and:[diffs onlyInArg isEmpty
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	677	and:[diffs onlyInReceiver isEmpty]]) ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	678	sameAction value.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	679	^ self "/ do not open
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	680	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	681	]
2849 08085872d08f * empty log message * Claus Gittinger <cg@exept.de> parents: 2776 diff changeset	682	].
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	683
05cf7ae53ada added: fm parents: 8811 diff changeset	684	^ self openOnClassChangeSet:classChangeSet title:ignoredTitle
7396 29b625902320 labels Claus Gittinger <cg@exept.de> parents: 7364 diff changeset	685
29b625902320 labels Claus Gittinger <cg@exept.de> parents: 7364 diff changeset	686	"Modified: / 13-10-2006 / 01:01:05 / cg"
2224 0e4250930948 checkin from browser Claus Gittinger <cg@exept.de> parents: 2221 diff changeset	687	!
0e4250930948 checkin from browser Claus Gittinger <cg@exept.de> parents: 2221 diff changeset	688
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	689	openOnClass:aClass versionA:aVersionA versionB:aVersionB
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	690	"create a VersionDiffBrowser instance and set the class change set of the
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	691	browser. The class diff set is generated from two versions of aClass via
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	692	the source code manager."
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	693
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	694	\|theBrowser\|
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	695
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	696	theBrowser := self new.
ef306e387021 checkin from browser ps parents: 2486 diff changeset	697	theBrowser allButOpen.
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	698	theBrowser setupForClass:aClass versionA:aVersionA versionB:aVersionB.
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	699	theBrowser openWindow.
ef306e387021 checkin from browser ps parents: 2486 diff changeset	700	^ theBrowser.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	701
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	702	"
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	703	self openOnClass:Array versionA:'1.116' versionB:'1.113'
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	704	"
3678 7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	705	!
7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	706
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	707	openOnClassChangeSet:classChangeSet title:ignoredTitle
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	708	"create a VersionDiffBrowser instance and set the class change set of the
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	709	browser. The class diff set is generated from two classes."
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	710
05cf7ae53ada added: fm parents: 8811 diff changeset	711	\|theBrowser\|
05cf7ae53ada added: fm parents: 8811 diff changeset	712
05cf7ae53ada added: fm parents: 8811 diff changeset	713	theBrowser := self new.
05cf7ae53ada added: fm parents: 8811 diff changeset	714	theBrowser allButOpen.
05cf7ae53ada added: fm parents: 8811 diff changeset	715	theBrowser classChangeSet:classChangeSet.
05cf7ae53ada added: fm parents: 8811 diff changeset	716	theBrowser openWindow.
05cf7ae53ada added: fm parents: 8811 diff changeset	717	^ theBrowser.
05cf7ae53ada added: fm parents: 8811 diff changeset	718	!
05cf7ae53ada added: fm parents: 8811 diff changeset	719
3678 7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	720	openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	721	^ self
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	722	openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	723	ignoreExtensions:false
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	724
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	725	"Modified: / 12-09-2011 / 11:52:44 / cg"
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	726	!
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	727
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	728	openOnDiffSet:diffSet labelA:aLabelA labelB:aLabelB title:ignoredTitle ignoreExtensions:aBoolean
3678 7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	729	\|theBrowser\|
7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	730
7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	731	theBrowser := self new.
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	732	theBrowser ignoreExtensions:aBoolean.
3678 7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	733	theBrowser allButOpen.
7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	734	theBrowser setupForDiffSet:diffSet labelA:aLabelA labelB:aLabelB.
7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	735	theBrowser window label:ignoredTitle.
7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	736	theBrowser openWindow.
7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	737	^ theBrowser.
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	738
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	739	"Created: / 12-09-2011 / 11:50:18 / cg"
5520 b6644f3ac71f * empty log message * penk parents: 5182 diff changeset	740	!
b6644f3ac71f * empty log message * penk parents: 5182 diff changeset	741
b6644f3ac71f * empty log message * penk parents: 5182 diff changeset	742	openOnDiffsBetweenFile:file1 and:file2
b6644f3ac71f * empty log message * penk parents: 5182 diff changeset	743	\|set1 set2 diffset theBrowser\|
b6644f3ac71f * empty log message * penk parents: 5182 diff changeset	744
b6644f3ac71f * empty log message * penk parents: 5182 diff changeset	745	set1 := ChangeSet fromFile:file1.
b6644f3ac71f * empty log message * penk parents: 5182 diff changeset	746	set2 := ChangeSet fromFile:file2.
b6644f3ac71f * empty log message * penk parents: 5182 diff changeset	747	diffset := set1 diffSetsAgainst:set2.
b6644f3ac71f * empty log message * penk parents: 5182 diff changeset	748
b6644f3ac71f * empty log message * penk parents: 5182 diff changeset	749	theBrowser := self new.
b6644f3ac71f * empty log message * penk parents: 5182 diff changeset	750	theBrowser allButOpen.
b6644f3ac71f * empty log message * penk parents: 5182 diff changeset	751	theBrowser setupForDiffSet:diffset labelA:file1 asFilename baseName labelB:file2 asFilename baseName.
b6644f3ac71f * empty log message * penk parents: 5182 diff changeset	752	theBrowser window label:('%1 vs. %2' bindWith:file1 asFilename baseName with:file2 asFilename baseName).
b6644f3ac71f * empty log message * penk parents: 5182 diff changeset	753	theBrowser openWindow.
b6644f3ac71f * empty log message * penk parents: 5182 diff changeset	754	^ theBrowser.
b6644f3ac71f * empty log message * penk parents: 5182 diff changeset	755
b6644f3ac71f * empty log message * penk parents: 5182 diff changeset	756	"
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	757	VersionDiffBrowser
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	758	openOnDiffsBetweenFile:'/phys/exept/tmp/ws/Workflow::BlockDescription.st'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	759	and:'/phys/exept/tmp/workflowClasses/Workflow::BlockDescription.st'
5520 b6644f3ac71f * empty log message * penk parents: 5182 diff changeset	760	"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	761	! !
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	762
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	763	!VersionDiffBrowser methodsFor:'accessing'!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	764
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	765	canIncludeExtensions:something
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	766	self canIncludeExtensionsHolder value:something.
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	767	!
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	768
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	769	changeSetA
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	770	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	771	gets the change set which contains only the new methods
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	772	in versionA of the class
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	773
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	774	<return: ChangeSet>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	775	"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	776
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	777	^ self classChangeSet methodsOnlyInA
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	778	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	779
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	780	changeSetB
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	781	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	782	gets the change set which contains only the new methods
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	783	in versionB of the class
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	784
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	785	<return: ChangeSet>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	786	"
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	787
ef306e387021 checkin from browser ps parents: 2486 diff changeset	788	^ self classChangeSet methodsOnlyInB
ef306e387021 checkin from browser ps parents: 2486 diff changeset	789	!
ef306e387021 checkin from browser ps parents: 2486 diff changeset	790
2856 754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	791	class:aClass versionA:revA versionB:revB
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	792	classIfSingleClassDiff := aClass.
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	793	versionAIfSingleClassDiff := revA.
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	794	versionBIfSingleClassDiff := revB.
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	795	!
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	796
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	797	classBeingCompared
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	798	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	799	gets the class from the change set which is compared.
2224 0e4250930948 checkin from browser Claus Gittinger <cg@exept.de> parents: 2221 diff changeset	800
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	801	<return: Class>
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	802	"
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	803	^ self classChangeSet classBeingCompared
ef306e387021 checkin from browser ps parents: 2486 diff changeset	804	!
ef306e387021 checkin from browser ps parents: 2486 diff changeset	805
ef306e387021 checkin from browser ps parents: 2486 diff changeset	806	classChangeSet
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	807	"returns the class change set which is the model of the version diff browser."
2224 0e4250930948 checkin from browser Claus Gittinger <cg@exept.de> parents: 2221 diff changeset	808
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	809	^ classChangeSet
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	810	!
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	811
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	812	classChangeSet:aClassChangeSet
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	813	"sets the class change set which is the model of the version diff browser.
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	814	The labels, the lists, the visibility and the selection of the lists must be reseted
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	815	when a new change set is given."
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	816
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	817	classChangeSet := aClassChangeSet.
2501 e86fae15642d checkin from browser ps parents: 2497 diff changeset	818	self updateLabels.
e86fae15642d checkin from browser ps parents: 2497 diff changeset	819	self updateLists.
e86fae15642d checkin from browser ps parents: 2497 diff changeset	820	self resetSelectionHolders.
e86fae15642d checkin from browser ps parents: 2497 diff changeset	821	!
2224 0e4250930948 checkin from browser Claus Gittinger <cg@exept.de> parents: 2221 diff changeset	822
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	823	ignoreExtensions
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	824	"if true, extension methods are suppressed.
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	825	Ignoring is useful when comparing for baseClass checkin,
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	826	as opposed to extension-checking, where extensions should not be ignored.
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	827	the default is false"
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	828
12205 f210b6224ef0 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	829	^ self includeExtensions not
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	830
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	831	"Created: / 12-09-2011 / 11:54:11 / cg"
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	832	!
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	833
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	834	ignoreExtensions:aBoolean
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	835	"if true, extension methods are suppressed.
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	836	Ignoring is useful when comparing for baseClass checkin,
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	837	as opposed to extension-checking, where extensions should not be ignored.
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	838	the default is false"
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	839
12205 f210b6224ef0 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	840	self includeExtensions:aBoolean not
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	841
12205 f210b6224ef0 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	842	"Modified: / 06-03-2012 / 15:37:32 / cg"
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	843	!
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	844
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	845	selectedChangeInA
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	846	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	847	gets the selected method change for the 'method only in version A'.
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	848
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	849	<return: MethodChange \| nil>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	850	"
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	851	\|sel change\|
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	852
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	853	sel := self methodsOnlyInASelection value.
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	854	sel notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	855	change := self changeSetA at:sel.
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	856	].
3753 48fdc128a790 refactored Claus Gittinger <cg@exept.de> parents: 3730 diff changeset	857	^ change
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	858	!
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	859
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	860	selectedChangeInB
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	861	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	862	gets the selected method change for the 'method only in version B'.
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	863
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	864	<return: MethodChange \| nil>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	865	"
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	866	\|sel change\|
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	867
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	868	sel := self methodsOnlyInBSelection value.
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	869	sel notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	870	change := (self changeSetB at:sel).
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	871	].
3753 48fdc128a790 refactored Claus Gittinger <cg@exept.de> parents: 3730 diff changeset	872	^ change
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	873	!
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	874
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	875	selectedChangesInM
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	876	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	877	get the two method changes for the selected 'changed method'.
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	878
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	879	<return: <Array with:MethodChange with:MethodChange \| nil>>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	880	"
2745 8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	881	\|sel changeA changeB theTwoChanges\|
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	882
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	883	sel := self methodsChangedSelection value.
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	884	sel notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	885	theTwoChanges := self classChangeSet methodsChanged at:sel.
3753 48fdc128a790 refactored Claus Gittinger <cg@exept.de> parents: 3730 diff changeset	886	"/ changeA := theTwoChanges first.
48fdc128a790 refactored Claus Gittinger <cg@exept.de> parents: 3730 diff changeset	887	"/ changeB := theTwoChanges second.
48fdc128a790 refactored Claus Gittinger <cg@exept.de> parents: 3730 diff changeset	888	"/ ^ Array with:changeA with:changeB.
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	889	^ theTwoChanges.
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	890	].
3753 48fdc128a790 refactored Claus Gittinger <cg@exept.de> parents: 3730 diff changeset	891	^ #(nil nil)
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	892	!
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	893
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	894	versionA
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	895	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	896	gets the first class version to be compared
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	897
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	898	<return: String>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	899	"
2731 5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	900	classChangeSet isNil ifTrue:[^ 'A'].
5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	901	^ classChangeSet labelA
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	902	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	903
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	904	versionB
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	905	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	906	gets the second class version to be compared
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	907
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	908	<return: String>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	909	"
2731 5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	910	classChangeSet isNil ifTrue:[^ 'B'].
5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	911	^ classChangeSet labelB
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	912	! !
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	913
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	914	!VersionDiffBrowser methodsFor:'actions'!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	915
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	916	acceptInLeftView
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	917	\|change\|
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	918
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	919	change := self selectedChangesInM first.
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	920	self applyChange:change
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	921	!
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	922
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	923	acceptInRightView
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	924	\|change\|
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	925
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	926	change := self selectedChangesInM second.
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	927	self applyChange:change
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	928	!
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	929
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	930	acceptInSingleView
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	931	\|change\|
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	932
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	933	change := self selectedChangeInA.
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	934	change isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	935	change := self selectedChangeInB
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	936	].
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	937	self applyChange:change
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	938	!
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	939
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	940	applySelectedChangeInA
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	941	self applyChange:(self selectedChangeInA)
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	942	!
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	943
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	944	applySelectedChangeInB
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	945	self applyChange:(self selectedChangeInB)
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	946	!
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	947
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	948	methodInADoubleClicked:index
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	949	"/ \|change\|
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	950	"/
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	951	"/ change := self changeSetA at:index.
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	952	"/ self browseChange:change
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	953	self browseClassInA
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	954	!
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	955
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	956	methodInBDoubleClicked:index
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	957	"/ \|change\|
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	958	"/
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	959	"/ change := self changeSetB at:index.
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	960	"/ self browseChange:change
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	961	self browseClassInB
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	962	!
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	963
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	964	methodInChangedDoubleClicked:index
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	965	self browseClassInM.
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	966	!
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	967
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	968	methodsChangedSelectionChanged
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	969	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	970	the selection in the list of the 'changed methods' changed.
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	971	Reset the selection of the two other lists and calc the method change.
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	972
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	973	<return: self>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	974	"
8602 cf0b099b0489 info Claus Gittinger <cg@exept.de> parents: 8103 diff changeset	975	\|sel changeA changeB methodsChanged parseError treeA treeB\|
cf0b099b0489 info Claus Gittinger <cg@exept.de> parents: 8103 diff changeset	976
cf0b099b0489 info Claus Gittinger <cg@exept.de> parents: 8103 diff changeset	977	self infoHolder value:''.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	978
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	979	sel := self methodsChangedSelection value.
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	980	sel notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	981	self methodsOnlyInASelection value:nil.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	982	self methodsOnlyInBSelection value:nil.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	983	methodsChanged := self classChangeSet methodsChanged.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	984	changeA := (methodsChanged at:sel) first.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	985	changeB := (methodsChanged at:sel) second.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	986	self withReadCursorDo:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	987	"/ see if the semantics have changed (or only prettyPrinted)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	988	RBParser notNil ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	989	(classChangeSet notNil
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	990	and:[ classChangeSet classBeingCompared notNil ]) ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	991	parseError := false.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	992	treeA := RBParser parseMethod:changeA source onError: [:str :pos \| parseError := true].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	993	treeB := RBParser parseMethod:changeB source onError: [:str :pos \| parseError := true].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	994	parseError ifFalse:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	995	(treeA equalTo:treeB withMapping:(Dictionary new)) ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	996	self infoHolder value:'Methods only differ in formatting / comments.'.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	997	]
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	998	]
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	999	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1000	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1001	self diffTextView
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1002	text1:(changeA prettyPrintedSource) text2:(changeB prettyPrintedSource);
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1003	moveToNextChanged
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1004	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1005	self showDiffTextView.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1006	]
2377 4687d21e8b01 checkin from browser ps parents: 2231 diff changeset	1007
4687d21e8b01 checkin from browser ps parents: 2231 diff changeset	1008	"Modified: / 3.9.1999 / 15:01:30 / ps"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1009	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1010
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1011	methodsOnlyInASelectionChanged
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1012	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1013	the selection in the list of the 'method only in version A' changed.
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1014	Reset the selection of the two other lists and show the method in
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1015	the text view.
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1016
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1017	<return: self>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1018	"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1019	\|change sel\|
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1020
8602 cf0b099b0489 info Claus Gittinger <cg@exept.de> parents: 8103 diff changeset	1021	self infoHolder value:''.
cf0b099b0489 info Claus Gittinger <cg@exept.de> parents: 8103 diff changeset	1022
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1023	sel := self methodsOnlyInASelection value.
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1024	sel notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1025	self methodsOnlyInBSelection value:nil.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1026	self methodsChangedSelection value:nil.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1027	change := self changeSetA at:sel.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1028	self methodText value:(change prettyPrintedSource).
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1029	self showSingleTextView.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1030	]
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1031	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1032
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1033	methodsOnlyInBSelectionChanged
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1034	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1035	the selection in the list of the 'method only in version B' changed.
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1036	Reset the selection of the two other lists and show the method in
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1037	the text view.
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1038
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1039	<return: self>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1040	"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1041	\|change sel\|
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1042
8602 cf0b099b0489 info Claus Gittinger <cg@exept.de> parents: 8103 diff changeset	1043	self infoHolder value:''.
cf0b099b0489 info Claus Gittinger <cg@exept.de> parents: 8103 diff changeset	1044
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1045	sel := self methodsOnlyInBSelection value.
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1046	sel notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1047	self methodsOnlyInASelection value:nil.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1048	self methodsChangedSelection value:nil.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1049	change := self changeSetB at:sel.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1050	self methodText value:(change prettyPrintedSource).
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1051	self showSingleTextView.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1052	]
9550 531c77d5d3e3 added: #removeSelectedChangeInBFromImage Claus Gittinger <cg@exept.de> parents: 9383 diff changeset	1053	!
531c77d5d3e3 added: #removeSelectedChangeInBFromImage Claus Gittinger <cg@exept.de> parents: 9383 diff changeset	1054
531c77d5d3e3 added: #removeSelectedChangeInBFromImage Claus Gittinger <cg@exept.de> parents: 9383 diff changeset	1055	removeSelectedChangeInBFromImage
531c77d5d3e3 added: #removeSelectedChangeInBFromImage Claus Gittinger <cg@exept.de> parents: 9383 diff changeset	1056	\|change cls sel op\|
531c77d5d3e3 added: #removeSelectedChangeInBFromImage Claus Gittinger <cg@exept.de> parents: 9383 diff changeset	1057
531c77d5d3e3 added: #removeSelectedChangeInBFromImage Claus Gittinger <cg@exept.de> parents: 9383 diff changeset	1058	change := self selectedChangeInB.
531c77d5d3e3 added: #removeSelectedChangeInBFromImage Claus Gittinger <cg@exept.de> parents: 9383 diff changeset	1059	change isMethodChange ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1060	(cls := change changeClass) notNil ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1061	(sel := change selector) notNil ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1062	RefactoryChangeManager notNil ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1063	op := RemoveMethodChange remove:sel from:cls.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1064	RefactoryChangeManager performChange: op.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1065	] ifFalse:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1066	cls removeSelector:sel
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1067	]
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1068	]
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1069	]
9550 531c77d5d3e3 added: #removeSelectedChangeInBFromImage Claus Gittinger <cg@exept.de> parents: 9383 diff changeset	1070	]
531c77d5d3e3 added: #removeSelectedChangeInBFromImage Claus Gittinger <cg@exept.de> parents: 9383 diff changeset	1071
531c77d5d3e3 added: #removeSelectedChangeInBFromImage Claus Gittinger <cg@exept.de> parents: 9383 diff changeset	1072	"Modified: / 15-08-2010 / 21:35:00 / cg"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1073	! !
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1074
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1075	!VersionDiffBrowser methodsFor:'aspects'!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1076
2585 718f8fce7ca4 * empty log message * Claus Gittinger <cg@exept.de> parents: 2578 diff changeset	1077	boxAVisible
2745 8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1078	boxAVisible isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1079	boxAVisible := true asValue.
2585 718f8fce7ca4 * empty log message * Claus Gittinger <cg@exept.de> parents: 2578 diff changeset	1080	].
2745 8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1081	^ boxAVisible.
2585 718f8fce7ca4 * empty log message * Claus Gittinger <cg@exept.de> parents: 2578 diff changeset	1082	!
718f8fce7ca4 * empty log message * Claus Gittinger <cg@exept.de> parents: 2578 diff changeset	1083
718f8fce7ca4 * empty log message * Claus Gittinger <cg@exept.de> parents: 2578 diff changeset	1084	boxBVisible
2745 8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1085	boxBVisible isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1086	boxBVisible := true asValue.
2585 718f8fce7ca4 * empty log message * Claus Gittinger <cg@exept.de> parents: 2578 diff changeset	1087	].
2745 8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1088	^ boxBVisible.
2585 718f8fce7ca4 * empty log message * Claus Gittinger <cg@exept.de> parents: 2578 diff changeset	1089	!
718f8fce7ca4 * empty log message * Claus Gittinger <cg@exept.de> parents: 2578 diff changeset	1090
718f8fce7ca4 * empty log message * Claus Gittinger <cg@exept.de> parents: 2578 diff changeset	1091	boxMVisible
2745 8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1092	boxMVisible isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1093	boxMVisible := true asValue.
2585 718f8fce7ca4 * empty log message * Claus Gittinger <cg@exept.de> parents: 2578 diff changeset	1094	].
2745 8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1095	^ boxMVisible.
2585 718f8fce7ca4 * empty log message * Claus Gittinger <cg@exept.de> parents: 2578 diff changeset	1096	!
718f8fce7ca4 * empty log message * Claus Gittinger <cg@exept.de> parents: 2578 diff changeset	1097
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1098	canIncludeExtensionsHolder
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1099	"can include extensions ? (menu item enabler)"
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1100
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1101	canIncludeExtensionsHolder isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1102	canIncludeExtensionsHolder := true asValue.
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1103	].
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1104	^ canIncludeExtensionsHolder.
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1105	!
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1106
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1107	changedLabelHolder
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1108	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1109	aspect for the label of the changed method box.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1110
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1111	<return: ValueHolder on: nil>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1112	"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1113
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1114	changedLabelHolder isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1115	changedLabelHolder := ValueHolder new.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1116	].
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1117	^ changedLabelHolder.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1118	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1119
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1120	diffTextLabelA
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1121	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1122	aspect for the label for version A.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1123
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1124	<return: ValueHolder on: nil>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1125	"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1126
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1127	diffTextLabelA isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1128	diffTextLabelA := ValueHolder new.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1129	].
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1130	^ diffTextLabelA.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1131	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1132
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1133	diffTextLabelB
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1134	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1135	aspect for the label for version B.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1136
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1137	<return: ValueHolder on: nil>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1138	"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1139
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1140	diffTextLabelB isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1141	diffTextLabelB := ValueHolder new.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1142	].
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1143	^ diffTextLabelB.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1144	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1145
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	1146	diffTextView
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1147	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1148	return the component for the diff text view.
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	1149
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1150	<return: HVScrollableView>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1151	"
7364 e7613aec8035 use codeViews (instead of TextViews) Claus Gittinger <cg@exept.de> parents: 7108 diff changeset	1152	\|v\|
e7613aec8035 use codeViews (instead of TextViews) Claus Gittinger <cg@exept.de> parents: 7108 diff changeset	1153
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	1154	diffTextView isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1155	v := DiffCodeView basicNew.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1156	v textViewClass:CodeView.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1157	v initialize.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1158	diffTextView := HVScrollableView
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1159	forView:v
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1160	miniScrollerH:true miniScrollerV:false.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1161	diffTextView addNextPreviousButtons.
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	1162	].
ef306e387021 checkin from browser ps parents: 2486 diff changeset	1163	^ diffTextView
7364 e7613aec8035 use codeViews (instead of TextViews) Claus Gittinger <cg@exept.de> parents: 7108 diff changeset	1164
e7613aec8035 use codeViews (instead of TextViews) Claus Gittinger <cg@exept.de> parents: 7108 diff changeset	1165	"Modified: / 06-10-2006 / 14:30:42 / cg"
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	1166	!
ef306e387021 checkin from browser ps parents: 2486 diff changeset	1167
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1168	includeExtensions
12205 f210b6224ef0 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	1169	^ self includeExtensionsHolder value
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1170
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1171	"Created: / 13-09-2011 / 11:48:51 / cg"
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1172	!
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1173
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1174	includeExtensions:aBoolean
12205 f210b6224ef0 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	1175	self includeExtensionsHolder value:aBoolean
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1176
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1177	"Created: / 13-09-2011 / 11:48:41 / cg"
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1178	!
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1179
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1180	includeExtensionsHolder
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1181	"only compare base-methods or include extensions ?"
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1182
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1183	includeExtensionsHolder isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1184	includeExtensionsHolder := false asValue.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1185	includeExtensionsHolder addDependent:self.
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1186	].
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1187	^ includeExtensionsHolder.
12205 f210b6224ef0 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	1188
f210b6224ef0 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	1189	"Modified: / 06-03-2012 / 15:36:52 / cg"
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1190	!
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1191
8602 cf0b099b0489 info Claus Gittinger <cg@exept.de> parents: 8103 diff changeset	1192	infoHolder
cf0b099b0489 info Claus Gittinger <cg@exept.de> parents: 8103 diff changeset	1193	infoHolder isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1194	infoHolder := ValueHolder new.
8602 cf0b099b0489 info Claus Gittinger <cg@exept.de> parents: 8103 diff changeset	1195	].
cf0b099b0489 info Claus Gittinger <cg@exept.de> parents: 8103 diff changeset	1196	^ infoHolder.
cf0b099b0489 info Claus Gittinger <cg@exept.de> parents: 8103 diff changeset	1197	!
cf0b099b0489 info Claus Gittinger <cg@exept.de> parents: 8103 diff changeset	1198
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1199	methodText
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1200	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1201	aspect for the text in the method text view.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1202
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1203	<return: ValueHolder on: nil>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1204	"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1205
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1206	methodText isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1207	methodText := ValueHolder new.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1208	].
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1209	^ methodText.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1210	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1211
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1212	methodsChanged
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1213	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1214	aspect for the 'changed method' list.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1215
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1216	<return: List>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1217	"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1218
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1219	methodsChanged isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1220	methodsChanged := List new.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1221	].
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1222	^ methodsChanged.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1223	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1224
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1225	methodsChangedSelection
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1226	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1227	aspect for the selection holder of 'changed method'-list.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1228
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1229	<return: ValueHolder on: nil>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1230	"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1231
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1232	methodsChangedSelection isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1233	methodsChangedSelection := ValueHolder new.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1234	].
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1235	^ methodsChangedSelection.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1236	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1237
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1238	methodsOnlyInA
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1239	"aspect for the 'method only in version A' list."
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1240
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1241	methodsOnlyInA isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1242	methodsOnlyInA := List new.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1243	].
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1244	^ methodsOnlyInA.
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1245
034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1246	"Modified: / 25-07-2006 / 11:14:43 / cg"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1247	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1248
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1249	methodsOnlyInASelection
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1250	"aspect for the selection holder of 'method only in version A'-list."
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1251
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1252	methodsOnlyInASelection isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1253	methodsOnlyInASelection := ValueHolder new.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1254	].
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1255	^ methodsOnlyInASelection.
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1256
034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1257	"Modified: / 25-07-2006 / 11:14:53 / cg"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1258	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1259
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1260	methodsOnlyInB
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1261	"aspect for the 'method only in version B' list"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1262
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1263	methodsOnlyInB isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1264	methodsOnlyInB := List new.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1265	].
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1266	^ methodsOnlyInB.
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1267
034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1268	"Modified: / 25-07-2006 / 11:14:48 / cg"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1269	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1270
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1271	methodsOnlyInBSelection
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1272	"aspect for the selection holder of 'method only in version B'-list."
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1273
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1274	methodsOnlyInBSelection isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1275	methodsOnlyInBSelection := ValueHolder new.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1276	].
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1277	^ methodsOnlyInBSelection.
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1278
034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1279	"Modified: / 25-07-2006 / 11:15:00 / cg"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1280	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1281
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1282	onlyInALabelHolder
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1283	"aspect for the label for 'method only in version A'."
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1284
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1285	onlyInALabelHolder isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1286	onlyInALabelHolder := ValueHolder new.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1287	].
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1288	^ onlyInALabelHolder.
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1289
034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1290	"Modified: / 25-07-2006 / 11:15:12 / cg"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1291	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1292
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1293	onlyInBLabelHolder
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1294	"aspect for the label for 'method only in version B'."
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1295
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1296	onlyInBLabelHolder isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1297	onlyInBLabelHolder := ValueHolder new.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1298	].
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1299	^ onlyInBLabelHolder.
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1300
034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1301	"Modified: / 25-07-2006 / 11:15:07 / cg"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1302	! !
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1303
2725 e2dc264e8c9c category changes Claus Gittinger <cg@exept.de> parents: 2716 diff changeset	1304	!VersionDiffBrowser methodsFor:'aspects-exported'!
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1305
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1306	changedLabelHolder:aValueHolder
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1307	builder aspectAt:#changedLabelHolder put:aValueHolder.
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1308
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1309	!
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1310
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1311	classHolder:aValueHolder
5182 0b3ecd84056a * empty log message * Claus Gittinger <cg@exept.de> parents: 5150 diff changeset	1312	classHolder notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1313	classHolder removeDependent:self
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1314	].
5182 0b3ecd84056a * empty log message * Claus Gittinger <cg@exept.de> parents: 5150 diff changeset	1315	classHolder := aValueHolder.
0b3ecd84056a * empty log message * Claus Gittinger <cg@exept.de> parents: 5150 diff changeset	1316	classHolder notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1317	classHolder addDependent:self
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1318	]
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1319	!
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1320
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1321	onlyInALabelHolder:aValueHolder
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1322	builder aspectAt:#onlyInALabelHolder put:aValueHolder.
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1323	!
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1324
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1325	onlyInBLabelHolder:aValueHolder
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1326	builder aspectAt:#onlyInBLabelHolder put:aValueHolder.
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1327	!
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1328
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1329	versionAHolder:aValueHolder
5182 0b3ecd84056a * empty log message * Claus Gittinger <cg@exept.de> parents: 5150 diff changeset	1330	versionAHolder notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1331	versionAHolder removeDependent:self
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1332	].
5182 0b3ecd84056a * empty log message * Claus Gittinger <cg@exept.de> parents: 5150 diff changeset	1333	versionAHolder := aValueHolder.
0b3ecd84056a * empty log message * Claus Gittinger <cg@exept.de> parents: 5150 diff changeset	1334	versionAHolder notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1335	versionAHolder addDependent:self
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1336	]
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1337	!
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1338
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1339	versionBHolder:aValueHolder
5182 0b3ecd84056a * empty log message * Claus Gittinger <cg@exept.de> parents: 5150 diff changeset	1340	versionBHolder notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1341	versionBHolder removeDependent:self
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1342	].
5182 0b3ecd84056a * empty log message * Claus Gittinger <cg@exept.de> parents: 5150 diff changeset	1343	versionBHolder := aValueHolder.
0b3ecd84056a * empty log message * Claus Gittinger <cg@exept.de> parents: 5150 diff changeset	1344	versionBHolder notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1345	versionBHolder addDependent:self
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1346	]
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1347	! !
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1348
4359 35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1349	!VersionDiffBrowser methodsFor:'aspects-menu'!
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1350
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1351	canAcceptInCodeView
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1352	^ self hasChangeSelectedInA
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1353	or:[self hasChangeSelectedInB
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1354	or:[self hasChangeSelectedInM]]
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1355	!
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1356
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1357	hasChangeSelectedInA
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1358	^ self selectedChangeInA notNil
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1359	!
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1360
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1361	hasChangeSelectedInB
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1362	^ self selectedChangeInB notNil
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1363	!
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1364
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1365	hasChangeSelectedInM
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1366	^ self methodsChangedSelection value notNil
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1367	! !
35995cc972f7 category change Claus Gittinger <cg@exept.de> parents: 4128 diff changeset	1368
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1369	!VersionDiffBrowser methodsFor:'change & update'!
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1370
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1371	update:something with:parameter from:changedObject
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1372	changedObject == includeExtensionsHolder ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1373	self updateLists.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1374	^ self
12205 f210b6224ef0 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	1375	].
f210b6224ef0 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	1376
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1377	(changedObject == classHolder
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1378	or:[changedObject == versionAHolder
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1379	or:[changedObject == versionBHolder]]) ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1380	self setupForClass:(classHolder value) versionA:(versionAHolder value) versionB:(versionBHolder value).
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1381	^ self
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1382	].
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1383	super update:something with:parameter from:changedObject
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1384
12205 f210b6224ef0 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	1385	"Modified: / 06-03-2012 / 15:42:38 / cg"
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1386	! !
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1387
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1388	!VersionDiffBrowser methodsFor:'initialization & release'!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1389
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1390	postBuildWith:aBuilder
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1391	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1392	components which are invisible should be ignored by the panel.
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1393	Cannot be set via the interface builder.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1394
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1395	<return: self>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1396	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1397
3843 673fbeb191c9 builder componentAt: -> self componentAt: Claus Gittinger <cg@exept.de> parents: 3839 diff changeset	1398	(self componentAt:#TopHorizontalPanel) ignoreInvisibleComponents:true.
6642 108b83a88516 * empty log message * Claus Gittinger <cg@exept.de> parents: 6272 diff changeset	1399	super postBuildWith:aBuilder
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1400	! !
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1401
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1402	!VersionDiffBrowser methodsFor:'menu action'!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1403
2465 0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1404	browseChange:aChange
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1405	"browse the change in aChange"
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1406
7396 29b625902320 labels Claus Gittinger <cg@exept.de> parents: 7364 diff changeset	1407	\|cls sel m browserClass\|
2650 447c99ac6f76 oops - inspect & browse menu was broken. Claus Gittinger <cg@exept.de> parents: 2626 diff changeset	1408
2578 29264fb3847e avoid debugger in browse-menu Claus Gittinger <cg@exept.de> parents: 2536 diff changeset	1409	aChange isNil ifTrue:[^ self].
7396 29b625902320 labels Claus Gittinger <cg@exept.de> parents: 7364 diff changeset	1410	browserClass := UserPreferences systemBrowserClass.
29b625902320 labels Claus Gittinger <cg@exept.de> parents: 7364 diff changeset	1411
2650 447c99ac6f76 oops - inspect & browse menu was broken. Claus Gittinger <cg@exept.de> parents: 2626 diff changeset	1412	cls := aChange changeClass.
7396 29b625902320 labels Claus Gittinger <cg@exept.de> parents: 7364 diff changeset	1413	aChange isMethodChange ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1414	sel := aChange changeSelector.
7396 29b625902320 labels Claus Gittinger <cg@exept.de> parents: 7364 diff changeset	1415	"/ (cls compiledMethodAt:sel) isNil ifTrue:[
29b625902320 labels Claus Gittinger <cg@exept.de> parents: 7364 diff changeset	1416	"/ (self confirm:'Method does not exist.\\Browse Class ?' withCRs) ifTrue:[
29b625902320 labels Claus Gittinger <cg@exept.de> parents: 7364 diff changeset	1417	"/ browserClass openInClass:cls
29b625902320 labels Claus Gittinger <cg@exept.de> parents: 7364 diff changeset	1418	"/ ].
29b625902320 labels Claus Gittinger <cg@exept.de> parents: 7364 diff changeset	1419	"/ sel := nil.
29b625902320 labels Claus Gittinger <cg@exept.de> parents: 7364 diff changeset	1420	"/ ]
29b625902320 labels Claus Gittinger <cg@exept.de> parents: 7364 diff changeset	1421	].
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1422	self withWaitCursorDo:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1423	browserClass openInClass:cls selector:sel.
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1424	]
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1425
7396 29b625902320 labels Claus Gittinger <cg@exept.de> parents: 7364 diff changeset	1426	"Modified: / 12-10-2006 / 23:58:40 / cg"
2465 0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1427	!
0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1428
0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1429	browseClassInA
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1430	"browse the selected method."
034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1431	self browseChange:(self selectedChangeInA).
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1432
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1433	"Modified: / 25-07-2006 / 11:14:02 / cg"
2465 0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1434	!
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1435
2465 0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1436	browseClassInB
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1437	"browse the selected method."
034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1438	self browseChange:(self selectedChangeInB).
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1439
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1440	"Modified: / 25-07-2006 / 11:13:58 / cg"
2465 0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1441	!
0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1442
0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1443	browseClassInM
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1444	"browse the selected method."
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1445
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1446	self browseChange:(self selectedChangesInM first).
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1447
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1448	"Modified: / 25-07-2006 / 11:13:54 / cg"
2465 0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1449	!
0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1450
2469 c78e7a79df34 apply; methodCategoryChange Claus Gittinger <cg@exept.de> parents: 2468 diff changeset	1451	createPatchFile
2856 754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	1452	"create a patchFile, to patch the old version (versionB) into the new version (versionA).
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	1453	I.e. a little changeFile to transport those changes."
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	1454
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1455	\|defaultName f oldVersion newVersion vsnMthdA vsnMthdB vsnA vsnB info classBeingCompared\|
2856 754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	1456
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	1457	defaultName := 'patchFile.chg'.
2469 c78e7a79df34 apply; methodCategoryChange Claus Gittinger <cg@exept.de> parents: 2468 diff changeset	1458
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1459	classBeingCompared := classChangeSet classBeingCompared.
034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1460	classBeingCompared notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1461	defaultName := classBeingCompared nameWithoutPrefix.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1462	classChangeSet versionA notNil ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1463	defaultName := defaultName , '-'.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1464	defaultName := defaultName , classChangeSet versionA.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1465	classChangeSet versionB notNil ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1466	defaultName := defaultName , '-'.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1467	defaultName := defaultName , classChangeSet versionB.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1468	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1469	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1470	defaultName := defaultName , '.chg'.
2856 754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	1471	].
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1472	f := Dialog
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1473	requestFileNameForSave:'Name of patchFile:'
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1474	default:defaultName.
2856 754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	1475	self warn:'Sorry: This function is not yet implemented'.
2730 0bf87aa1ac49 * empty log message * Claus Gittinger <cg@exept.de> parents: 2726 diff changeset	1476	^ self.
0bf87aa1ac49 * empty log message * Claus Gittinger <cg@exept.de> parents: 2726 diff changeset	1477
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1478	"/ vsnMthdA := self changeSetA
3103 228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1479	"/ detect:[:ch \| ch isMethodChange
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1480	"/ and:[ch changeClass isMeta
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1481	"/ and:[ch changeSelector = #version]]]
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1482	"/ ifNone:nil.
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1483	"/ vsnMthdB := self changeSetA
3103 228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1484	"/ detect:[:ch \| ch isMethodChange
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1485	"/ and:[ch changeClass isMeta
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1486	"/ and:[ch changeSelector = #version]]]
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1487	"/ ifNone:nil.
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1488	"/
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1489	"/ vsnMthdA notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1490	"/ "/ extract the version
3103 228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1491	"/ vsnA := Class revisionStringFromSource:vsnMthdA source.
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1492	"/ vsnA notNil ifTrue:[
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1493	"/ info := Class revisionInfoFromString:vsnA.
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1494	"/ info notNil ifTrue:[
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1495	"/ vsnA := info at:#revision ifAbsent:nil.
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1496	"/ ] ifFalse:[
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1497	"/ vsnA := nil.
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1498	"/ ].
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1499	"/ ].
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1500	"/ ].
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1501	"/ vsnMthdB notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1502	"/ "/ extract the version
3103 228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1503	"/ vsnB := Class revisionStringFromSource:vsnMthdB source.
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1504	"/ vsnB notNil ifTrue:[
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1505	"/ info := Class revisionInfoFromString:vsnB.
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1506	"/ info notNil ifTrue:[
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1507	"/ vsnB := info at:#revision ifAbsent:nil.
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1508	"/ ] ifFalse:[
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1509	"/ vsnB := nil.
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1510	"/ ].
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1511	"/ ].
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1512	"/ ].
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1513	"/
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1514	"/ (vsnA isNil or:[vsnB isNil or:[vsnA = vsnB]]) ifTrue:[
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1515	"/ self warn:'The generated patch file will not be able to validate/update the class version'.
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1516	"/ ].
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1517	"/
228e1cb0ef07 statements after return Claus Gittinger <cg@exept.de> parents: 3051 diff changeset	1518	"/self halt:'not yet finished'.
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1519
9602 46d76851e419 changed: #createPatchFile Claus Gittinger <cg@exept.de> parents: 9587 diff changeset	1520	"Modified: / 27-10-2010 / 11:34:58 / cg"
2469 c78e7a79df34 apply; methodCategoryChange Claus Gittinger <cg@exept.de> parents: 2468 diff changeset	1521	!
c78e7a79df34 apply; methodCategoryChange Claus Gittinger <cg@exept.de> parents: 2468 diff changeset	1522
2465 0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1523	inspectSelectedChangeInA
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1524	"inspect the selected method change for the 'method only in version A'."
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1525
2465 0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1526	self selectedChangeInA inspect.
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1527
034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1528	"Modified: / 25-07-2006 / 11:13:30 / cg"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1529	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1530
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1531	inspectSelectedChangeInB
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1532	"inspect the selected method change for the 'method only in version B'."
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1533
2465 0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1534	self selectedChangeInB inspect.
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1535
034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1536	"Modified: / 25-07-2006 / 11:13:22 / cg"
2465 0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1537	!
0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1538
0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1539	inspectSelectedChangeInM
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1540	"inspect the two method changes for the selected 'changed method'."
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1541
2465 0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1542	\|changes\|
0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1543
0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1544	changes := self selectedChangesInM.
0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1545	changes do:[:change \|
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1546	change inspect
2465 0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1547	].
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1548
034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1549	"Modified: / 25-07-2006 / 11:13:13 / cg"
2465 0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1550	!
0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1551
2501 e86fae15642d checkin from browser ps parents: 2497 diff changeset	1552	mainMenu
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1553	"if this application runs as an subapplication,
034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1554	the menu bar should not be used."
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1555
2501 e86fae15642d checkin from browser ps parents: 2497 diff changeset	1556	self masterApplication isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1557	^ self class mainMenu
2501 e86fae15642d checkin from browser ps parents: 2497 diff changeset	1558	].
e86fae15642d checkin from browser ps parents: 2497 diff changeset	1559	^ nil
6828 034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1560
034ea2c4c22a comments Claus Gittinger <cg@exept.de> parents: 6792 diff changeset	1561	"Modified: / 25-07-2006 / 11:13:44 / cg"
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1562	!
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1563
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1564	openDocumentation
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1565	HTMLDocumentView openFullOnDocumentationFile:'tools/misc/TOP.html#VERSIONDIFF'
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1566	! !
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1567
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1568	!VersionDiffBrowser methodsFor:'private'!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1569
2745 8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1570	addAcceptToTextViewMenus
8657 4a54180313b5 enable/disable of edit-menu items Claus Gittinger <cg@exept.de> parents: 8629 diff changeset	1571	"add to the standard diff text view or single text views menu an accept entry.
4a54180313b5 enable/disable of edit-menu items Claus Gittinger <cg@exept.de> parents: 8629 diff changeset	1572	The acceptAction will fetch the corresponding change and apply it
4a54180313b5 enable/disable of edit-menu items Claus Gittinger <cg@exept.de> parents: 8629 diff changeset	1573	(not the shown text)
2745 8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1574
8657 4a54180313b5 enable/disable of edit-menu items Claus Gittinger <cg@exept.de> parents: 8629 diff changeset	1575	<return: self>
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1576	"
2745 8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1577
8657 4a54180313b5 enable/disable of edit-menu items Claus Gittinger <cg@exept.de> parents: 8629 diff changeset	1578	\|diffTextView leftView rightView singleView\|
2745 8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1579
8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1580	diffTextView := self diffTextView.
8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1581	leftView := diffTextView leftTextView.
8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1582	rightView := diffTextView rightTextView.
3843 673fbeb191c9 builder componentAt: -> self componentAt: Claus Gittinger <cg@exept.de> parents: 3839 diff changeset	1583	singleView := self componentAt:#singleTextView.
2745 8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1584
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1585	(Array
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1586	with:leftView
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1587	with:rightView
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1588	with:singleView)
2745 8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1589	do:[:v \|
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1590	\|mGen\|
8657 4a54180313b5 enable/disable of edit-menu items Claus Gittinger <cg@exept.de> parents: 8629 diff changeset	1591
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1592	mGen := [
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1593	\|m\|
8657 4a54180313b5 enable/disable of edit-menu items Claus Gittinger <cg@exept.de> parents: 8629 diff changeset	1594
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1595	m := v editMenu.
8657 4a54180313b5 enable/disable of edit-menu items Claus Gittinger <cg@exept.de> parents: 8629 diff changeset	1596
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1597	(m selectorAt:#accept) isNil ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1598	m addLabels:(resources array:#('-' 'Accept'))
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1599	selectors:(Array with:nil with:#accept)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1600	after:#copySelection.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1601	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1602	m
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1603	actionAt:#accept
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1604	put:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1605	v == singleView ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1606	self acceptInSingleView
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1607	] ifFalse:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1608	v == leftView ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1609	self acceptInLeftView
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1610	] ifFalse:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1611	self acceptInRightView
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1612	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1613	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1614	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1615	m selectorAt:#accept put:nil.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1616	m enable:#copySelection.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1617	m setEnable:#accept to:[self canAcceptInCodeView].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1618	m
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1619	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1620	v menuHolder:mGen.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1621	v menuMessage:#value.
2745 8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1622	]
8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1623	!
8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1624
3753 48fdc128a790 refactored Claus Gittinger <cg@exept.de> parents: 3730 diff changeset	1625	applyChange:change
48fdc128a790 refactored Claus Gittinger <cg@exept.de> parents: 3730 diff changeset	1626	change notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1627	change apply
3753 48fdc128a790 refactored Claus Gittinger <cg@exept.de> parents: 3730 diff changeset	1628	]
48fdc128a790 refactored Claus Gittinger <cg@exept.de> parents: 3730 diff changeset	1629	!
48fdc128a790 refactored Claus Gittinger <cg@exept.de> parents: 3730 diff changeset	1630
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1631	printStringForChange:aChange
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1632	"generate a print string for a change."
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1633
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1634	\|m changeClassName useChangesString selectorString
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1635	singleComparedClass singleComparedClassesName singleComparedMetaclassesName\|
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1636
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1637	(singleComparedClass := self classBeingCompared) notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1638	singleComparedClassesName := singleComparedClass name.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1639	singleComparedMetaclassesName := singleComparedClass theMetaclass name.
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1640	].
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	1641
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1642	aChange isClassDefinitionChange ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1643	^ aChange printStringWithoutClassName
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1644	].
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1645	aChange isDoIt ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1646	^ aChange source , ' (doIt)'
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1647	].
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1648	aChange isNameSpaceCreationChange ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1649	^ aChange source
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1650	].
3678 7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	1651
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1652	changeClassName := aChange className.
0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1653	changeClassName isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1654	^ aChange source
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1655	].
12123 4bde08cebd48 trunk branched into /branches/jv Jan Vrany <jan.vrany@fit.cvut.cz> parents: 10892 diff changeset	1656	useChangesString := false.
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1657
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1658	(changeClassName = singleComparedClassesName) ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1659	changeClassName := ''.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1660	useChangesString := true.
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1661	] ifFalse:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1662	(changeClassName = singleComparedMetaclassesName) ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1663	changeClassName := 'class '.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1664	useChangesString := true.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1665	] ifFalse:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1666	((changeClassName includes:$:) and:[ changeClassName startsWith:((singleComparedClassesName ? ''),'::') ]) ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1667	changeClassName := changeClassName copyFrom:(singleComparedClassesName,'::') size+1.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1668	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1669	].
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1670	].
6272 54b4aec6a387 * empty log message * Claus Gittinger <cg@exept.de> parents: 6210 diff changeset	1671
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1672	selectorString := ''.
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1673	(aChange isMethodChange
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1674	and:[ aChange changeClass notNil ]) ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1675	selectorString := aChange selector.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1676	m := aChange changeMethod.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1677	m notNil ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1678	m := m originalMethodIfWrapped.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1679	selectorString := m printStringForBrowserWithSelector:aChange selector inClass:aChange changeClass.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1680	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1681	selectorString := ' ',selectorString
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	1682	].
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1683
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1684	aChange isMethodCategoryChange ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1685	^ changeClassName,selectorString, ' (category)'
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1686	].
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1687	^ changeClassName,selectorString
9587 9f33d5c62efa changed: #printStringForChange: Claus Gittinger <cg@exept.de> parents: 9550 diff changeset	1688
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1689	"Modified: / 24-11-2011 / 12:11:02 / cg"
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	1690	!
ef306e387021 checkin from browser ps parents: 2486 diff changeset	1691
2501 e86fae15642d checkin from browser ps parents: 2497 diff changeset	1692	resetSelectionHolders
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1693	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1694	reset all selection holders when a new change set is given.
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1695	First set the selection to nil.
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1696
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1697	<return: self>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1698	"
2501 e86fae15642d checkin from browser ps parents: 2497 diff changeset	1699
e86fae15642d checkin from browser ps parents: 2497 diff changeset	1700	self methodsChangedSelection value:nil.
e86fae15642d checkin from browser ps parents: 2497 diff changeset	1701	self methodsOnlyInASelection value:nil.
e86fae15642d checkin from browser ps parents: 2497 diff changeset	1702	self methodsOnlyInBSelection value:nil.
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1703	self diffTextView text1:'' text2:''.
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1704	self methodText value:''.
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1705
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1706	"/ self methodsChangedSelectionChanged.
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1707	"/ self methodsOnlyInASelectionChanged.
f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1708	"/ self methodsOnlyInBSelectionChanged.
2501 e86fae15642d checkin from browser ps parents: 2497 diff changeset	1709	!
e86fae15642d checkin from browser ps parents: 2497 diff changeset	1710
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1711	showDiffTextView
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1712	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1713	if a method change is selected, then show the diff text view.
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1714	Add an accept entry to the popup menu.
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1715
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1716	<return: self>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1717	"
2694 a19deafda6b0 * empty log message * Claus Gittinger <cg@exept.de> parents: 2650 diff changeset	1718
3843 673fbeb191c9 builder componentAt: -> self componentAt: Claus Gittinger <cg@exept.de> parents: 3839 diff changeset	1719	(self componentAt:#diffTextViewBox) raise; beVisible.
673fbeb191c9 builder componentAt: -> self componentAt: Claus Gittinger <cg@exept.de> parents: 3839 diff changeset	1720	(self componentAt:#singleTextView) beInvisible.
673fbeb191c9 builder componentAt: -> self componentAt: Claus Gittinger <cg@exept.de> parents: 3839 diff changeset	1721	(self componentAt:#diffTextView) realizeAllSubViews.
2694 a19deafda6b0 * empty log message * Claus Gittinger <cg@exept.de> parents: 2650 diff changeset	1722
2465 0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	1723	self addAcceptToTextViewMenus.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1724	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1725
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1726	showSingleTextView
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1727	"
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1728	if a method is selected which is only in version A or B of the class,
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1729	then show the text view.
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1730	Add an accept entry to the popup menu.
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1731
3147 6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1732	<return: self>
6977e4703d1a checkin from browser Claus Gittinger <cg@exept.de> parents: 3146 diff changeset	1733	"
2507 f5f8a26b7003 checkin from browser ps parents: 2501 diff changeset	1734
3843 673fbeb191c9 builder componentAt: -> self componentAt: Claus Gittinger <cg@exept.de> parents: 3839 diff changeset	1735	(self componentAt:#singleTextView) raise; beVisible.
673fbeb191c9 builder componentAt: -> self componentAt: Claus Gittinger <cg@exept.de> parents: 3839 diff changeset	1736	(self componentAt:#diffTextViewBox) beInvisible.
2501 e86fae15642d checkin from browser ps parents: 2497 diff changeset	1737	self addAcceptToTextViewMenus.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1738	!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1739
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	1740	updateLabels
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1741	"update the labels of the diff text view. Show the version numbers
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1742	of the class."
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1743
2694 a19deafda6b0 * empty log message * Claus Gittinger <cg@exept.de> parents: 2650 diff changeset	1744	\|theVersionA theVersionB builder\|
2224 0e4250930948 checkin from browser Claus Gittinger <cg@exept.de> parents: 2221 diff changeset	1745
2694 a19deafda6b0 * empty log message * Claus Gittinger <cg@exept.de> parents: 2650 diff changeset	1746	builder := self builder.
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	1747	(theVersionA := self versionA) notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1748	self diffTextLabelA value:theVersionA.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1749	self onlyInALabelHolder value:('Only in ' , theVersionA).
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1750	(self componentAt:#OnlyInALabel)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1751	foregroundColor:Color white;
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1752	backgroundColor:Color green darkened.
2224 0e4250930948 checkin from browser Claus Gittinger <cg@exept.de> parents: 2221 diff changeset	1753	].
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	1754	(theVersionB :=self versionB) notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1755	self diffTextLabelB value:theVersionB.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1756	self onlyInBLabelHolder value:('Only in ' , theVersionB).
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1757	(self componentAt:#OnlyInBLabel)
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1758	foregroundColor:Color white;
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1759	backgroundColor:Color red darkened.
2224 0e4250930948 checkin from browser Claus Gittinger <cg@exept.de> parents: 2221 diff changeset	1760	].
7396 29b625902320 labels Claus Gittinger <cg@exept.de> parents: 7364 diff changeset	1761
29b625902320 labels Claus Gittinger <cg@exept.de> parents: 7364 diff changeset	1762	self changedLabelHolder value:('Different').
29b625902320 labels Claus Gittinger <cg@exept.de> parents: 7364 diff changeset	1763
29b625902320 labels Claus Gittinger <cg@exept.de> parents: 7364 diff changeset	1764	"Modified: / 13-10-2006 / 01:07:08 / cg"
2224 0e4250930948 checkin from browser Claus Gittinger <cg@exept.de> parents: 2221 diff changeset	1765	!
0e4250930948 checkin from browser Claus Gittinger <cg@exept.de> parents: 2221 diff changeset	1766
0e4250930948 checkin from browser Claus Gittinger <cg@exept.de> parents: 2221 diff changeset	1767	updateLists
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1768	\|classChangeSet listOnlyInA listOnlyInB listChanged
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1769	printStringGenerator sortBlockForChangeLists filteredList
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1770	isIgnoredChange numIgnoredExtensions\|
2230 5e10eebb1de2 move change-compare code to where it belongs (Change-hierarchy) Claus Gittinger <cg@exept.de> parents: 2229 diff changeset	1771
2585 718f8fce7ca4 * empty log message * Claus Gittinger <cg@exept.de> parents: 2578 diff changeset	1772	classChangeSet := self classChangeSet.
718f8fce7ca4 * empty log message * Claus Gittinger <cg@exept.de> parents: 2578 diff changeset	1773
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1774	printStringGenerator := [:aChange \| self printStringForChange:aChange].
3839 df64b936da0d sort lists by name Claus Gittinger <cg@exept.de> parents: 3763 diff changeset	1775	sortBlockForChangeLists := [:a :b \| (printStringGenerator value:a) < (printStringGenerator value:b)].
df64b936da0d sort lists by name Claus Gittinger <cg@exept.de> parents: 3763 diff changeset	1776
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1777	numIgnoredExtensions := 0.
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1778
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1779	isIgnoredChange :=
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1780	[:change \|
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1781	\|packageOfMethodInChange packageOfMethodInImage changeMethod ignored\|
9242 c3394838ddbd changed: #updateLists Claus Gittinger <cg@exept.de> parents: 9241 diff changeset	1782
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1783	ignored := false.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1784	change isMethodCodeChange ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1785	packageOfMethodInChange := change package.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1786	(packageOfMethodInChange notNil
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1787	and:[ packageOfMethodInChange ~= PackageId noProjectID
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1788	and:[ packageOfMethodInChange ~= change changeClass package ]]) ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1789	ignored := true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1790	].
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1791
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1792	changeMethod := change changeMethod.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1793	changeMethod notNil ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1794	packageOfMethodInImage := changeMethod package.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1795	(true "packageOfMethodInImage notNil"
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1796	and:[ packageOfMethodInImage ~= PackageId noProjectID
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1797	and:[ packageOfMethodInImage ~= changeMethod mclass package ]]) ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1798	ignored := true
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1799	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1800	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1801	numIgnoredExtensions := numIgnoredExtensions + (ignored ifTrue:[1] ifFalse:[0]).
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1802	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1803	ignored.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1804	].
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1805
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1806	listOnlyInA := self methodsOnlyInA.
2731 5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1807	listOnlyInA removeAll.
5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1808	classChangeSet notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1809	"/ classChangeSet methodsOnlyInA sort:sortBlockForChangeLists.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1810	filteredList := classChangeSet methodsOnlyInA.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1811	self includeExtensions ifFalse:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1812	filteredList := filteredList reject:isIgnoredChange.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1813	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1814	listOnlyInA addAll: (filteredList collect:printStringGenerator).
2731 5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1815	].
2585 718f8fce7ca4 * empty log message * Claus Gittinger <cg@exept.de> parents: 2578 diff changeset	1816
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1817	listOnlyInB := self methodsOnlyInB.
2731 5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1818	listOnlyInB removeAll.
5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1819	classChangeSet notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1820	"/ classChangeSet methodsOnlyInB sort:sortBlockForChangeLists.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1821	filteredList := classChangeSet methodsOnlyInB.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1822	self includeExtensions ifFalse:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1823	filteredList := filteredList reject:isIgnoredChange.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1824	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1825	listOnlyInB addAll: (filteredList collect:printStringGenerator).
2731 5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1826	].
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1827
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1828	listChanged := self methodsChanged.
2731 5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1829	listChanged removeAll.
5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1830	classChangeSet notNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1831	"/ classChangeSet methodsChanged sort:[:a :b \| sortBlockForChangeLists value:a first value:b first].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1832	filteredList := classChangeSet methodsChanged.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1833	self includeExtensions ifFalse:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1834	filteredList := filteredList reject:[:entry \| isIgnoredChange value:entry first].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1835	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1836	listChanged addAll: (filteredList collect:[:entry\| printStringGenerator value:(entry first)]).
2731 5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1837	].
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1838
2731 5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1839	self boxAVisible value:(listOnlyInA notEmpty).
5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1840	self boxBVisible value:(listOnlyInB notEmpty).
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1841
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1842	self boxMVisible value:(listChanged isEmpty
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1843	and: [(listOnlyInA notEmpty
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1844	or:[listOnlyInB notEmpty])]) not.
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1845
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1846	numIgnoredExtensions ~~ 0 ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1847	self infoHolder value:('%1 extension methods ignored.' bindWith:numIgnoredExtensions)
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1848	] ifFalse:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1849	self infoHolder value:nil
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1850	].
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1851
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1852	"Modified: / 21-03-2012 / 17:00:13 / cg"
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1853	! !
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	1854
2501 e86fae15642d checkin from browser ps parents: 2497 diff changeset	1855	!VersionDiffBrowser methodsFor:'setup'!
e86fae15642d checkin from browser ps parents: 2497 diff changeset	1856
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1857	setupForClass:aClass againstVersion:aVersionA
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1858	"compute the class change set for the class aClass of its current version against the repository version A.
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1859	When setting the class change set, the labels, list etc. of the receiver
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1860	are updated."
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1861
2731 5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1862	\|changeSet\|
5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1863
2745 8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1864	aClass isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1865	changeSet := nil
2745 8fa3af64f96e checkin from browser Claus Gittinger <cg@exept.de> parents: 2731 diff changeset	1866	] ifFalse:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1867	aClass isNameSpace ifFalse:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1868	aClass isLoaded ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1869	changeSet := (ClassChangeSet newForClass:aClass againstVersion:aVersionA).
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1870	]
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1871	].
2731 5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1872	].
2856 754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	1873	self classChangeSet:changeSet.
2857 0c467f6b1741 handle case if invoked without versionString Claus Gittinger <cg@exept.de> parents: 2856 diff changeset	1874	aVersionA isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1875	self class:aClass versionA:'Repository' versionB:'Current'.
2857 0c467f6b1741 handle case if invoked without versionString Claus Gittinger <cg@exept.de> parents: 2856 diff changeset	1876	] ifFalse:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1877	self class:aClass versionA:aVersionA versionB:(aVersionA , 'm').
2857 0c467f6b1741 handle case if invoked without versionString Claus Gittinger <cg@exept.de> parents: 2856 diff changeset	1878	]
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1879	!
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1880
2949 7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	1881	setupForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1882	"generate the class change set from the two classes A and B.
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1883	When setting the class change set, the labels, list etc. of the receiver
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1884	are updated."
2949 7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	1885
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	1886	\|changeSet\|
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	1887
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	1888	changeSet := (ClassChangeSet newForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB).
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	1889	self classChangeSet:changeSet
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	1890	!
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	1891
2510 58974b8db9fd checkin from browser ps parents: 2507 diff changeset	1892	setupForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1893	"generate the class change set from the two source files A and B.
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1894	When setting the class change set, the labels, list etc. of the receiver
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1895	are updated."
2510 58974b8db9fd checkin from browser ps parents: 2507 diff changeset	1896
2731 5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1897	\|changeSet\|
5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1898
9383 dc59d4bf4a56 code deobfuscated: Claus Gittinger <cg@exept.de> parents: 9325 diff changeset	1899	aClass isRealNameSpace ifFalse:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1900	aClass isLoaded ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1901	changeSet := (ClassChangeSet newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB).
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1902	]
2731 5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1903	].
5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1904	self classChangeSet:changeSet
7499 6bb22d2d1ad9 use isRealNameSpace Claus Gittinger <cg@exept.de> parents: 7419 diff changeset	1905
6bb22d2d1ad9 use isRealNameSpace Claus Gittinger <cg@exept.de> parents: 7419 diff changeset	1906	"Modified: / 10-11-2006 / 17:15:26 / cg"
2510 58974b8db9fd checkin from browser ps parents: 2507 diff changeset	1907	!
58974b8db9fd checkin from browser ps parents: 2507 diff changeset	1908
2501 e86fae15642d checkin from browser ps parents: 2497 diff changeset	1909	setupForClass:aClass versionA:aVersionA versionB:aVersionB
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1910	"compute the class change set for the class aClass and the versions A and B.
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1911	When setting the class change set, the labels, list etc. of the receiver
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1912	are updated."
2501 e86fae15642d checkin from browser ps parents: 2497 diff changeset	1913
2731 5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1914	\|changeSet\|
5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1915
5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1916	aClass isNameSpace ifFalse:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1917	aClass isLoaded ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1918	changeSet := (ClassChangeSet newForClass:aClass versionA:aVersionA versionB:aVersionB).
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1919	]
2731 5628e2514bfa * empty log message * Claus Gittinger <cg@exept.de> parents: 2730 diff changeset	1920	].
2856 754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	1921	self classChangeSet:changeSet.
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	1922	self class:aClass versionA:aVersionA versionB:aVersionB.
3678 7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	1923	!
7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	1924
7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	1925	setupForDiffSet:diffSet labelA:aLabelA labelB:aLabelB
7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	1926	\|changeSet\|
7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	1927
7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	1928	changeSet := (ClassChangeSet new diffSet:diffSet; labelA:aLabelA; labelB:aLabelB).
7a54c5f8c9fe * empty log message * Claus Gittinger <cg@exept.de> parents: 3594 diff changeset	1929	self classChangeSet:changeSet
2501 e86fae15642d checkin from browser ps parents: 2497 diff changeset	1930	! !
e86fae15642d checkin from browser ps parents: 2497 diff changeset	1931
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	1932	!VersionDiffBrowser::ClassChangeSet class methodsFor:'instance creation'!
ef306e387021 checkin from browser ps parents: 2486 diff changeset	1933
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1934	changeSetForClass:aClass
3756 7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	1935	"return a ChangeSet for the class aClass and its current source.
7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	1936	The source is generated into a stream and then the change set is generated
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1937	from the source stream."
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1938
3756 7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	1939	^ ChangeSet forExistingClass:aClass.
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1940	!
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1941
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	1942	changeSetForClass:aClass andRevision:aVersion
3594 12071dccbbe4 #valueNowOrOnUnwindDo: -> #ensure: Claus Gittinger <cg@exept.de> parents: 3344 diff changeset	1943	"return a ChangeSet for the class aClass and version aVersion.
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1944	The version from the class source stream is checked out from the repositiory
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1945	into a source stream. Then the change set is generated from the source stream."
3594 12071dccbbe4 #valueNowOrOnUnwindDo: -> #ensure: Claus Gittinger <cg@exept.de> parents: 3344 diff changeset	1946
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	1947	\|theSourceCodeManager theSourceStream theChangeSet\|
ef306e387021 checkin from browser ps parents: 2486 diff changeset	1948
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	1949	theSourceCodeManager := SourceCodeManagerUtilities default sourceCodeManagerFor:aClass.
3594 12071dccbbe4 #valueNowOrOnUnwindDo: -> #ensure: Claus Gittinger <cg@exept.de> parents: 3344 diff changeset	1950	[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1951	theSourceStream := theSourceCodeManager getSourceStreamFor:aClass revision:aVersion.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1952	theSourceStream notNil
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1953	ifTrue:[theChangeSet := ChangeSet fromStream:theSourceStream]
3594 12071dccbbe4 #valueNowOrOnUnwindDo: -> #ensure: Claus Gittinger <cg@exept.de> parents: 3344 diff changeset	1954	] ensure:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1955	theSourceStream notNil ifTrue:[theSourceStream close]
3594 12071dccbbe4 #valueNowOrOnUnwindDo: -> #ensure: Claus Gittinger <cg@exept.de> parents: 3344 diff changeset	1956	].
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1957	self sortChangeSet:theChangeSet.
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1958	^ theChangeSet
7108 e22911bfd36b sourceCodeManager access Claus Gittinger <cg@exept.de> parents: 6828 diff changeset	1959
e22911bfd36b sourceCodeManager access Claus Gittinger <cg@exept.de> parents: 6828 diff changeset	1960	"Modified: / 12-09-2006 / 14:24:51 / cg"
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	1961	!
ef306e387021 checkin from browser ps parents: 2486 diff changeset	1962
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1963	changeSetForClass:aClass andSource:aSource
3594 12071dccbbe4 #valueNowOrOnUnwindDo: -> #ensure: Claus Gittinger <cg@exept.de> parents: 3344 diff changeset	1964	"return a ChangeSet for the class aClass and source aSource.
4638 79734f7bdfc4 Handle openErrorSignal in preparition for change openErrorSignal Stefan Vogel <sv@exept.de> parents: 4359 diff changeset	1965	The source is converted to a stream and then the change set is generated
79734f7bdfc4 Handle openErrorSignal in preparition for change openErrorSignal Stefan Vogel <sv@exept.de> parents: 4359 diff changeset	1966	from the source stream.
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1967	Raise an error if the source stream cannot be opened."
4638 79734f7bdfc4 Handle openErrorSignal in preparition for change openErrorSignal Stefan Vogel <sv@exept.de> parents: 4359 diff changeset	1968
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	1969	\|theChangeSet theSourceStream\|
ef306e387021 checkin from browser ps parents: 2486 diff changeset	1970
3594 12071dccbbe4 #valueNowOrOnUnwindDo: -> #ensure: Claus Gittinger <cg@exept.de> parents: 3344 diff changeset	1971	[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1972	theSourceStream := aSource readStream.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1973	theChangeSet := ChangeSet fromStream:(theSourceStream := aSource readStream)
3594 12071dccbbe4 #valueNowOrOnUnwindDo: -> #ensure: Claus Gittinger <cg@exept.de> parents: 3344 diff changeset	1974	] ensure:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1975	theSourceStream notNil ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1976	theSourceStream close
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1977	]
3594 12071dccbbe4 #valueNowOrOnUnwindDo: -> #ensure: Claus Gittinger <cg@exept.de> parents: 3344 diff changeset	1978	].
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1979	self sortChangeSet:theChangeSet.
4653 0a97ce41f5bd More openErrorSignal change preparations Stefan Vogel <sv@exept.de> parents: 4638 diff changeset	1980	^ theChangeSet
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	1981	!
ef306e387021 checkin from browser ps parents: 2486 diff changeset	1982
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1983	newForClass:aClass againstVersion:aVersionA
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1984	"return a ClassChangeSet for the class aClass against some verson in the repository.
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	1985	A new instance of ClassChangeSet is generated containing
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1986	the correspondenting changes."
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1987
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	1988	\|theClassChangeSet\|
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1989
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1990	theClassChangeSet := self new.
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	1991	theClassChangeSet setupForClass:aClass againstVersion:aVersionA.
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1992	^ theClassChangeSet
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1993	!
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	1994
2949 7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	1995	newForClass:classA labelA:aLabelA andClass:classB labelB:aLabelB
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1996	"return a ClassChangeSet for two classes.
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	1997	A new instance of ClassChangeSet is generated containing the correspondenting changes."
2949 7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	1998
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	1999	\|aStream sourceA sourceB theChangeSetA theChangeSetB theClassChangeSet\|
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2000
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2001	theClassChangeSet := self new.
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2002	theClassChangeSet classBeingCompared:classA.
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2003	theClassChangeSet labelA:aLabelA.
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2004	theClassChangeSet labelB:aLabelB.
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2005
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2006	aStream := '' writeStream.
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2007	Method flushSourceStreamCache.
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2008	classA fileOutOn:aStream withTimeStamp:false.
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2009	sourceA := aStream contents asString.
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2010
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2011	aStream := '' writeStream.
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2012	Method flushSourceStreamCache.
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2013	classB fileOutOn:aStream withTimeStamp:false.
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2014	sourceB := aStream contents asString.
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2015
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2016	theChangeSetA:=self changeSetForClass:classA andSource:sourceA.
2949 7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2017	theChangeSetB:=self changeSetForClass:classB andSource:sourceB.
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2018	theChangeSetA isNil
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2019	ifTrue: [theChangeSetA := ChangeSet new].
2949 7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2020	theChangeSetB isNil
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2021	ifTrue: [theChangeSetB := ChangeSet new].
2949 7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2022
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2023	"/ just in case (if comparing a class against another),
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2024	"/ unify the classes of the changes (to avoid that all changes are detected as different)
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2025
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2026	theChangeSetB do:[:eachChange \|
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2027	eachChange isMethodChange ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2028	eachChange changeClass isMeta ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2029	eachChange changeClass ~~ classA theMetaclass ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2030	eachChange changeClass:classA theMetaclass.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2031	]
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2032	] ifFalse:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2033	eachChange changeClass ~~ classA theNonMetaclass ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2034	eachChange changeClass:classA theNonMetaclass.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2035	]
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2036	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2037	].
2949 7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2038	].
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2039	"/ remove all #initialize doIts
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2040	theChangeSetA := theChangeSetA select:[:eachChange \| eachChange isDoIt not or:[eachChange isInitialize not]].
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2041	theChangeSetB := theChangeSetB select:[:eachChange \| eachChange isDoIt not or:[eachChange isInitialize not]].
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2042
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2043	theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB).
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2044	^ theClassChangeSet
2949 7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2045	!
7ce4f684026b * empty log message * Claus Gittinger <cg@exept.de> parents: 2947 diff changeset	2046
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2047	newForClass:aClass labelA:aLabelA sourceA:aSourceA labelB:aLabelB sourceB:aSourceB
3730 717e425e843e allow for private classes to be compared Claus Gittinger <cg@exept.de> parents: 3687 diff changeset	2048	"return a ClassChangeSet for the class aClass and the two sources.
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2049	The two classes are compared via the source files. A new instance of
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2050	ClassChangeSet is generated containing the correspondenting changes."
3730 717e425e843e allow for private classes to be compared Claus Gittinger <cg@exept.de> parents: 3687 diff changeset	2051
4128 540bf0752f89 * empty log message * Claus Gittinger <cg@exept.de> parents: 3853 diff changeset	2052	\|theChangeSetA theChangeSetB theClassChangeSet className metaClassName\|
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2053
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2054	theClassChangeSet := self new.
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2055	theClassChangeSet classBeingCompared:aClass.
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2056	theClassChangeSet labelA:aLabelA.
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2057	theClassChangeSet labelB:aLabelB.
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2058	theChangeSetA:=self changeSetForClass:aClass andSource:aSourceA.
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2059	theChangeSetB:=self changeSetForClass:aClass andSource:aSourceB.
3730 717e425e843e allow for private classes to be compared Claus Gittinger <cg@exept.de> parents: 3687 diff changeset	2060
4128 540bf0752f89 * empty log message * Claus Gittinger <cg@exept.de> parents: 3853 diff changeset	2061	className := aClass name.
540bf0752f89 * empty log message * Claus Gittinger <cg@exept.de> parents: 3853 diff changeset	2062	metaClassName := aClass class name.
540bf0752f89 * empty log message * Claus Gittinger <cg@exept.de> parents: 3853 diff changeset	2063
3730 717e425e843e allow for private classes to be compared Claus Gittinger <cg@exept.de> parents: 3687 diff changeset	2064	aClass isPrivate ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2065	theChangeSetA := theChangeSetA select:[:change \| change isMethodChange not
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2066	or:[change className = className or:[change className = metaClassName]]].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2067	theChangeSetA := theChangeSetA select:[:change \| change isClassDefinitionChange not
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2068	or:[change className = className or:[change className = metaClassName]]].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2069	theChangeSetA := theChangeSetA select:[:change \| change isDoIt not
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2070	or:[change receiverClassName = className or:[change receiverClassName = metaClassName]]].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2071	theChangeSetB := theChangeSetB select:[:change \| change isMethodChange not
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2072	or:[change className = className or:[change className = metaClassName]]].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2073	theChangeSetB := theChangeSetB select:[:change \| change isClassDefinitionChange not
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2074	or:[change className = className or:[change className = metaClassName]]].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2075	theChangeSetB := theChangeSetB select:[:change \| change isDoIt not
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2076	or:[change receiverClassName = className or:[change receiverClassName = metaClassName]]].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2077	"/ there might be more needed...
3730 717e425e843e allow for private classes to be compared Claus Gittinger <cg@exept.de> parents: 3687 diff changeset	2078	].
717e425e843e allow for private classes to be compared Claus Gittinger <cg@exept.de> parents: 3687 diff changeset	2079
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2080	theChangeSetA isNil
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2081	ifTrue: [theChangeSetA := ChangeSet new].
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2082	theChangeSetB isNil
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2083	ifTrue: [theChangeSetB := ChangeSet new].
2947 59694f799b13 fixed compareWithClass Claus Gittinger <cg@exept.de> parents: 2857 diff changeset	2084
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2085	theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB).
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2086	^ theClassChangeSet
2465 0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	2087	!
0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	2088
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2089	newForClass:aClass versionA:aVersionA versionB:aVersionB
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2090	"return a ClassChangeSet for the class aClass and the two versions.
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2091	The two class version are checked out from the repository and then being
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2092	compared. A new instance of ClassChangeSet is generated containing
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2093	the correspondenting changes."
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2094
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2095	\|theChangeSetA theChangeSetB theClassChangeSet\|
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2096
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2097	theClassChangeSet := self new.
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2098	theClassChangeSet classBeingCompared:aClass.
2856 754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	2099	theClassChangeSet versionA:aVersionA.
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	2100	theClassChangeSet versionB:aVersionB.
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2101	theClassChangeSet labelA:aVersionA.
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2102	theClassChangeSet labelB:aVersionB.
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2103	theChangeSetA := self changeSetForClass: aClass andRevision: aVersionA.
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2104	theChangeSetB := self changeSetForClass: aClass andRevision: aVersionB.
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2105	theChangeSetA isNil ifTrue: [theChangeSetA := ChangeSet new].
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2106	theChangeSetB isNil ifTrue: [theChangeSetB := ChangeSet new].
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2107	theClassChangeSet diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB).
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2108	^ theClassChangeSet
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2109	!
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2110
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2111	sortChangeSet:aChangeSet
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2112	"/ sort by meta and selector
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2113
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2114	aChangeSet
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2115	sort:[:a :b \|
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2116	a == b ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2117	false
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2118	] ifFalse:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2119	a isClassDefinitionChange == b isClassDefinitionChange ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2120	a isClassChange == b isClassChange ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2121	a isClassChange ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2122	a isForMeta == b isForMeta ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2123	a isMethodChange == b isMethodChange ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2124	a className < b className
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2125	or:[ a className = b className
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2126	and:[ a isPrimitiveChange not
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2127	and:[ b isPrimitiveChange not
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2128	and:[ a selector < b selector ]]]]
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2129	] ifFalse:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2130	a isMethodChange not
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2131	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2132	] ifFalse:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2133	a isForMeta
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2134	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2135	] ifFalse:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2136	a printString < b printString
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2137	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2138	] ifFalse:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2139	a isClassChange
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2140	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2141	] ifFalse:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2142	a isClassDefinitionChange
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2143	].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2144	]
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2145	].
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2146	! !
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2147
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2148	!VersionDiffBrowser::ClassChangeSet methodsFor:'accessing'!
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2149
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2150	classBeingCompared
3756 7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2151	"returns the value of the class which is compared"
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2152
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2153	^ classBeingCompared
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2154	!
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	2155
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2156	classBeingCompared:something
3756 7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2157	"set the value of the class which is compared"
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2158
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2159	classBeingCompared := something.
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2160	!
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2161
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	2162	diffSet
3756 7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2163	"returns a diffSet containing the different changes.
7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2164	it responds to:
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	2165
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2166	changed OrderedCollection of arrays containing ChangeSets for methods
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2167	which are changed and exists in the class versionA and versionB
3756 7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2168	onlyInArg ChangeSet for the methods which exists only in the class versionB
7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2169	onlyInReceiver ChangeSet for the methods which exists only in the class versionA
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2170	"
3756 7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2171
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	2172	^ diffSet
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	2173	!
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	2174
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	2175	diffSet:something
3756 7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2176	"sets the diffSet containing the different changes.
7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2177	it responds to:
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	2178
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2179	changed OrderedCollection of arrays containing ChangeSets for methods
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2180	which are changed and exists in the class versionA and versionB
3756 7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2181	onlyInArg ChangeSet for the methods which exists only in the class versionB
7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2182	onlyInReceiver ChangeSet for the methods which exists only in the class versionA
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2183	"
2695 6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	2184
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	2185	diffSet := something.
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	2186	!
6cf8801118a3 more startup entries Claus Gittinger <cg@exept.de> parents: 2694 diff changeset	2187
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2188	labelA
3756 7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2189	"returns the label for the class versionA"
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2190
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2191	^ labelA
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2192	!
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2193
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2194	labelA:something
3756 7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2195	"sets the label for the class versionA"
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2196
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2197	labelA := something.
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2198	!
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2199
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2200	labelB
3756 7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2201	"returns the label for the class versionB"
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2202
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2203	^ labelB
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2204	!
2465 0567a72d20a5 added apply & browse Claus Gittinger <cg@exept.de> parents: 2419 diff changeset	2205
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2206	labelB:something
3756 7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2207	"sets the label for the class versionB"
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2208
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2209	labelB := something.
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2210	!
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2211
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2212	methodsChanged
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2213	"returns an OrderedCollection of arrays containing ChangeSets for methods
3756 7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2214	which are changed and exists in the class versionA and versionB
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2215
3756 7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2216	<return: OrderedCollection of Array(2)>
7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2217	"
7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2218
7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2219	^ self diffSet changed
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2220	!
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2221
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2222	methodsOnlyInA
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2223	"returns a ChangeSet for the methods which exists only in the class versionA"
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2224
3756 7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2225	^ self diffSet onlyInReceiver
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2226	!
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2227
ef306e387021 checkin from browser ps parents: 2486 diff changeset	2228	methodsOnlyInB
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2229	"returns a ChangeSet for the methods which exists only in the class versionB"
2497 ef306e387021 checkin from browser ps parents: 2486 diff changeset	2230
3756 7b7e4b5fd63e refactored Claus Gittinger <cg@exept.de> parents: 3753 diff changeset	2231	^ self diffSet onlyInArg
2856 754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	2232	!
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	2233
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	2234	versionA
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	2235	^ versionA
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	2236	!
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	2237
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	2238	versionA:something
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	2239	versionA := something.
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	2240	!
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	2241
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	2242	versionB
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	2243	^ versionB
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	2244	!
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	2245
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	2246	versionB:something
754d84dec893 checkin from browser Claus Gittinger <cg@exept.de> parents: 2853 diff changeset	2247	versionB := something.
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	2248	! !
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	2249
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	2250	!VersionDiffBrowser::ClassChangeSet methodsFor:'misc'!
05cf7ae53ada added: fm parents: 8811 diff changeset	2251
05cf7ae53ada added: fm parents: 8811 diff changeset	2252	removeAllVersionMethods
05cf7ae53ada added: fm parents: 8811 diff changeset	2253	diffSet removeAllVersionMethods.
05cf7ae53ada added: fm parents: 8811 diff changeset	2254	! !
05cf7ae53ada added: fm parents: 8811 diff changeset	2255
05cf7ae53ada added: fm parents: 8811 diff changeset	2256	!VersionDiffBrowser::ClassChangeSet methodsFor:'setup'!
05cf7ae53ada added: fm parents: 8811 diff changeset	2257
05cf7ae53ada added: fm parents: 8811 diff changeset	2258	setupForClass:aClass againstVersion:aVersionA
05cf7ae53ada added: fm parents: 8811 diff changeset	2259	"return a ClassChangeSet for the class aClass against some verison in the repository.
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2260	A new instance of ClassChangeSet is generated containing
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2261	the correspondenting changes."
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	2262
05cf7ae53ada added: fm parents: 8811 diff changeset	2263	\|theChangeSetA theChangeSetB versionCompared\|
05cf7ae53ada added: fm parents: 8811 diff changeset	2264
05cf7ae53ada added: fm parents: 8811 diff changeset	2265	self classBeingCompared:aClass.
05cf7ae53ada added: fm parents: 8811 diff changeset	2266	versionCompared := aVersionA.
05cf7ae53ada added: fm parents: 8811 diff changeset	2267	aVersionA isNil ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2268	self labelA:(versionCompared := aClass revision).
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2269	self versionA:versionCompared.
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	2270	] ifFalse:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2271	aVersionA == #newest ifTrue:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2272	self labelA:(VersionDiffBrowser resources string:'Newest').
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2273	] ifFalse:[
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2274	self labelA:versionCompared.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2275	self versionA:versionCompared.
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2276	]
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	2277	].
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2278	self labelB:(VersionDiffBrowser resources string:'Current').
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	2279	theChangeSetA := self class changeSetForClass: aClass andRevision: versionCompared.
05cf7ae53ada added: fm parents: 8811 diff changeset	2280	theChangeSetB := self class changeSetForClass: aClass.
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2281	theChangeSetA isNil ifTrue: [theChangeSetA := ChangeSet new].
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2282	theChangeSetB isNil ifTrue: [theChangeSetB := ChangeSet new].
1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2283
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	2284	"/ if we are comparing a private class, prune out other changes
05cf7ae53ada added: fm parents: 8811 diff changeset	2285	aClass isPrivate ifTrue:[
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2286	theChangeSetA removeAllSuchThat:[:aChange \| aChange className ~= aClass name ].
5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2287	theChangeSetB removeAllSuchThat:[:aChange \| aChange className ~= aClass name ].
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	2288	].
9239 1cfdf9dae50b double click; extensions-filter; better printStrings Claus Gittinger <cg@exept.de> parents: 8891 diff changeset	2289	self activityNotification:'Generating diff-set...'.
8891 05cf7ae53ada added: fm parents: 8811 diff changeset	2290	self diffSet:(theChangeSetA diffSetsAgainst:theChangeSetB).
05cf7ae53ada added: fm parents: 8811 diff changeset	2291	self activityNotification:nil.
05cf7ae53ada added: fm parents: 8811 diff changeset	2292	^ diffSet
05cf7ae53ada added: fm parents: 8811 diff changeset	2293	! !
05cf7ae53ada added: fm parents: 8811 diff changeset	2294
2221 f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	2295	!VersionDiffBrowser class methodsFor:'documentation'!
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	2296
f536ebd184ef initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	2297	version
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2298	^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.104 2012/03/22 08:32:02 cg Exp $'
8811 65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame: fm parents: 8657 diff changeset	2299	!
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame: fm parents: 8657 diff changeset	2300
65e08571a2f3 changed: #openOnClass:labelA:sourceA:labelB:sourceB:title:ifSame: fm parents: 8657 diff changeset	2301	version_CVS
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2302	^ '�Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.104 2012/03/22 08:32:02 cg Exp �'
12128 a7ff7d66ee85 Improvements in LintHighlighter, few fixes Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12125 diff changeset	2303	!
a7ff7d66ee85 Improvements in LintHighlighter, few fixes Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12125 diff changeset	2304
a7ff7d66ee85 Improvements in LintHighlighter, few fixes Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12125 diff changeset	2305	version_SVN
12229 5c129972b1fd Merged with trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12205 diff changeset	2306	^ '$Id: VersionDiffBrowser.st 7978 2012-04-13 13:15:47Z vranyj1 $'
12125 0c49a3b13e43 Merged with /trunk Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12123 diff changeset	2307	! !

author	Jan Vrany <jan.vrany@fit.cvut.cz>
	Fri, 13 Apr 2012 14:15:47 +0100
branch	jv
changeset 12229	5c129972b1fd
parent 12205	f210b6224ef0
child 12254	b1237f76f501
permissions	-rw-r--r--