certi-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[certi-cvs] certi scripts/NW_MessageType.ods libCERTI/Netwo... [br_DEV_H


From: certi-cvs
Subject: [certi-cvs] certi scripts/NW_MessageType.ods libCERTI/Netwo... [br_DEV_HETEROGENEOUS]
Date: Wed, 09 Apr 2008 08:43:47 +0000

CVSROOT:        /sources/certi
Module name:    certi
Branch:         br_DEV_HETEROGENEOUS
Changes by:     Eric NOULARD <erk>      08/04/09 08:43:46

Modified files:
        scripts        : NW_MessageType.ods 
        libCERTI       : NetworkMessage.hh NM_Classes.hh 
                         NetworkMessage_RW.cc NM_Classes.cc 

Log message:
        Intermediate commit in order to save work.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/NW_MessageType.ods?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&rev=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.30.2.2&r2=3.30.2.3
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.hh?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage_RW.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=3.45.2.2&r2=3.45.2.3
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.cc?cvsroot=certi&only_with_tag=br_DEV_HETEROGENEOUS&r1=1.1.2.3&r2=1.1.2.4

Patches:
Index: scripts/NW_MessageType.ods
===================================================================
RCS file: /sources/certi/certi/scripts/Attic/NW_MessageType.ods,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
Binary files /tmp/cvsKs7N6M and /tmp/cvsqlPapj differ

Index: libCERTI/NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.30.2.2
retrieving revision 3.30.2.3
diff -u -b -r3.30.2.2 -r3.30.2.3
--- libCERTI/NetworkMessage.hh  8 Apr 2008 14:05:26 -0000       3.30.2.2
+++ libCERTI/NetworkMessage.hh  9 Apr 2008 08:43:45 -0000       3.30.2.3
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: NetworkMessage.hh,v 3.30.2.2 2008/04/08 14:05:26 erk Exp $
+// $Id: NetworkMessage.hh,v 3.30.2.3 2008/04/09 08:43:45 erk Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef CERTI_NETWORK_MESSAGE_HH
@@ -42,6 +42,13 @@
 
 namespace certi {
 
+/**
+ * NetworkMessage is the base class used
+ * for modelling message exchanged between RTIG and RTIA.
+ * NetworkMessage is the base class of a class hierarchy.
+ * Each specific message is a (direct of indirect)
+ * daughter class of NetworkMessage.    
+ */ 
 class CERTI_EXPORT NetworkMessage : public BasicMessage
 {
 public:
@@ -264,17 +271,28 @@
         */
        FederationTime date ;
        void setDate(FederationTime date) {this->date = date;};
-       FederationTime getDate() const {return this->date;};
+       const FederationTime getDate() const {return this->date;};
 
        int numberOfRegulators ;
        unsigned long multicastAddress ;
 
+       /**
+     * Indicate if the message is Labelled or not
+     */
        bool isLabelled;        
        std::string label;
        void setLabel(const std::string label) {this->label = label;};
+       void setLabel(const char *new_label) { label = std::string(new_label); }
        const std::string getLabel() const {return this->label;};
        
+       /**
+        * Indicate if the message is Tagged or not
+        */
+       bool isTagged;
        std::string tag;
+       void setTag(const std::string tag) {this->tag = tag;};
+       void setTag(const char *new_tag) { tag = std::string(new_tag); }
+       const std::string getTag() const {return this->tag;};
 
        ObjectHandlecount idCount ;
        ObjectHandle firstId ;
@@ -296,8 +314,8 @@
        long nbExtents ;
        long region ;
 
-       void setLabel(const char *new_label) { label = std::string(new_label); }
-       void setTag(const char *new_tag) { tag = std::string(new_tag); }
+       
+       
        void setFEDid(const char *NewFEDid);
        const std::string getName() const {return name;}
        
@@ -380,4 +398,4 @@
 
 #endif // CERTI_NETWORK_MESSAGE_HH
 
-// $Id: NetworkMessage.hh,v 3.30.2.2 2008/04/08 14:05:26 erk Exp $
+// $Id: NetworkMessage.hh,v 3.30.2.3 2008/04/09 08:43:45 erk Exp $

Index: libCERTI/NM_Classes.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Attic/NM_Classes.hh,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- libCERTI/NM_Classes.hh      8 Apr 2008 21:42:01 -0000       1.1.2.3
+++ libCERTI/NM_Classes.hh      9 Apr 2008 08:43:45 -0000       1.1.2.4
@@ -22,6 +22,7 @@
 #ifndef CERTI_NM_CLASSES_HH
 #define CERTI_NM_CLASSES_HH
 #include "NetworkMessage.hh"
+#include <vector>
 
 namespace certi {
 /**
@@ -32,93 +33,111 @@
        static NetworkMessage* create(NetworkMessage::Message_T type) throw 
(RTIinternalError);
 };
 
+class CERTI_EXPORT NM_WithHandleArray : public NetworkMessage {
+public:
+       typedef NetworkMessage Super;
+       NM_WithHandleArray();
+       virtual ~NM_WithHandleArray();
+       virtual void serialize();
+       virtual void deserialize();     
+       /* specific Getter/Setter */    
+       AttributeHandle getHandle(int i) {return handleArray[i];};
+       void setHandle(AttributeHandle h, int i) {handleArray[i]=h;};
+protected:
+       /* specific field */
+       UShort handleArraySize ;
+       /* FIXME will make this a vector<AttributeHandle> */
+       AttributeHandle handleArray[MAX_ATTRIBUTES_PER_CLASS];
+private:
+};
+
 /*<BEGIN>---------- Not_Used ------------<BEGIN>*/
 class CERTI_EXPORT NM_Not_Used : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Not_Used();
        virtual ~NM_Not_Used();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Not_Used ------------<END>*/
 
 /*<BEGIN>---------- Close_Connexion ------------<BEGIN>*/
 class CERTI_EXPORT NM_Close_Connexion : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Close_Connexion();
        virtual ~NM_Close_Connexion();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Close_Connexion ------------<END>*/
 
 /*<BEGIN>---------- Message_Null ------------<BEGIN>*/
 class CERTI_EXPORT NM_Message_Null : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Message_Null();
        virtual ~NM_Message_Null();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Message_Null ------------<END>*/
 
 /*<BEGIN>---------- Create_Federation_Execution ------------<BEGIN>*/
 class CERTI_EXPORT NM_Create_Federation_Execution : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Create_Federation_Execution();
        virtual ~NM_Create_Federation_Execution();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */      
          std::string federationName ;
          std::string FEDid ;
-  private:
+private:
 };
 
 /*<END>---------- Create_Federation_Execution ------------<END>*/
 
 /*<BEGIN>---------- Destroy_Federation_Execution ------------<BEGIN>*/
 class CERTI_EXPORT NM_Destroy_Federation_Execution : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Destroy_Federation_Execution();
        virtual ~NM_Destroy_Federation_Execution();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
       /* specific field */      
          std::string federationName;
-  private:
+private:
 };
 
 /*<END>---------- Destroy_Federation_Execution ------------<END>*/
 
 /*<BEGIN>---------- Join_Federation_Execution ------------<BEGIN>*/
 class CERTI_EXPORT NM_Join_Federation_Execution : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Join_Federation_Execution();
        virtual ~NM_Join_Federation_Execution();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
          int32_t  numberOfRegulators;
          uint32_t multicastAddress;
@@ -126,1216 +145,1192 @@
          uint32_t bestEffortPeer;
          std::string federationName;
          std::string federateName;
-  private:
+private:
 };
 
 /*<END>---------- Join_Federation_Execution ------------<END>*/
 
 /*<BEGIN>---------- Resign_Federation_Execution ------------<BEGIN>*/
 class CERTI_EXPORT NM_Resign_Federation_Execution : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Resign_Federation_Execution();
        virtual ~NM_Resign_Federation_Execution();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Resign_Federation_Execution ------------<END>*/
 
 /*<BEGIN>---------- Set_Time_Regulating ------------<BEGIN>*/
 class CERTI_EXPORT NM_Set_Time_Regulating : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Set_Time_Regulating();
        virtual ~NM_Set_Time_Regulating();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
          bool   regulating;
-  private:
+private:
 };
 
 /*<END>---------- Set_Time_Regulating ------------<END>*/
 
 /*<BEGIN>---------- Set_Time_Constrained ------------<BEGIN>*/
 class CERTI_EXPORT NM_Set_Time_Constrained : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Set_Time_Constrained();
        virtual ~NM_Set_Time_Constrained();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */    
          bool   constrained;
-  private:
+private:
 };
 
 /*<END>---------- Set_Time_Constrained ------------<END>*/
 
 /*<BEGIN>---------- Register_Federation_Synchronization_Point 
------------<BEGIN>*/
-class CERTI_EXPORT NM_Register_Federation_Synchronization_Point : public 
NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Register_Federation_Synchronization_Point : public 
NM_WithHandleArray {
+public:
+       typedef NM_WithHandleArray Super;
        NM_Register_Federation_Synchronization_Point();
        virtual ~NM_Register_Federation_Synchronization_Point();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
       /* specific field */       
-               
-         std::string tag;
-         bool hasHandleArray;
-         UShort handleArraySize ;
-         AttributeHandle handleArray[MAX_ATTRIBUTES_PER_CLASS];          
-         
-  private:
+private:
 };
 
 /*<END>---------- Register_Federation_Synchronization_Point ------------<END>*/
 
 /*<BEGIN>---------- Synchronization_Point_Registration_Succeeded 
------------<BEGIN>*/
 class CERTI_EXPORT NM_Synchronization_Point_Registration_Succeeded : public 
NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Synchronization_Point_Registration_Succeeded();
        virtual ~NM_Synchronization_Point_Registration_Succeeded();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
       /* specific field */      
          
-  private:
+private:
 };
 
 /*<END>---------- Synchronization_Point_Registration_Succeeded 
------------<END>*/
 
 /*<BEGIN>---------- Announce_Synchronization_Point ------------<BEGIN>*/
 class CERTI_EXPORT NM_Announce_Synchronization_Point : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Announce_Synchronization_Point();
        virtual ~NM_Announce_Synchronization_Point();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
       /* specific field */       
