--- a/ChangeSet.st	Fri Oct 02 10:44:10 2009 +0200
+++ b/ChangeSet.st	Sun Oct 04 18:48:02 2009 +0200
@@ -1988,7 +1988,7 @@
 
     dispatchSelector := ('process_',(selector copyReplaceAll:$: with:$_)) asSymbol.
 "/ Transcript showCR:dispatchSelector.
-    (self class implements:dispatchSelector) ifTrue:[
+    (self respondsTo:dispatchSelector) ifTrue:[
         ^ self perform:dispatchSelector.
     ].
 
@@ -2244,20 +2244,23 @@
 handleCategoriesForClass
     |category change|
 
-    inputStream skipSeparators.
-    category := inputStream nextChunk.
-
-    change := ClassCategoryChange new.
-    change 
-        className:className
-        category:category.
-
-    self addChange:change.
+    [
+        inputStream skipSeparators.
+        category := inputStream nextChunk.
+        category notEmpty
+    ] whileTrue:[
+        change := ClassCategoryChange new.
+        change 
+            className:className
+            category:category.
+
+        self addChange:change.
+    ].
     ^ true
 !
 
 handleCategoriesForMethod
-    |methodSelector categories category change isPrivate isPublic|
+    |methodSelector categories change isPrivate isPublic category|
 
     methodSelector := (arguments at:1) evaluate.
     inputStream skipSeparators.
@@ -2265,12 +2268,15 @@
 
     categories := OrderedCollection new.
     [
+        |done category |
+
         category := inputStream nextChunk withoutSeparators.
-        category notEmpty ifTrue:[
+        done := category isEmpty.
+        done ifFalse:[
             categories add:category
         ].
-        category notEmpty
-    ] whileTrue.
+        done
+    ] whileFalse.
 
     categories size > 1 ifTrue:[
         isPrivate := categories includes:'private'.
@@ -2315,6 +2321,9 @@
     selector == #'subclass:instanceVariableNames:classVariableNames:poolDictionaries:classInstanceVariableNames:' ifTrue:[
         ^ self handleClassDefinitionChange.
     ].
+"/    selector == #'guid:' ifTrue:[
+"/        ^ self handleGUIDChange.
+"/    ].
     ^ super processChange
 
 
@@ -2486,5 +2495,9 @@
 !ChangeSet class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.163 2009-09-23 20:02:58 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.164 2009-10-04 16:48:02 cg Exp $'
+!
+
+version_CVS
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.164 2009-10-04 16:48:02 cg Exp $'
 ! !