--- a/XBMReader.st Tue Feb 03 18:18:33 1998 +0100
+++ b/XBMReader.st Tue Feb 03 18:19:55 1998 +0100
@@ -139,31 +139,27 @@
lineString := aStream nextLine.
lineString isNil ifTrue:[
- 'XBMReader [warning]: short file' errorPrintCR.
- ^ nil
+ ^ self fileFormatError:'short file'.
].
[lineString startsWith:'#'] whileFalse:[
lineString := aStream nextLine.
lineString isNil ifTrue:[
- ^ nil
+ ^ self fileFormatError:'short file'.
].
].
(lineString startsWith:'#define') ifFalse:[
- 'XBMReader [warning]: format error (expected #define)' errorPrintCR.
- ^ nil
+ ^ self fileFormatError:'format error (expected #define)'.
].
index := lineString indexOf:(Character space).
index := lineString indexOf:(Character space) startingAt:(index + 1).
(index == 0) ifTrue:[
- 'XBMReader [warning]: format error' errorPrintCR.
- ^ nil
+ ^ self fileFormatError:'format error'.
].
((lineString copyTo:index - 1) endsWith:'width') ifFalse:[
- 'XBMReader [warning]: format error (expected width)' errorPrintCR.
- ^ nil
+ ^ self fileFormatError:'format error (expected width)'.
].
lineString := lineString copyFrom:(index + 1).
width := Number readFromString:lineString.
@@ -172,12 +168,10 @@
index := lineString indexOf:(Character space).
index := lineString indexOf:(Character space) startingAt:(index + 1).
(index == 0) ifTrue:[
- 'XBMReader [warning]: format error' errorPrintCR.
- ^ nil
+ ^ self fileFormatError:'format error'.
].
((lineString copyTo:index - 1) endsWith:'height') ifFalse:[
- 'XBMReader [warning]: format error (expected height)' errorPrintCR.
- ^ nil
+ ^ self fileFormatError:'format error (expected height)'.
].
lineString := lineString copyFrom:(index + 1).
height := Number readFromString:lineString.
@@ -226,7 +220,7 @@
XBMReader fromFile:'bitmaps/globe1.xbm'
"
- "Modified: 11.4.1997 / 16:51:21 / cg"
+ "Modified: / 3.2.1998 / 18:19:45 / cg"
! !
!XBMReader methodsFor:'writing to file'!
@@ -315,6 +309,6 @@
!XBMReader class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/XBMReader.st,v 1.37 1997-06-30 20:56:38 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/XBMReader.st,v 1.38 1998-02-03 17:19:55 cg Exp $'
! !
XBMReader initialize!