PR: merge from tag mergeto_trunk_17Jan05

[modules/kernel.git] / src / SALOMEDS / SALOMEDS_AttributeStudyProperties_i.hxx

diff --git a/src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.hxx b/src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.hxx
index 95d30cb658a1936fdfb3fb5ae152e244c08d3cb8..b7e1d00202c602e50ff1d59a4263b0971fc4381c 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.hxx
@@ -13,22 +13,20 @@
 #define SALOMEDS_AttributeStudyProperties_i_HeaderFile
 
 // IDL headers
-#include <SALOMEDS_StudyPropertiesAttribute.hxx>
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
+
+#include "SALOMEDS_StudyPropertiesAttribute.hxx"
 #include "SALOMEDS_GenericAttribute_i.hxx"
 
-class SALOMEDS_AttributeStudyProperties_i: public virtual POA_SALOMEDS::AttributeStudyProperties,
-                                           public virtual SALOMEDS_GenericAttribute_i {
-public:
-  
-  SALOMEDS_AttributeStudyProperties_i(const Handle(SALOMEDS_StudyPropertiesAttribute)& theAttr, CORBA::ORB_ptr orb) 
-  {
-    _myOrb = CORBA::ORB::_duplicate(orb);
-    _myAttr = theAttr;
-  };
-  ~SALOMEDS_AttributeStudyProperties_i() {};
+DEFINE_DERIVED_ATTR(AttributeStudyProperties,SALOMEDS_StudyPropertiesAttribute,false);
 
+class SALOMEDS_AttributeStudyProperties_i: 
+  public virtual POA_SALOMEDS::AttributeStudyProperties,
+  public virtual SALOMEDS_TAttributeStudyProperties_i 
+{
+  DEFINE_DERIVED_ATTR_METH_DEFAULT(AttributeStudyProperties,SALOMEDS_StudyPropertiesAttribute);
+public:
   virtual void SetUserName(const char* theName);
   virtual char* GetUserName() ;
   virtual void SetCreationDate(CORBA::Long theMinute, CORBA::Long theHour, CORBA::Long theDay, CORBA::Long theMonth, CORBA::Long theYear);
@@ -53,6 +51,10 @@ public:
                                    SALOMEDS::LongSeq_out theMonths,
                                    SALOMEDS::LongSeq_out theYears,
                                    CORBA::Boolean theWithCreator);
+
+  char* Store();
+  void Restore(const char*);
+
 };