-               
-         std::string tag;
-  private:
+private:
 };
 
 /*<END>---------- Announce_Synchronization_Point ------------<END>*/
 
 /*<BEGIN>---------- Synchronization_Point_Achieved ------------<BEGIN>*/
 class CERTI_EXPORT NM_Synchronization_Point_Achieved : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Synchronization_Point_Achieved();
        virtual ~NM_Synchronization_Point_Achieved();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */      
-         
-  private:
+private:
 };
 
 /*<END>---------- Synchronization_Point_Achieved ------------<END>*/
 
 /*<BEGIN>---------- Federation_Synchronized ------------<BEGIN>*/
 class CERTI_EXPORT NM_Federation_Synchronized : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Federation_Synchronized();
        virtual ~NM_Federation_Synchronized();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */     
-         
-  private:
+private:
 };
 
 /*<END>---------- Federation_Synchronized ------------<END>*/
 
 /*<BEGIN>---------- Request_Federation_Save ------------<BEGIN>*/
 class CERTI_EXPORT NM_Request_Federation_Save : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Request_Federation_Save();
        virtual ~NM_Request_Federation_Save();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-          
-  private:
+private:
 };
 
 /*<END>---------- Request_Federation_Save ------------<END>*/
 
 /*<BEGIN>---------- Federate_Save_Begun ------------<BEGIN>*/
 class CERTI_EXPORT NM_Federate_Save_Begun : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Federate_Save_Begun();
        virtual ~NM_Federate_Save_Begun();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
          
-  private:
+private:
 };
 
 /*<END>---------- Federate_Save_Begun ------------<END>*/
 
 /*<BEGIN>---------- Federate_Save_Complete ------------<BEGIN>*/
 class CERTI_EXPORT NM_Federate_Save_Complete : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Federate_Save_Complete();
        virtual ~NM_Federate_Save_Complete();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Federate_Save_Complete ------------<END>*/
 
 /*<BEGIN>---------- Federate_Save_Not_Complete ------------<BEGIN>*/
 class CERTI_EXPORT NM_Federate_Save_Not_Complete : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Federate_Save_Not_Complete();
        virtual ~NM_Federate_Save_Not_Complete();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Federate_Save_Not_Complete ------------<END>*/
 
 /*<BEGIN>---------- Initiate_Federate_Save ------------<BEGIN>*/
 class CERTI_EXPORT NM_Initiate_Federate_Save : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Initiate_Federate_Save();
        virtual ~NM_Initiate_Federate_Save();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-         
-  private:
+private:
 };
 
 /*<END>---------- Initiate_Federate_Save ------------<END>*/
 
 /*<BEGIN>---------- Federation_Saved ------------<BEGIN>*/
 class CERTI_EXPORT NM_Federation_Saved : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Federation_Saved();
        virtual ~NM_Federation_Saved();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Federation_Saved ------------<END>*/
 
 /*<BEGIN>---------- Federation_Not_Saved ------------<BEGIN>*/
 class CERTI_EXPORT NM_Federation_Not_Saved : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Federation_Not_Saved();
        virtual ~NM_Federation_Not_Saved();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Federation_Not_Saved ------------<END>*/
 
 /*<BEGIN>---------- Request_Federation_Restore ------------<BEGIN>*/
 class CERTI_EXPORT NM_Request_Federation_Restore : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Request_Federation_Restore();
        virtual ~NM_Request_Federation_Restore();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
          
-  private:
+private:
 };
 
 /*<END>---------- Request_Federation_Restore ------------<END>*/
 
 /*<BEGIN>---------- Federate_Restore_Complete ------------<BEGIN>*/
 class CERTI_EXPORT NM_Federate_Restore_Complete : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Federate_Restore_Complete();
        virtual ~NM_Federate_Restore_Complete();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Federate_Restore_Complete ------------<END>*/
 
 /*<BEGIN>---------- Federate_Restore_Not_Complete ------------<BEGIN>*/
 class CERTI_EXPORT NM_Federate_Restore_Not_Complete : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Federate_Restore_Not_Complete();
        virtual ~NM_Federate_Restore_Not_Complete();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Federate_Restore_Not_Complete ------------<END>*/
 
 /*<BEGIN>---------- Request_Federation_Restore_Succeeded ------------<BEGIN>*/
 class CERTI_EXPORT NM_Request_Federation_Restore_Succeeded : public 
NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Request_Federation_Restore_Succeeded();
        virtual ~NM_Request_Federation_Restore_Succeeded();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Request_Federation_Restore_Succeeded ------------<END>*/
 
 /*<BEGIN>---------- Request_Federation_Restore_Failed ------------<BEGIN>*/
 class CERTI_EXPORT NM_Request_Federation_Restore_Failed : public 
NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Request_Federation_Restore_Failed();
        virtual ~NM_Request_Federation_Restore_Failed();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-         std::string tag;
-  private:
+private:
 };
 
 /*<END>---------- Request_Federation_Restore_Failed ------------<END>*/
 
 /*<BEGIN>---------- Federation_Restore_Begun ------------<BEGIN>*/
 class CERTI_EXPORT NM_Federation_Restore_Begun : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Federation_Restore_Begun();
        virtual ~NM_Federation_Restore_Begun();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Federation_Restore_Begun ------------<END>*/
 
 /*<BEGIN>---------- Initiate_Federate_Restore ------------<BEGIN>*/
 class CERTI_EXPORT NM_Initiate_Federate_Restore : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Initiate_Federate_Restore();
        virtual ~NM_Initiate_Federate_Restore();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Initiate_Federate_Restore ------------<END>*/
 
 /*<BEGIN>---------- Federation_Restored ------------<BEGIN>*/
 class CERTI_EXPORT NM_Federation_Restored : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Federation_Restored();
        virtual ~NM_Federation_Restored();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Federation_Restored ------------<END>*/
 
 /*<BEGIN>---------- Federation_Not_Restored ------------<BEGIN>*/
 class CERTI_EXPORT NM_Federation_Not_Restored : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Federation_Not_Restored();
        virtual ~NM_Federation_Not_Restored();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Federation_Not_Restored ------------<END>*/
 
 /*<BEGIN>---------- Publish_Object_Class ------------<BEGIN>*/
-class CERTI_EXPORT NM_Publish_Object_Class : public NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Publish_Object_Class : public NM_WithHandleArray {
+public:
+       typedef NM_WithHandleArray Super;
        NM_Publish_Object_Class();
        virtual ~NM_Publish_Object_Class();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-         bool hasHandleArray;
-         UShort handleArraySize ;
-         AttributeHandle handleArray[MAX_ATTRIBUTES_PER_CLASS];        
-  private:
+private:
 };
 
 /*<END>---------- Publish_Object_Class ------------<END>*/
 
 /*<BEGIN>---------- Unpublish_Object_Class ------------<BEGIN>*/
 class CERTI_EXPORT NM_Unpublish_Object_Class : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Unpublish_Object_Class();
        virtual ~NM_Unpublish_Object_Class();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
          ObjectClassHandle objectClass;
-  private:
+private:
 };
 
 /*<END>---------- Unpublish_Object_Class ------------<END>*/
 
 /*<BEGIN>---------- Publish_Interaction_Class ------------<BEGIN>*/
 class CERTI_EXPORT NM_Publish_Interaction_Class : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Publish_Interaction_Class();
        virtual ~NM_Publish_Interaction_Class();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+       const InteractionClassHandle getInteractionClassHandle() const {return 
interactionClass;};
+       void setInteractionClassHandle(InteractionClassHandle interactionClass) 
{this->interactionClass=interactionClass;};
+protected:
        /* specific field */
          InteractionClassHandle interactionClass;
-  private:
+private:
 };
 
 /*<END>---------- Publish_Interaction_Class ------------<END>*/
 
 /*<BEGIN>---------- Unpublish_Interaction_Class ------------<BEGIN>*/
-class CERTI_EXPORT NM_Unpublish_Interaction_Class : public NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Unpublish_Interaction_Class : public 
NM_Publish_Interaction_Class {
+public:
+       typedef NM_Publish_Interaction_Class Super;
        NM_Unpublish_Interaction_Class();
        virtual ~NM_Unpublish_Interaction_Class();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-         InteractionClassHandle interactionClass;
-  private:
+private:
 };
 
 /*<END>---------- Unpublish_Interaction_Class ------------<END>*/
 
 /*<BEGIN>---------- Subscribe_Object_Class ------------<BEGIN>*/
-class CERTI_EXPORT NM_Subscribe_Object_Class : public NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Subscribe_Object_Class : public NM_WithHandleArray {
+public:
+       typedef NM_WithHandleArray Super;
        NM_Subscribe_Object_Class();
        virtual ~NM_Subscribe_Object_Class();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
       /* specific field */
-         bool hasHandleArray;
-         UShort handleArraySize ;
-         AttributeHandle handleArray[MAX_ATTRIBUTES_PER_CLASS];
-  private:
+private:
 };
 
 /*<END>---------- Subscribe_Object_Class ------------<END>*/
 
 /*<BEGIN>---------- Unsubscribe_Object_Class ------------<BEGIN>*/
-class CERTI_EXPORT NM_Unsubscribe_Object_Class : public NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Unsubscribe_Object_Class : public 
NM_Unpublish_Object_Class {
+public:
+       typedef NM_Unpublish_Object_Class Super;
        NM_Unsubscribe_Object_Class();
        virtual ~NM_Unsubscribe_Object_Class();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-         ObjectClassHandle objectClass;
-  private:
+private:
 };
 
 /*<END>---------- Unsubscribe_Object_Class ------------<END>*/
 
 /*<BEGIN>---------- Subscribe_Interaction_Class ------------<BEGIN>*/
