--- a/PeekableStream.st	Sun Aug 22 19:49:35 2004 +0200
+++ b/PeekableStream.st	Sun Aug 22 19:58:15 2004 +0200
@@ -221,7 +221,7 @@
      return the value of the last chunk.
      Someone (which is usually some codeView) is notified of errors."
 
-    |lastValue pkg spc spaces
+    |lastValue pkg nameSpace usedNameSpaces
      packageQuerySignal nameSpaceQuerySignal usedNameSpaceQuerySignal
      changeDefaultApplicationNotificationSignal
      defaultApplicationQuerySignal defaultApplication
@@ -257,39 +257,39 @@
     defaultApplicationQuerySignal := Class defaultApplicationQuerySignal.
     changeDefaultApplicationNotificationSignal := Class changeDefaultApplicationNotificationSignal.
 
-    "/ support for ST/X's namespaces & packages
+    "/ support for ST/X's nameSpaces & packages
     packageQuerySignal := Class packageQuerySignal.
     nameSpaceQuerySignal := Class nameSpaceQuerySignal.
     usedNameSpaceQuerySignal := Class usedNameSpaceQuerySignal.
 
-    (someone respondsTo:#packageToInstall) ifFalse:[
-        pkg := packageQuerySignal query.
-        askSomeoneForPackage := false.
-    ] ifTrue:[
+    (someone respondsTo:#packageToInstall) ifTrue:[
         pkg := someone packageToInstall.
         askSomeoneForPackage := true.
+    ] ifFalse:[
+        pkg := packageQuerySignal query.
+        askSomeoneForPackage := false.
     ].
-    (someone respondsTo:#currentNameSpace) ifFalse:[
-        spc := nameSpaceQuerySignal query.
-    ] ifTrue:[
-        spc := someone currentNameSpace
+    (someone respondsTo:#currentNameSpace) ifTrue:[
+        nameSpace := someone currentNameSpace
+    ] ifFalse:[
+        nameSpace := nameSpaceQuerySignal query.
     ].
-    (someone respondsTo:#usedNameSpaces) ifFalse:[
-        spaces := usedNameSpaceQuerySignal query.
-    ] ifTrue:[
-        spaces := someone usedNameSpaces
+    (someone respondsTo:#usedNameSpaces) ifTrue:[
+        usedNameSpaces := someone usedNameSpaces
+    ] ifFalse:[
+        usedNameSpaces := usedNameSpaceQuerySignal query.
     ].
-    (someone respondsTo:#defaultApplication) ifFalse:[
+    (someone respondsTo:#defaultApplication) ifTrue:[
+        defaultApplication := someone defaultApplication
+    ] ifFalse:[
         defaultApplication := defaultApplicationQuerySignal query.
-    ] ifTrue:[
-        defaultApplication := someone defaultApplication
     ].
 
     confirmationQuerySignal := Metaclass confirmationQuerySignal.
 
     passedSignals := IdentitySet new.
+    handledSignals := SignalSet new.
 
-    handledSignals := SignalSet new.
     handledSignals add:changeDefaultApplicationNotificationSignal.
     passedSignals add:changeDefaultApplicationNotificationSignal.
     handledSignals add:defaultApplicationQuerySignal.
@@ -312,17 +312,11 @@
     outerContext := thisContext.
 
     handledSignals handle:[:ex |
-        |sig action what sender msg param oldPackage newPackage proceedValue
-         canContinueForAll|
+        |sig action what sender msg proceedValue canContinueForAll|
 
         sig := ex signal.
-"/sig == packageQuerySignal ifTrue:[
-"/self halt.
-"/].
-        (passedSignals includes:sig) ifTrue:[
-            (sig isHandledIn:outerContext) ifTrue:[
-                ex reject
-            ]
+        ((passedSignals includes:sig) and:[sig isHandledIn:outerContext]) ifTrue:[
+            ex reject
         ].
         
         sig == changeDefaultApplicationNotificationSignal ifTrue:[
@@ -338,7 +332,7 @@
             ex proceedWith:defaultApplication
         ].
         sig == packageQuerySignal ifTrue:[
-            "/ query for the package to use for classes & methods
+            "answer the package to use for classes & methods"
             askSomeoneForPackage ifTrue:[
                 ex proceedWith:someone packageToInstall
             ] ifFalse:[
@@ -346,22 +340,24 @@
             ]
         ].
         sig == usedNameSpaceQuerySignal ifTrue:[
-            "/ query for the namespaces searched when encountering globals
-            ex proceedWith:spaces
+            "answer the nameSpaces to be searched when encountering globals"
+            ex proceedWith:usedNameSpaces
         ].
         sig == nameSpaceQuerySignal ifTrue:[
-            "/ query for the namespace to install new classes in
-            ex proceedWith:spc
+            "answer the nameSpace to install new classes in"
+            ex proceedWith:nameSpace
         ].
         sig == confirmationQuerySignal ifTrue:[
-            ex proceedWith:false "/ no dialogs popping up
+            "don't pop up dialogs"
+            ex proceedWith:false
         ].
 
         sig == Stream endOfStreamSignal ifTrue:[
+            "pass premature end of stream signal"
             ex reject
         ].
 
-        sig == Signal noHandlerSignal ifTrue:[
+        sig == NoHandlerError ifTrue:[
             ex parameter rejected ifTrue:[
                 ex reject
             ].
@@ -376,20 +372,13 @@
 
         "/ for your convenience ...
         (sig == Class methodRedefinitionSignal) ifTrue:[
-            param := ex parameter. "/ an association: oldMethod -> newMethod
-            oldPackage := param key package.
-            newPackage := param value package.
-            msg := 'trying to overwrite method:\\    ' , param key whoString , '\\in package ''' 
-                   , oldPackage , ''' with method from package ''' , newPackage , ''''.
+            msg := 'trying to overwrite method:\\    ' , ex oldMethod whoString , '\\in package ''' 
+                   , ex oldPackage , ''' with method from package ''' , ex newPackage , ''''.
             canContinueForAll := true.
         ] ifFalse:[
             (sig == Class classRedefinitionSignal) ifTrue:[
-                param := ex parameter. "/ an association: oldClass -> newClass
-                
-                oldPackage := param key package.
-                newPackage := param value package.
-                msg := 'trying to redefine class: ' , param key name allBold , '\\in package ''' 
-                       , oldPackage , ''' with new definition from package ''' , newPackage , ''''.
+                msg := 'trying to redefine class: ' , ex oldClass name allBold , '\\in package ''' 
+                       , ex oldPackage , ''' with new definition from package ''' , ex newPackage , ''''.
                 canContinueForAll := true.
                 redef := true.
             ] ifFalse:[
@@ -407,16 +396,16 @@
         "/ handle the case where no GUI has been built in,
         "/ just abort the fileIn with a notification
 
-        Display isNil ifTrue:[
+        Screen current isNil ifTrue:[
             sender := ex suspendedContext sender.
-            msg := msg , ('\\in ' , sender receiver class name , '>>>' , sender selector) withCRs.
+            msg := (msg , '\\in ' , sender receiver class name , '>>' , sender selector) withCRs.
             self notify:msg.
             ex return
         ].
 
         sig == HaltInterrupt ifTrue:[
             sender := ex suspendedContext.
-            msg := msg , ('\\in ' , sender receiver class name , '>>>' , sender selector) withCRs
+            msg := (msg , '\\in ' , sender receiver class name , '>>' , sender selector) withCRs
         ].
 
         "/ otherwise ask what should be done now and either
@@ -463,11 +452,11 @@
             ex proceedWith:proceedValue
         ].
         action == #abort ifTrue:[
-            AbortSignal raise.
+            AbortOperationRequest raise.
             ex return
         ].
         action == #cancelAll ifTrue:[
-            AbortAllSignal raise.
+            AbortAllOperationRequest raise.
             ex return
         ].
         action == #skip ifTrue:[
@@ -942,7 +931,7 @@
 !PeekableStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/PeekableStream.st,v 1.24 2004-07-13 08:38:59 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/PeekableStream.st,v 1.25 2004-08-22 17:58:15 stefan Exp $'
 ! !
 
 PeekableStream initialize!