--- a/Class.st	Mon Aug 28 01:21:07 1995 +0200
+++ b/Class.st	Mon Aug 28 17:47:54 1995 +0200
@@ -22,7 +22,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libbasic/Class.st,v 1.57 1995-08-27 23:20:08 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Class.st,v 1.58 1995-08-28 15:47:12 claus Exp $
 '!
 
 !Class class methodsFor:'documentation'!
@@ -43,7 +43,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libbasic/Class.st,v 1.57 1995-08-27 23:20:08 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Class.st,v 1.58 1995-08-28 15:47:12 claus Exp $
 "
 !
 
@@ -1933,7 +1933,7 @@
     "file out all methods belonging to aCategory, aString onto aStream"
 
     |nMethods count sep source sortedSelectors sortedMethods first 
-     wasPrivate wasProtected|
+     privacy|
 
     methodArray notNil ifTrue:[
 	nMethods := 0.
@@ -1959,8 +1959,7 @@
 		(aCategory = aMethod category) ifTrue:[
 
 		    first ifFalse:[
-			(wasPrivate ~~ aMethod isPrivate
-			or:[wasProtected ~~ aMethod isProtected]) ifTrue:[
+			privacy ~~ aMethod privacy ifTrue:[
 			    first := true.
 			    aStream space.
 			    aStream nextPut:sep.
@@ -1968,20 +1967,15 @@
 			aStream cr; cr
 		    ].
 
-		    wasPrivate := aMethod isPrivate.
-		    wasProtected := aMethod isProtected.
+		    privacy := aMethod privacy.
 
 		    first ifTrue:[
 			aStream nextPut:sep.
 			self printClassNameOn:aStream.
-			wasPrivate ifTrue:[
-			    aStream nextPutAll:' privateMethodsFor:'''.
+			privacy ~~ #public ifTrue:[
+			    aStream space; nextPutAll:privacy; nextPutAll:'MethodsFor:'''.
 			] ifFalse:[
-			    wasProtected ifTrue:[
-				aStream nextPutAll:' protectedMethodsFor:'''.
-			    ] ifFalse:[
-				aStream nextPutAll:' methodsFor:'''.
-			    ]
+			    aStream nextPutAll:' methodsFor:'''.
 			].
 			aCategory notNil ifTrue:[
 			    aStream nextPutAll:aCategory
@@ -2004,26 +1998,23 @@
 	]
     ]
 
-    "Modified: 27.8.1995 / 01:20:40 / claus"
+    "Modified: 28.8.1995 / 14:30:41 / claus"
 !
 
 fileOutMethod:aMethod on:aStream
     "file out the method, aMethod onto aStream"
 
-    |cat sep source|
+    |cat sep source privacy|
 
     methodArray notNil ifTrue:[
 	sep := aStream class chunkSeparator.
 	aStream nextPut:sep.
 	self printClassNameOn:aStream.
-	aMethod isPrivate ifTrue:[
-	    aStream nextPutAll:' privateMethodsFor:'''.
+
+	(privacy := aMethod privacy) ~~ #public ifTrue:[
+	    aStream space; nextPutAll:privacy; nextPutAll:'MethodsFor:'''.
 	] ifFalse:[
-	    aMethod isProtected ifTrue:[
-		aStream nextPutAll:' protectedMethodsFor:'''.
-	    ] ifFalse:[
-		aStream nextPutAll:' methodsFor:'''.
-	    ]
+	    aStream nextPutAll:' methodsFor:'''.
 	].
 	cat := aMethod category.
 	cat notNil ifTrue:[