-class CERTI_EXPORT NM_Subscribe_Interaction_Class : public NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Subscribe_Interaction_Class : public 
NM_Publish_Interaction_Class {
+public:
+       typedef NM_Publish_Interaction_Class Super;
        NM_Subscribe_Interaction_Class();
        virtual ~NM_Subscribe_Interaction_Class();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-         InteractionClassHandle interactionClass;
-  private:
+private:
 };
 
 /*<END>---------- Subscribe_Interaction_Class ------------<END>*/
 
 /*<BEGIN>---------- Unsubscribe_Interaction_Class ------------<BEGIN>*/
-class CERTI_EXPORT NM_Unsubscribe_Interaction_Class : public NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Unsubscribe_Interaction_Class : public 
NM_Publish_Interaction_Class {
+public:
+       typedef NM_Publish_Interaction_Class Super;
        NM_Unsubscribe_Interaction_Class();
        virtual ~NM_Unsubscribe_Interaction_Class();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-         InteractionClassHandle interactionClass;
-  private:
+private:
 };
 
 /*<END>---------- Unsubscribe_Interaction_Class ------------<END>*/
 
 /*<BEGIN>---------- Turn_Interactions_On ------------<BEGIN>*/
-class CERTI_EXPORT NM_Turn_Interactions_On : public NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Turn_Interactions_On : public 
NM_Publish_Interaction_Class {
+public:
+       typedef NM_Publish_Interaction_Class Super;
        NM_Turn_Interactions_On();
        virtual ~NM_Turn_Interactions_On();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-         InteractionClassHandle interactionClass;
-  private:
+private:
 };
 
 /*<END>---------- Turn_Interactions_On ------------<END>*/
 
 /*<BEGIN>---------- Turn_Interactions_Off ------------<BEGIN>*/
-class CERTI_EXPORT NM_Turn_Interactions_Off : public NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Turn_Interactions_Off : public 
NM_Publish_Interaction_Class {
+public:
+       typedef NM_Publish_Interaction_Class Super;
        NM_Turn_Interactions_Off();
        virtual ~NM_Turn_Interactions_Off();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-         InteractionClassHandle interactionClass;
-  private:
+private:
 };
 
 /*<END>---------- Turn_Interactions_Off ------------<END>*/
 
 /*<BEGIN>---------- Register_Object ------------<BEGIN>*/
 class CERTI_EXPORT NM_Register_Object : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Register_Object();
        virtual ~NM_Register_Object();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
          ObjectHandle object;
-  private:
+private:
 };
 
 /*<END>---------- Register_Object ------------<END>*/
 
 /*<BEGIN>---------- Discover_Object ------------<BEGIN>*/
-class CERTI_EXPORT NM_Discover_Object : public NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Discover_Object : public NM_Register_Object {
+public:
+       typedef NM_Register_Object Super;
        NM_Discover_Object();
        virtual ~NM_Discover_Object();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-         ObjectHandle object;
-  private:
+private:
 };
 
 /*<END>---------- Discover_Object ------------<END>*/
 
 /*<BEGIN>---------- Update_Attribute_Values ------------<BEGIN>*/
-class CERTI_EXPORT NM_Update_Attribute_Values : public NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Update_Attribute_Values : public NM_WithHandleArray {
+public:
+       typedef NetworkMessage Super;
        NM_Update_Attribute_Values();
        virtual ~NM_Update_Attribute_Values();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
       /* specific field */
          ObjectClassHandle objectClass;
-         bool hasHandleArray;
-         UShort handleArraySize ;
-         AttributeHandle handleArray[MAX_ATTRIBUTES_PER_CLASS];
          ValueLengthPair ValueArray[MAX_ATTRIBUTES_PER_CLASS];
-         
-  private:
+private:
 };
 
 /*<END>---------- Update_Attribute_Values ------------<END>*/
 
 /*<BEGIN>---------- Reflect_Attribute_Values ------------<BEGIN>*/
 class CERTI_EXPORT NM_Reflect_Attribute_Values : public 
