XCAF: assembly item ref driver added, file name typo correction

diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyAtemRefDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyAtemRefDriver.cxx
deleted file mode 100644 (file)
index 118a946..0000000
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyAtemRefDriver.cxx
+++ /dev/null
@@ -1,80 +0,0 @@
-// Created on: 2017-02-14
-// Created by: Sergey NIKONOV
-// Copyright (c) 2008-2017 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <CDM_MessageDriver.hxx>
-#include <Standard_Type.hxx>
-#include <TDF_Attribute.hxx>
-#include <XCAFDoc_AssemblyItemRef.hxx>
-#include <XmlMXCAFDoc_AssemblyAtemRefDriver.hxx>
-#include <XmlObjMgt_Persistent.hxx>
-
-IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_AssemblyItemRefDriver, XmlMDF_ADriver)
-IMPLEMENT_DOMSTRING(Path, "path")
-
-//=======================================================================
-//function :
-//purpose  : 
-//=======================================================================
-XmlMXCAFDoc_AssemblyItemRefDriver::XmlMXCAFDoc_AssemblyItemRefDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
-: XmlMDF_ADriver(theMsgDriver, STANDARD_TYPE(XCAFDoc_AssemblyItemRef)->Name())
-{
-}
-
-//=======================================================================
-//function :
-//purpose  : 
-//=======================================================================
-Handle(TDF_Attribute) XmlMXCAFDoc_AssemblyItemRefDriver::NewEmpty() const
-{
-  return new XCAFDoc_AssemblyItemRef();
-}
-
-//=======================================================================
-//function :
-//purpose  : 
-//=======================================================================
-Standard_Boolean XmlMXCAFDoc_AssemblyItemRefDriver::Paste(const XmlObjMgt_Persistent&  theSource,
-                                                          const Handle(TDF_Attribute)& theTarget,
-                                                          XmlObjMgt_RRelocationTable&  /*theRelocTable*/) const
-{
-  const XmlObjMgt_Element& anElement = theSource;
-
-  XmlObjMgt_DOMString aPath = anElement.getAttribute(::Path());
-  if (aPath == NULL)
-    return Standard_False;
-
-  Handle(XCAFDoc_AssemblyItemRef) aThis = Handle(XCAFDoc_AssemblyItemRef)::DownCast(theTarget);
-  if (aThis.IsNull())
-    return Standard_False;
-
-  aThis->Set(aPath.GetString());
-
-  return Standard_True;
-}
-
-//=======================================================================
-//function :
-//purpose  : 
-//=======================================================================
-void XmlMXCAFDoc_AssemblyItemRefDriver::Paste(const Handle(TDF_Attribute)& theSource,
-                                              XmlObjMgt_Persistent&        theTarget,
-                                              XmlObjMgt_SRelocationTable&  /*theRelocTable*/) const
-{
-  Handle(XCAFDoc_AssemblyItemRef) aThis = Handle(XCAFDoc_AssemblyItemRef)::DownCast(theSource);
-
-  XmlObjMgt_DOMString aPath(aThis->Get().ToString().ToCString());
-
-  theTarget.Element().setAttribute(::Path(), aPath);
-}

diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyAtemRefDriver.hxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyAtemRefDriver.hxx
deleted file mode 100644 (file)
index 2be1a1e..0000000
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyAtemRefDriver.hxx
+++ /dev/null
@@ -1,55 +0,0 @@
-// Created on: 2017-02-16
-// Created by: Sergey NIKONOV
-// Copyright (c) 2008-2017 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _XmlMXCAFDoc_AssemblyItemRefDriver_HeaderFile
-#define _XmlMXCAFDoc_AssemblyItemRefDriver_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
-#include <XmlMDF_ADriver.hxx>
-#include <Standard_Boolean.hxx>
-#include <XmlObjMgt_RRelocationTable.hxx>
-#include <XmlObjMgt_SRelocationTable.hxx>
-
-class CDM_MessageDriver;
-class TDF_Attribute;
-class XmlObjMgt_Persistent;
-
-class XmlMXCAFDoc_AssemblyItemRefDriver;
-DEFINE_STANDARD_HANDLE(XmlMXCAFDoc_AssemblyItemRefDriver, XmlMDF_ADriver)
-
-//! Attribute Driver.
-class XmlMXCAFDoc_AssemblyItemRefDriver : public XmlMDF_ADriver
-{
-public:
-
-  Standard_EXPORT XmlMXCAFDoc_AssemblyItemRefDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
-
-  Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
-
-  Standard_EXPORT Standard_Boolean Paste(const XmlObjMgt_Persistent&  theSource,
-                                         const Handle(TDF_Attribute)& theTarget,
-                                         XmlObjMgt_RRelocationTable&  theRelocTable) const Standard_OVERRIDE;
-
-  Standard_EXPORT void Paste(const Handle(TDF_Attribute)& theSource,
-                             XmlObjMgt_Persistent&        theTarget,
-                             XmlObjMgt_SRelocationTable&  theRelocTable) const Standard_OVERRIDE;
-
-  DEFINE_STANDARD_RTTIEXT(XmlMXCAFDoc_AssemblyItemRefDriver, XmlMDF_ADriver)
-
-};
-
-#endif // _XmlMXCAFDoc_AssemblyItemRefDriver_HeaderFile

diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyItemRefDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyItemRefDriver.cxx
index 378c71eda2ec66d5e5b47ea3974ada9f76f7c0ee..28cd41673d64c5a7101b357c3114b3ad83005983 100644 (file)
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyItemRefDriver.cxx
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_AssemblyItemRefDriver.cxx
@@ -22,8 +22,6 @@
 
 IMPLEMENT_STANDARD_RTTIEXT(XmlMXCAFDoc_AssemblyItemRefDriver, XmlMDF_ADriver)
 IMPLEMENT_DOMSTRING(Path, "path")
-IMPLEMENT_DOMSTRING(AttrGUID, "guid")
-IMPLEMENT_DOMSTRING(SubshapeIndex, "subshape_index")
 
 //=======================================================================
 //function :
@@ -61,26 +59,7 @@ Standard_Boolean XmlMXCAFDoc_AssemblyItemRefDriver::Paste(const XmlObjMgt_Persis
   if (aThis.IsNull())
     return Standard_False;
 
-  aThis->SetItem(aPath.GetString());
-
-  XmlObjMgt_DOMString anAttrGUID = anElement.getAttribute(::AttrGUID());
-  if (anAttrGUID != NULL)
-  {
-    Standard_GUID aGUID(anAttrGUID.GetString());
-    aThis->SetGUID(aGUID);
-    return Standard_True;
-  }
-
-  XmlObjMgt_DOMString aSubshapeIndex = anElement.getAttribute(::SubshapeIndex());
-  if (aSubshapeIndex != NULL)
-  {
-    Standard_Integer anIndex;
-    if (!aSubshapeIndex.GetInteger(anIndex))
-      return Standard_False;
-
-    aThis->SetSubshapeIndex(anIndex);
-    return Standard_True;
-  }
+  aThis->Set(aPath.GetString());
 
   return Standard_True;
 }
@@ -95,23 +74,7 @@ void XmlMXCAFDoc_AssemblyItemRefDriver::Paste(const Handle(TDF_Attribute)& theSo
 {
   Handle(XCAFDoc_AssemblyItemRef) aThis = Handle(XCAFDoc_AssemblyItemRef)::DownCast(theSource);
 
-  XmlObjMgt_DOMString aPath(aThis->GetItem().ToString().ToCString());
-  theTarget.Element().setAttribute(::Path(), aPath);
-
-  if (aThis->IsGUID())
-  {
-    Standard_GUID aGUID = aThis->GetGUID();
-    Standard_Character aGUIDStr[Standard_GUID_SIZE + 1];
-    aGUID.ToCString(aGUIDStr);
-    aGUIDStr[Standard_GUID_SIZE] = '\0';
-    XmlObjMgt_DOMString anAttrGUID(aGUIDStr);
-    theTarget.Element().setAttribute(::AttrGUID(), anAttrGUID);
-  }
-  else if (aThis->IsSubshapeIndex())
-  {
-    TCollection_AsciiString aSubshapeIndexStr(aThis->GetSubshapeIndex());
-    XmlObjMgt_DOMString aSubshapeIndex(aSubshapeIndexStr.ToCString());
-    theTarget.Element().setAttribute(::SubshapeIndex(), aSubshapeIndex);
-  }
+  XmlObjMgt_DOMString aPath(aThis->Get().ToString().ToCString());
 
+  theTarget.Element().setAttribute(::Path(), aPath);
 }