ResourcePack.st
changeset 1173 86a212598655
parent 1078 f7b6f15899ab
child 1803 1d27b31ed478
--- a/ResourcePack.st	Fri Jan 10 18:33:02 1997 +0100
+++ b/ResourcePack.st	Fri Jan 10 18:47:31 1997 +0100
@@ -17,7 +17,7 @@
 	category:'Interface-Support'
 !
 
-!ResourcePack  class methodsFor:'documentation'!
+!ResourcePack class methodsFor:'documentation'!
 
 copyright
 "
@@ -161,7 +161,7 @@
 "
 ! !
 
-!ResourcePack  class methodsFor:'initialization'!
+!ResourcePack class methodsFor:'initialization'!
 
 flushCachedResourcePacks
     "forget all cached resources - needed after a style change"
@@ -180,7 +180,7 @@
     "ResourcePack initialize"
 ! !
 
-!ResourcePack  class methodsFor:'instance creation'!
+!ResourcePack class methodsFor:'instance creation'!
 
 for:aClass
     "get the full resource definitions for aClass (i.e. with super packs).
@@ -233,7 +233,7 @@
     ^ newPack
 ! !
 
-!ResourcePack  class methodsFor:'private'!
+!ResourcePack class methodsFor:'private'!
 
 addToCache:aPack
     |idx|
@@ -395,7 +395,7 @@
         stream := ReadStream on:lineString.
         name := String 
                     readFrom:stream 
-                    onError:[('RESOURCEPACK: invalid line <',lineString,'>') errorPrintNL. nil].
+                    onError:[('ResourcePack [warning]: invalid line <',lineString,'>') errorPrintCR. nil].
 "/ OLD: l := stream position
         l := stream position + 1.
 
@@ -432,7 +432,7 @@
         ] ifFalse:[
             value := Compiler evaluate:rest compile:false.
             (value == #Error) ifTrue:[
-                Transcript show:('error in resource:' , name).
+                Transcript show:('ResourcePack: error in resource:' , name).
             ] ifFalse:[
                 encoding notNil ifTrue:[
                     value isString ifTrue:[
@@ -445,7 +445,7 @@
     ]
 
     "Created: 26.2.1996 / 19:17:07 / cg"
-    "Modified: 26.2.1996 / 19:18:07 / cg"
+    "Modified: 10.1.1997 / 18:05:06 / cg"
 !
 
 readFromFile:fileName directory:dirName
@@ -471,10 +471,10 @@
     ok ifFalse:[
         fileReadFailed := true.
 
-        ('RESOURCEPACK: ''' , fileName , ''' contains error(s) - data may be incomplete.') errorPrintNL.
+        ('ResourcePack [warning]: ''' , fileName , ''' contains error(s) - data may be incomplete.') errorPrintCR.
     ].
 
-    "Modified: 14.5.1996 / 11:57:22 / cg"
+    "Modified: 10.1.1997 / 18:05:17 / cg"
 !
 
 readFromResourceStream:inStream in:dirName
@@ -549,8 +549,8 @@
                 ] ifFalse:[
                     skipping ifFalse:[
                         ErrorSignal handle:[:ex |
-                            ('RESOURCEPACK: error: ''' , ex errorString , '''') errorPrintNL.
-                            ('RESOURCEPACK: line ' , lNo printString , ': ''' , lineString , '''') errorPrintNL.
+                            ('ResourcePack [warning]: ''' , ex errorString , '''') errorPrintCR.
+                            ('ResourcePack [info]: line ' , lNo printString , ': ''' , lineString , '''') infoPrintCR.
                             ok := false.
                         ] do:[
                             self processLine:lineString encoding:encoding
@@ -563,7 +563,7 @@
     ^ ok
 
     "Modified: 31.8.1995 / 02:33:45 / claus"
-    "Modified: 26.2.1996 / 19:22:36 / cg"
+    "Modified: 10.1.1997 / 18:05:59 / cg"
 ! !
 
 !ResourcePack methodsFor:'merging'!
@@ -576,9 +576,9 @@
     ]
 ! !
 
-!ResourcePack  class methodsFor:'documentation'!
+!ResourcePack class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.37 1996-10-18 12:36:43 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.38 1997-01-10 17:47:31 cg Exp $'
 ! !
 ResourcePack initialize!