NM_Update_Attribute_Values {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Reflect_Attribute_Values();
        virtual ~NM_Reflect_Attribute_Values();       
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Reflect_Attribute_Values ------------<END>*/
 
 /*<BEGIN>---------- Send_Interaction ------------<BEGIN>*/
-class CERTI_EXPORT NM_Send_Interaction : public NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Send_Interaction : public NM_WithHandleArray {
+public:
+       typedef NetworkMessage Super;
        NM_Send_Interaction();
        virtual ~NM_Send_Interaction();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
          InteractionClassHandle interactionClass;
-         bool hasHandleArray;
-         UShort handleArraySize ;
-         AttributeHandle handleArray[MAX_ATTRIBUTES_PER_CLASS];
          ValueLengthPair ValueArray[MAX_ATTRIBUTES_PER_CLASS];
-  private:
+private:
 };
 
 /*<END>---------- Send_Interaction ------------<END>*/
 
 /*<BEGIN>---------- Receive_Interaction ------------<BEGIN>*/
 class CERTI_EXPORT NM_Receive_Interaction : public NM_Send_Interaction {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Receive_Interaction();
        virtual ~NM_Receive_Interaction();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Receive_Interaction ------------<END>*/
 
 /*<BEGIN>---------- Delete_Object ------------<BEGIN>*/
-class CERTI_EXPORT NM_Delete_Object : public NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Delete_Object : public NM_Register_Object {
+public:
+       typedef NM_Register_Object Super;
        NM_Delete_Object();
        virtual ~NM_Delete_Object();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+       
+private:
 };
 
 /*<END>---------- Delete_Object ------------<END>*/
 
 /*<BEGIN>---------- Remove_Object ------------<BEGIN>*/
 class CERTI_EXPORT NM_Remove_Object : public NM_Delete_Object {
-  public:
+public:
+       typedef NM_Delete_Object Super;
        NM_Remove_Object();
        virtual ~NM_Remove_Object();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Remove_Object ------------<END>*/
 
 /*<BEGIN>---------- Change_Attribute_Transport_Type ------------<BEGIN>*/
 class CERTI_EXPORT NM_Change_Attribute_Transport_Type : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Change_Attribute_Transport_Type();
        virtual ~NM_Change_Attribute_Transport_Type();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Change_Attribute_Transport_Type ------------<END>*/
 
 /*<BEGIN>---------- Change_Attribute_Order_Type ------------<BEGIN>*/
 class CERTI_EXPORT NM_Change_Attribute_Order_Type : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Change_Attribute_Order_Type();
        virtual ~NM_Change_Attribute_Order_Type();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Change_Attribute_Order_Type ------------<END>*/
 
 /*<BEGIN>---------- Change_Interaction_Transport_Type ------------<BEGIN>*/
 class CERTI_EXPORT NM_Change_Interaction_Transport_Type : public 
NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Change_Interaction_Transport_Type();
        virtual ~NM_Change_Interaction_Transport_Type();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Change_Interaction_Transport_Type ------------<END>*/
 
 /*<BEGIN>---------- Change_Interaction_Order_Type ------------<BEGIN>*/
 class CERTI_EXPORT NM_Change_Interaction_Order_Type : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Change_Interaction_Order_Type();
        virtual ~NM_Change_Interaction_Order_Type();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Change_Interaction_Order_Type ------------<END>*/
 
 /*<BEGIN>---------- Request_Class_Attribute_Value_Update ------------<BEGIN>*/
 class CERTI_EXPORT NM_Request_Class_Attribute_Value_Update : public 
NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Request_Class_Attribute_Value_Update();
        virtual ~NM_Request_Class_Attribute_Value_Update();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Request_Class_Attribute_Value_Update ------------<END>*/
 
 /*<BEGIN>---------- Request_Object_Attribute_Value_Update ------------<BEGIN>*/
-class CERTI_EXPORT NM_Request_Object_Attribute_Value_Update : public 
NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Request_Object_Attribute_Value_Update : public 
NM_WithHandleArray {
+public:
+       typedef NM_WithHandleArray Super;
        NM_Request_Object_Attribute_Value_Update();
        virtual ~NM_Request_Object_Attribute_Value_Update();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+       ObjectHandle object;
+private:
 };
 
 /*<END>---------- Request_Object_Attribute_Value_Update ------------<END>*/
 
 /*<BEGIN>---------- Is_Attribute_Owned_By_Federate ------------<BEGIN>*/
 class CERTI_EXPORT NM_Is_Attribute_Owned_By_Federate : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Is_Attribute_Owned_By_Federate();
        virtual ~NM_Is_Attribute_Owned_By_Federate();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+       ObjectHandle    object;
+       AttributeHandle attribute;
+private:
 };
 
 /*<END>---------- Is_Attribute_Owned_By_Federate ------------<END>*/
 
 /*<BEGIN>---------- Query_Attribute_Ownership ------------<BEGIN>*/
-class CERTI_EXPORT NM_Query_Attribute_Ownership : public NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Query_Attribute_Ownership : public 
NM_Is_Attribute_Owned_By_Federate {
+public:
+       typedef NM_Is_Attribute_Owned_By_Federate Super;
        NM_Query_Attribute_Ownership();
        virtual ~NM_Query_Attribute_Ownership();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Query_Attribute_Ownership ------------<END>*/
 
 /*<BEGIN>---------- Attribute_Is_Not_Owned ------------<BEGIN>*/
-class CERTI_EXPORT NM_Attribute_Is_Not_Owned : public NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Attribute_Is_Not_Owned : public 
NM_Is_Attribute_Owned_By_Federate {
+public:
+       typedef NM_Is_Attribute_Owned_By_Federate Super;
        NM_Attribute_Is_Not_Owned();
        virtual ~NM_Attribute_Is_Not_Owned();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Attribute_Is_Not_Owned ------------<END>*/
 
 /*<BEGIN>---------- Inform_Attribute_Ownership ------------<BEGIN>*/
-class CERTI_EXPORT NM_Inform_Attribute_Ownership : public NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Inform_Attribute_Ownership : public 
NM_Is_Attribute_Owned_By_Federate {
+public:
+       typedef NM_Is_Attribute_Owned_By_Federate Super;
        NM_Inform_Attribute_Ownership();
        virtual ~NM_Inform_Attribute_Ownership();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Inform_Attribute_Ownership ------------<END>*/
 
 /*<BEGIN>---------- Negotiated_Attribute_Ownership_Divestiture 
------------<BEGIN>*/
-class CERTI_EXPORT NM_Negotiated_Attribute_Ownership_Divestiture : public 
NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Negotiated_Attribute_Ownership_Divestiture : public 
NM_WithHandleArray {
+public:
+       typedef NetworkMessage Super;
        NM_Negotiated_Attribute_Ownership_Divestiture();
        virtual ~NM_Negotiated_Attribute_Ownership_Divestiture();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+       const ObjectHandle getObject() const {return object;};
+       void setObject(ObjectHandle object) {this->object=object;};
+protected:
        /* specific field */
-  private:
+       ObjectHandle object;
+private:
 };
 
 /*<END>---------- Negotiated_Attribute_Ownership_Divestiture 
------------<END>*/
 
 /*<BEGIN>---------- Attribute_Ownership_Acquisition_Notification 
------------<BEGIN>*/
 class CERTI_EXPORT NM_Attribute_Ownership_Acquisition_Notification : public 
NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Attribute_Ownership_Acquisition_Notification();
        virtual ~NM_Attribute_Ownership_Acquisition_Notification();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Attribute_Ownership_Acquisition_Notification 
------------<END>*/
 
 /*<BEGIN>---------- Attribute_Ownership_Divestiture_Notification 
------------<BEGIN>*/
 class CERTI_EXPORT NM_Attribute_Ownership_Divestiture_Notification : public 
NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Attribute_Ownership_Divestiture_Notification();
        virtual ~NM_Attribute_Ownership_Divestiture_Notification();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Attribute_Ownership_Divestiture_Notification 
------------<END>*/
 
 /*<BEGIN>---------- Request_Attribute_Ownership_Assumption 
------------<BEGIN>*/
-class CERTI_EXPORT NM_Request_Attribute_Ownership_Assumption : public 
NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Request_Attribute_Ownership_Assumption : public 
NM_Negotiated_Attribute_Ownership_Divestiture {
+public:
+       typedef NM_Negotiated_Attribute_Ownership_Divestiture Super;
        NM_Request_Attribute_Ownership_Assumption();
        virtual ~NM_Request_Attribute_Ownership_Assumption();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Request_Attribute_Ownership_Assumption ------------<END>*/
 
 /*<BEGIN>---------- Attribute_Ownership_Unavailable ------------<BEGIN>*/
 class CERTI_EXPORT NM_Attribute_Ownership_Unavailable : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Attribute_Ownership_Unavailable();
        virtual ~NM_Attribute_Ownership_Unavailable();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Attribute_Ownership_Unavailable ------------<END>*/
 
 /*<BEGIN>---------- Attribute_Ownership_Acquisition_If_Available 
------------<BEGIN>*/
 class CERTI_EXPORT NM_Attribute_Ownership_Acquisition_If_Available : public 
NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Attribute_Ownership_Acquisition_If_Available();
        virtual ~NM_Attribute_Ownership_Acquisition_If_Available();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Attribute_Ownership_Acquisition_If_Available 
------------<END>*/
 
 /*<BEGIN>---------- Unconditional_Attribute_Ownership_Divestiture 
------------<BEGIN>*/
 class CERTI_EXPORT NM_Unconditional_Attribute_Ownership_Divestiture : public 
NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Unconditional_Attribute_Ownership_Divestiture();
        virtual ~NM_Unconditional_Attribute_Ownership_Divestiture();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Unconditional_Attribute_Ownership_Divestiture 
------------<END>*/
 
 /*<BEGIN>---------- Attribute_Ownership_Acquisition ------------<BEGIN>*/
-class CERTI_EXPORT NM_Attribute_Ownership_Acquisition : public NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Attribute_Ownership_Acquisition : public 
NM_Negotiated_Attribute_Ownership_Divestiture {
+public:
+       typedef NM_Negotiated_Attribute_Ownership_Divestiture Super;
        NM_Attribute_Ownership_Acquisition();
        virtual ~NM_Attribute_Ownership_Acquisition();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Attribute_Ownership_Acquisition ------------<END>*/
 
 /*<BEGIN>---------- Request_Attribute_Ownership_Release ------------<BEGIN>*/
-class CERTI_EXPORT NM_Request_Attribute_Ownership_Release : public 
NetworkMessage {
-  public:
+class CERTI_EXPORT NM_Request_Attribute_Ownership_Release : public 
NM_Negotiated_Attribute_Ownership_Divestiture {
+public:
+       typedef NM_Negotiated_Attribute_Ownership_Divestiture Super;
        NM_Request_Attribute_Ownership_Release();
        virtual ~NM_Request_Attribute_Ownership_Release();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Request_Attribute_Ownership_Release ------------<END>*/
 
 /*<BEGIN>---------- Cancel_Negotiated_Attribute_Ownership_Divestiture 
------------<BEGIN>*/
 class CERTI_EXPORT NM_Cancel_Negotiated_Attribute_Ownership_Divestiture : 
public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Cancel_Negotiated_Attribute_Ownership_Divestiture();
        virtual ~NM_Cancel_Negotiated_Attribute_Ownership_Divestiture();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Cancel_Negotiated_Attribute_Ownership_Divestiture 
------------<END>*/
 
 /*<BEGIN>---------- Attribute_Ownership_Release_Response ------------<BEGIN>*/
 class CERTI_EXPORT NM_Attribute_Ownership_Release_Response : public 
NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Attribute_Ownership_Release_Response();
        virtual ~NM_Attribute_Ownership_Release_Response();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Attribute_Ownership_Release_Response ------------<END>*/
 
 /*<BEGIN>---------- Cancel_Attribute_Ownership_Acquisition 
------------<BEGIN>*/
 class CERTI_EXPORT NM_Cancel_Attribute_Ownership_Acquisition : public 
NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Cancel_Attribute_Ownership_Acquisition();
        virtual ~NM_Cancel_Attribute_Ownership_Acquisition();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Cancel_Attribute_Ownership_Acquisition ------------<END>*/
 
 /*<BEGIN>---------- Confirm_Attribute_Ownership_Acquisition_Cancellation 
------------<BEGIN>*/
 class CERTI_EXPORT NM_Confirm_Attribute_Ownership_Acquisition_Cancellation : 
public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Confirm_Attribute_Ownership_Acquisition_Cancellation();
        virtual ~NM_Confirm_Attribute_Ownership_Acquisition_Cancellation();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Confirm_Attribute_Ownership_Acquisition_Cancellation 
------------<END>*/
 
 /*<BEGIN>---------- Ddm_Create_Region ------------<BEGIN>*/
 class CERTI_EXPORT NM_Ddm_Create_Region : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Ddm_Create_Region();
        virtual ~NM_Ddm_Create_Region();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Ddm_Create_Region ------------<END>*/
 
 /*<BEGIN>---------- Ddm_Modify_Region ------------<BEGIN>*/
 class CERTI_EXPORT NM_Ddm_Modify_Region : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Ddm_Modify_Region();
        virtual ~NM_Ddm_Modify_Region();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Ddm_Modify_Region ------------<END>*/
 
 /*<BEGIN>---------- Ddm_Delete_Region ------------<BEGIN>*/
 class CERTI_EXPORT NM_Ddm_Delete_Region : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Ddm_Delete_Region();
        virtual ~NM_Ddm_Delete_Region();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Ddm_Delete_Region ------------<END>*/
 
 /*<BEGIN>---------- Ddm_Associate_Region ------------<BEGIN>*/
 class CERTI_EXPORT NM_Ddm_Associate_Region : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Ddm_Associate_Region();
        virtual ~NM_Ddm_Associate_Region();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Ddm_Associate_Region ------------<END>*/
 
 /*<BEGIN>---------- Ddm_Register_Object ------------<BEGIN>*/
 class CERTI_EXPORT NM_Ddm_Register_Object : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Ddm_Register_Object();
        virtual ~NM_Ddm_Register_Object();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Ddm_Register_Object ------------<END>*/
 
 /*<BEGIN>---------- Ddm_Unassociate_Region ------------<BEGIN>*/
 class CERTI_EXPORT NM_Ddm_Unassociate_Region : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Ddm_Unassociate_Region();
        virtual ~NM_Ddm_Unassociate_Region();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Ddm_Unassociate_Region ------------<END>*/
 
 /*<BEGIN>---------- Ddm_Subscribe_Attributes ------------<BEGIN>*/
 class CERTI_EXPORT NM_Ddm_Subscribe_Attributes : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Ddm_Subscribe_Attributes();
        virtual ~NM_Ddm_Subscribe_Attributes();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Ddm_Subscribe_Attributes ------------<END>*/
 
 /*<BEGIN>---------- Ddm_Unsubscribe_Attributes ------------<BEGIN>*/
 class CERTI_EXPORT NM_Ddm_Unsubscribe_Attributes : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Ddm_Unsubscribe_Attributes();
        virtual ~NM_Ddm_Unsubscribe_Attributes();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Ddm_Unsubscribe_Attributes ------------<END>*/
 
 /*<BEGIN>---------- Ddm_Subscribe_Interaction ------------<BEGIN>*/
 class CERTI_EXPORT NM_Ddm_Subscribe_Interaction : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Ddm_Subscribe_Interaction();
        virtual ~NM_Ddm_Subscribe_Interaction();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Ddm_Subscribe_Interaction ------------<END>*/
 
 /*<BEGIN>---------- Ddm_Unsubscribe_Interaction ------------<BEGIN>*/
 class CERTI_EXPORT NM_Ddm_Unsubscribe_Interaction : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Ddm_Unsubscribe_Interaction();
        virtual ~NM_Ddm_Unsubscribe_Interaction();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Ddm_Unsubscribe_Interaction ------------<END>*/
 
 /*<BEGIN>---------- Provide_Attribute_Value_Update ------------<BEGIN>*/
 class CERTI_EXPORT NM_Provide_Attribute_Value_Update : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Provide_Attribute_Value_Update();
        virtual ~NM_Provide_Attribute_Value_Update();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Provide_Attribute_Value_Update ------------<END>*/
 
 /*<BEGIN>---------- Get_Fed_File ------------<BEGIN>*/
 class CERTI_EXPORT NM_Get_Fed_File : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Get_Fed_File();
        virtual ~NM_Get_Fed_File();
        virtual void serialize();
        virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Get_Fed_File ------------<END>*/
 
 /*<BEGIN>---------- Last ------------<BEGIN>*/
 class CERTI_EXPORT NM_Last : public NetworkMessage {
-  public:
+public:
+       typedef NetworkMessage Super;
        NM_Last();
        virtual ~NM_Last();
-       virtual void serialize();
-       virtual void deserialize();
        /* specific Getter/Setter */
-  protected:
+protected:
        /* specific field */
-  private:
+private:
 };
 
 /*<END>---------- Last ------------<END>*/

Index: libCERTI/NetworkMessage_RW.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage_RW.cc,v
retrieving revision 3.45.2.2
retrieving revision 3.45.2.3
diff -u -b -r3.45.2.2 -r3.45.2.3
--- libCERTI/NetworkMessage_RW.cc       8 Apr 2008 14:05:26 -0000       3.45.2.2
+++ libCERTI/NetworkMessage_RW.cc       9 Apr 2008 08:43:46 -0000       3.45.2.3
@@ -16,7 +16,7 @@
 // License along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: NetworkMessage_RW.cc,v 3.45.2.2 2008/04/08 14:05:26 erk Exp $
+// $Id: NetworkMessage_RW.cc,v 3.45.2.3 2008/04/09 08:43:46 erk Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -822,16 +822,27 @@
        msgBuf.write_int32(exception);
        msgBuf.write_int32(federate);
        msgBuf.write_int32(federation);
+       /*
+        * "builtin" Optional part
+        * The subclass may chose in the constructor
+        * the variable part.
+        */
        if (isDated) {
                msgBuf.write_double(date);
        }
+       if (isLabelled) {
+               msgBuf.write_string(label);
+       }
+       if (isTagged) {
+               msgBuf.write_string(tag);
+       }
        G.Out(pdGendoc,"exit NetworkMessage::serialize");
 } /* end of serialize */
 
 void NetworkMessage::deserialize() {
        G.Out(pdGendoc,"enter NetworkMessage::deserialize");
        /* We serialize the common Network message part 
-        * ALL Network Message will contain the following
+        * ALL Network Messages will contain the following
         */     
        D.Out(pdDebug,("deserialize"+getName()).c_str());       
        /* deserialize common part */
@@ -839,9 +850,20 @@
        exception   = static_cast<certi::TypeException>(msgBuf.read_int32());
        federate    = msgBuf.read_int32();
        federation  = msgBuf.read_int32();
+       /*
+        * "builtin" Optional part
+        * The subclass may chose in the constructor
+        * the variable part.
+        */
        if (isDated) {
                date = msgBuf.read_double();
        }
+       if (isLabelled) {
+               label = msgBuf.read_string();
+       }
+       if (isTagged) {
+               tag = msgBuf.read_string();
+       }
        G.Out(pdGendoc,"exit NetworkMessage::deserialize");
 } /* end of deserialize */
 
@@ -1201,4 +1223,4 @@
 
 } // namespace certi
 
-// $Id: NetworkMessage_RW.cc,v 3.45.2.2 2008/04/08 14:05:26 erk Exp $
+// $Id: NetworkMessage_RW.cc,v 3.45.2.3 2008/04/09 08:43:46 erk Exp $

Index: libCERTI/NM_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/Attic/NM_Classes.cc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- libCERTI/NM_Classes.cc      8 Apr 2008 21:42:01 -0000       1.1.2.3
+++ libCERTI/NM_Classes.cc      9 Apr 2008 08:43:46 -0000       1.1.2.4
@@ -27,6 +27,7 @@
        
        switch (type) {
        case NetworkMessage::NOT_USED:
+               throw RTIinternalError("NOT_USED message type should not be 
used!!");
           msg = new NM_Not_Used(); 
           break;
        case NetworkMessage::CLOSE_CONNEXION:
@@ -280,32 +281,64 @@
           msg = new NM_Get_Fed_File(); 
           break;
        case NetworkMessage::LAST:
+               throw RTIinternalError("LAST message type should not be 
used!!");
           msg = new NM_Last(); 
           break;
-
        default:
                throw RTIinternalError("Unknown/Unimplemented message Type");
        }
 } /* end of NM_Factory::create */
 
-/*<BEGIN>---------- Not_Used ------------<BEGIN>*/
-NM_Not_Used::NM_Not_Used() {
-    this->name = "NOT_USED";
+NM_WithHandleArray::NM_WithHandleArray() {
+       this->name = "NM_WithHandleArray";
     this->type = NetworkMessage::NOT_USED;
     /* specific field init */
+       this->handleArraySize = 0;
 }
-NM_Not_Used::~NM_Not_Used() {
+
+NM_WithHandleArray::~NM_WithHandleArray() {
 }
-void NM_Not_Used::serialize() {
+
+void NM_WithHandleArray::serialize() {
+       int i;
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
+       msgBuf.write_uint16(handleArraySize);
+       /* 
+        * Note that if handleArraySize is 0 
+        * the loop is void which is done on purpose.
+        * (this is a feature not a bug :-) 
+        */             
+       for (i = 0 ; i < handleArraySize ; i ++) {
+               msgBuf.write_uint16(handleArray[i]);
+       }
+
 } /* end of serialize */ 
-void NM_Not_Used::deserialize() {
+void NM_WithHandleArray::deserialize() {
+       int i;
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
+       handleArraySize = msgBuf.read_int16();
+       /* 
+        * Note that if handleArraySize is 0 
+        * the loop is void which is done on purpose.
+        * (this is a feature not a bug :-) 
+        */     
+       for (i = 0 ; i < handleArraySize ; i ++) {
+               handleArray[i] = msgBuf.read_int16();
+       }
 } /* end of deserialize */
+
+/*<BEGIN>---------- Not_Used ------------<BEGIN>*/
+NM_Not_Used::NM_Not_Used() {
+       this->name = "NOT_USED";
+       this->type = NetworkMessage::NOT_USED;
+       /* specific field init */
+}
+NM_Not_Used::~NM_Not_Used() {
+}
 /*<END>---------- Not_Used ------------<END>*/
 
 /*<BEGIN>---------- Close_Connexion ------------<BEGIN>*/
@@ -316,16 +349,6 @@
 }
 NM_Close_Connexion::~NM_Close_Connexion() {
 }
-void NM_Close_Connexion::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Close_Connexion::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Close_Connexion ------------<END>*/
 
 /*<BEGIN>---------- Message_Null ------------<BEGIN>*/
@@ -337,16 +360,6 @@
 }
 NM_Message_Null::~NM_Message_Null() {  
 }
-void NM_Message_Null::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */  
-} /* end of serialize */ 
-void NM_Message_Null::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Message_Null ------------<END>*/
 
 /*<BEGIN>---------- Create_Federation_Execution ------------<BEGIN>*/
@@ -360,14 +373,14 @@
 }
 void NM_Create_Federation_Execution::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
   msgBuf.write_string(federationName);
   msgBuf.write_string(FEDid);
 } /* end of serialize */ 
 void NM_Create_Federation_Execution::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
   federationName = msgBuf.read_string();
   FEDid          = msgBuf.read_string();
@@ -385,13 +398,13 @@
 }
 void NM_Destroy_Federation_Execution::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
   msgBuf.write_string(federationName);
 } /* end of serialize */ 
 void NM_Destroy_Federation_Execution::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
   date           = msgBuf.read_double();
   federationName = msgBuf.read_string();    
@@ -408,7 +421,7 @@
 }
 void NM_Join_Federation_Execution::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
   msgBuf.write_int32(numberOfRegulators);
   msgBuf.write_uint32(multicastAddress);
@@ -419,7 +432,7 @@
 } /* end of serialize */ 
 void NM_Join_Federation_Execution::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
   numberOfRegulators = msgBuf.read_int32();
   multicastAddress   = msgBuf.read_uint32();
@@ -438,16 +451,6 @@
 }
 NM_Resign_Federation_Execution::~NM_Resign_Federation_Execution() {
 }
-void NM_Resign_Federation_Execution::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Resign_Federation_Execution::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Resign_Federation_Execution ------------<END>*/
 
 /*<BEGIN>---------- Set_Time_Regulating ------------<BEGIN>*/
@@ -461,13 +464,13 @@
 }
 void NM_Set_Time_Regulating::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
   msgBuf.write_bool(regulating);         
 } /* end of serialize */ 
 void NM_Set_Time_Regulating::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
   regulating = msgBuf.read_bool();
 } /* end of deserialize */
