X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOMEDS%2FSALOMEDS_GenericAttribute_i.hxx;h=516f329c9db66535f3cd530234f7597c096830c3;hb=d4617a5edb41e7acd4025a2b56160ae267ede7f6;hp=80a7c96e081a6dc03fa81f8be07b4e7a9e555be3;hpb=bd0aa83cc3573de6b62b2a56e168dd372097bd45;p=modules%2Fyacs.git

diff --git a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx
index 80a7c96e0..516f329c9 100644
--- a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx
@@ -1,160 +1,66 @@
-//  SALOME SALOMEDS : data structure of SALOME and sources of Salome data server 
+// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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 
+// Copyright (C) 2003-2007  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, or (at your option) any later version.
 //
+// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
 //  File   : SALOMEDS_GenericAttribute_i.hxx
-//  Author : Yves FRICAUD
+//  Author : Sergey RUIN
 //  Module : SALOME
-//  $Header$
-
+//
 #ifndef _GENERIC_ATTRIBUTE_I_HXX_
 #define _GENERIC_ATTRIBUTE_I_HXX_
 
-#include <TDF_Attribute.hxx>
-#include <Standard_GUID.hxx>
-
 // IDL headers
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS)
-
-class SALOMEDS_SObject_i;
-
-class SALOMEDS_GenericAttribute_i:
-  public virtual POA_SALOMEDS::GenericAttribute,
-  public virtual PortableServer::RefCountServantBase 
-{ 
-private: 
-  friend class SALOMEDS_SObject_i;
-
-  SALOMEDS_GenericAttribute_i(); // Not implemented
-  void operator=(const SALOMEDS_GenericAttribute_i&);  //Not implemented
+#include <SALOME_GenericObj_i.hh>
+#include "DF_Attribute.hxx"
+#include "SALOMEDS_SObject_i.hxx"
+#include "SALOMEDSImpl_GenericAttribute.hxx"
+
+class Standard_EXPORT SALOMEDS_GenericAttribute_i: public virtual POA_SALOMEDS::GenericAttribute,
+                                   public virtual PortableServer::ServantBase,
+                                   public virtual SALOME::GenericObj_i
+{
 
 protected:
-  SALOMEDS_SObject_i* _mySObject;
-  Handle(TDF_Attribute) _myBasicAttr;
+  DF_Attribute*    _impl;
+  CORBA::ORB_var   _orb;
 
-  SALOMEDS_GenericAttribute_i(const Handle(TDF_Attribute)& theAttr,
-			      SALOMEDS_SObject_i* theSObject);
-  
+public:
+  SALOMEDS_GenericAttribute_i(DF_Attribute* theImpl, CORBA::ORB_ptr theOrb);
   virtual ~SALOMEDS_GenericAttribute_i();
 
-  void SetBasicAttribute(const Handle(TDF_Attribute)& theAttr){
-    _myBasicAttr = theAttr;
-  }
+  void CheckLocked() throw (SALOMEDS::GenericAttribute::LockProtection);
   
-public:
-  void Restore(const char*);
+  virtual char* Type();
 
-  char* Store();
+  char* GetClassType();
 
-  char* Type();
-  
   SALOMEDS::SObject_ptr GetSObject();
-
-  void CheckLocked() 
-    throw (SALOMEDS::GenericAttribute::LockProtection);
-
-  virtual void SetAttribute(const Handle(TDF_Attribute)& theAttr) = 0;
-
-  virtual const Handle(TDF_Attribute)& GetAttribute() const = 0;
-
-};
-
-
-template<class TDFAttribute, class TStoreTDFAttribute, bool TIsCheckLockedStudy = true>
-class SALOMEDS_TGenericAttribute_i:
-  public virtual SALOMEDS_GenericAttribute_i
-{
-public:
-  typedef TDFAttribute TAttr;
-  typedef TStoreTDFAttribute TStoreAttr;
-
-  virtual void SetAttribute(const Handle(TDF_Attribute)& theAttr){
-    _myAttr = TStoreAttr::DownCast(theAttr);
-    SetBasicAttribute(theAttr);
-  }
-  virtual const Handle(TDF_Attribute)& GetAttribute() const{
-    return _myAttr;
-  }
-  static bool IsCheckLockedStudy(){
-    return TIsCheckLockedStudy;
-  }
-  static Handle(TDF_Attribute) NewAttribute(){
-    return new TAttr;
-  }
-
-protected:
-  TStoreAttr _myAttr;
-
-  SALOMEDS_TGenericAttribute_i(const Handle(TDF_Attribute)& theAttr,
-			       SALOMEDS_SObject_i* theSObject):
-    SALOMEDS_GenericAttribute_i(theAttr,theSObject),
-    _myAttr(TStoreAttr::DownCast(theAttr))
-  {
-  }
   
-private: 
-  friend class SALOMEDS_SObject_i;
+  virtual DF_Attribute* GetImpl() { return _impl; }
 
-  SALOMEDS_TGenericAttribute_i(); //Not implemented
-  void operator=(const SALOMEDS_TGenericAttribute_i&);  //Not implemented
+  static SALOMEDS::GenericAttribute_ptr CreateAttribute(DF_Attribute* theAttr, CORBA::ORB_ptr theOrb);  
 
+  virtual CORBA::LongLong GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal);
 };
 
-
-#define DEFINE_DERIVED_ATTR(TName,TAttr,TCheck) \
-  typedef SALOMEDS_TGenericAttribute_i<TAttr,Handle_##TAttr,TCheck> \
-    SALOMEDS_T##TName##_i
-
-
-#define DEFINE_DERIVED_ATTR_METH_BASE(TName) \
-public: \
-  friend class SALOMEDS_SObject_i; \
-  static SALOMEDS_GenericAttribute_i* \
-    NewInstance(const Handle(TDF_Attribute)& theAttr, \
-                SALOMEDS_SObject_i* theSObject) \
-      { return new SALOMEDS_##TName##_i(theAttr,theSObject);} \
-private: \
-  SALOMEDS_##TName##_i(const Handle(TDF_Attribute)& theAttr, \
-                       SALOMEDS_SObject_i* theSObject): \
-    SALOMEDS_GenericAttribute_i(theAttr,theSObject), \
-    SALOMEDS_T##TName##_i(theAttr,theSObject) \
-    {} \
-  void operator=(const SALOMEDS_##TName##_i&); \
-  SALOMEDS_##TName##_i()
-
-
-#define DEFINE_DERIVED_ATTR_METH_DEFAULT(TName,TAttr) \
-DEFINE_DERIVED_ATTR_METH_BASE(TName); \
-public: \
-  static Standard_GUID GetGUID(){ return TAttr::GetID(); } \
-private:
-
-
-#define DEFINE_DERIVED_ATTR_METH(TName,theGUID) \
-DEFINE_DERIVED_ATTR_METH_BASE(TName); \
-public: \
-  static Standard_GUID GetGUID(){ return theGUID; } \
-private:
-
-
 #endif