[certi-cvs] certi scripts/TestMessageSpec.msg scripts/CERTI...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      09/09/11 18:45:34

Modified files:
        scripts        : TestMessageSpec.msg CERTI_NetworkMessage.msg 
        libCERTI       : NetworkMessage.hh NM_Classes.hh NM_Classes.cc 

Log message:
        First update for a cleaner NetworkMessage 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/TestMessageSpec.msg?cvsroot=certi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/CERTI_NetworkMessage.msg?cvsroot=certi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NetworkMessage.hh?cvsroot=certi&r1=3.46&r2=3.47
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.hh?cvsroot=certi&r1=3.10&r2=3.11
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.cc?cvsroot=certi&r1=3.16&r2=3.17

Patches:
Index: scripts/TestMessageSpec.msg
===================================================================
RCS file: /sources/certi/certi/scripts/TestMessageSpec.msg,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- scripts/TestMessageSpec.msg 6 Sep 2009 13:25:13 -0000       1.7
+++ scripts/TestMessageSpec.msg 11 Sep 2009 18:45:34 -0000      1.8
@@ -26,7 +26,7 @@
      language CXX [#include "AnotherNativeType.hh"]
 }
 
-native MessageType {
+native MessageType2 {
      language CXX []
 }
 
@@ -36,6 +36,6 @@
 
 message MyOtherMessage : merge MyMessage {
     required bool              constrained  // constrain 
-       optional MessageType       mytype
+       optional MessageType2       mytype
        required uint32            a { default=1 }
 }

Index: scripts/CERTI_NetworkMessage.msg
===================================================================
RCS file: /sources/certi/certi/scripts/CERTI_NetworkMessage.msg,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- scripts/CERTI_NetworkMessage.msg    11 Sep 2009 18:00:33 -0000      1.7
+++ scripts/CERTI_NetworkMessage.msg    11 Sep 2009 18:45:34 -0000      1.8
@@ -33,6 +33,20 @@
     language Java   [import certi.NetworkMessage]
 }
 
+native FederationTime {
+    language CXX    [#include "FedTimeD.hh"]
+    language Python [import certi.FedTimeD]
+    language Java   [import certi.FedTimeD]
+}
+
+message NewNetworkMessage {
+    required uint32          type
+    required string          name
+    optional FederationTime  date
+    optional string          label
+    optional string          tag
+}
+
 native AttributeHandle {
     language CXX [#include "certi.hh"]
 }
@@ -213,7 +227,9 @@
        required ObjectHandle object
 }
 
-message NM_Is_Attribute_Owned_By_Federate : merge NetworkMessage {}
+message NM_Is_Attribute_Owned_By_Federate : merge NetworkMessage {
+      required AttributeHandle attribute
+}
 
 message NM_Query_Attribute_Ownership : merge NM_Is_Attribute_Owned_By_Federate 
{}
 

Index: libCERTI/NetworkMessage.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NetworkMessage.hh,v
retrieving revision 3.46
retrieving revision 3.47
diff -u -b -r3.46 -r3.47
--- libCERTI/NetworkMessage.hh  8 Apr 2009 10:47:19 -0000       3.46
+++ libCERTI/NetworkMessage.hh  11 Sep 2009 18:45:34 -0000      3.47
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: NetworkMessage.hh,v 3.46 2009/04/08 10:47:19 approx Exp $
+// $Id: NetworkMessage.hh,v 3.47 2009/09/11 18:45:34 erk Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef CERTI_NETWORK_MESSAGE_HH
@@ -282,9 +282,6 @@
         */
        std::string exceptionReason;    
 
-       /* used by some sub-classes */
-       int32_t attribute;
-
 protected:
        /** 
         * The message name.
@@ -350,4 +347,4 @@
 
 #endif // CERTI_NETWORK_MESSAGE_HH
 
-// $Id: NetworkMessage.hh,v 3.46 2009/04/08 10:47:19 approx Exp $
+// $Id: NetworkMessage.hh,v 3.47 2009/09/11 18:45:34 erk Exp $

Index: libCERTI/NM_Classes.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NM_Classes.hh,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -b -r3.10 -r3.11
--- libCERTI/NM_Classes.hh      8 Apr 2009 10:47:19 -0000       3.10
+++ libCERTI/NM_Classes.hh      11 Sep 2009 18:45:34 -0000      3.11
@@ -1089,7 +1089,7 @@
 protected:
        /* specific field */
        //      ObjectHandle    object;
-       //      AttributeHandle attribute;
+       AttributeHandle attribute;
 private:
 };
 

Index: libCERTI/NM_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NM_Classes.cc,v
retrieving revision 3.16
retrieving revision 3.17
diff -u -b -r3.16 -r3.17
--- libCERTI/NM_Classes.cc      7 Jun 2009 15:08:46 -0000       3.16
+++ libCERTI/NM_Classes.cc      11 Sep 2009 18:45:34 -0000      3.17
@@ -333,7 +333,7 @@
 
 NM_WithHandleArray::NM_WithHandleArray() {
        this->name = "NM_WithHandleArray";
-       this->type = NetworkMessage::NOT_USED;
+       this->type = NOT_USED;
        /* specific field init */
        this->handleArraySize = 0;
 }
@@ -412,7 +412,7 @@
 /*<BEGIN>---------- Message_Null ------------<BEGIN>*/
 NM_Message_Null::NM_Message_Null() {
        this->name = "MESSAGE_NULL";
-       this->type = NetworkMessage::MESSAGE_NULL;
+       this->type = MESSAGE_NULL;
        /* specific field init */       
 }
 NM_Message_Null::~NM_Message_Null() {