@@ -484,13 +487,13 @@
 }
 void NM_Set_Time_Constrained::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
   msgBuf.write_bool(constrained);  
 } /* end of serialize */ 
 void NM_Set_Time_Constrained::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
   constrained = msgBuf.read_bool();
 } /* end of deserialize */
@@ -503,37 +506,10 @@
     /* specific field init */
     isDated    = true;
     isLabelled = true;
+       isTagged   = true;
 }
 
NM_Register_Federation_Synchronization_Point::~NM_Register_Federation_Synchronization_Point()
 {
 }
-void NM_Register_Federation_Synchronization_Point::serialize() {
-  int i;
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */   
-  msgBuf.write_string(tag);
-  msgBuf.write_bool(hasHandleArray);
-  if (hasHandleArray) {
-         msgBuf.write_uint16(handleArraySize);
-         for (i = 0 ; i < handleArraySize ; i ++) {
-                 msgBuf.write_uint16(handleArray[i]);
-         }
-  }
-} /* end of serialize */ 
-void NM_Register_Federation_Synchronization_Point::deserialize() {
-  int i;
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */  
-  tag            = msgBuf.read_string();
-  hasHandleArray = msgBuf.read_bool();
-  if (hasHandleArray) {
-         handleArraySize = msgBuf.read_int16();
-         for (i = 0 ; i < handleArraySize ; i ++) {
-                       handleArray[i] = msgBuf.read_int16();
-         }
-  }
-} /* end of deserialize */
 /*<END>---------- Register_Federation_Synchronization_Point ------------<END>*/
 
 /*<BEGIN>---------- Synchronization_Point_Registration_Succeeded 
------------<BEGIN>*/
@@ -546,16 +522,6 @@
 }
 
