[squeak-dev] The Trunk: Multilingual-fbs.166.mcz

commits at source.squeak.org commits at source.squeak.org
Thu Jul 25 07:43:22 UTC 2013


Frank Shearar uploaded a new version of Multilingual to project The Trunk:
http://source.squeak.org/trunk/Multilingual-fbs.166.mcz

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

Name: Multilingual-fbs.166
Author: fbs
Time: 25 July 2013, 8:42:44.55 am
UUID: f9658a15-dc44-cc40-8cee-9ae3cca73c16
Ancestors: Multilingual-fbs.165

SmalltalkImage current -> Smalltalk.

=============== Diff against Multilingual-fbs.165 ===============

Item was changed:
  ----- Method: JapaneseEnvironment class>>clipboardInterpreterClass (in category 'subclass responsibilities') -----
  clipboardInterpreterClass
  	| platformName osVersion |
+ 	platformName := Smalltalk  platformName.
+ 	osVersion := Smalltalk osVersion.
- 	platformName := SmalltalkImage current  platformName.
- 	osVersion := SmalltalkImage current osVersion.
  	(platformName = 'Win32' and: [osVersion = 'CE']) 
  		ifTrue: [^NoConversionClipboardInterpreter].
  	platformName = 'Win32' ifTrue: [^WinShiftJISClipboardInterpreter].
  	platformName = 'Mac OS' ifTrue: [^MacShiftJISClipboardInterpreter].
  	^platformName = 'unix' 
  		ifTrue: 
  			[(ShiftJISTextConverter encodingNames includes: X11Encoding getEncoding) 
  				ifTrue: [MacShiftJISClipboardInterpreter]
  				ifFalse: [UnixJPClipboardInterpreter]]
  		ifFalse: [ NoConversionClipboardInterpreter ]!

Item was changed:
  ----- Method: JapaneseEnvironment class>>defaultEncodingName (in category 'public query') -----
  defaultEncodingName
  	| platformName osVersion |
+ 	platformName := Smalltalk platformName.
+ 	osVersion := Smalltalk osVersion.
- 	platformName := SmalltalkImage current platformName.
- 	osVersion := SmalltalkImage current osVersion.
  	(platformName = 'Win32' and: [osVersion = 'CE']) ifTrue: [^'utf-8'].
  	(#('Win32' 'ZaurusOS') includes: platformName) ifTrue: [^'shift-jis'].
  	platformName = 'Mac OS' 
  		ifTrue: 
  			[^('10*' match: osVersion) 
  				ifTrue: ['utf-8']
  				ifFalse: ['shift-jis']].
  	^'unix' = platformName ifTrue: ['euc-jp'] ifFalse: ['mac-roman']!

Item was changed:
  ----- Method: JapaneseEnvironment class>>inputInterpreterClass (in category 'subclass responsibilities') -----
  inputInterpreterClass
  	| platformName osVersion encoding |
+ 	platformName := Smalltalk platformName.
+ 	osVersion := Smalltalk osVersion.
- 	platformName := SmalltalkImage current platformName.
- 	osVersion := SmalltalkImage current osVersion.
  	(platformName = 'Win32'
  			and: [osVersion = 'CE'])
  		ifTrue: [^ MacRomanInputInterpreter].
  	platformName = 'Win32'
  		ifTrue: [^ (self win32VMUsesUnicode) ifTrue: [UTF32JPInputInterpreter] ifFalse: [WinShiftJISInputInterpreter]].
  	platformName = 'Mac OS'
  		ifTrue: [^ (('10*' match: osVersion)
+ 					and: [(Smalltalk getSystemAttribute: 3) isNil])
- 					and: [(SmalltalkImage current getSystemAttribute: 3) isNil])
  				ifTrue: [MacUnicodeInputInterpreter]
  				ifFalse: [MacShiftJISInputInterpreter]].
  	platformName = 'unix'
  		ifTrue: [encoding := X11Encoding encoding.
  			(EUCJPTextConverter encodingNames includes: encoding)
  				ifTrue: [^ UnixEUCJPInputInterpreter].
  			(UTF8TextConverter encodingNames includes: encoding)
  				ifTrue: [^ UnixUTF8JPInputInterpreter].
  			(ShiftJISTextConverter encodingNames includes: encoding)
  				ifTrue: [^ MacShiftJISInputInterpreter]].
  	^ MacRomanInputInterpreter!

