15 changePositions changeClassNames changeHeaderLines |
15 changePositions changeClassNames changeHeaderLines |
16 changeIsFollowupMethodChange anyChanges changeNrShown |
16 changeIsFollowupMethodChange anyChanges changeNrShown |
17 changeNrProcessed skipSignal compareChanges compareCheckBox |
17 changeNrProcessed skipSignal compareChanges compareCheckBox |
18 changeFileSize changeFileTimestamp checkBlock changeTimeStamps |
18 changeFileSize changeFileTimestamp checkBlock changeTimeStamps |
19 tabSpec autoUpdate editingClassSource lastSearchType' |
19 tabSpec autoUpdate editingClassSource lastSearchType' |
20 classVariableNames:'CompressSnapshotInfo NoColoring' |
20 classVariableNames:'CompressSnapshotInfo NoColoring ShowWarningDialogs' |
21 poolDictionaries:'' |
21 poolDictionaries:'' |
22 category:'Interface-Browsers' |
22 category:'Interface-Browsers' |
23 ! |
23 ! |
24 |
24 |
25 !ChangesBrowser class methodsFor:'documentation'! |
25 !ChangesBrowser class methodsFor:'documentation'! |
157 "compiler notifys us of an error - this should really not happen since |
157 "compiler notifys us of an error - this should really not happen since |
158 changes ought to be correct (did someone edit the changes file ??). |
158 changes ought to be correct (did someone edit the changes file ??). |
159 Show the bad change in the codeView and let codeView hilight the error; |
159 Show the bad change in the codeView and let codeView hilight the error; |
160 no corrections allowed here therefore return false" |
160 no corrections allowed here therefore return false" |
161 |
161 |
162 self error:aString position:relPos to:relEndPos from:aCompiler. |
162 ShowWarningDialogs == true ifTrue:[ |
|
163 self error:aString position:relPos to:relEndPos from:aCompiler. |
|
164 ] ifFalse:[ |
|
165 Transcript showCR:aString. |
|
166 ]. |
163 ^ false |
167 ^ false |
164 ! |
168 ! |
165 |
169 |
166 error:aString position:relPos to:relEndPos from:aCompiler |
170 error:aString position:relPos to:relEndPos from:aCompiler |
167 "compiler notifys us of an error - this should really not happen since |
171 "compiler notifys us of an error - this should really not happen since |
169 Show the bad change in the codeView and let codeView hilight the error" |
173 Show the bad change in the codeView and let codeView hilight the error" |
170 |
174 |
171 |action| |
175 |action| |
172 |
176 |
173 (changeNrProcessed ~~ changeNrShown) ifTrue:[ |
177 (changeNrProcessed ~~ changeNrShown) ifTrue:[ |
174 self changeSelection:changeNrProcessed |
178 self changeSelection:changeNrProcessed |
175 ]. |
179 ]. |
176 (skipSignal notNil) ifTrue:[ |
180 (skipSignal notNil) ifTrue:[ |
177 |
181 |
178 codeView highlightingErrorPosition:relPos to:relEndPos do:[ |
182 codeView highlightingErrorPosition:relPos to:relEndPos do:[ |
179 |box| |
183 |box| |
180 |
184 |
181 " |
185 " |
182 start dialog - make certain cleanup is done |
186 start dialog - make certain cleanup is done |
183 " |
187 " |
184 action := OptionBox |
188 action := OptionBox |
185 request:aString |
189 request:aString |
186 label:'Error' |
190 label:'Error' |
187 form:(WarningBox iconBitmap) |
191 form:(WarningBox iconBitmap) |
188 buttonLabels:#('cancel' 'skip' 'continue') |
192 buttonLabels:#('cancel' 'skip' /* 'shut up' */ 'continue') |
189 values:#(#abort #skip #continue) |
193 values:#(#abort #skip /* #shutUp */ #continue) |
190 default:#continue. |
194 default:#continue. |
191 ]. |
195 ]. |
192 |
196 |
193 action == #abort ifTrue:[ |
197 "/ action == #shutUp ifTrue:[ |
194 Object abortSignal raise. |
198 "/ aCompiler ignoreWarnings. |
195 ^ false |
199 "/ ^ false |
196 ]. |
200 "/ ]. |
197 action == #skip ifTrue:[ |
201 |
198 skipSignal raise. |
202 action == #abort ifTrue:[ |
199 ^ false |
203 Object abortSignal raise. |
200 ]. |
204 ^ false |
201 ^ false |
205 ]. |
|
206 action == #skip ifTrue:[ |
|
207 skipSignal raise. |
|
208 ^ false |
|
209 ]. |
|
210 ^ false |
202 ]. |
211 ]. |
203 ^ codeView error:aString position:relPos to:relEndPos from:aCompiler |
212 ^ codeView error:aString position:relPos to:relEndPos from:aCompiler |
204 |
213 |
205 "Modified: 20.2.1996 / 20:47:59 / cg" |
214 "Modified: 20.2.1996 / 20:47:59 / cg" |
206 ! |
215 ! |
2277 changeSelection:lineNr |
2286 changeSelection:lineNr |
2278 "show a change in the codeView" |
2287 "show a change in the codeView" |
2279 |
2288 |
2280 |aStream sawExcla chunk| |
2289 |aStream sawExcla chunk| |
2281 |
2290 |
|
2291 lineNr isNil ifTrue:[ |
|
2292 codeView contents:nil. |
|
2293 codeView initializeDoITAction. |
|
2294 ^ self |
|
2295 ]. |
|
2296 |
2282 aStream := self streamForChange:lineNr. |
2297 aStream := self streamForChange:lineNr. |
2283 aStream isNil ifTrue:[ |
2298 aStream isNil ifTrue:[ |
2284 codeView initializeDoITAction. |
2299 codeView initializeDoITAction. |
2285 ^ self |
2300 ^ self |
2286 ]. |
2301 ]. |