NM_Synchronization_Point_Registration_Succeeded::~NM_Synchronization_Point_Registration_Succeeded()
 {
 }
-void NM_Synchronization_Point_Registration_Succeeded::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Synchronization_Point_Registration_Succeeded::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Synchronization_Point_Registration_Succeeded 
------------<END>*/
 
 /*<BEGIN>---------- Announce_Synchronization_Point ------------<BEGIN>*/
@@ -565,21 +531,10 @@
     /* specific field init */
     isDated    = true;
     isLabelled = true;
+       isTagged   = true;
 }
 NM_Announce_Synchronization_Point::~NM_Announce_Synchronization_Point() {
 }
-void NM_Announce_Synchronization_Point::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-  msgBuf.write_string(tag);
-} /* end of serialize */ 
-void NM_Announce_Synchronization_Point::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-  tag            = msgBuf.read_string();
-} /* end of deserialize */
 /*<END>---------- Announce_Synchronization_Point ------------<END>*/
 
 /*<BEGIN>---------- Synchronization_Point_Achieved ------------<BEGIN>*/
@@ -592,16 +547,6 @@
 }
 NM_Synchronization_Point_Achieved::~NM_Synchronization_Point_Achieved() {
 }
-void NM_Synchronization_Point_Achieved::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Synchronization_Point_Achieved::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Synchronization_Point_Achieved ------------<END>*/
 
 /*<BEGIN>---------- Federation_Synchronized ------------<BEGIN>*/
@@ -614,16 +559,6 @@
 }
 NM_Federation_Synchronized::~NM_Federation_Synchronized() {
 }
-void NM_Federation_Synchronized::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Federation_Synchronized::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Federation_Synchronized ------------<END>*/
 
 /*<BEGIN>---------- Request_Federation_Save ------------<BEGIN>*/
@@ -635,16 +570,6 @@
 }
 NM_Request_Federation_Save::~NM_Request_Federation_Save() {
 }
-void NM_Request_Federation_Save::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Request_Federation_Save::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Request_Federation_Save ------------<END>*/
 
 /*<BEGIN>---------- Federate_Save_Begun ------------<BEGIN>*/
@@ -655,16 +580,6 @@
 }
 NM_Federate_Save_Begun::~NM_Federate_Save_Begun() {
 }
-void NM_Federate_Save_Begun::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Federate_Save_Begun::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Federate_Save_Begun ------------<END>*/
 
 /*<BEGIN>---------- Federate_Save_Complete ------------<BEGIN>*/
@@ -675,16 +590,6 @@
 }
 NM_Federate_Save_Complete::~NM_Federate_Save_Complete() {
 }
-void NM_Federate_Save_Complete::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Federate_Save_Complete::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Federate_Save_Complete ------------<END>*/
 
 /*<BEGIN>---------- Federate_Save_Not_Complete ------------<BEGIN>*/
@@ -695,16 +600,6 @@
 }
 NM_Federate_Save_Not_Complete::~NM_Federate_Save_Not_Complete() {
 }
-void NM_Federate_Save_Not_Complete::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Federate_Save_Not_Complete::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Federate_Save_Not_Complete ------------<END>*/
 
 /*<BEGIN>---------- Initiate_Federate_Save ------------<BEGIN>*/
@@ -717,16 +612,6 @@
 }
 NM_Initiate_Federate_Save::~NM_Initiate_Federate_Save() {
 }
-void NM_Initiate_Federate_Save::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Initiate_Federate_Save::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Initiate_Federate_Save ------------<END>*/
 
 /*<BEGIN>---------- Federation_Saved ------------<BEGIN>*/
@@ -737,16 +622,6 @@
 }
 NM_Federation_Saved::~NM_Federation_Saved() {
 }
-void NM_Federation_Saved::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Federation_Saved::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Federation_Saved ------------<END>*/
 
 /*<BEGIN>---------- Federation_Not_Saved ------------<BEGIN>*/
@@ -757,16 +632,6 @@
 }
 NM_Federation_Not_Saved::~NM_Federation_Not_Saved() {
 }
-void NM_Federation_Not_Saved::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Federation_Not_Saved::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Federation_Not_Saved ------------<END>*/
 
 /*<BEGIN>---------- Request_Federation_Restore ------------<BEGIN>*/
@@ -779,16 +644,6 @@
 }
 NM_Request_Federation_Restore::~NM_Request_Federation_Restore() {
 }
-void NM_Request_Federation_Restore::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */  
-} /* end of serialize */ 
-void NM_Request_Federation_Restore::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Request_Federation_Restore ------------<END>*/
 
 /*<BEGIN>---------- Federate_Restore_Complete ------------<BEGIN>*/
@@ -799,16 +654,6 @@
 }
 NM_Federate_Restore_Complete::~NM_Federate_Restore_Complete() {
 }
-void NM_Federate_Restore_Complete::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Federate_Restore_Complete::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Federate_Restore_Complete ------------<END>*/
 
 /*<BEGIN>---------- Federate_Restore_Not_Complete ------------<BEGIN>*/
@@ -819,16 +664,6 @@
 }
 NM_Federate_Restore_Not_Complete::~NM_Federate_Restore_Not_Complete() {
 }
-void NM_Federate_Restore_Not_Complete::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Federate_Restore_Not_Complete::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Federate_Restore_Not_Complete ------------<END>*/
 
 /*<BEGIN>---------- Request_Federation_Restore_Succeeded ------------<BEGIN>*/
@@ -841,16 +676,6 @@
 }
 
NM_Request_Federation_Restore_Succeeded::~NM_Request_Federation_Restore_Succeeded()
 {
 }
-void NM_Request_Federation_Restore_Succeeded::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Request_Federation_Restore_Succeeded::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Request_Federation_Restore_Succeeded ------------<END>*/
 
 /*<BEGIN>---------- Request_Federation_Restore_Failed ------------<BEGIN>*/
@@ -860,21 +685,10 @@
     /* specific field init */
     isDated    = true;
     isLabelled = true;
+       isTagged   = true;
 }
 NM_Request_Federation_Restore_Failed::~NM_Request_Federation_Restore_Failed() {
 }
-void NM_Request_Federation_Restore_Failed::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-  msgBuf.write_string(tag);
-} /* end of serialize */ 
-void NM_Request_Federation_Restore_Failed::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-  tag = msgBuf.read_string();
-} /* end of deserialize */
 /*<END>---------- Request_Federation_Restore_Failed ------------<END>*/
 
 /*<BEGIN>---------- Federation_Restore_Begun ------------<BEGIN>*/
@@ -886,16 +700,6 @@
 }
 NM_Federation_Restore_Begun::~NM_Federation_Restore_Begun() {
 }
-void NM_Federation_Restore_Begun::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Federation_Restore_Begun::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Federation_Restore_Begun ------------<END>*/
 
 /*<BEGIN>---------- Initiate_Federate_Restore ------------<BEGIN>*/
@@ -906,16 +710,6 @@
 }
 NM_Initiate_Federate_Restore::~NM_Initiate_Federate_Restore() {
 }
-void NM_Initiate_Federate_Restore::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Initiate_Federate_Restore::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Initiate_Federate_Restore ------------<END>*/
 
 /*<BEGIN>---------- Federation_Restored ------------<BEGIN>*/
@@ -926,16 +720,6 @@
 }
 NM_Federation_Restored::~NM_Federation_Restored() {
 }
-void NM_Federation_Restored::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Federation_Restored::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Federation_Restored ------------<END>*/
 
 /*<BEGIN>---------- Federation_Not_Restored ------------<BEGIN>*/
@@ -946,16 +730,6 @@
 }
 NM_Federation_Not_Restored::~NM_Federation_Not_Restored() {
 }
-void NM_Federation_Not_Restored::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Federation_Not_Restored::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Federation_Not_Restored ------------<END>*/
 
 /*<BEGIN>---------- Publish_Object_Class ------------<BEGIN>*/
@@ -966,32 +740,6 @@
 }
 NM_Publish_Object_Class::~NM_Publish_Object_Class() {
 }
-void NM_Publish_Object_Class::serialize() {
-  int i;
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-  msgBuf.write_bool(hasHandleArray);
-    if (hasHandleArray) {
-         msgBuf.write_uint16(handleArraySize);
-         for (i = 0 ; i < handleArraySize ; i ++) {
-                 msgBuf.write_uint16(handleArray[i]);
-         }
-  }
-} /* end of serialize */ 
-void NM_Publish_Object_Class::deserialize() {
-  int i;
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-  hasHandleArray = msgBuf.read_bool();
-  if (hasHandleArray) {
-         handleArraySize = msgBuf.read_int16();
-         for (i = 0 ; i < handleArraySize ; i ++) {
-                       handleArray[i] = msgBuf.read_int16();
-         }
-  }
-} /* end of deserialize */
 /*<END>---------- Publish_Object_Class ------------<END>*/
 
 /*<BEGIN>---------- Unpublish_Object_Class ------------<BEGIN>*/
@@ -1004,13 +752,13 @@
 }
 void NM_Unpublish_Object_Class::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
   msgBuf.write_int32(objectClass);
 } /* end of serialize */ 
 void NM_Unpublish_Object_Class::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
   objectClass = msgBuf.read_int32();
 } /* end of deserialize */
@@ -1026,13 +774,13 @@
 }
 void NM_Publish_Interaction_Class::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
   msgBuf.write_int32(interactionClass);
 } /* end of serialize */ 
 void NM_Publish_Interaction_Class::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
   interactionClass = msgBuf.read_int32();
 } /* end of deserialize */
