--- a/Tools__NewSystemBrowser.st	Wed Jul 05 10:44:49 2017 +0200
+++ b/Tools__NewSystemBrowser.st	Wed Jul 05 10:54:33 2017 +0200
@@ -40838,6 +40838,7 @@
     "Modified: / 28-02-2012 / 16:27:44 / cg"
 ! !
 
+
 !NewSystemBrowser methodsFor:'menu actions-namespace'!
 
 nameSpaceMenuCheckOut
@@ -45286,7 +45287,7 @@
 
     "/ remove existing ones ...
     (cls := self theSingleSelectedClass) notNil ifTrue:[
-        classesMethodCategories := cls categories asSet.
+        classesMethodCategories := cls methodCategories asSet.
         someMethodCategories := allMethodCategories select:[:cat | (classesMethodCategories includes:cat) not].
 "/        someMethodCategories removeAllFoundIn:classesMethodCategories.
         (classesMethodCategories includes:suggestion) ifTrue:[
@@ -45345,7 +45346,7 @@
         LastNewProtocols removeLast
     ].
 
-    "Modified: / 25.2.2000 / 00:56:04 / cg"
+    "Modified: / 05-07-2017 / 10:52:32 / cg"
 !
 
 protocolMenuPrintOut
@@ -45419,14 +45420,14 @@
     "/ offer the current classes's protocols in the dialog
     (selClasses := self selectedClassesValue) notEmptyOrNil ifTrue:[
         selClasses do:[:eachClass |
-            someCategories addAll:(eachClass categories).
+            someCategories addAll:(eachClass methodCategories).
         ]
     ] ifFalse:[
         "/ offer the current method-classes' protocols in the dialog
         (selMethods := self selectedMethodsValue) notNil ifTrue:[
             selMethods do:[:eachMethod | |cls|
                 (cls := eachMethod mclass) notNil ifTrue:[
-                    someCategories addAll:cls categories
+                    someCategories addAll:cls methodCategories
                 ]
             ]
         ]
@@ -45489,7 +45490,7 @@
         self immediateUpdate value:false.
     ]
 
-    "Modified: / 28-02-2012 / 17:00:47 / cg"
+    "Modified: / 05-07-2017 / 10:52:41 / cg"
 !
 
 protocolMenuSpawn
@@ -45554,7 +45555,7 @@
     matchingProtocols := Set new.
     environment allClassesAndMetaclassesDo:[:eachClass |
         eachClass isLoaded ifTrue:[
-            eachClass categories do:[:cat |
+            eachClass methodCategories do:[:cat |
                 (pattern match:cat) ifTrue:[
                     matchingProtocols add:cat.
                 ]
@@ -45562,6 +45563,8 @@
         ]
     ].
     ^ self spawnFullProtocolBrowserFor:matchingProtocols in:openHow
+
+    "Modified: / 05-07-2017 / 10:52:49 / cg"
 !
 
 protocolMenuUpdate
@@ -45614,7 +45617,7 @@
                                 all := protocols includes:(BrowserList nameListEntryForALL).
                                 self withWaitCursorDo:[
                                     environment allClassesAndMetaclassesDo:[:eachClass |
-                                        eachClass categories do:[:cat |
+                                        eachClass methodCategories do:[:cat |
                                             (all or:[protocols includes:cat]) ifTrue:[
                                                 whatToDo value:eachClass value:cat.
                                             ]
@@ -45634,6 +45637,8 @@
             "/ brwsr selectMethods:selectedMethods.
 "/            brwsr immediateUpdate value:false.
         ]
+
+    "Modified: / 05-07-2017 / 10:53:05 / cg"
 !
 
 spawnProtocolBrowserFor:classes and:protocols in:where
@@ -48637,13 +48642,13 @@
     "/ offer the current classes's protocols in the dialog
     (selClasses := self selectedClassesValue) notNil ifTrue:[
         selClasses do:[:eachClass |
-            someCategories addAll:(eachClass categories).
+            someCategories addAll:(eachClass methodCategories).
         ]
     ] ifFalse:[
         "/ offer the current method-classes' protocols in the dialog
         methodSelection do:[:eachMethod | |cls|
             (cls := eachMethod mclass) notNil ifTrue:[
-                someCategories addAll:cls categories
+                someCategories addAll:cls methodCategories
             ]
         ]
     ].
@@ -48789,7 +48794,7 @@
 
     self moveMethods:methodSelection toProtocol:newCategory
 
-    "Modified: / 28-02-2012 / 16:52:19 / cg"
+    "Modified: / 05-07-2017 / 10:53:02 / cg"
 !
 
 selectorMenuNewImageSpec
@@ -54298,10 +54303,12 @@
 
     allProtocols := Set new.
     self selectedClassesDo:[:eachClass |
-        allProtocols addAll:(eachClass categories).
+        allProtocols addAll:(eachClass methodCategories).
     ].
     allProtocols := allProtocols select:[:each | aMatchPattern match:each].
     self selectProtocols:allProtocols asOrderedCollection.
+
+    "Modified: / 05-07-2017 / 10:52:53 / cg"
 !
 
 setupNavigationStateFrom:anotherNavigationState
@@ -57189,7 +57196,7 @@
         eachClass := eachNonMetaClass.
         meta ifTrue:[eachClass := eachNonMetaClass theMetaclass].
 
-        someCategories addAll:eachClass categories.
+        someCategories addAll:eachClass methodCategories.
         methodCategoryListApp notNil ifTrue:[
             someCategories addAll:(methodCategoryListApp additionalProtocolForClass:eachClass).
         ]
@@ -57218,8 +57225,8 @@
         list:someCategories
         initialAnswer:initial
 
-    "Created: / 29.2.2000 / 10:50:38 / cg"
-    "Modified: / 29.2.2000 / 10:54:26 / cg"
+    "Created: / 29-02-2000 / 10:50:38 / cg"
+    "Modified: / 05-07-2017 / 10:52:28 / cg"
 !
 
 askForNameSpace:title title:boxTitle initialText:initialTextOrNil
@@ -58567,7 +58574,7 @@
 
     targets do:[:cls |
         allIncluded ifTrue:[
-            cls categories do:[:cat |
+            cls methodCategories do:[:cat |
                 aBlock value:cls value:cat
             ]
         ] ifFalse:[
@@ -58582,7 +58589,7 @@
         ]
     ].
 
-    "Modified: / 28-02-2012 / 16:53:00 / cg"
+    "Modified: / 05-07-2017 / 10:52:56 / cg"
 !
 
 selectedSelectorInCodeViewOrNil