--- a/ChangesBrowser.st Thu Jul 22 15:26:25 1999 +0200
+++ b/ChangesBrowser.st Thu Jul 22 18:30:38 1999 +0200
@@ -17,7 +17,7 @@
changeNrProcessed skipSignal compareChanges compareCheckBox
changeFileSize changeFileTimestamp checkBlock changeTimeStamps
tabSpec autoUpdate editingClassSource lastSearchType'
- classVariableNames:'CompressSnapshotInfo NoColoring'
+ classVariableNames:'CompressSnapshotInfo NoColoring ShowWarningDialogs'
poolDictionaries:''
category:'Interface-Browsers'
!
@@ -159,7 +159,11 @@
Show the bad change in the codeView and let codeView hilight the error;
no corrections allowed here therefore return false"
- self error:aString position:relPos to:relEndPos from:aCompiler.
+ ShowWarningDialogs == true ifTrue:[
+ self error:aString position:relPos to:relEndPos from:aCompiler.
+ ] ifFalse:[
+ Transcript showCR:aString.
+ ].
^ false
!
@@ -171,34 +175,39 @@
|action|
(changeNrProcessed ~~ changeNrShown) ifTrue:[
- self changeSelection:changeNrProcessed
+ self changeSelection:changeNrProcessed
].
(skipSignal notNil) ifTrue:[
- codeView highlightingErrorPosition:relPos to:relEndPos do:[
- |box|
-
- "
- start dialog - make certain cleanup is done
- "
- action := OptionBox
- request:aString
- label:'Error'
- form:(WarningBox iconBitmap)
- buttonLabels:#('cancel' 'skip' 'continue')
- values:#(#abort #skip #continue)
- default:#continue.
- ].
-
- action == #abort ifTrue:[
- Object abortSignal raise.
- ^ false
- ].
- action == #skip ifTrue:[
- skipSignal raise.
- ^ false
- ].
- ^ false
+ codeView highlightingErrorPosition:relPos to:relEndPos do:[
+ |box|
+
+ "
+ start dialog - make certain cleanup is done
+ "
+ action := OptionBox
+ request:aString
+ label:'Error'
+ form:(WarningBox iconBitmap)
+ buttonLabels:#('cancel' 'skip' /* 'shut up' */ 'continue')
+ values:#(#abort #skip /* #shutUp */ #continue)
+ default:#continue.
+ ].
+
+"/ action == #shutUp ifTrue:[
+"/ aCompiler ignoreWarnings.
+"/ ^ false
+"/ ].
+
+ action == #abort ifTrue:[
+ Object abortSignal raise.
+ ^ false
+ ].
+ action == #skip ifTrue:[
+ skipSignal raise.
+ ^ false
+ ].
+ ^ false
].
^ codeView error:aString position:relPos to:relEndPos from:aCompiler
@@ -2279,6 +2288,12 @@
|aStream sawExcla chunk|
+ lineNr isNil ifTrue:[
+ codeView contents:nil.
+ codeView initializeDoITAction.
+ ^ self
+ ].
+
aStream := self streamForChange:lineNr.
aStream isNil ifTrue:[
codeView initializeDoITAction.
@@ -3099,5 +3114,5 @@
!ChangesBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.163 1999-07-22 13:26:25 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.164 1999-07-22 16:30:38 cg Exp $'
! !