[Pkg] The Trunk: System-mt.838.mcz

[commits at source.squeak.org]

Marcel Taeumel uploaded a new version of System to project The Trunk:
http://source.squeak.org/trunk/System-mt.838.mcz

==================== Summary ====================

Name: System-mt.838
Author: mt
Time: 21 July 2016, 11:55:13.013126 am
UUID: 2329d019-0868-b345-96ad-3eb65dc1509a
Ancestors: System-mt.837

In "slips detected - browse?" dialogs, use "confirm" instead of "choose".

=============== Diff against System-mt.837 ===============

Item was changed:
  ----- Method: ChangeSet>>fileOut (in category 'fileIn/Out') -----
  fileOut
  	"File out the receiver, to a file whose name is a function of the  
  	change-set name and either of the date & time or chosen to have a  
  	unique numeric tag, depending on the preference  
  	'changeSetVersionNumbers'"
  	| slips nameToUse |
  	self checkForConversionMethods.
  	ChangeSet promptForDefaultChangeSetDirectoryIfNecessary.
  	nameToUse := Preferences changeSetVersionNumbers
  				ifTrue: [self defaultChangeSetDirectory nextNameFor: self name extension: FileStream cs]
  				ifFalse: [self name , FileDirectory dot , Utilities dateTimeSuffix, FileDirectory dot , FileStream cs].
  	Cursor write showWhile: [ | internalStream |
  			internalStream := WriteStream on: (String new: 10000).
  			internalStream header; timeStamp.
  			self fileOutPreambleOn: internalStream.
  			self fileOutOn: internalStream.
  			self fileOutPostscriptOn: internalStream.
  			internalStream trailer.
  
  			FileStream writeSourceCodeFrom: internalStream baseName: (nameToUse copyFrom: 1 to: nameToUse size - 3) isSt: false useHtml: false.
  	].
  	Preferences checkForSlips
  		ifFalse: [^ self].
  	slips := self checkForSlips.
  	(slips size > 0
+ 			and: [UIManager default confirm: 'Changeset was filed out. Still, methods in this fileOut have halts\or references to the Transcript or other ''slips'' in them.\Would you like to browse them?' withCRs
+ 				title: 'Browse Slips?']) 
- 			and: [(UIManager default chooseFrom: #('Ignore' 'Browse slips')
- 				 	title: 'Methods in this fileOut have halts
- or references to the Transcript
- or other ''slips'' in them.
- Would you like to browse them?')
- 					= 2])
  		ifTrue: [self systemNavigation browseMessageList: slips name: 'Possible slips in ' , name]!

Item was changed:
  ----- Method: ChangeSet>>lookForSlips (in category 'fileIn/Out') -----
  lookForSlips
  	"Scan the receiver for changes that the user may regard as slips to be remedied"
  
  	| slips nameLine msg |
  	nameLine := '
  "', self name, '"
  '.
  	(slips := self checkForSlips) size = 0 ifTrue:
+ 		[^ self inform: ('No slips detected in change set\"{1}".' translated withCRs format: {self name})].
- 		[^ self inform: 'No slips detected in change set', nameLine].
  
  	msg := slips size = 1
  		ifTrue:
+ 			[ 'One method in change set "{1}"\has a halt, reference to the Transcript,
+ and/or some other ''slip'' in it.\Would you like to browse it?' translated withCRs format: {self name}]
- 			[ 'One method in change set', nameLine, 
- 'has a halt, reference to the Transcript,
- and/or some other ''slip'' in it.
- Would you like to browse it? ?']
  		ifFalse:
+ 			[ '{1} methods in change set "{2}"\have halts or references to the
+ Transcript or other ''slips'' in them.\Would you like to browse them?' translated withCRs format: {slips size. self name}].
- 			[ slips size printString,
- ' methods in change set', nameLine, 'have halts or references to the
- Transcript or other ''slips'' in them.
- Would you like to browse them?'].
  
+ 	(UIManager default confirm: msg title: 'Browse Slips?')
+ 		ifTrue: [self systemNavigation
+ 			browseMessageList: slips
+ 			name: 'Possible slips in ', self name]!
- 	(UIManager default  chooseFrom: #('Ignore' 'Browse slips') title: msg) = 2
- 		ifTrue: [self systemNavigation  browseMessageList: slips
- 							name: 'Possible slips in ', name]!