@@ -1046,18 +794,6 @@
 }
 NM_Unpublish_Interaction_Class::~NM_Unpublish_Interaction_Class() {
 }
-void NM_Unpublish_Interaction_Class::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-  msgBuf.write_int32(interactionClass);
-} /* end of serialize */ 
-void NM_Unpublish_Interaction_Class::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-  interactionClass = msgBuf.read_int32();
-} /* end of deserialize */
 /*<END>---------- Unpublish_Interaction_Class ------------<END>*/
 
 /*<BEGIN>---------- Subscribe_Object_Class ------------<BEGIN>*/
@@ -1068,32 +804,6 @@
 }
 NM_Subscribe_Object_Class::~NM_Subscribe_Object_Class() {
 }
-void NM_Subscribe_Object_Class::serialize() {
-  int i;
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-  msgBuf.write_bool(hasHandleArray);
-  if (hasHandleArray) {
-         msgBuf.write_uint16(handleArraySize);
-         for (i = 0 ; i < handleArraySize ; i ++) {
-                 msgBuf.write_uint16(handleArray[i]);
-         }
-  }
-} /* end of serialize */ 
-void NM_Subscribe_Object_Class::deserialize() {
-  int i;
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-  hasHandleArray = msgBuf.read_bool();
-    if (hasHandleArray) {
-         handleArraySize = msgBuf.read_int16();
-         for (i = 0 ; i < handleArraySize ; i ++) {
-                       handleArray[i] = msgBuf.read_int16();
-         }
-  }
-} /* end of deserialize */
 /*<END>---------- Subscribe_Object_Class ------------<END>*/
 
 /*<BEGIN>---------- Unsubscribe_Object_Class ------------<BEGIN>*/
@@ -1104,18 +814,6 @@
 }
 NM_Unsubscribe_Object_Class::~NM_Unsubscribe_Object_Class() {
 }
-void NM_Unsubscribe_Object_Class::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-  msgBuf.write_int32(objectClass);
-} /* end of serialize */ 
-void NM_Unsubscribe_Object_Class::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-  objectClass = msgBuf.read_int32();
-} /* end of deserialize */
 /*<END>---------- Unsubscribe_Object_Class ------------<END>*/
 
 /*<BEGIN>---------- Subscribe_Interaction_Class ------------<BEGIN>*/
@@ -1126,18 +824,6 @@
 }
 NM_Subscribe_Interaction_Class::~NM_Subscribe_Interaction_Class() {
 }
-void NM_Subscribe_Interaction_Class::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-  msgBuf.write_int32(interactionClass);
-} /* end of serialize */ 
-void NM_Subscribe_Interaction_Class::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-  interactionClass = msgBuf.read_int32();
-} /* end of deserialize */
 /*<END>---------- Subscribe_Interaction_Class ------------<END>*/
 
 /*<BEGIN>---------- Unsubscribe_Interaction_Class ------------<BEGIN>*/
@@ -1148,18 +834,6 @@
 }
 NM_Unsubscribe_Interaction_Class::~NM_Unsubscribe_Interaction_Class() {
 }
-void NM_Unsubscribe_Interaction_Class::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-  msgBuf.write_int32(interactionClass);
-} /* end of serialize */ 
-void NM_Unsubscribe_Interaction_Class::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-  interactionClass = msgBuf.read_int32();
-} /* end of deserialize */
 /*<END>---------- Unsubscribe_Interaction_Class ------------<END>*/
 
 /*<BEGIN>---------- Turn_Interactions_On ------------<BEGIN>*/
@@ -1170,18 +844,6 @@
 }
 NM_Turn_Interactions_On::~NM_Turn_Interactions_On() {
 }
-void NM_Turn_Interactions_On::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-  msgBuf.write_int32(interactionClass);
-} /* end of serialize */ 
-void NM_Turn_Interactions_On::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-  interactionClass = msgBuf.read_int32();
-} /* end of deserialize */
 /*<END>---------- Turn_Interactions_On ------------<END>*/
 
 /*<BEGIN>---------- Turn_Interactions_Off ------------<BEGIN>*/
@@ -1192,18 +854,6 @@
 }
 NM_Turn_Interactions_Off::~NM_Turn_Interactions_Off() {
 }
-void NM_Turn_Interactions_Off::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-  msgBuf.write_int32(interactionClass);
-} /* end of serialize */
-void NM_Turn_Interactions_Off::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-  interactionClass = msgBuf.read_int32();
-} /* end of deserialize */
 /*<END>---------- Turn_Interactions_Off ------------<END>*/
 
 /*<BEGIN>---------- Register_Object ------------<BEGIN>*/
@@ -1217,13 +867,13 @@
 }
 void NM_Register_Object::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
   msgBuf.write_int32(object);
 } /* end of serialize */ 
 void NM_Register_Object::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
   object = msgBuf.read_int32();
 } /* end of deserialize */
@@ -1238,18 +888,6 @@
 }
 NM_Discover_Object::~NM_Discover_Object() {
 }
-void NM_Discover_Object::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-  msgBuf.write_int32(object);
-} /* end of serialize */ 
-void NM_Discover_Object::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-  object = msgBuf.read_int32();
-} /* end of deserialize */
 /*<END>---------- Discover_Object ------------<END>*/
 
 /*<BEGIN>---------- Update_Attribute_Values ------------<BEGIN>*/
@@ -1265,16 +903,9 @@
 void NM_Update_Attribute_Values::serialize() {
   int i;
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
   msgBuf.write_int32(objectClass);
-  msgBuf.write_bool(hasHandleArray);
-  if (hasHandleArray) {
-         msgBuf.write_uint16(handleArraySize);
-         for (i = 0 ; i < handleArraySize ; i ++) {
-                 msgBuf.write_uint16(handleArray[i]);
-         }
-  }
   /* the value pre-encoded by the user (HLA 1.3) */
   for (i = 0 ; i < handleArraySize ; i++) {
          msgBuf.write_int32(ValueArray[i].length) ;
@@ -1284,16 +915,9 @@
 void NM_Update_Attribute_Values::deserialize() {
   int i;
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
   objectClass = msgBuf.read_int32();
-  hasHandleArray = msgBuf.read_bool();
-  if (hasHandleArray) {
-         handleArraySize = msgBuf.read_int16();
-         for (i = 0 ; i < handleArraySize ; i ++) {
-                       handleArray[i] = msgBuf.read_int16();
-         }
-  }  
   for (i = 0 ; i < handleArraySize ; i ++) {
          ValueArray[i].length = msgBuf.read_int32();
          msgBuf.read_bytes(ValueArray[i].value, ValueArray[i].length);
@@ -1309,7 +933,6 @@
 }
 NM_Reflect_Attribute_Values::~NM_Reflect_Attribute_Values() {
 }
-
 /*<END>---------- Reflect_Attribute_Values ------------<END>*/
 
 /*<BEGIN>---------- Send_Interaction ------------<BEGIN>*/
@@ -1325,16 +948,9 @@
 void NM_Send_Interaction::serialize() {
        int i;
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
   msgBuf.write_int32(interactionClass);
-    msgBuf.write_bool(hasHandleArray);
-    if (hasHandleArray) {
-         msgBuf.write_uint16(handleArraySize);
-         for (i = 0 ; i < handleArraySize ; i ++) {
-                 msgBuf.write_uint16(handleArray[i]);
-         }
-    }
     /* the value pre-encoded by the user (HLA 1.3) */
     for (i = 0 ; i < handleArraySize ; i++) {
          msgBuf.write_int32(ValueArray[i].length) ;
@@ -1344,16 +960,9 @@
 void NM_Send_Interaction::deserialize() {
        int i;
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
   interactionClass = msgBuf.read_int32();
-    hasHandleArray = msgBuf.read_bool();
-    if (hasHandleArray) {
-         handleArraySize = msgBuf.read_int16();
-         for (i = 0 ; i < handleArraySize ; i ++) {
-                       handleArray[i] = msgBuf.read_int16();
-         }
-    }  
     for (i = 0 ; i < handleArraySize ; i ++) {
          ValueArray[i].length = msgBuf.read_int32();
          msgBuf.read_bytes(ValueArray[i].value, ValueArray[i].length);
@@ -1381,18 +990,6 @@
 }
 NM_Delete_Object::~NM_Delete_Object() {
 }
-void NM_Delete_Object::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-  msgBuf.write_int32(object);
-} /* end of serialize */ 
-void NM_Delete_Object::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-  object = msgBuf.read_int32();
-} /* end of deserialize */
 /*<END>---------- Delete_Object ------------<END>*/
 
 /*<BEGIN>---------- Remove_Object ------------<BEGIN>*/
@@ -1416,12 +1013,12 @@
 }
 void NM_Change_Attribute_Transport_Type::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Change_Attribute_Transport_Type::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Change_Attribute_Transport_Type ------------<END>*/
@@ -1436,12 +1033,12 @@
 }
 void NM_Change_Attribute_Order_Type::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Change_Attribute_Order_Type::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Change_Attribute_Order_Type ------------<END>*/
@@ -1456,12 +1053,12 @@
 }
 void NM_Change_Interaction_Transport_Type::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Change_Interaction_Transport_Type::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Change_Interaction_Transport_Type ------------<END>*/
@@ -1476,12 +1073,12 @@
 }
 void NM_Change_Interaction_Order_Type::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Change_Interaction_Order_Type::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Change_Interaction_Order_Type ------------<END>*/
@@ -1496,12 +1093,12 @@
 }
 void NM_Request_Class_Attribute_Value_Update::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Request_Class_Attribute_Value_Update::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Request_Class_Attribute_Value_Update ------------<END>*/
@@ -1516,13 +1113,15 @@
 }
 void NM_Request_Object_Attribute_Value_Update::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
+       msgBuf.write_int32(object);
 } /* end of serialize */ 
 void NM_Request_Object_Attribute_Value_Update::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
