From 847c578869589a7099ca714bc10fe3b6036ee43c Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Tue, 15 Jul 2014 15:26:52 +0200
Subject: [PATCH] mtp3: Change categories to match Pharo code a bit

Pharo has a lot of changes in the MTP3 code and added M2UA and
other link handling code as well. This should be merged back.
---
 mtp3/MTP3Messages.st      | 98 +++++++++++++++++++--------------------
 mtp3/MTP3MessagesTests.st | 10 ++--
 2 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/mtp3/MTP3Messages.st b/mtp3/MTP3Messages.st
index d16b36e..5d6efca 100644
--- a/mtp3/MTP3Messages.st
+++ b/mtp3/MTP3Messages.st
@@ -19,7 +19,7 @@
 Object subclass: MTP3Address [
     | dpc opc |
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: 'A representation of a MTP3 Address. It includes the Destination Point Code (DPC) and the Originating Point Code (OPC).'>
 ]
 
@@ -28,7 +28,7 @@ Object subclass: MTP3Address [
 Object subclass: MTP3Service [
     | on_transfer on_pause on_resume on_status |
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-LinkHandling'>
     <comment: 'I represent the primitives of Q.701 for MTP3.
 This service is not implemented yet!'>
 
@@ -70,7 +70,7 @@ This service is not implemented yet!'>
 
 Object subclass: MTP3NetworkManagementTimer [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: 'I represent the legal ranges from Q.704'>
 
     MTP3NetworkManagementTimer class >> T1 [
@@ -253,7 +253,7 @@ Object subclass: MTP3NetworkManagementTimer [
 
 Object subclass: MTP3Field [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: 'I am a baseclass for MTP3 Fields. I provide no functionality myself.'>
 ]
 
@@ -262,7 +262,7 @@ Object subclass: MTP3Field [
 MTP3Field subclass: MTP3Heading [
     | h0 h1 |
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: 'Encoding/Decoding of the Heading code H0 and Heading code H1. Please refer to MTP3MSG for the possible h0 and h1 values.'>
 
     MTP3Heading class >> parseFrom: aStream [
@@ -306,7 +306,7 @@ MTP3Field subclass: MTP3Heading [
 
 Object subclass: MTP3LinkTestTimer [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     T1 [
@@ -329,7 +329,7 @@ Object subclass: MTP3LinkTestTimer [
 Object subclass: MTP3MSG [
     | service label heading |
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3MSG class >> findMessageClassFor: aServiceIndicator heading: aHeading [
@@ -384,7 +384,7 @@ Object subclass: MTP3MSG [
 MTP3MSG subclass: MTP3LinkTestMSG [
     | pattern |
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: 'I represent messages specified in Q.707'>
 
     MTP3LinkTestMSG class >> h0 [
@@ -442,7 +442,7 @@ MTP3MSG subclass: MTP3LinkTestMSG [
 
 MTP3MSG subclass: MTP3NetworkManagementMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: 'MTP3Message is a codec class for the MessageTransferPart as of Q.701-Q.704, Q.706 and Q.707. Currently only the ITU version will be supported.
 The spec is really difficult to read a MTP3 Message will have:
     DCBA (MTPSubservice         4bit)
@@ -643,7 +643,7 @@ The spec is really difficult to read a MTP3 Message will have:
 
 MTP3NetworkManagementMSG subclass: MTP3TRMMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: 'TRM message base class'>
 
     MTP3TRMMSG class >> h0 [
@@ -659,7 +659,7 @@ MTP3NetworkManagementMSG subclass: MTP3TRMMSG [
 
 MTP3NetworkManagementMSG subclass: MTP3CHMMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: 'CHM message base class'>
 
     MTP3CHMMSG class >> h0 [
@@ -675,7 +675,7 @@ MTP3NetworkManagementMSG subclass: MTP3CHMMSG [
 
 MTP3NetworkManagementMSG subclass: MTP3ECMMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: 'ECM message base class'>
 
     MTP3ECMMSG class >> h0 [
@@ -691,7 +691,7 @@ MTP3NetworkManagementMSG subclass: MTP3ECMMSG [
 
 MTP3LinkTestMSG subclass: MTP3SLTMMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3SLTMMSG class >> h1 [
@@ -707,7 +707,7 @@ MTP3LinkTestMSG subclass: MTP3SLTMMSG [
 
 MTP3CHMMSG subclass: MTP3CBAMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3CBAMSG class >> h1 [
@@ -723,7 +723,7 @@ MTP3CHMMSG subclass: MTP3CBAMSG [
 
 MTP3CHMMSG subclass: MTP3COOMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3COOMSG class >> h1 [
@@ -740,7 +740,7 @@ MTP3CHMMSG subclass: MTP3COOMSG [
 MTP3Field subclass: MTP3Label [
     | dpc opc slc |
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: 'I represent a Q.704 15.2 Label. Maybe I should use GSMBitField or such in the future.'>
 
     MTP3Label class >> parseFrom: aStream [
@@ -811,7 +811,7 @@ MTP3Field subclass: MTP3Label [
 
 MTP3NetworkManagementMSG subclass: MTP3RSMMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: 'RSM message base class'>
 
     MTP3RSMMSG class >> h0 [
@@ -827,7 +827,7 @@ MTP3NetworkManagementMSG subclass: MTP3RSMMSG [
 
 MTP3RSMMSG subclass: MTP3RSTMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3RSTMSG class >> h1 [
@@ -843,7 +843,7 @@ MTP3RSMMSG subclass: MTP3RSTMSG [
 
 MTP3CHMMSG subclass: MTP3CBDMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3CBDMSG class >> h1 [
@@ -859,7 +859,7 @@ MTP3CHMMSG subclass: MTP3CBDMSG [
 
 MTP3LinkTestMSG subclass: MTP3SLTAMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3SLTAMSG class >> h1 [
@@ -875,7 +875,7 @@ MTP3LinkTestMSG subclass: MTP3SLTAMSG [
 
 MTP3ECMMSG subclass: MTP3ECOMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3ECOMSG class >> h1 [
@@ -891,7 +891,7 @@ MTP3ECMMSG subclass: MTP3ECOMSG [
 
 MTP3NetworkManagementMSG subclass: MTP3DLMMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: 'DLM message base class'>
 
     MTP3DLMMSG class >> h0 [
@@ -907,7 +907,7 @@ MTP3NetworkManagementMSG subclass: MTP3DLMMSG [
 
 MTP3DLMMSG subclass: MTP3CNPMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3CNPMSG class >> h1 [
@@ -923,7 +923,7 @@ MTP3DLMMSG subclass: MTP3CNPMSG [
 
 MTP3DLMMSG subclass: MTP3DLCMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3DLCMSG class >> h1 [
@@ -939,7 +939,7 @@ MTP3DLMMSG subclass: MTP3DLCMSG [
 
 MTP3DLMMSG subclass: MTP3CNSMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3CNSMSG class >> h1 [
@@ -955,7 +955,7 @@ MTP3DLMMSG subclass: MTP3CNSMSG [
 
 MTP3DLMMSG subclass: MTP3CSSMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3CSSMSG class >> h1 [
@@ -971,7 +971,7 @@ MTP3DLMMSG subclass: MTP3CSSMSG [
 
 MTP3RSMMSG subclass: MTP3RSRMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3RSRMSG class >> h1 [
@@ -987,7 +987,7 @@ MTP3RSMMSG subclass: MTP3RSRMSG [
 
 MTP3CHMMSG subclass: MTP3COAMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3COAMSG class >> h1 [
@@ -1003,7 +1003,7 @@ MTP3CHMMSG subclass: MTP3COAMSG [
 
 MTP3NetworkManagementMSG subclass: MTP3MIMMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: 'MIM message base class'>
 
     MTP3MIMMSG class >> h0 [
@@ -1019,7 +1019,7 @@ MTP3NetworkManagementMSG subclass: MTP3MIMMSG [
 
 MTP3MIMMSG subclass: MTP3LIAMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3LIAMSG class >> h1 [
@@ -1035,7 +1035,7 @@ MTP3MIMMSG subclass: MTP3LIAMSG [
 
 MTP3MIMMSG subclass: MTP3LINMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3LINMSG class >> h1 [
@@ -1051,7 +1051,7 @@ MTP3MIMMSG subclass: MTP3LINMSG [
 
 MTP3MIMMSG subclass: MTP3LFUMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3LFUMSG class >> h1 [
@@ -1067,7 +1067,7 @@ MTP3MIMMSG subclass: MTP3LFUMSG [
 
 MTP3MIMMSG subclass: MTP3LIDMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3LIDMSG class >> h1 [
@@ -1083,7 +1083,7 @@ MTP3MIMMSG subclass: MTP3LIDMSG [
 
 MTP3MIMMSG subclass: MTP3LUAMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3LUAMSG class >> h1 [
@@ -1099,7 +1099,7 @@ MTP3MIMMSG subclass: MTP3LUAMSG [
 
 MTP3MIMMSG subclass: MTP3LUNMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3LUNMSG class >> h1 [
@@ -1115,7 +1115,7 @@ MTP3MIMMSG subclass: MTP3LUNMSG [
 
 MTP3MIMMSG subclass: MTP3LLTMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3LLTMSG class >> h1 [
@@ -1131,7 +1131,7 @@ MTP3MIMMSG subclass: MTP3LLTMSG [
 
 MTP3NetworkManagementMSG subclass: MTP3FCMMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: 'FCM message base class'>
 
     MTP3FCMMSG class >> h0 [
@@ -1147,7 +1147,7 @@ MTP3NetworkManagementMSG subclass: MTP3FCMMSG [
 
 MTP3FCMMSG subclass: MTP3TFCMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3TFCMSG class >> humanName [
@@ -1159,7 +1159,7 @@ MTP3FCMMSG subclass: MTP3TFCMSG [
 
 MTP3FCMMSG subclass: MTP3RCTMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3RCTMSG class >> humanName [
@@ -1171,7 +1171,7 @@ MTP3FCMMSG subclass: MTP3RCTMSG [
 
 MTP3TRMMSG subclass: MTP3TRAMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3TRAMSG class >> h1 [
@@ -1188,7 +1188,7 @@ MTP3TRMMSG subclass: MTP3TRAMSG [
 MTP3Field subclass: MTP3ServiceIndicators [
     | serviceIndicator subServiceField |
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: 'I represent a Q.704 14.2.1 service Indicator and 14.2.2 sub-service field'>
 
     MTP3ServiceIndicators class >> broadbandIsdnUserPart [
@@ -1309,7 +1309,7 @@ MTP3Field subclass: MTP3ServiceIndicators [
 
 MTP3NetworkManagementMSG subclass: MTP3TFMMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: 'TFM message base class'>
 
     MTP3TFMMSG class >> h0 [
@@ -1325,7 +1325,7 @@ MTP3NetworkManagementMSG subclass: MTP3TFMMSG [
 
 MTP3TFMMSG subclass: MTP3TFAMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3TFAMSG class >> h1 [
@@ -1341,7 +1341,7 @@ MTP3TFMMSG subclass: MTP3TFAMSG [
 
 MTP3TFMMSG subclass: MTP3TFRMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3TFRMSG class >> h1 [
@@ -1357,7 +1357,7 @@ MTP3TFMMSG subclass: MTP3TFRMSG [
 
 MTP3TFMMSG subclass: MTP3TFPMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3TFPMSG class >> h1 [
@@ -1373,7 +1373,7 @@ MTP3TFMMSG subclass: MTP3TFPMSG [
 
 MTP3NetworkManagementMSG subclass: MTP3UFCMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: 'UFC message base class'>
 
     MTP3UFCMSG class >> h0 [
@@ -1389,7 +1389,7 @@ MTP3NetworkManagementMSG subclass: MTP3UFCMSG [
 
 MTP3UFCMSG subclass: MTP3UPUMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3UPUMSG class >> h1 [
@@ -1405,7 +1405,7 @@ MTP3UFCMSG subclass: MTP3UPUMSG [
 
 MTP3ECMMSG subclass: MTP3ECAMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3ECAMSG class >> h1 [
@@ -1421,7 +1421,7 @@ MTP3ECMMSG subclass: MTP3ECAMSG [
 
 MTP3MIMMSG subclass: MTP3LRTMSG [
     
-    <category: 'OsmoNetwork-MTP3'>
+    <category: 'MTP3-Codec'>
     <comment: nil>
 
     MTP3LRTMSG class >> h1 [
diff --git a/mtp3/MTP3MessagesTests.st b/mtp3/MTP3MessagesTests.st
index ec9e86f..01474d7 100644
--- a/mtp3/MTP3MessagesTests.st
+++ b/mtp3/MTP3MessagesTests.st
@@ -1,7 +1,7 @@
 TestCase subclass: MTP3LabelTest [
     
     <comment: nil>
-    <category: 'OsmoNetwork-MTP3-Tests'>
+    <category: 'MTP3-Codec-Tests'>
 
     testParseFrom [
 	| data stream label |
@@ -21,7 +21,7 @@ TestCase subclass: MTP3LabelTest [
 TestCase subclass: MTP3SLTAMSGTest [
     
     <comment: 'A MTP3SLTAMSGTest is a test class for testing the behavior of MTP3SLTAMSG'>
-    <category: 'OsmoNetwork-MTP3-Tests'>
+    <category: 'MTP3-Codec-Tests'>
 
     testParsing [
 	| data stream msg |
@@ -43,7 +43,7 @@ TestCase subclass: MTP3SLTAMSGTest [
 TestCase subclass: MTP3SLTMMSGTest [
     
     <comment: 'A MTP3SLTMMSGTest is a test class for testing the behavior of MTP3SLTMMSG'>
-    <category: 'OsmoNetwork-MTP3-Tests'>
+    <category: 'MTP3-Codec-Tests'>
 
     testParsing [
 	| data stream msg |
@@ -65,7 +65,7 @@ TestCase subclass: MTP3SLTMMSGTest [
 TestCase subclass: MTP3ServiceIndicatorsTest [
     
     <comment: 'A MTP3ServiceIndicatorsTest is a test class for testing the behavior of MTP3ServiceIndicators'>
-    <category: 'OsmoNetwork-MTP3-Tests'>
+    <category: 'MTP3-Codec-Tests'>
 
     testParseFrom [
 	| data stream field |
@@ -85,7 +85,7 @@ TestCase subclass: MTP3ServiceIndicatorsTest [
 TestCase subclass: MTP3HeadingTest [
     
     <comment: 'A MTP3HeadingTest is a test class for testing the behavior of MTP3Heading'>
-    <category: 'OsmoNetwork-MTP3-Tests'>
+    <category: 'MTP3-Codec-Tests'>
 
     testParsing [
 	| data stream field |