X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSALOMEDS%2FSALOMEDS_GenericAttribute_i.hxx;h=2ea8c97fe54b166a3d31fe3a3012520ac7abfbf2;hb=052ef1c27c4b47b1aafc3b5879415d0efd7749b6;hp=7fec24e58e88b765ec1ef5b41221000c7160eeb8;hpb=4655b0b0eb5345da6a86852021014b0cbae2ad30;p=modules%2Fkernel.git

diff --git a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx
index 7fec24e58..2ea8c97fe 100644
--- a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx
@@ -1,10 +1,29 @@
-//  File      : SALOMEDS_GenericAttribute_i.hxx
-//  Created   : Fri Jul 05 15:49:37 2002
-//  Author    : Yves FRICAUD
-
-//  Project   : SALOME
-//  Module    : SALOMEDS
-//  Copyright : Open CASCADE 2002
+//  SALOME SALOMEDS : data structure of SALOME and sources of Salome data server 
+//
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 
+//  This library is free software; you can redistribute it and/or 
+//  modify it under the terms of the GNU Lesser General Public 
+//  License as published by the Free Software Foundation; either 
+//  version 2.1 of the License. 
+// 
+//  This library is distributed in the hope that it will be useful, 
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//  Lesser General Public License for more details. 
+// 
+//  You should have received a copy of the GNU Lesser General Public 
+//  License along with this library; if not, write to the Free Software 
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+// 
+//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : SALOMEDS_GenericAttribute_i.hxx
+//  Author : Yves FRICAUD
+//  Module : SALOME
 //  $Header$
 
 #ifndef _GENERIC_ATTRIBUTE_I_HXX_
@@ -15,7 +34,6 @@
 #include CORBA_SERVER_HEADER(SALOMEDS)
 #include <TDF_Attribute.hxx>
 #include "SALOMEDS_SObject_i.hxx"
-#include "SALOMEDS_IORAttribute.hxx"
 
 class SALOMEDS_GenericAttribute_i: public POA_SALOMEDS::GenericAttribute,
 				   public PortableServer::RefCountServantBase {
@@ -26,16 +44,51 @@ public:
   SALOMEDS_GenericAttribute_i() {};
   
   void CheckLocked() throw (SALOMEDS::GenericAttribute::LockProtection);
+
+  char* Store() {return "";};
+
+  void Restore(const char*) {};
   
-  ~SALOMEDS_GenericAttribute_i() {};
+  char* Type();
+
+  SALOMEDS::SObject_ptr GetSObject();
 
-//  CORBA::Boolean  GetPtr(SALOMEDS::SObject_out so) {
-//    SALOMEDS_SObject_i* sob_impl = new  SALOMEDS_SObject_i(_myAttr->Label(), _myOrb);
-//    SALOMEDS::SObject_var sob = sob_impl->_this();
-//    return sob._retn();
-//  };
+  ~SALOMEDS_GenericAttribute_i() {};
 
+  static Standard_GUID GetGUID(const char* theType);
 
+  static SALOMEDS::GenericAttribute_ptr CreateAttribute(CORBA::ORB_ptr theOrb, const Handle(TDF_Attribute)& theAttr);
 };
 
+// defines for creation attributes objects
+
+//cout<<"*** Create new CORBA attribute for "<<#CORBA_Name<<endl;
+#define __ReturnCORBAAttribute(OCAF_Name, CORBA_Name) if (theAttr->ID() == OCAF_Name::GetID()) { \
+    SALOMEDS_##CORBA_Name##_i* Attr = new SALOMEDS_##CORBA_Name##_i(Handle(OCAF_Name)::DownCast(theAttr), theOrb); \
+    return Attr->CORBA_Name::_this(); \
+  }
+
+//cout<<"Create New Attribute "<<#CORBA_Name<<endl;
+#define __FindOrCreateAttribute(OCAF_Name, CORBA_Name) if (strcmp(aTypeOfAttribute, #CORBA_Name) == 0) { \
+    Handle(OCAF_Name) anAttr; \
+    if (!Lab.FindAttribute(OCAF_Name::GetID(), anAttr)) { \
+      anAttr = new OCAF_Name; \
+      Lab.AddAttribute(anAttr); \
+    } \
+    SALOMEDS_##CORBA_Name##_i* Attr = new SALOMEDS_##CORBA_Name##_i(anAttr, _orb); \
+    return Attr->CORBA_Name::_this(); \
+  }
+
+//cout<<"Create New Attribute "<<#CORBA_Name<<endl;
+#define __FindOrCreateAttributeLocked(OCAF_Name, CORBA_Name) if (strcmp(aTypeOfAttribute, #CORBA_Name) == 0) { \
+    Handle(OCAF_Name) anAttr; \
+    if (!Lab.FindAttribute(OCAF_Name::GetID(), anAttr)) { \
+      CheckLocked(); \
+      anAttr = new OCAF_Name; \
+      Lab.AddAttribute(anAttr); \
+    } \
+    SALOMEDS_##CORBA_Name##_i* Attr = new SALOMEDS_##CORBA_Name##_i(anAttr, _orb); \
+    return Attr->CORBA_Name::_this(); \
+  }
+
 #endif