--- a/Model.st	Sat Dec 11 02:29:14 1993 +0100
+++ b/Model.st	Sat Dec 11 02:31:47 1993 +0100
@@ -30,65 +30,22 @@
 Instance variables:
     dependentViews      Collection      the views knowing me
 
-$Header: /cvs/stx/stx/libview2/Model.st,v 1.3 1993-10-13 02:43:55 claus Exp $
+$Header: /cvs/stx/stx/libview2/Model.st,v 1.4 1993-12-11 01:31:16 claus Exp $
 written summer 92 by claus
 '!
 
 !Model methodsFor:'accessing'!
 
-addDependent:aView
-    "make the argument, anObject be dependent of the receiver"
-
-    dependents isNil ifTrue:[
-        dependents := IdentitySet new
-    ].
-    dependents add:aView
-!
-
-removeDependent:anObject
-    "make the argument, anObject be independent of the receiver"
-
-    dependents notNil ifTrue:[
-        dependents remove:anObject ifAbsent:[]
-    ]
-!
-
 dependents
     "return a Collection of dependents - nil if there is none"
 
     ^ dependents
 !
 
-release
-    "remove all dependencies from the receiver"
-
-    dependents := nil
-! !
-
-!Model methodsFor:'events'!
+dependents:aCollection
+    "set the collection of dependents"
 
-changed:something with:arguments
-    dependents notNil ifTrue:[
-        dependents do:[:someOne |
-            someOne update:something with:arguments
-        ]
-    ]
-!
-
-changed:something
-    dependents notNil ifTrue:[
-        dependents do:[:someOne |
-            someOne update:something
-        ]
-    ]
-!
-
-changed
-    dependents notNil ifTrue:[
-        dependents do:[:someOne |
-            someOne update:self
-        ]
-    ]
+    dependents := aCollection
 ! !
 
 !Model methodsFor:'drawing'!

--- a/PBMReader.st	Sat Dec 11 02:29:14 1993 +0100
+++ b/PBMReader.st	Sat Dec 11 02:31:47 1993 +0100
@@ -25,7 +25,7 @@
 this class provides methods for loading and saving Portable BitMap-file images
 (Jef Poskanzers portable bitmap package)..
 
-$Header: /cvs/stx/stx/libview2/PBMReader.st,v 1.2 1993-10-13 00:46:16 claus Exp $
+$Header: /cvs/stx/stx/libview2/PBMReader.st,v 1.3 1993-12-11 01:31:47 claus Exp $
 written Aug 93 by claus
 '!
 
@@ -118,11 +118,9 @@
 
     | pnmType |
 
-    inStream := FileStream readonlyFileNamed:fileName.
-    inStream isNil ifTrue:[
-        ('open error on ' , fileName) printNewline.
-        ^ nil
-    ].
+    inStream := self class streamReadingFile:fileName.
+    inStream isNil ifTrue:[^ nil].
+
     inStream next == $P ifFalse:[
         ('not PNM format in ', fileName) printNewline.
         inStream close. 
@@ -148,7 +146,8 @@
 readDepth1PBMFile:fileName 
     "import portable bitmap (PBM)"
 
-    inStream := FileStream readonlyFileNamed:fileName.
+    inStream := self class streamReadingFile:fileName.
+    inStream isNil ifTrue:[^ nil].
 
     (inStream next == $P) ifFalse: [
         inStream close. 
@@ -183,7 +182,9 @@
 
     |maxval|
 
-    inStream := FileStream readonlyFileNamed:fileName.
+    inStream := self class streamReadingFile:fileName.
+    inStream isNil ifTrue:[^ nil].
+
     inStream next == $P ifFalse:[ 
         inStream close.
         self error: 'not a pgm file format'
@@ -224,7 +225,9 @@
 
     | maxval |
 
-    inStream := FileStream readonlyFileNamed:fileName.
+    inStream := self class streamReadingFile:fileName.
+    inStream isNil ifTrue:[^ nil].
+
     (inStream next == $P) ifFalse: [
         inStream close. 
         self error: 'not a ppm file format'