Item was changed:
  ----- Method: JapaneseEnvironment class>>systemConverterClass (in category 'subclass responsibilities') -----
  systemConverterClass
  	| platformName osVersion encoding |
+ 	platformName := Smalltalk platformName.
+ 	osVersion := Smalltalk osVersion.
- 	platformName := SmalltalkImage current platformName.
- 	osVersion := SmalltalkImage current osVersion.
  	(platformName = 'Win32' and: [osVersion = 'CE']) 
  		ifTrue: [^UTF8TextConverter].
  	(#('Win32' 'ZaurusOS') includes: platformName) 
  		ifTrue: [^ShiftJISTextConverter].
  	platformName = 'Mac OS' 
  		ifTrue: 
  			[^('10*' match: osVersion) 
  				ifTrue: [UTF8TextConverter]
  				ifFalse: [ShiftJISTextConverter]].
  	platformName = 'unix' 
  		ifTrue: 
  			[encoding := X11Encoding encoding.
  			encoding ifNil: [^EUCJPTextConverter].
  			(encoding = 'utf-8') 
  				ifTrue: [^UTF8TextConverter].				
  			(encoding = 'shiftjis' or: [ encoding = 'sjis' ]) 
  				ifTrue: [^ShiftJISTextConverter].				
  			^EUCJPTextConverter].
  	^MacRomanTextConverter!

Item was changed:
  ----- Method: KoreanEnvironment class>>clipboardInterpreterClass (in category 'as yet unclassified') -----
  clipboardInterpreterClass
  	| platformName osVersion |
+ 	platformName := Smalltalk platformName.
+ 	osVersion := Smalltalk osVersion.
- 	platformName := SmalltalkImage current platformName.
- 	osVersion := SmalltalkImage current osVersion.
  	(platformName = 'Win32' and: [osVersion = 'CE']) 
  		ifTrue: [^NoConversionClipboardInterpreter].
  	platformName = 'Win32' ifTrue: [^WinKSX1001ClipboardInterpreter].
  	platformName = 'Mac OS' 
  		ifTrue: 
  			[('10*' match: osVersion) 
  				ifTrue: [^NoConversionClipboardInterpreter]
  				ifFalse: [^WinKSX1001ClipboardInterpreter]].
  	platformName = 'unix' 
  		ifTrue: 
  			[(ShiftJISTextConverter encodingNames includes: X11Encoding getEncoding) 
  				ifTrue: [^WinKSX1001ClipboardInterpreter]
  				ifFalse: [^NoConversionClipboardInterpreter]].
  	^NoConversionClipboardInterpreter!

Item was changed:
  ----- Method: KoreanEnvironment class>>defaultEncodingName (in category 'as yet unclassified') -----
  defaultEncodingName
  	| platformName osVersion |
+ 	platformName := Smalltalk platformName.
+ 	osVersion := Smalltalk osVersion.
- 	platformName := SmalltalkImage current platformName.
- 	osVersion := SmalltalkImage current osVersion.
  	(platformName = 'Win32' and: [osVersion = 'CE']) ifTrue: [^'utf-8' copy].
  	(#('Win32' 'Mac OS' 'ZaurusOS') includes: platformName) 
  		ifTrue: [^'euc-kr' copy].
  	(#('unix') includes: platformName) ifTrue: [^'euc-kr' copy].
  	^'mac-roman'!

Item was changed:
  ----- Method: KoreanEnvironment class>>inputInterpreterClass (in category 'as yet unclassified') -----
  inputInterpreterClass
  	| platformName osVersion encoding |
+ 	platformName := Smalltalk platformName.
+ 	osVersion := Smalltalk osVersion.
- 	platformName := SmalltalkImage current platformName.
- 	osVersion := SmalltalkImage current osVersion.
  	(platformName = 'Win32' and: [osVersion = 'CE']) 
  		ifTrue: [^MacRomanInputInterpreter].
  	platformName = 'Win32' ifTrue: [^WinKSX1001InputInterpreter].
  	platformName = 'Mac OS' 
  		ifTrue: 
  			[('10*' match: osVersion) 
  				ifTrue: [^MacUnicodeInputInterpreter]
  				ifFalse: [^WinKSX1001InputInterpreter]].
  	platformName = 'unix' 
  		ifTrue: 
  			[encoding := X11Encoding encoding.
  			(EUCJPTextConverter encodingNames includes: encoding) 
  				ifTrue: [^MacRomanInputInterpreter].
  			(UTF8TextConverter encodingNames includes: encoding) 
  				ifTrue: [^MacRomanInputInterpreter].
  			(ShiftJISTextConverter encodingNames includes: encoding) 
  				ifTrue: [^MacRomanInputInterpreter]].
  	^MacRomanInputInterpreter!

Item was changed:
  ----- Method: LanguageEnvironment class>>defaultFileNameConverter (in category 'public query') -----
  defaultFileNameConverter
+ 	Smalltalk platformName = 'Win32' ifTrue:[^UTF8TextConverter new].
- 	SmalltalkImage current  platformName = 'Win32' ifTrue:[^UTF8TextConverter new].
  	FileNameConverterClass
  		ifNil: [FileNameConverterClass := self currentPlatform class fileNameConverterClass].
  	^ FileNameConverterClass new!

Item was changed:
  ----- Method: Latin1Environment class>>defaultEncodingName (in category 'subclass responsibilities') -----
  defaultEncodingName
  	| platformName osVersion |
+ 	platformName := Smalltalk platformName.
+ 	osVersion := Smalltalk osVersion.
- 	platformName := SmalltalkImage current platformName.
- 	osVersion := SmalltalkImage current osVersion.
  	(platformName = 'Win32' and: [osVersion = 'CE']) ifTrue: [^'utf-8' copy].
  	(#('Win32' 'Mac OS' 'ZaurusOS') includes: platformName) 
  		ifTrue: [^'iso8859-1' copy].
  	(#('unix') includes: platformName) ifTrue: [^'iso8859-1' copy].
  	^'mac-roman'!

Item was changed:
  ----- Method: Latin1Environment class>>inputInterpreterClass (in category 'subclass responsibilities') -----
  inputInterpreterClass
  	| platformName osVersion |
+ 	platformName := Smalltalk platformName.
+ 	osVersion := Smalltalk osVersion.
- 	platformName := SmalltalkImage current platformName.
- 	osVersion := SmalltalkImage current osVersion.
  	(platformName = 'Win32' and: [osVersion ~= 'CE'])
  		ifTrue: [^ (self win32VMUsesUnicode) ifTrue: [UTF32InputInterpreter] ifFalse: [MacRomanInputInterpreter]].
  	platformName = 'Mac OS'
  		ifTrue: [^ MacUnicodeInputInterpreter].
  	platformName = 'unix'
  		ifTrue: [^ UTF32InputInterpreter].
  	^ MacUnicodeInputInterpreter!

Item was changed:
  ----- Method: Latin1Environment class>>systemConverterClass (in category 'subclass responsibilities') -----
  systemConverterClass
  
  	| platformName osVersion |
+ 	platformName := Smalltalk platformName.
+ 	osVersion := Smalltalk getSystemAttribute: 1002.
- 	platformName := SmalltalkImage current platformName.
- 	osVersion := SmalltalkImage current getSystemAttribute: 1002.
  	(platformName = 'Win32'
  			and: [osVersion = 'CE'])
  		ifTrue: [^ MacRomanTextConverter].
  	platformName = 'Win32'
  		ifTrue: [^ (self win32VMUsesUnicode) ifTrue: [UTF8TextConverter] ifFalse: [Latin1TextConverter]].
  	platformName = 'Mac OS'
+ 		ifTrue: [^ ('10*' match: Smalltalk osVersion)
- 		ifTrue: [^ ('10*' match: SmalltalkImage current osVersion)
  				ifTrue: [UTF8TextConverter]
  				ifFalse: [MacRomanTextConverter]].
  	platformName = 'unix'
  		ifTrue: [^ UTF8TextConverter].
  	^ MacRomanTextConverter!

Item was changed:
  ----- Method: Latin2Environment class>>clipboardInterpreterClass (in category 'subclass responsibilities') -----
  clipboardInterpreterClass
  
+ 	(#('Win32') includes: Smalltalk platformName) 
- 	(#('Win32') includes: SmalltalkImage current platformName) 
  		ifTrue: [^CP1250ClipboardInterpreter  ].
  
  	^ ISO88592ClipboardInterpreter .
  !

Item was changed:
  ----- Method: Latin2Environment class>>defaultEncodingName (in category 'subclass responsibilities') -----
  defaultEncodingName
  	| platformName osVersion |
+ 	platformName := Smalltalk platformName.
+ 	osVersion := Smalltalk osVersion.
- 	platformName := SmalltalkImage current platformName.
- 	osVersion := SmalltalkImage current osVersion.
  	(platformName = 'Win32' and: [osVersion = 'CE']) ifTrue: [^'utf-8' copy].
  	(#('Win32') includes: platformName) 
  		ifTrue: [^'cp-1250' copy].
  	(#('unix') includes: platformName) ifTrue: [^'iso8859-2' copy].
  	^'mac-roman'!

Item was changed:
  ----- Method: Latin2Environment class>>fileNameConverterClass (in category 'subclass responsibilities') -----
  fileNameConverterClass
  
+ 	(#('Win32') includes: Smalltalk platformName) 
- 	(#('Win32') includes: SmalltalkImage current platformName) 
  		ifTrue: [^CP1250TextConverter ].
  
  	^ ISO88592TextConverter.
  
  !

Item was changed:
  ----- Method: Latin2Environment class>>inputInterpreterClass (in category 'subclass responsibilities') -----
  inputInterpreterClass
  
+ 	(#('Win32') includes: Smalltalk platformName) 
- 	(#('Win32') includes: SmalltalkImage current platformName) 
  		ifTrue: [^CP1250InputInterpreter ].
  
  	^ ISO88592InputInterpreter.
  
  !

Item was changed:
  ----- Method: Latin2Environment class>>systemConverterClass (in category 'subclass responsibilities') -----
  systemConverterClass
  
+ 	(#('Win32') includes: Smalltalk platformName) 
- 	(#('Win32') includes: SmalltalkImage current platformName) 
  		ifTrue: [^CP1250TextConverter ].
  
  	^ ISO88592TextConverter.
  !

Item was changed:
  ----- Method: MultiByteFileStream class>>guessDefaultLineEndConvention (in category 'class initialization') -----
  guessDefaultLineEndConvention
  	"Lets try to guess the line end convention from what we know about the
  	path name delimiter from FileDirectory."
  	FileDirectory pathNameDelimiter = $:
  		ifTrue: [^ self defaultToCR].
  	FileDirectory pathNameDelimiter = $/
+ 		ifTrue: [((Smalltalk osVersion)
- 		ifTrue: [((SmalltalkImage current osVersion)
  					beginsWith: 'darwin')
  				ifTrue: [^ self defaultToCR]
  				ifFalse: [^ self defaultToLF]].
  	FileDirectory pathNameDelimiter = $\
  		ifTrue: [^ self defaultToCRLF].
  	"in case we don't know"
  	^ self defaultToCR!

Item was changed:
  ----- Method: RussianEnvironment class>>inputInterpreterClass (in category 'as yet unclassified') -----
  inputInterpreterClass
  	| platformName  |
+ 	platformName := Smalltalk platformName.
- 	platformName := SmalltalkImage current platformName.
  	platformName = 'Win32'
  		ifTrue: [^UTF32RussianInputInterpreter].
  	platformName = 'Mac OS'
+ 		ifTrue: [^ (('10*' match: Smalltalk osVersion)
+ 					and: [(Smalltalk getSystemAttribute: 3) isNil])
- 		ifTrue: [^ (('10*' match: SmalltalkImage current osVersion)
- 					and: [(SmalltalkImage current getSystemAttribute: 3) isNil])
  				ifTrue: [MacUnicodeInputInterpreter]
  				ifFalse: [MacRomanInputInterpreter]].
  	platformName = 'unix'
  		ifTrue: [^ UTF32RussianInputInterpreter].
  	^ MacRomanInputInterpreter!

Item was changed:
  ----- Method: SimplifiedChineseEnvironment class>>clipboardInterpreterClass (in category 'subclass responsibilities') -----
  clipboardInterpreterClass
  	| platformName osVersion |
+ 	platformName := Smalltalk platformName.
+ 	osVersion := Smalltalk osVersion.
- 	platformName := SmalltalkImage current platformName.
- 	osVersion := SmalltalkImage current osVersion.
  	(platformName = 'Win32' and: [osVersion = 'CE']) 
  		ifTrue: [^NoConversionClipboardInterpreter].
  	platformName = 'Win32' ifTrue: [^WinGB2312ClipboardInterpreter].
  	platformName = 'Mac OS' 
  		ifTrue: 
  			[('10*' match: osVersion) 
  				ifTrue: [^NoConversionClipboardInterpreter]
  				ifFalse: [^WinGB2312ClipboardInterpreter]].
  	platformName = 'unix' 
  		ifTrue: 
  			[(ShiftJISTextConverter encodingNames includes: X11Encoding getEncoding) 
  				ifTrue: [^MacShiftJISClipboardInterpreter]
  				ifFalse: [^NoConversionClipboardInterpreter]].
  	^NoConversionClipboardInterpreter!

Item was changed:
  ----- Method: SimplifiedChineseEnvironment class>>defaultEncodingName (in category 'public query') -----
  defaultEncodingName
  	| platformName osVersion |
+ 	platformName := Smalltalk platformName.
+ 	osVersion := Smalltalk osVersion.
- 	platformName := SmalltalkImage current platformName.
- 	osVersion := SmalltalkImage current osVersion.
  	(platformName = 'Win32' and: [osVersion = 'CE']) ifTrue: [^'utf-8' copy].
  	(#('Win32' 'Mac OS' 'ZaurusOS') includes: platformName) 
  		ifTrue: [^'gb2312' copy].
  	(#('unix') includes: platformName) ifTrue: [^'euc-cn' copy].
  	^'mac-roman'!

Item was changed:
  ----- Method: SimplifiedChineseEnvironment class>>inputInterpreterClass (in category 'subclass responsibilities') -----
  inputInterpreterClass
  	| platformName osVersion encoding |
+ 	platformName := Smalltalk platformName.
+ 	osVersion := Smalltalk osVersion.
- 	platformName := SmalltalkImage current platformName.
- 	osVersion := SmalltalkImage current osVersion.
  	(platformName = 'Win32' and: [osVersion = 'CE']) 
  		ifTrue: [^MacRomanInputInterpreter].
  	platformName = 'Win32' ifTrue: [^WinGB2312InputInterpreter].
  	platformName = 'Mac OS' 
  		ifTrue: 
  			[('10*' match: osVersion) 
  				ifTrue: [^MacUnicodeInputInterpreter]
  				ifFalse: [^WinGB2312InputInterpreter]].
  	platformName = 'unix' 
  		ifTrue: 
  			[encoding := X11Encoding encoding.
  			(EUCJPTextConverter encodingNames includes: encoding) 
  				ifTrue: [^MacRomanInputInterpreter].
  			(UTF8TextConverter encodingNames includes: encoding) 
  				ifTrue: [^MacRomanInputInterpreter].
  			(ShiftJISTextConverter encodingNames includes: encoding) 
  				ifTrue: [^MacRomanInputInterpreter]].
  	^MacRomanInputInterpreter!



More information about the Squeak-dev mailing list