+       object  = msgBuf.read_int32();
 } /* end of deserialize */
 /*<END>---------- Request_Object_Attribute_Value_Update ------------<END>*/
 
@@ -1531,18 +1130,23 @@
     this->name = "IS_ATTRIBUTE_OWNED_BY_FEDERATE";
     this->type = NetworkMessage::IS_ATTRIBUTE_OWNED_BY_FEDERATE;
     /* specific field init */
+       isLabelled = true;
 }
 NM_Is_Attribute_Owned_By_Federate::~NM_Is_Attribute_Owned_By_Federate() {
 }
 void NM_Is_Attribute_Owned_By_Federate::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
+       msgBuf.write_int32(object);
+       msgBuf.write_int32(attribute);
 } /* end of serialize */ 
 void NM_Is_Attribute_Owned_By_Federate::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
+       object    = msgBuf.read_int32();
+       attribute = msgBuf.read_int32();
 } /* end of deserialize */
 /*<END>---------- Is_Attribute_Owned_By_Federate ------------<END>*/
 
@@ -1554,16 +1158,6 @@
 }
 NM_Query_Attribute_Ownership::~NM_Query_Attribute_Ownership() {
 }
-void NM_Query_Attribute_Ownership::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Query_Attribute_Ownership::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Query_Attribute_Ownership ------------<END>*/
 
 /*<BEGIN>---------- Attribute_Is_Not_Owned ------------<BEGIN>*/
@@ -1574,16 +1168,6 @@
 }
 NM_Attribute_Is_Not_Owned::~NM_Attribute_Is_Not_Owned() {
 }
-void NM_Attribute_Is_Not_Owned::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Attribute_Is_Not_Owned::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Attribute_Is_Not_Owned ------------<END>*/
 
 /*<BEGIN>---------- Inform_Attribute_Ownership ------------<BEGIN>*/
@@ -1594,16 +1178,6 @@
 }
 NM_Inform_Attribute_Ownership::~NM_Inform_Attribute_Ownership() {
 }
-void NM_Inform_Attribute_Ownership::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Inform_Attribute_Ownership::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Inform_Attribute_Ownership ------------<END>*/
 
 /*<BEGIN>---------- Negotiated_Attribute_Ownership_Divestiture 
------------<BEGIN>*/
@@ -1611,18 +1185,23 @@
     this->name = "NEGOTIATED_ATTRIBUTE_OWNERSHIP_DIVESTITURE";
     this->type = NetworkMessage::NEGOTIATED_ATTRIBUTE_OWNERSHIP_DIVESTITURE;
     /* specific field init */
+       isLabelled = true;
 }
 
NM_Negotiated_Attribute_Ownership_Divestiture::~NM_Negotiated_Attribute_Ownership_Divestiture()
 {
 }
 void NM_Negotiated_Attribute_Ownership_Divestiture::serialize() {
+       int i;
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
+       msgBuf.write_int32(object);
 } /* end of serialize */ 
 void NM_Negotiated_Attribute_Ownership_Divestiture::deserialize() {
+       int i;
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
+       object = msgBuf.read_int32();
 } /* end of deserialize */
 /*<END>---------- Negotiated_Attribute_Ownership_Divestiture 
------------<END>*/
 
@@ -1636,12 +1215,12 @@
 }
 void NM_Attribute_Ownership_Acquisition_Notification::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Attribute_Ownership_Acquisition_Notification::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Attribute_Ownership_Acquisition_Notification 
------------<END>*/
@@ -1656,12 +1235,12 @@
 }
 void NM_Attribute_Ownership_Divestiture_Notification::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Attribute_Ownership_Divestiture_Notification::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Attribute_Ownership_Divestiture_Notification 
------------<END>*/
@@ -1674,16 +1253,6 @@
 }
 
NM_Request_Attribute_Ownership_Assumption::~NM_Request_Attribute_Ownership_Assumption()
 {
 }
-void NM_Request_Attribute_Ownership_Assumption::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Request_Attribute_Ownership_Assumption::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Request_Attribute_Ownership_Assumption ------------<END>*/
 
 /*<BEGIN>---------- Attribute_Ownership_Unavailable ------------<BEGIN>*/
@@ -1696,12 +1265,12 @@
 }
 void NM_Attribute_Ownership_Unavailable::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Attribute_Ownership_Unavailable::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Attribute_Ownership_Unavailable ------------<END>*/
@@ -1716,12 +1285,12 @@
 }
 void NM_Attribute_Ownership_Acquisition_If_Available::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Attribute_Ownership_Acquisition_If_Available::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Attribute_Ownership_Acquisition_If_Available 
------------<END>*/
@@ -1736,12 +1305,12 @@
 }
 void NM_Unconditional_Attribute_Ownership_Divestiture::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Unconditional_Attribute_Ownership_Divestiture::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Unconditional_Attribute_Ownership_Divestiture 
------------<END>*/
@@ -1754,16 +1323,6 @@
 }
 NM_Attribute_Ownership_Acquisition::~NM_Attribute_Ownership_Acquisition() {
 }
-void NM_Attribute_Ownership_Acquisition::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Attribute_Ownership_Acquisition::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Attribute_Ownership_Acquisition ------------<END>*/
 
 /*<BEGIN>---------- Request_Attribute_Ownership_Release ------------<BEGIN>*/
@@ -1774,16 +1333,6 @@
 }
 
NM_Request_Attribute_Ownership_Release::~NM_Request_Attribute_Ownership_Release()
 {
 }
-void NM_Request_Attribute_Ownership_Release::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Request_Attribute_Ownership_Release::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Request_Attribute_Ownership_Release ------------<END>*/
 
 /*<BEGIN>---------- Cancel_Negotiated_Attribute_Ownership_Divestiture 
------------<BEGIN>*/
@@ -1796,12 +1345,12 @@
 }
 void NM_Cancel_Negotiated_Attribute_Ownership_Divestiture::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Cancel_Negotiated_Attribute_Ownership_Divestiture::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Cancel_Negotiated_Attribute_Ownership_Divestiture 
------------<END>*/
@@ -1816,12 +1365,12 @@
 }
 void NM_Attribute_Ownership_Release_Response::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Attribute_Ownership_Release_Response::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Attribute_Ownership_Release_Response ------------<END>*/
@@ -1836,12 +1385,12 @@
 }
 void NM_Cancel_Attribute_Ownership_Acquisition::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Cancel_Attribute_Ownership_Acquisition::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Cancel_Attribute_Ownership_Acquisition ------------<END>*/
@@ -1856,12 +1405,12 @@
 }
 void NM_Confirm_Attribute_Ownership_Acquisition_Cancellation::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Confirm_Attribute_Ownership_Acquisition_Cancellation::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Confirm_Attribute_Ownership_Acquisition_Cancellation 
------------<END>*/
@@ -1876,12 +1425,12 @@
 }
 void NM_Ddm_Create_Region::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Ddm_Create_Region::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Ddm_Create_Region ------------<END>*/
@@ -1896,12 +1445,12 @@
 }
 void NM_Ddm_Modify_Region::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Ddm_Modify_Region::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Ddm_Modify_Region ------------<END>*/
@@ -1916,12 +1465,12 @@
 }
 void NM_Ddm_Delete_Region::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Ddm_Delete_Region::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Ddm_Delete_Region ------------<END>*/
@@ -1936,12 +1485,12 @@
 }
 void NM_Ddm_Associate_Region::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Ddm_Associate_Region::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Ddm_Associate_Region ------------<END>*/
@@ -1956,12 +1505,12 @@
 }
 void NM_Ddm_Register_Object::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Ddm_Register_Object::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Ddm_Register_Object ------------<END>*/
@@ -1976,12 +1525,12 @@
 }
 void NM_Ddm_Unassociate_Region::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Ddm_Unassociate_Region::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Ddm_Unassociate_Region ------------<END>*/
@@ -1996,12 +1545,12 @@
 }
 void NM_Ddm_Subscribe_Attributes::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Ddm_Subscribe_Attributes::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Ddm_Subscribe_Attributes ------------<END>*/
@@ -2016,12 +1565,12 @@
 }
 void NM_Ddm_Unsubscribe_Attributes::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Ddm_Unsubscribe_Attributes::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Ddm_Unsubscribe_Attributes ------------<END>*/
@@ -2036,12 +1585,12 @@
 }
 void NM_Ddm_Subscribe_Interaction::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Ddm_Subscribe_Interaction::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Ddm_Subscribe_Interaction ------------<END>*/
@@ -2056,12 +1605,12 @@
 }
 void NM_Ddm_Unsubscribe_Interaction::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Ddm_Unsubscribe_Interaction::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Ddm_Unsubscribe_Interaction ------------<END>*/
@@ -2076,12 +1625,12 @@
 }
 void NM_Provide_Attribute_Value_Update::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Provide_Attribute_Value_Update::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Provide_Attribute_Value_Update ------------<END>*/
@@ -2096,12 +1645,12 @@
 }
 void NM_Get_Fed_File::serialize() {
   /* call mother class */      
-  NetworkMessage::serialize(); 
+       Super::serialize(); 
   /* specific code (if any) goes here */
 } /* end of serialize */ 
 void NM_Get_Fed_File::deserialize() {
   /* call mother class */      
-  NetworkMessage::deserialize(); 
+       Super::deserialize(); 
   /* specific code (if any) goes here */
 } /* end of deserialize */
 /*<END>---------- Get_Fed_File ------------<END>*/
@@ -2114,16 +1663,6 @@
 }
 NM_Last::~NM_Last() {
 }
-void NM_Last::serialize() {
-  /* call mother class */      
-  NetworkMessage::serialize(); 
-  /* specific code (if any) goes here */
-} /* end of serialize */ 
-void NM_Last::deserialize() {
-  /* call mother class */      
-  NetworkMessage::deserialize(); 
-  /* specific code (if any) goes here */
-} /* end of deserialize */
 /*<END>---------- Last ------------<END>*/
 
 } /* end of certi namespace */




reply via email to

[Prev in Thread] Current Thread [Next in Thread]