# HG changeset patch # User Claus Gittinger # Date 1039518135 -3600 # Node ID 35995cc972f70e2669b76881921f914c57498c4c # Parent b0023a5ca3b8e26487e557273264c86e4be5b1d4 category change diff -r b0023a5ca3b8 -r 35995cc972f7 VersionDiffBrowser.st --- a/VersionDiffBrowser.st Tue Dec 10 12:01:45 2002 +0100 +++ b/VersionDiffBrowser.st Tue Dec 10 12:02:15 2002 +0100 @@ -1049,26 +1049,6 @@ ^ onlyInBLabelHolder. ! ! -!VersionDiffBrowser methodsFor:'aspects - menu'! - -canAcceptInCodeView - ^ self hasChangeSelectedInA - or:[self hasChangeSelectedInB - or:[self hasChangeSelectedInM]] -! - -hasChangeSelectedInA - ^ self selectedChangeInA notNil -! - -hasChangeSelectedInB - ^ self selectedChangeInB notNil -! - -hasChangeSelectedInM - ^ self methodsChangedSelection value notNil -! ! - !VersionDiffBrowser methodsFor:'aspects-exported'! changedLabelHolder:aValueHolder @@ -1120,6 +1100,26 @@ ] ! ! +!VersionDiffBrowser methodsFor:'aspects-menu'! + +canAcceptInCodeView + ^ self hasChangeSelectedInA + or:[self hasChangeSelectedInB + or:[self hasChangeSelectedInM]] +! + +hasChangeSelectedInA + ^ self selectedChangeInA notNil +! + +hasChangeSelectedInB + ^ self selectedChangeInB notNil +! + +hasChangeSelectedInM + ^ self methodsChangedSelection value notNil +! ! + !VersionDiffBrowser methodsFor:'change & update'! update:something with:parameter from:changedObject @@ -1987,5 +1987,5 @@ !VersionDiffBrowser class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.62 2002-10-31 13:50:01 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.63 2002-12-10 11:02:15 cg Exp $' ! ! diff -r b0023a5ca3b8 -r 35995cc972f7 WorkspaceApplication.st --- a/WorkspaceApplication.st Tue Dec 10 12:01:45 2002 +0100 +++ b/WorkspaceApplication.st Tue Dec 10 12:02:15 2002 +0100 @@ -633,7 +633,7 @@ ^ super closeRequest ! ! -!WorkspaceApplication methodsFor:'menu actions'! +!WorkspaceApplication methodsFor:'menu-actions'! addGlobalVariable |name nameKey selection| @@ -1410,5 +1410,5 @@ !WorkspaceApplication class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.50 2002-12-10 11:01:45 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.51 2002-12-10 11:02:03 cg Exp $' ! !