--- a/ChangeSetBrowser.st Mon Nov 18 18:12:07 2002 +0100
+++ b/ChangeSetBrowser.st Mon Nov 18 18:12:40 2002 +0100
@@ -389,19 +389,16 @@
)
#(#MenuItem
#label: '-'
- #isVisible: #notReadOnly
)
#(#MenuItem
#label: 'Previous Snapshot'
#translateLabel: true
- #isVisible: #notReadOnly
#value: #findPreviousSnapshot
#enabled: #hasSelection
)
#(#MenuItem
#label: 'Next Snapshot'
#translateLabel: true
- #isVisible: #notReadOnly
#value: #findNextSnapshot
#enabled: #hasSelection
)
@@ -443,14 +440,12 @@
#(#MenuItem
#label: 'Settings'
#translateLabel: true
- #isVisible: #notReadOnly
#submenu:
#(#Menu
#(
#(#MenuItem
#label: 'Auto Compare'
#translateLabel: true
- #isVisible: #notReadOnly
#indication: #autoCompare
)
#(#MenuItem
@@ -461,14 +456,22 @@
)
#(#MenuItem
#label: '-'
- #isVisible: #notReadOnly
)
#(#MenuItem
#label: 'Apply in Original NameSpace'
#translateLabel: true
- #isVisible: #notReadOnly
#indication: #applyInOriginalNameSpace
)
+ #(#MenuItem
+ #label: 'Apply in NameSpace...'
+ #translateLabel: true
+ #indication: #applyInNameSpace
+ )
+ #(#MenuItem
+ #label: 'Apply into Package...'
+ #translateLabel: true
+ #indication: #applyInPackage
+ )
)
nil
nil
@@ -649,7 +652,16 @@
sig := Object abortSignal
].
sig catch:[
- (changeSet at:changeNr) apply.
+
+ Parser::ParseError handle:[:ex |
+ ex signal == Parser::UndefinedSuperclassError ifTrue:[
+ codeView error:(ex errorString) position:1 to:nil from:nil
+ ] ifFalse:[
+ codeView error:(ex errorMessage) position:(ex startPosition) to:(ex endPosition) from:(ex parser)
+ ]
+ ] do:[
+ (changeSet at:changeNr) apply.
+ ]
].
changeNrProcessed := nil.
].
@@ -867,5 +879,5 @@
!ChangeSetBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.28 2002-11-11 09:39:47 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.29 2002-11-18 17:12:40 cg Exp $'
! !