hg/stx-goodies-monticello: MCMergeResolutionRequest.st@e3dd2050492e (annotated)

1167 37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	1	"
37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	2	COPYRIGHT (c) 2023 LabWare
37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	3	"
76 1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	4	"{ Package: 'stx:goodies/monticello' }"
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	5
1167 37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	6	"{ NameSpace: Smalltalk }"
37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	7
76 1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	8	Notification subclass:#MCMergeResolutionRequest
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	9	instanceVariableNames:'merger'
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	10	classVariableNames:''
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	11	poolDictionaries:''
583 6d9d9e1c78ab category change Claus Gittinger <cg@exept.de> parents: 76 diff changeset	12	category:'SCM-Monticello-Versioning'
76 1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	13	!
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	14
1167 37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	15	!MCMergeResolutionRequest class methodsFor:'documentation'!
37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	16
37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	17	copyright
37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	18	"
37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	19	COPYRIGHT (c) 2023 LabWare
37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	20
37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	21
37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	22	"
37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	23	! !
76 1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	24
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	25	!MCMergeResolutionRequest methodsFor:'as yet unclassified'!
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	26
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	27	defaultAction
1167 37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	28	"
37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	29	^ (MCMergeBrowser new
37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	30	merger: merger;
37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	31	label: messageText) showModally
37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	32	"
37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	33	self notYetImplemented.
37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	34
37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	35	"Modified: / 02-05-2023 / 14:27:58 / Jan Vrany <jan.vrany@labware.com>"
76 1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	36	!
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	37
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	38	merger
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	39	^ merger
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	40	!
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	41
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	42	merger: aMerger
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	43	merger _ aMerger
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	44	! !
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	45
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	46	!MCMergeResolutionRequest class methodsFor:'documentation'!
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	47
1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	48	version
583 6d9d9e1c78ab category change Claus Gittinger <cg@exept.de> parents: 76 diff changeset	49	^ '$Header: /cvs/stx/stx/goodies/monticello/MCMergeResolutionRequest.st,v 1.2 2012-09-11 21:12:59 cg Exp $'
76 1be5824351fb initial checkin Claus Gittinger <cg@exept.de> parents: diff changeset	50	! !
1167 37c202ea81a8 Remove unused Squeak UI code Jan Vrany <jan.vrany@labware.com> parents: 583 diff changeset	51

author	Jan Vrany <jan.vrany@labware.com>
	Tue, 11 Jul 2023 12:13:27 +0100
branch	jv
changeset 1173	e3dd2050492e
parent 1167	37c202ea81a8
permissions	-rw-r--r--