OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00
Code Activity

0029220: Application Framework - replace CDM_MessageDriver interface by Message_Messenger.

Browse Source
This commit is contained in:
szy
2017-12-13 15:27:50 +03:00
committed by bugmaster
parent 31e026ba63
commit 83ae35919c
398 changed files with 1452 additions and 1824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/XmlMDataStd/XmlMDataStd.cxx
View File

@@ -15,7 +15,7 @@
// modified 20.04.2009 Sergey Zaritchny
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <XmlMDataStd.hxx>
#include <XmlMDataStd_AsciiStringDriver.hxx>
#include <XmlMDataStd_BooleanArrayDriver.hxx>
@@ -51,7 +51,7 @@ static Standard_Integer myDocumentVersion = -1;
//purpose :
//=======================================================================
void XmlMDataStd::AddDrivers (const Handle(XmlMDF_ADriverTable)& aDriverTable,
const Handle(CDM_MessageDriver)& anMsgDrv)
const Handle(Message_Messenger)& anMsgDrv)
{
aDriverTable-> AddDriver (new XmlMDataStd_DirectoryDriver (anMsgDrv));
aDriverTable-> AddDriver (new XmlMDataStd_IntegerArrayDriver (anMsgDrv));

4
src/XmlMDataStd/XmlMDataStd.hxx
View File

@@ -20,7 +20,7 @@
#include <Standard_Integer.hxx>
class XmlMDF_ADriverTable;
class CDM_MessageDriver;
class Message_Messenger;
class XmlMDataStd_NameDriver;
class XmlMDataStd_IntegerDriver;
class XmlMDataStd_RealDriver;
@@ -59,7 +59,7 @@ public:
//! Adds the attribute drivers to <aDriverTable>.
Standard_EXPORT static void AddDrivers (const Handle(XmlMDF_ADriverTable)& aDriverTable, const Handle(CDM_MessageDriver)& anMsgDrv);
Standard_EXPORT static void AddDrivers (const Handle(XmlMDF_ADriverTable)& aDriverTable, const Handle(Message_Messenger)& anMsgDrv);
Standard_EXPORT static void SetDocumentVersion (const Standard_Integer DocVersion);

6
src/XmlMDataStd/XmlMDataStd_AsciiStringDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_AsciiString.hxx>
#include <TDF_Attribute.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_DOMSTRING (AttributeIDString, "asciiguid")
//purpose : Constructor
//=======================================================================
XmlMDataStd_AsciiStringDriver::XmlMDataStd_AsciiStringDriver
(const Handle(CDM_MessageDriver)& theMsgDriver)
(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{}
@@ -68,7 +68,7 @@ Standard_Boolean XmlMDataStd_AsciiStringDriver::Paste
Handle(TDataStd_AsciiString)::DownCast(theTarget)->SetID(aGUID);
return Standard_True;
}
WriteMessage("error retrieving AsciiString for type TDataStd_AsciiString");
myMessageDriver->Send("error retrieving AsciiString for type TDataStd_AsciiString", Message_Fail);
return Standard_False;
}

4
src/XmlMDataStd/XmlMDataStd_AsciiStringDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_AsciiStringDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_AsciiStringDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_AsciiStringDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

12
src/XmlMDataStd/XmlMDataStd_BooleanArrayDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <NCollection_LocalArray.hxx>
#include <Standard_Type.hxx>
#include <TColStd_HArray1OfByte.hxx>
@@ -32,7 +32,7 @@ IMPLEMENT_DOMSTRING (AttributeIDString, "boolarrattguid")
//function : XmlMDataStd_BooleanArrayDriver
//purpose : Constructor
//=======================================================================
XmlMDataStd_BooleanArrayDriver::XmlMDataStd_BooleanArrayDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
XmlMDataStd_BooleanArrayDriver::XmlMDataStd_BooleanArrayDriver(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{
@@ -68,7 +68,7 @@ Standard_Boolean XmlMDataStd_BooleanArrayDriver::Paste(const XmlObjMgt_Persisten
TCollection_ExtendedString("Cannot retrieve the first index"
" for BooleanArray attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -79,7 +79,7 @@ Standard_Boolean XmlMDataStd_BooleanArrayDriver::Paste(const XmlObjMgt_Persisten
TCollection_ExtendedString("Cannot retrieve the last index"
" for BooleanArray attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -88,7 +88,7 @@ Standard_Boolean XmlMDataStd_BooleanArrayDriver::Paste(const XmlObjMgt_Persisten
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("The last index is greater than the first index"
" for BooleanArray attribute \"");
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -108,7 +108,7 @@ Standard_Boolean XmlMDataStd_BooleanArrayDriver::Paste(const XmlObjMgt_Persisten
TCollection_ExtendedString("Cannot retrieve integer member"
" for BooleanArray attribute as \"")
+ aValueStr + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
arr.SetValue(i, (Standard_Byte) aValue);

4
src/XmlMDataStd/XmlMDataStd_BooleanArrayDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_BooleanArrayDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_BooleanArrayDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_BooleanArrayDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

12
src/XmlMDataStd/XmlMDataStd_BooleanListDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <NCollection_LocalArray.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_BooleanList.hxx>
@@ -33,7 +33,7 @@ IMPLEMENT_DOMSTRING (AttributeIDString, "boollistattguid")
//function : XmlMDataStd_BooleanListDriver
//purpose : Constructor
//=======================================================================
XmlMDataStd_BooleanListDriver::XmlMDataStd_BooleanListDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
XmlMDataStd_BooleanListDriver::XmlMDataStd_BooleanListDriver(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{
@@ -69,7 +69,7 @@ Standard_Boolean XmlMDataStd_BooleanListDriver::Paste(const XmlObjMgt_Persistent
TCollection_ExtendedString("Cannot retrieve the first index"
" for BooleanList attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -80,7 +80,7 @@ Standard_Boolean XmlMDataStd_BooleanListDriver::Paste(const XmlObjMgt_Persistent
TCollection_ExtendedString("Cannot retrieve the last index"
" for BooleanList attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -94,7 +94,7 @@ Standard_Boolean XmlMDataStd_BooleanListDriver::Paste(const XmlObjMgt_Persistent
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve integer member"
" for BooleanList attribute as \"");
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
aBooleanList->Append(anInteger ? Standard_True : Standard_False);
@@ -110,7 +110,7 @@ Standard_Boolean XmlMDataStd_BooleanListDriver::Paste(const XmlObjMgt_Persistent
TCollection_ExtendedString("Cannot retrieve integer member"
" for BooleanList attribute as \"")
+ aValueStr + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
aBooleanList->Append(aValue ? Standard_True : Standard_False);

4
src/XmlMDataStd/XmlMDataStd_BooleanListDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_BooleanListDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_BooleanListDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_BooleanListDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

14
src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <NCollection_LocalArray.hxx>
#include <Standard_Type.hxx>
#include <TColStd_HArray1OfByte.hxx>
@@ -34,7 +34,7 @@ IMPLEMENT_DOMSTRING (IsDeltaOn, "delta")
//function : XmlMDataStd_ByteArrayDriver
//purpose : Constructor
//=======================================================================
XmlMDataStd_ByteArrayDriver::XmlMDataStd_ByteArrayDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
XmlMDataStd_ByteArrayDriver::XmlMDataStd_ByteArrayDriver(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{
@@ -70,7 +70,7 @@ Standard_Boolean XmlMDataStd_ByteArrayDriver::Paste(const XmlObjMgt_Persistent&
TCollection_ExtendedString("Cannot retrieve the first index"
" for ByteArray attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -81,7 +81,7 @@ Standard_Boolean XmlMDataStd_ByteArrayDriver::Paste(const XmlObjMgt_Persistent&
TCollection_ExtendedString("Cannot retrieve the last index"
" for ByteArray attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -90,7 +90,7 @@ Standard_Boolean XmlMDataStd_ByteArrayDriver::Paste(const XmlObjMgt_Persistent&
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("The last index is greater than the first index"
" for ByteArray attribute \"");
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -109,7 +109,7 @@ Standard_Boolean XmlMDataStd_ByteArrayDriver::Paste(const XmlObjMgt_Persistent&
TCollection_ExtendedString("Cannot retrieve integer member"
" for ByteArray attribute as \"")
+ aValueStr + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
arr.SetValue(i, (Standard_Byte) aValue);
@@ -126,7 +126,7 @@ Standard_Boolean XmlMDataStd_ByteArrayDriver::Paste(const XmlObjMgt_Persistent&
TCollection_ExtendedString("Cannot retrieve the isDelta value"
" for ByteArray attribute as \"")
+ aDeltaValue + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
else

4
src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_ByteArrayDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_ByteArrayDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_ByteArrayDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

6
src/XmlMDataStd/XmlMDataStd_CommentDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_Comment.hxx>
#include <TDF_Attribute.hxx>
@@ -29,7 +29,7 @@ IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_CommentDriver,XmlMDF_ADriver)
//purpose : Constructor
//=======================================================================
XmlMDataStd_CommentDriver::XmlMDataStd_CommentDriver
(const Handle(CDM_MessageDriver)& theMsgDriver)
(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{}
@@ -57,7 +57,7 @@ Standard_Boolean XmlMDataStd_CommentDriver::Paste
Handle(TDataStd_Comment)::DownCast(theTarget) -> Set (aString);
return Standard_True;
}
WriteMessage("error retrieving ExtendedString for type TDataStd_Comment");
myMessageDriver->Send("error retrieving ExtendedString for type TDataStd_Comment", Message_Fail);
return Standard_False;
}

4
src/XmlMDataStd/XmlMDataStd_CommentDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_CommentDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_CommentDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_CommentDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

4
src/XmlMDataStd/XmlMDataStd_DirectoryDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_Directory.hxx>
#include <TDF_Attribute.hxx>
@@ -28,7 +28,7 @@ IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_DirectoryDriver,XmlMDF_ADriver)
//purpose : Constructor
//=======================================================================
XmlMDataStd_DirectoryDriver::XmlMDataStd_DirectoryDriver
(const Handle(CDM_MessageDriver)& theMsgDriver)
(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{}

4
src/XmlMDataStd/XmlMDataStd_DirectoryDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_DirectoryDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_DirectoryDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_DirectoryDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

8
src/XmlMDataStd/XmlMDataStd_ExpressionDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_Expression.hxx>
#include <TDataStd_Variable.hxx>
@@ -32,7 +32,7 @@ IMPLEMENT_DOMSTRING (VariablesString, "variables")
//purpose : Constructor
//=======================================================================
XmlMDataStd_ExpressionDriver::XmlMDataStd_ExpressionDriver
(const Handle(CDM_MessageDriver)& theMsgDriver)
(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{}
@@ -65,7 +65,7 @@ Standard_Boolean XmlMDataStd_ExpressionDriver::Paste
TCollection_ExtendedString aString;
if (!XmlObjMgt::GetExtendedString (theSource, aString))
{
WriteMessage("error retrieving ExtendedString for type TDataStd_Expression");
myMessageDriver->Send("error retrieving ExtendedString for type TDataStd_Expression", Message_Fail);
return Standard_False;
}
aC->SetExpression(aString);
@@ -82,7 +82,7 @@ Standard_Boolean XmlMDataStd_ExpressionDriver::Paste
aMsgString = TCollection_ExtendedString
("XmlMDataStd_ExpressionDriver: Cannot retrieve reference on first variable from \"")
+ aDOMStr + "\"";
WriteMessage (aMsgString);
myMessageDriver->Send (aMsgString, Message_Fail);
return Standard_False;
}
Standard_Integer i = 1;

4
src/XmlMDataStd/XmlMDataStd_ExpressionDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_ExpressionDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_ExpressionDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_ExpressionDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

10
src/XmlMDataStd/XmlMDataStd_ExtStringArrayDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <LDOM_MemManager.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_ExtStringArray.hxx>
@@ -55,7 +55,7 @@ static Standard_Boolean Contains(const Handle(TDataStd_ExtStringArray)& arr,
//=======================================================================
XmlMDataStd_ExtStringArrayDriver::XmlMDataStd_ExtStringArrayDriver
( const Handle(CDM_MessageDriver)& theMsgDriver )
( const Handle(Message_Messenger)& theMsgDriver )
: XmlMDF_ADriver( theMsgDriver, NULL )
{}
@@ -90,7 +90,7 @@ Standard_Boolean XmlMDataStd_ExtStringArrayDriver::Paste
TCollection_ExtendedString("Cannot retrieve the first index"
" for ExtStringArray attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -100,7 +100,7 @@ Standard_Boolean XmlMDataStd_ExtStringArrayDriver::Paste
TCollection_ExtendedString("Cannot retrieve the last index"
" for ExtStringArray attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -192,7 +192,7 @@ Standard_Boolean XmlMDataStd_ExtStringArrayDriver::Paste
TCollection_ExtendedString("Cannot retrieve the isDelta value"
" for IntegerArray attribute as \"")
+ aDeltaValue + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
else

4
src/XmlMDataStd/XmlMDataStd_ExtStringArrayDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_ExtStringArrayDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_ExtStringArrayDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_ExtStringArrayDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

10
src/XmlMDataStd/XmlMDataStd_ExtStringListDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <LDOM_MemManager.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_ExtStringList.hxx>
@@ -35,7 +35,7 @@ IMPLEMENT_DOMSTRING (AttributeIDString, "extstrlistattguid")
//function : XmlMDataStd_ExtStringListDriver
//purpose : Constructor
//=======================================================================
XmlMDataStd_ExtStringListDriver::XmlMDataStd_ExtStringListDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
XmlMDataStd_ExtStringListDriver::XmlMDataStd_ExtStringListDriver(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{
@@ -71,7 +71,7 @@ Standard_Boolean XmlMDataStd_ExtStringListDriver::Paste(const XmlObjMgt_Persiste
TCollection_ExtendedString("Cannot retrieve the first index"
" for ExtStringList attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -82,7 +82,7 @@ Standard_Boolean XmlMDataStd_ExtStringListDriver::Paste(const XmlObjMgt_Persiste
TCollection_ExtendedString("Cannot retrieve the last index"
" for ExtStringList attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -92,7 +92,7 @@ Standard_Boolean XmlMDataStd_ExtStringListDriver::Paste(const XmlObjMgt_Persiste
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a list of extended strings");
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}

4
src/XmlMDataStd/XmlMDataStd_ExtStringListDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_ExtStringListDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_ExtStringListDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_ExtStringListDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

68
src/XmlMDataStd/XmlMDataStd_IntPackedMapDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <NCollection_LocalArray.hxx>
#include <Standard_Type.hxx>
#include <TColStd_HPackedMapOfInteger.hxx>
@@ -39,7 +39,7 @@ IMPLEMENT_DOMSTRING (IsDeltaOn, "delta")
//=======================================================================
XmlMDataStd_IntPackedMapDriver::XmlMDataStd_IntPackedMapDriver
(const Handle(CDM_MessageDriver)& theMsgDriver)
(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataStd_IntPackedMap)->Name())
{}
@@ -74,61 +74,61 @@ Standard_Boolean XmlMDataStd_IntPackedMapDriver::Paste
TCollection_ExtendedString("Cannot retrieve the Map size"
" for IntPackedMap attribute as \"")
+ aSize + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
Handle(TColStd_HPackedMapOfInteger) aHMap = new TColStd_HPackedMapOfInteger ();
Standard_Boolean Ok = Standard_True;
if(aSize) {
Standard_CString aValueString =
Standard_CString(XmlObjMgt::GetStringValue(anElement).GetString());
Standard_CString(XmlObjMgt::GetStringValue(anElement).GetString());
// Handle(TColStd_HPackedMapOfInteger) aHMap = new TColStd_HPackedMapOfInteger ();
for (Standard_Integer i = 1; i <= aSize; i++) {
Standard_Integer aValue;
if (!XmlObjMgt::GetInteger(aValueString, aValue)) {
Ok = Standard_False; break;
}
if(!aHMap->ChangeMap().Add( aValue )) {
Ok = Standard_False; break;
}
Standard_Integer aValue;
if (!XmlObjMgt::GetInteger(aValueString, aValue)) {
Ok = Standard_False; break;
}
if(!aHMap->ChangeMap().Add( aValue )) {
Ok = Standard_False; break;
}
}
if(!Ok) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve integer member"
" for IntPackedMap attribute as \"")
+ aValueString + "\"";
WriteMessage (aMessageString);
return Standard_False;
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve integer member"
" for IntPackedMap attribute as \"")
+ aValueString + "\"";
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
if(aPackedMap->ChangeMap(aHMap))
Ok = Standard_True;
Ok = Standard_True;
}
if(Ok) {
Standard_Boolean aDelta(Standard_False);
if(XmlMDataStd::DocumentVersion() > 2) {
Standard_Integer aDeltaValue;
if (!anElement.getAttribute(::IsDeltaOn()).GetInteger(aDeltaValue))
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve the isDelta value"
" for IntPackedMap attribute as \"")
+ aDeltaValue + "\"";
WriteMessage (aMessageString);
return Standard_False;
}
else
aDelta = aDeltaValue != 0;
Standard_Integer aDeltaValue;
if (!anElement.getAttribute(::IsDeltaOn()).GetInteger(aDeltaValue))
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve the isDelta value"
" for IntPackedMap attribute as \"")
+ aDeltaValue + "\"";
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
else
aDelta = aDeltaValue != 0;
}
#ifdef OCCT_DEBUG
else if(XmlMDataStd::DocumentVersion() == -1)
cout << "Current DocVersion field is not initialized. " <<endl;
cout << "Current DocVersion field is not initialized. " <<endl;
#endif
aPackedMap->SetDelta(aDelta);
return Standard_True;
}
}
WriteMessage("error retrieving Map for type TDataStd_IntPackedMap");
myMessageDriver->Send("error retrieving Map for type TDataStd_IntPackedMap", Message_Fail);
return Standard_False;
}
@@ -142,7 +142,7 @@ void XmlMDataStd_IntPackedMapDriver::Paste (const Handle(TDF_Attribute)& theSour
{
Handle(TDataStd_IntPackedMap) aS = Handle(TDataStd_IntPackedMap)::DownCast(theSource);
if (aS.IsNull()) {
WriteMessage ("IntPackedMapDriver:: The source attribute is Null.");
myMessageDriver->Send ("IntPackedMapDriver:: The source attribute is Null.", Message_Warning);
return;
}

4
src/XmlMDataStd/XmlMDataStd_IntPackedMapDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_IntPackedMapDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_IntPackedMapDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_IntPackedMapDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

14
src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.cxx
View File

@@ -15,7 +15,7 @@
//AGV 150202: Changed prototype XmlObjMgt::SetStringValue()
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <NCollection_LocalArray.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_IntegerArray.hxx>
@@ -37,7 +37,7 @@ IMPLEMENT_DOMSTRING (AttributeIDString, "intarrattguid")
//=======================================================================
XmlMDataStd_IntegerArrayDriver::XmlMDataStd_IntegerArrayDriver
(const Handle(CDM_MessageDriver)& theMsgDriver)
(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{}
@@ -71,7 +71,7 @@ Standard_Boolean XmlMDataStd_IntegerArrayDriver::Paste
TCollection_ExtendedString("Cannot retrieve the first index"
" for IntegerArray attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -81,7 +81,7 @@ Standard_Boolean XmlMDataStd_IntegerArrayDriver::Paste
TCollection_ExtendedString("Cannot retrieve the last index"
" for IntegerArray attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -95,7 +95,7 @@ Standard_Boolean XmlMDataStd_IntegerArrayDriver::Paste
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve integer member"
" for IntegerArray attribute as \"");
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
anIntArray->SetValue(aFirstInd, anInteger);
@@ -113,7 +113,7 @@ Standard_Boolean XmlMDataStd_IntegerArrayDriver::Paste
TCollection_ExtendedString("Cannot retrieve integer member"
" for IntegerArray attribute as \"")
+ aValueStr + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
anIntArray->SetValue(ind, aValue);
@@ -129,7 +129,7 @@ Standard_Boolean XmlMDataStd_IntegerArrayDriver::Paste
TCollection_ExtendedString("Cannot retrieve the isDelta value"
" for IntegerArray attribute as \"")
+ aDeltaValue + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
else

4
src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_IntegerArrayDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_IntegerArrayDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_IntegerArrayDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

6
src/XmlMDataStd/XmlMDataStd_IntegerDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_Integer.hxx>
#include <TDF_Attribute.hxx>
@@ -29,7 +29,7 @@ IMPLEMENT_DOMSTRING (AttributeIDString, "intattguid")
//purpose : Constructor
//=======================================================================
XmlMDataStd_IntegerDriver::XmlMDataStd_IntegerDriver
(const Handle(CDM_MessageDriver)& theMsgDriver)
(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{}
@@ -58,7 +58,7 @@ Standard_Boolean XmlMDataStd_IntegerDriver::Paste
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve Integer attribute from \"")
+ anIntStr + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}

4
src/XmlMDataStd/XmlMDataStd_IntegerDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_IntegerDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_IntegerDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_IntegerDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

12
src/XmlMDataStd/XmlMDataStd_IntegerListDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <NCollection_LocalArray.hxx>
#include <Standard_Type.hxx>
#include <TColStd_ListIteratorOfListOfInteger.hxx>
@@ -33,7 +33,7 @@ IMPLEMENT_DOMSTRING (AttributeIDString, "intlistattguid")
//function : XmlMDataStd_IntegerListDriver
//purpose : Constructor
//=======================================================================
XmlMDataStd_IntegerListDriver::XmlMDataStd_IntegerListDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
XmlMDataStd_IntegerListDriver::XmlMDataStd_IntegerListDriver(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{
@@ -69,7 +69,7 @@ Standard_Boolean XmlMDataStd_IntegerListDriver::Paste(const XmlObjMgt_Persistent
TCollection_ExtendedString("Cannot retrieve the first index"
" for IntegerList attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -80,7 +80,7 @@ Standard_Boolean XmlMDataStd_IntegerListDriver::Paste(const XmlObjMgt_Persistent
TCollection_ExtendedString("Cannot retrieve the last index"
" for IntegerList attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -94,7 +94,7 @@ Standard_Boolean XmlMDataStd_IntegerListDriver::Paste(const XmlObjMgt_Persistent
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve integer member"
" for IntegerList attribute as \"");
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
anIntList->Append(anInteger);
@@ -110,7 +110,7 @@ Standard_Boolean XmlMDataStd_IntegerListDriver::Paste(const XmlObjMgt_Persistent
TCollection_ExtendedString("Cannot retrieve integer member"
" for IntegerList attribute as \"")
+ aValueStr + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
anIntList->Append(aValue);

4
src/XmlMDataStd/XmlMDataStd_IntegerListDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_IntegerListDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_IntegerListDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_IntegerListDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

6
src/XmlMDataStd/XmlMDataStd_NameDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_Name.hxx>
#include <TDF_Attribute.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_DOMSTRING (AttributeIDString, "nameguid")
//purpose : Constructor
//=======================================================================
XmlMDataStd_NameDriver::XmlMDataStd_NameDriver
(const Handle(CDM_MessageDriver)& theMsgDriver)
(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{}
@@ -71,7 +71,7 @@ Standard_Boolean XmlMDataStd_NameDriver::Paste
return Standard_True;
}
}
WriteMessage("error retrieving ExtendedString for type TDataStd_Name");
myMessageDriver->Send("error retrieving ExtendedString for type TDataStd_Name", Message_Fail);
return Standard_False;
}

4
src/XmlMDataStd/XmlMDataStd_NameDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_NameDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_NameDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_NameDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

598
src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <LDOM_MemManager.hxx>
#include <Standard_Type.hxx>
#include <TCollection_ExtendedString.hxx>
@@ -65,7 +65,7 @@ IMPLEMENT_DOMSTRING (Value, "value")
//function : XmlMDataStd_NamedDataDriver
//purpose : Constructor
//=======================================================================
XmlMDataStd_NamedDataDriver::XmlMDataStd_NamedDataDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
XmlMDataStd_NamedDataDriver::XmlMDataStd_NamedDataDriver(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{
@@ -102,7 +102,7 @@ static TCollection_ExtendedString SplitItemFromStart(TCollection_ExtendedString&
}
//=======================================================================
Handle(TColStd_HArray1OfInteger) BuildIntArray(const TCollection_AsciiString& ValString,
const Standard_Integer theLen)
const Standard_Integer theLen)
{
Handle(TColStd_HArray1OfInteger) anArr;
if(ValString.Length() == 0 || !theLen) return anArr;
@@ -117,7 +117,7 @@ Handle(TColStd_HArray1OfInteger) BuildIntArray(const TCollection_AsciiString& Va
//=======================================================================
Handle(TColStd_HArray1OfReal) BuildRealArray(const TCollection_AsciiString& ValString,
const Standard_Integer theLen)
const Standard_Integer theLen)
{
Handle(TColStd_HArray1OfReal) anArr;
if(ValString.Length() == 0 || !theLen) return anArr;
@@ -134,8 +134,8 @@ Handle(TColStd_HArray1OfReal) BuildRealArray(const TCollection_AsciiString& ValS
//purpose : persistent -> transient (retrieve)
//=======================================================================
Standard_Boolean XmlMDataStd_NamedDataDriver::Paste(const XmlObjMgt_Persistent& theSource,
const Handle(TDF_Attribute)& theTarget,
XmlObjMgt_RRelocationTable& ) const
const Handle(TDF_Attribute)& theTarget,
XmlObjMgt_RRelocationTable& ) const
{
Standard_Integer aFirstInd, aLastInd, ind;
const XmlObjMgt_Element& anElement = theSource;
@@ -150,7 +150,7 @@ Standard_Boolean XmlMDataStd_NamedDataDriver::Paste(const XmlObjMgt_Persistent&
TCollection_ExtendedString("Cannot retrieve the first index for NamedData"
" attribute (DataMapOfStringInteger) as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -164,7 +164,7 @@ Standard_Boolean XmlMDataStd_NamedDataDriver::Paste(const XmlObjMgt_Persistent&
TCollection_ExtendedString("Cannot retrieve the last index for NamedData"
" attribute (DataMapOfStringInteger) as \"")
+ aLastIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
try {
@@ -173,38 +173,38 @@ Standard_Boolean XmlMDataStd_NamedDataDriver::Paste(const XmlObjMgt_Persistent&
if((aFirstInd | aLastInd) && aLastInd >= aFirstInd) {
if ( !anElement.hasChildNodes() )
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve DataMapOfStringInteger");
WriteMessage (aMessageString);
return Standard_False;
}
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve DataMapOfStringInteger");
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
aCurNode = anElement.getFirstChild();
LDOM_Element* aCurElement = (LDOM_Element*)&aCurNode;
TCollection_ExtendedString aValueStr, aKey;
TColStd_DataMapOfStringInteger aMap;
for (ind = aFirstInd; ind < aLastInd; ind++) {
XmlObjMgt::GetExtendedString( *aCurElement, aKey );
aValueStr = SplitItemFromEnd(aKey);
if(aValueStr.Length() == 0) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
WriteMessage (aMessageString);
return Standard_False;
}
TCollection_AsciiString aVal(aValueStr,'?');
Standard_Integer aValue = aVal.IntegerValue();
aMap.Bind(aKey, aValue);
aCurNode = aCurElement->getNextSibling();
aCurElement = (LDOM_Element*)&aCurNode;
XmlObjMgt::GetExtendedString( *aCurElement, aKey );
aValueStr = SplitItemFromEnd(aKey);
if(aValueStr.Length() == 0) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
TCollection_AsciiString aVal(aValueStr,'?');
Standard_Integer aValue = aVal.IntegerValue();
aMap.Bind(aKey, aValue);
aCurNode = aCurElement->getNextSibling();
aCurElement = (LDOM_Element*)&aCurNode;
}
XmlObjMgt::GetExtendedString( *aCurElement, aKey );
aValueStr = SplitItemFromEnd(aKey);
if(aValueStr.Length() == 0) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
WriteMessage (aMessageString);
return Standard_False;
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
TCollection_AsciiString aVal(aValueStr,'?');
Standard_Integer aValue = aVal.IntegerValue();
@@ -212,74 +212,74 @@ Standard_Boolean XmlMDataStd_NamedDataDriver::Paste(const XmlObjMgt_Persistent&
T->ChangeIntegers(aMap);
}
//DataMapOfStringReal
//DataMapOfStringReal
aFirstIndex = anElement.getAttribute(::FirstRealIndex());
if (aFirstIndex == NULL)
aFirstInd = 1;
else if (!aFirstIndex.GetInteger(aFirstInd))
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve the first index for NamedData "
"attribute (DataMapOfStringReal) as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
return Standard_False;
}
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve the first index for NamedData "
"attribute (DataMapOfStringReal) as \"")
+ aFirstIndex + "\"";
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
// Read the LastIndex;
// Read the LastIndex;
aLastIndex = anElement.getAttribute(::LastRealIndex());
if(aLastIndex == NULL) {
aFirstInd = 0;
aLastInd = 0;
} else if (!aLastIndex.GetInteger(aLastInd)) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve the last index for NamedData"
" attribute (DataMapOfStringReal) as \"")
+ aLastIndex + "\"";
WriteMessage (aMessageString);
TCollection_ExtendedString("Cannot retrieve the last index for NamedData"
" attribute (DataMapOfStringReal) as \"")
+ aLastIndex + "\"";
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
if((aFirstInd | aLastInd) && aLastInd >= aFirstInd) {
if ( !anElement.hasChildNodes())
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve DataMapOfStringReal");
WriteMessage (aMessageString);
return Standard_False;
}
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve DataMapOfStringReal");
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
LDOM_Element* aCurElement;
if (aCurNode.isNull())
aCurNode = anElement.getFirstChild();
aCurNode = anElement.getFirstChild();
else
aCurNode = ((LDOM_Element*)&aCurNode)->getNextSibling();
aCurElement = (LDOM_Element*)&aCurNode;
TCollection_ExtendedString aValueStr, aKey;
TDataStd_DataMapOfStringReal aMap;
for (ind = aFirstInd; ind < aLastInd; ind++) {
XmlObjMgt::GetExtendedString( *aCurElement, aKey );
aValueStr = SplitItemFromEnd(aKey);
if(aValueStr.Length() == 0) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
WriteMessage (aMessageString);
return Standard_False;
}
TCollection_AsciiString aVal(aValueStr,'?');
Standard_Real aValue = aVal.RealValue();
aMap.Bind(aKey, aValue);
aCurNode = aCurElement->getNextSibling();
aCurElement = (LDOM_Element*)&aCurNode;
XmlObjMgt::GetExtendedString( *aCurElement, aKey );
aValueStr = SplitItemFromEnd(aKey);
if(aValueStr.Length() == 0) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
TCollection_AsciiString aVal(aValueStr,'?');
Standard_Real aValue = aVal.RealValue();
aMap.Bind(aKey, aValue);
aCurNode = aCurElement->getNextSibling();
aCurElement = (LDOM_Element*)&aCurNode;
}
XmlObjMgt::GetExtendedString( *aCurElement, aKey );
aValueStr = SplitItemFromEnd(aKey);
if(aValueStr.Length() == 0) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
WriteMessage (aMessageString);
return Standard_False;
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
TCollection_AsciiString aVal(aValueStr,'?');
Standard_Real aValue = aVal.RealValue();
@@ -292,66 +292,66 @@ Standard_Boolean XmlMDataStd_NamedDataDriver::Paste(const XmlObjMgt_Persistent&
if (aFirstIndex == NULL)
aFirstInd = 1;
else if (!aFirstIndex.GetInteger(aFirstInd))
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve the first index for NamedData"
" attribute (DataMapOfStringString) as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
return Standard_False;
}
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve the first index for NamedData"
" attribute (DataMapOfStringString) as \"")
+ aFirstIndex + "\"";
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
aLastIndex = anElement.getAttribute(::LastStringIndex());
if(aLastIndex == NULL) {
aFirstInd = 0;
aLastInd = 0;
} else if (!aLastIndex.GetInteger(aLastInd)) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve the last index for NamedData"
" attribute (DataMapOfStringString) as \"")
+ aLastIndex + "\"";
WriteMessage (aMessageString);
TCollection_ExtendedString("Cannot retrieve the last index for NamedData"
" attribute (DataMapOfStringString) as \"")
+ aLastIndex + "\"";
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
if((aFirstInd | aLastInd) && aLastInd >= aFirstInd) {
if ( !anElement.hasChildNodes())
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve DataMapOfStringString");
WriteMessage (aMessageString);
return Standard_False;
}
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve DataMapOfStringString");
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
LDOM_Element* aCurElement;
if (aCurNode.isNull())
aCurNode = anElement.getFirstChild();
aCurNode = anElement.getFirstChild();
else
aCurNode = ((LDOM_Element*)&aCurNode)->getNextSibling();
aCurNode = ((LDOM_Element*)&aCurNode)->getNextSibling();
aCurElement = (LDOM_Element*)&aCurNode;
TCollection_ExtendedString aValue, aKey;
TDataStd_DataMapOfStringString aMap;
for (ind = aFirstInd; ind < aLastInd; ind++) {
XmlObjMgt::GetExtendedString( *aCurElement, aKey );
aValue = SplitItemFromStart(aKey); // ==>from start
if(aValue.Length() == 0) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
WriteMessage (aMessageString);
return Standard_False;
}
aMap.Bind(aKey, aValue);
aCurNode = aCurElement->getNextSibling();
aCurElement = (LDOM_Element*)&aCurNode;
XmlObjMgt::GetExtendedString( *aCurElement, aKey );
aValue = SplitItemFromStart(aKey); // ==>from start
if(aValue.Length() == 0) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
aMap.Bind(aKey, aValue);
aCurNode = aCurElement->getNextSibling();
aCurElement = (LDOM_Element*)&aCurNode;
}
XmlObjMgt::GetExtendedString( *aCurElement, aKey );
aValue = SplitItemFromStart(aKey);
if(aValue.Length() == 0) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
WriteMessage (aMessageString);
return Standard_False;
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
aMap.Bind(aKey, aValue);
T->ChangeStrings(aMap);
}
@@ -361,73 +361,73 @@ Standard_Boolean XmlMDataStd_NamedDataDriver::Paste(const XmlObjMgt_Persistent&
if (aFirstIndex == NULL)
aFirstInd = 1;
else if (!aFirstIndex.GetInteger(aFirstInd))
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve the first index for NamedData "
"attribute (DataMapOfStringByte) as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
return Standard_False;
}
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve the first index for NamedData "
"attribute (DataMapOfStringByte) as \"")
+ aFirstIndex + "\"";
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
// Read the LastIndex;
// Read the LastIndex;
aLastIndex = anElement.getAttribute(::LastByteIndex());
if(aLastIndex == NULL) {
aFirstInd = 0;
aLastInd = 0;
} else if (!aLastIndex.GetInteger(aLastInd)) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve the last index for NamedData"
" attribute (DataMapOfStringByte) as \"")
+ aLastIndex + "\"";
WriteMessage (aMessageString);
TCollection_ExtendedString("Cannot retrieve the last index for NamedData"
" attribute (DataMapOfStringByte) as \"")
+ aLastIndex + "\"";
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
if((aFirstInd | aLastInd) && aLastInd >= aFirstInd) {
if ( !anElement.hasChildNodes())
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve DataMapOfStringByte");
WriteMessage (aMessageString);
return Standard_False;
}
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve DataMapOfStringByte");
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
LDOM_Element* aCurElement;
if (aCurNode.isNull())
aCurNode = anElement.getFirstChild();
aCurNode = anElement.getFirstChild();
else
aCurNode = ((LDOM_Element*)&aCurNode)->getNextSibling();
aCurNode = ((LDOM_Element*)&aCurNode)->getNextSibling();
aCurElement = (LDOM_Element*)&aCurNode;
TCollection_ExtendedString aValueStr, aKey;
TDataStd_DataMapOfStringByte aMap;
for (ind = aFirstInd; ind < aLastInd; ind++) {
XmlObjMgt::GetExtendedString( *aCurElement, aKey );
aValueStr = SplitItemFromEnd(aKey);
if(aValueStr.Length() == 0) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
WriteMessage (aMessageString);
return Standard_False;
}
TCollection_AsciiString aVal(aValueStr,'?');
Standard_Byte aValue = (Standard_Byte)aVal.IntegerValue();
aMap.Bind(aKey, aValue);
aCurNode = aCurElement->getNextSibling();
aCurElement = (LDOM_Element*)&aCurNode;
XmlObjMgt::GetExtendedString( *aCurElement, aKey );
aValueStr = SplitItemFromEnd(aKey);
if(aValueStr.Length() == 0) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
TCollection_AsciiString aVal(aValueStr,'?');
Standard_Byte aValue = (Standard_Byte)aVal.IntegerValue();
aMap.Bind(aKey, aValue);
aCurNode = aCurElement->getNextSibling();
aCurElement = (LDOM_Element*)&aCurNode;
}
XmlObjMgt::GetExtendedString( *aCurElement, aKey );
aValueStr = SplitItemFromEnd(aKey);
if(aValueStr.Length() == 0) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
WriteMessage (aMessageString);
return Standard_False;
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
TCollection_AsciiString aVal(aValueStr,'?');
Standard_Byte aValue = (Standard_Byte)aVal.IntegerValue();
aMap.Bind(aKey, aValue);
@@ -439,14 +439,14 @@ Standard_Boolean XmlMDataStd_NamedDataDriver::Paste(const XmlObjMgt_Persistent&
if (aFirstIndex == NULL)
aFirstInd = 1;
else if (!aFirstIndex.GetInteger(aFirstInd))
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve the first index for NamedData "
"attribute (DataMapOfStringHArray1OfInteger) as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
return Standard_False;
}
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve the first index for NamedData "
"attribute (DataMapOfStringHArray1OfInteger) as \"")
+ aFirstIndex + "\"";
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
// Read the LastIndex;
aLastIndex = anElement.getAttribute(::LastIntArrIndex());
@@ -455,74 +455,74 @@ Standard_Boolean XmlMDataStd_NamedDataDriver::Paste(const XmlObjMgt_Persistent&
aLastInd = 0;
} else if (!aLastIndex.GetInteger(aLastInd)) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve the last index for NamedData"
" attribute (DataMapOfStringHArray1OfInteger) as \"")
+ aLastIndex + "\"";
WriteMessage (aMessageString);
TCollection_ExtendedString("Cannot retrieve the last index for NamedData"
" attribute (DataMapOfStringHArray1OfInteger) as \"")
+ aLastIndex + "\"";
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
if((aFirstInd | aLastInd) && aLastInd >= aFirstInd) {
if ( !anElement.hasChildNodes())
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve DataMapOfStringHArray1OfInteger");
WriteMessage (aMessageString);
return Standard_False;
}
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve DataMapOfStringHArray1OfInteger");
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
LDOM_Element* aCurElement;
if (aCurNode.isNull())
aCurNode = anElement.getFirstChild();
aCurNode = anElement.getFirstChild();
else
aCurNode =((LDOM_Element*)&aCurNode)->getNextSibling();
aCurNode =((LDOM_Element*)&aCurNode)->getNextSibling();
aCurElement = (LDOM_Element*)&aCurNode;
TCollection_ExtendedString aKey, aValueStr;
TDataStd_DataMapOfStringHArray1OfInteger aMap;
for (ind = aFirstInd; ind < aLastInd; ind++) {
XmlObjMgt::GetExtendedString( *aCurElement, aKey );// Len - at the end
aValueStr = SplitItemFromEnd(aKey);
if(aValueStr.Length() == 0) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
WriteMessage (aMessageString);
return Standard_False;
}
TCollection_AsciiString aVal(aValueStr,'?');
Standard_Integer aLen = aVal.IntegerValue();
TCollection_AsciiString aValueString = aCurElement->getAttribute(::Value());
Handle(TColStd_HArray1OfInteger) aValue = BuildIntArray(aValueString, aLen);
if(aValue.IsNull()) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
WriteMessage (aMessageString);
return Standard_False;
}
aMap.Bind(aKey, aValue);
aCurNode = aCurElement->getNextSibling();
aCurElement = (LDOM_Element*)&aCurNode;
XmlObjMgt::GetExtendedString( *aCurElement, aKey );// Len - at the end
aValueStr = SplitItemFromEnd(aKey);
if(aValueStr.Length() == 0) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
TCollection_AsciiString aVal(aValueStr,'?');
Standard_Integer aLen = aVal.IntegerValue();
TCollection_AsciiString aValueString = aCurElement->getAttribute(::Value());
Handle(TColStd_HArray1OfInteger) aValue = BuildIntArray(aValueString, aLen);
if(aValue.IsNull()) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
aMap.Bind(aKey, aValue);
aCurNode = aCurElement->getNextSibling();
aCurElement = (LDOM_Element*)&aCurNode;
}
XmlObjMgt::GetExtendedString( *aCurElement, aKey );
aValueStr = SplitItemFromEnd(aKey);
if(aValueStr.Length() == 0) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
WriteMessage (aMessageString);
return Standard_False;
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
TCollection_AsciiString aVal(aValueStr,'?');
Standard_Integer aLen = aVal.IntegerValue();
TCollection_AsciiString aValueString = aCurElement->getAttribute(::Value());
Handle(TColStd_HArray1OfInteger) aValue = BuildIntArray(aValueString, aLen);
if(aValue.IsNull()) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
WriteMessage (aMessageString);
return Standard_False;
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
aMap.Bind(aKey, aValue);
T->ChangeArraysOfIntegers(aMap);
@@ -533,104 +533,104 @@ Standard_Boolean XmlMDataStd_NamedDataDriver::Paste(const XmlObjMgt_Persistent&
if (aFirstIndex == NULL)
aFirstInd = 1;
else if (!aFirstIndex.GetInteger(aFirstInd))
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve the first index for NamedData "
"attribute (DataMapOfStringHArray1OfReal) as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
return Standard_False;
}
// Read the LastIndex;
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve the first index for NamedData "
"attribute (DataMapOfStringHArray1OfReal) as \"")
+ aFirstIndex + "\"";
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
// Read the LastIndex;
aLastIndex = anElement.getAttribute(::LastRealArrIndex());
if(aLastIndex == NULL) {
aFirstInd = 0;
aLastInd = 0;
} else if (!aLastIndex.GetInteger(aLastInd)) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve the last index for NamedData"
" attribute (DataMapOfStringHArray1OfReal) as \"")
+ aLastIndex + "\"";
WriteMessage (aMessageString);
TCollection_ExtendedString("Cannot retrieve the last index for NamedData"
" attribute (DataMapOfStringHArray1OfReal) as \"")
+ aLastIndex + "\"";
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
if((aFirstInd | aLastInd) && aLastInd >= aFirstInd) {
if ( !anElement.hasChildNodes())
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve DataMapOfStringHArray1OfReal");
WriteMessage (aMessageString);
return Standard_False;
}
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve DataMapOfStringHArray1OfReal");
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
LDOM_Element* aCurElement;
if (aCurNode.isNull())
aCurNode = anElement.getFirstChild();
aCurNode = anElement.getFirstChild();
else
aCurNode =((LDOM_Element*)&aCurNode)->getNextSibling();
aCurNode =((LDOM_Element*)&aCurNode)->getNextSibling();
aCurElement = (LDOM_Element*)&aCurNode;
TCollection_ExtendedString aKey, aValueStr;
TDataStd_DataMapOfStringHArray1OfReal aMap;
for (ind = aFirstInd; ind < aLastInd; ind++) {
XmlObjMgt::GetExtendedString( *aCurElement, aKey );// Len - at the end
aValueStr = SplitItemFromEnd(aKey);
if(aValueStr.Length() == 0) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
WriteMessage (aMessageString);
return Standard_False;
}
TCollection_AsciiString aVal(aValueStr,'?');
Standard_Integer aLen = aVal.IntegerValue();
TCollection_AsciiString aValueString = aCurElement->getAttribute(::Value());
Handle(TColStd_HArray1OfReal) aValue = BuildRealArray(aValueString, aLen);
if(aValue.IsNull()) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
WriteMessage (aMessageString);
return Standard_False;
}
aMap.Bind(aKey, aValue);
aCurNode = aCurElement->getNextSibling();
aCurElement = (LDOM_Element*)&aCurNode;
XmlObjMgt::GetExtendedString( *aCurElement, aKey );// Len - at the end
aValueStr = SplitItemFromEnd(aKey);
if(aValueStr.Length() == 0) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
TCollection_AsciiString aVal(aValueStr,'?');
Standard_Integer aLen = aVal.IntegerValue();
TCollection_AsciiString aValueString = aCurElement->getAttribute(::Value());
Handle(TColStd_HArray1OfReal) aValue = BuildRealArray(aValueString, aLen);
if(aValue.IsNull()) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
aMap.Bind(aKey, aValue);
aCurNode = aCurElement->getNextSibling();
aCurElement = (LDOM_Element*)&aCurNode;
}
XmlObjMgt::GetExtendedString( *aCurElement, aKey );
aValueStr = SplitItemFromEnd(aKey);
if(aValueStr.Length() == 0) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
WriteMessage (aMessageString);
return Standard_False;
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
TCollection_AsciiString aVal(aValueStr,'?');
Standard_Integer aLen = aVal.IntegerValue();
TCollection_AsciiString aValueString = aCurElement->getAttribute(::Value());
Handle(TColStd_HArray1OfReal) aValue = BuildRealArray(aValueString, aLen);
if(aValue.IsNull()) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
WriteMessage (aMessageString);
return Standard_False;
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a value from item = ") + aKey;
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
aMap.Bind(aKey, aValue);
T->ChangeArraysOfReals(aMap);
T->ChangeArraysOfReals(aMap);
}
} catch (EXCEPTION) {
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Unknown exception during data retrieve in NamedDatDriver ");
WriteMessage (aMessageString);
return Standard_False;}
return Standard_True;
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;}
return Standard_True;
}
//=======================================================================
@@ -638,12 +638,12 @@ Standard_Boolean XmlMDataStd_NamedDataDriver::Paste(const XmlObjMgt_Persistent&
//purpose : transient -> persistent (store)
//=======================================================================
void XmlMDataStd_NamedDataDriver::Paste(const Handle(TDF_Attribute)& theSource,
XmlObjMgt_Persistent& theTarget,
XmlObjMgt_SRelocationTable& ) const
XmlObjMgt_Persistent& theTarget,
XmlObjMgt_SRelocationTable& ) const
{
Handle(TDataStd_NamedData) S = Handle(TDataStd_NamedData)::DownCast(theSource);
if(S.IsNull()) {
WriteMessage ("NamedDataDriver:: The source attribute is Null.");
myMessageDriver->Send ("NamedDataDriver:: The source attribute is Null.", Message_Warning);
return;}
Standard_Integer i=0, up;
@@ -657,7 +657,7 @@ void XmlMDataStd_NamedDataDriver::Paste(const Handle(TDF_Attribute)& theSource,
TColStd_DataMapIteratorOfDataMapOfStringInteger itr(S->GetIntegersContainer());
for (i=1; itr.More(); itr.Next(),i++) {
const TCollection_ExtendedString aValueStr =
itr.Key() + ' ' + TCollection_ExtendedString(itr.Value());// key - value;
itr.Key() + ' ' + TCollection_ExtendedString(itr.Value());// key - value;
XmlObjMgt_Element aCurTarget = aDoc.createElement( ::ExtString() );
XmlObjMgt::SetExtendedString( aCurTarget, aValueStr );
anElement.appendChild( aCurTarget );
@@ -669,11 +669,11 @@ void XmlMDataStd_NamedDataDriver::Paste(const Handle(TDF_Attribute)& theSource,
theTarget.Element().setAttribute(::LastRealIndex(), up);
TDataStd_DataMapIteratorOfDataMapOfStringReal itr(S->GetRealsContainer());
for (i=1; itr.More(); itr.Next(),i++) {
const TCollection_ExtendedString aValueStr =
itr.Key() + ' ' + TCollection_ExtendedString(itr.Value());// key - value;
XmlObjMgt_Element aCurTarget = aDoc.createElement( ::ExtString() );
XmlObjMgt::SetExtendedString( aCurTarget, aValueStr );
anElement.appendChild( aCurTarget );
const TCollection_ExtendedString aValueStr =
itr.Key() + ' ' + TCollection_ExtendedString(itr.Value());// key - value;
XmlObjMgt_Element aCurTarget = aDoc.createElement( ::ExtString() );
XmlObjMgt::SetExtendedString( aCurTarget, aValueStr );
anElement.appendChild( aCurTarget );
}
}
@@ -683,7 +683,7 @@ void XmlMDataStd_NamedDataDriver::Paste(const Handle(TDF_Attribute)& theSource,
TDataStd_DataMapIteratorOfDataMapOfStringString itr(S->GetStringsContainer());
for (i=1; itr.More(); itr.Next(),i++) {
const TCollection_ExtendedString aValueStr =
itr.Key() + ' ' + TCollection_ExtendedString(itr.Value());// key(without blanks) - value;
itr.Key() + ' ' + TCollection_ExtendedString(itr.Value());// key(without blanks) - value;
XmlObjMgt_Element aCurTarget = aDoc.createElement( ::ExtString() );
XmlObjMgt::SetExtendedString( aCurTarget, aValueStr );
anElement.appendChild( aCurTarget );
@@ -696,7 +696,7 @@ void XmlMDataStd_NamedDataDriver::Paste(const Handle(TDF_Attribute)& theSource,
TDataStd_DataMapIteratorOfDataMapOfStringByte itr(S->GetBytesContainer());
for (i=1; itr.More(); itr.Next(),i++) {
const TCollection_ExtendedString aValueStr =
itr.Key() + ' ' + TCollection_ExtendedString(itr.Value());// key - value;
itr.Key() + ' ' + TCollection_ExtendedString(itr.Value());// key - value;
XmlObjMgt_Element aCurTarget = aDoc.createElement( ::ExtString() );
XmlObjMgt::SetExtendedString( aCurTarget, aValueStr );
anElement.appendChild( aCurTarget );
@@ -712,7 +712,7 @@ void XmlMDataStd_NamedDataDriver::Paste(const Handle(TDF_Attribute)& theSource,
const Standard_Integer aLen = anArr1.Upper() - anArr1.Lower() +1;
const TCollection_ExtendedString aValueStr =
itr.Key() + ' ' + TCollection_ExtendedString(aLen);// key - Num_of_Arr_elements;
itr.Key() + ' ' + TCollection_ExtendedString(aLen);// key - Num_of_Arr_elements;
XmlObjMgt_Element aCurTarget = aDoc.createElement( ::ExtString() );
XmlObjMgt::SetExtendedString( aCurTarget, aValueStr); //key
anElement.appendChild( aCurTarget );
@@ -720,12 +720,12 @@ void XmlMDataStd_NamedDataDriver::Paste(const Handle(TDF_Attribute)& theSource,
//Value = Array
TCollection_AsciiString aValueStr2;
Standard_Integer j = anArr1.Lower();
for(;;) {
aValueStr2 += TCollection_AsciiString(anArr1.Value(j));
if (j >= anArr1.Upper()) break;
aValueStr2 += ' ';
j++;
}
for(;;) {
aValueStr2 += TCollection_AsciiString(anArr1.Value(j));
if (j >= anArr1.Upper()) break;
aValueStr2 += ' ';
j++;
}
aCurTarget.setAttribute(::Value(), aValueStr2.ToCString());
}
@@ -741,7 +741,7 @@ void XmlMDataStd_NamedDataDriver::Paste(const Handle(TDF_Attribute)& theSource,
//key
const TCollection_ExtendedString aValueStr =
itr.Key() + ' ' + TCollection_ExtendedString(aLen);// key - Num_of_Arr_elements;
itr.Key() + ' ' + TCollection_ExtendedString(aLen);// key - Num_of_Arr_elements;
XmlObjMgt_Element aCurTarget = aDoc.createElement( ::ExtString() );
XmlObjMgt::SetExtendedString( aCurTarget, aValueStr); //key
anElement.appendChild( aCurTarget );
@@ -750,13 +750,13 @@ void XmlMDataStd_NamedDataDriver::Paste(const Handle(TDF_Attribute)& theSource,
TCollection_AsciiString aValueStr2;
Standard_Integer j = anArr1.Lower();
for(;;) {
char aValueChar[32];
Sprintf(aValueChar, "%.15g", anArr1.Value(j));
TCollection_AsciiString aValueStr3(aValueChar);
aValueStr2 += aValueStr3;
if (j >= anArr1.Upper()) break;
aValueStr2 += ' ';
j++;
char aValueChar[32];
Sprintf(aValueChar, "%.15g", anArr1.Value(j));
TCollection_AsciiString aValueStr3(aValueChar);
aValueStr2 += aValueStr3;
if (j >= anArr1.Upper()) break;
aValueStr2 += ' ';
j++;
}
aCurTarget.setAttribute(::Value(), aValueStr2.ToCString());

4
src/XmlMDataStd/XmlMDataStd_NamedDataDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_NamedDataDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_NamedDataDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_NamedDataDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

4
src/XmlMDataStd/XmlMDataStd_NoteBookDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_NoteBook.hxx>
#include <TDF_Attribute.hxx>
@@ -28,7 +28,7 @@ IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_NoteBookDriver,XmlMDF_ADriver)
//purpose : Constructor
//=======================================================================
XmlMDataStd_NoteBookDriver::XmlMDataStd_NoteBookDriver
(const Handle(CDM_MessageDriver)& theMsgDriver)
(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{}

4
src/XmlMDataStd/XmlMDataStd_NoteBookDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_NoteBookDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_NoteBookDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_NoteBookDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

14
src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx
View File

@@ -15,7 +15,7 @@
//AGV 150202: Changed prototype XmlObjMgt::SetStringValue()
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <NCollection_LocalArray.hxx>
#include <Standard_ErrorHandler.hxx>
#include <Standard_OutOfMemory.hxx>
@@ -40,7 +40,7 @@ IMPLEMENT_DOMSTRING (AttributeIDString, "realarrattguid")
//=======================================================================
XmlMDataStd_RealArrayDriver::XmlMDataStd_RealArrayDriver
(const Handle(CDM_MessageDriver)& theMsgDriver)
(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{}
@@ -75,7 +75,7 @@ Standard_Boolean XmlMDataStd_RealArrayDriver::Paste
TCollection_ExtendedString("Cannot retrieve the first index"
" for RealArray attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -85,7 +85,7 @@ Standard_Boolean XmlMDataStd_RealArrayDriver::Paste
TCollection_ExtendedString("Cannot retrieve the last index"
" for RealArray attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -105,7 +105,7 @@ Standard_Boolean XmlMDataStd_RealArrayDriver::Paste
TCollection_ExtendedString("Cannot retrieve array of real members"
" for RealArray attribute from Integer \"")
+ aString + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
} else {
@@ -117,7 +117,7 @@ Standard_Boolean XmlMDataStd_RealArrayDriver::Paste
TCollection_ExtendedString("Cannot retrieve real member"
" for RealArray attribute as \"")
+ aValueStr + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
aRealArray->SetValue(ind, aValue);
@@ -133,7 +133,7 @@ Standard_Boolean XmlMDataStd_RealArrayDriver::Paste
TCollection_ExtendedString("Cannot retrieve the isDelta value"
" for RealArray attribute as \"")
+ aDeltaValue + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
else

4
src/XmlMDataStd/XmlMDataStd_RealArrayDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_RealArrayDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_RealArrayDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_RealArrayDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

6
src/XmlMDataStd/XmlMDataStd_RealDriver.cxx
View File

@@ -15,7 +15,7 @@
//AGV 150202: Changed prototype XmlObjMgt::SetStringValue()
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_Real.hxx>
#include <TDF_Attribute.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_DOMSTRING (AttributeIDString, "realattguid")
//purpose : Constructor
//=======================================================================
XmlMDataStd_RealDriver::XmlMDataStd_RealDriver
(const Handle(CDM_MessageDriver)& theMsgDriver)
(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{}
@@ -60,7 +60,7 @@ Standard_Boolean XmlMDataStd_RealDriver::Paste
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve Real attribute from \"")
+ aRealStr + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}

4
src/XmlMDataStd/XmlMDataStd_RealDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_RealDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_RealDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_RealDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

12
src/XmlMDataStd/XmlMDataStd_RealListDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <NCollection_LocalArray.hxx>
#include <Standard_Type.hxx>
#include <TColStd_ListIteratorOfListOfReal.hxx>
@@ -32,7 +32,7 @@ IMPLEMENT_DOMSTRING (AttributeIDString, "reallistattguid")
//function : XmlMDataStd_RealListDriver
//purpose : Constructor
//=======================================================================
XmlMDataStd_RealListDriver::XmlMDataStd_RealListDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
XmlMDataStd_RealListDriver::XmlMDataStd_RealListDriver(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{
@@ -69,7 +69,7 @@ Standard_Boolean XmlMDataStd_RealListDriver::Paste(const XmlObjMgt_Persistent&
TCollection_ExtendedString("Cannot retrieve the first index"
" for RealList attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -80,7 +80,7 @@ Standard_Boolean XmlMDataStd_RealListDriver::Paste(const XmlObjMgt_Persistent&
TCollection_ExtendedString("Cannot retrieve the last index"
" for RealList attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -102,7 +102,7 @@ Standard_Boolean XmlMDataStd_RealListDriver::Paste(const XmlObjMgt_Persistent&
TCollection_ExtendedString("Cannot retrieve array of real members"
" for RealList attribute from Integer \"")
+ aString + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
}
@@ -116,7 +116,7 @@ Standard_Boolean XmlMDataStd_RealListDriver::Paste(const XmlObjMgt_Persistent&
TCollection_ExtendedString("Cannot retrieve real member"
" for RealList attribute as \"")
+ aValueStr + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
aRealList->Append(aValue);

4
src/XmlMDataStd/XmlMDataStd_RealListDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_RealListDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_RealListDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_RealListDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

20
src/XmlMDataStd/XmlMDataStd_ReferenceArrayDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <LDOM_MemManager.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_ReferenceArray.hxx>
@@ -35,7 +35,7 @@ IMPLEMENT_DOMSTRING (AttributeIDString, "refarrattguid")
//function : XmlMDataStd_ReferenceArrayDriver
//purpose : Constructor
//=======================================================================
XmlMDataStd_ReferenceArrayDriver::XmlMDataStd_ReferenceArrayDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
XmlMDataStd_ReferenceArrayDriver::XmlMDataStd_ReferenceArrayDriver(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{
@@ -71,7 +71,7 @@ Standard_Boolean XmlMDataStd_ReferenceArrayDriver::Paste(const XmlObjMgt_Persist
TCollection_ExtendedString("Cannot retrieve the first index"
" for ReferenceArray attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -82,7 +82,7 @@ Standard_Boolean XmlMDataStd_ReferenceArrayDriver::Paste(const XmlObjMgt_Persist
TCollection_ExtendedString("Cannot retrieve the last index"
" for ReferenceArray attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -93,7 +93,7 @@ Standard_Boolean XmlMDataStd_ReferenceArrayDriver::Paste(const XmlObjMgt_Persist
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a Array of reference");
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -106,7 +106,7 @@ Standard_Boolean XmlMDataStd_ReferenceArrayDriver::Paste(const XmlObjMgt_Persist
aValueStr = XmlObjMgt::GetStringValue( *aCurElement );
if (aValueStr == NULL)
{
WriteMessage ("Cannot retrieve reference string from element");
myMessageDriver->Send ("Cannot retrieve reference string from element", Message_Fail);
return Standard_False;
}
TCollection_AsciiString anEntry;
@@ -115,7 +115,7 @@ Standard_Boolean XmlMDataStd_ReferenceArrayDriver::Paste(const XmlObjMgt_Persist
TCollection_ExtendedString aMessage =
TCollection_ExtendedString ("Cannot retrieve reference from \"")
+ aValueStr + '\"';
WriteMessage (aMessage);
myMessageDriver->Send (aMessage, Message_Fail);
return Standard_False;
}
// Find label by entry
@@ -133,7 +133,7 @@ Standard_Boolean XmlMDataStd_ReferenceArrayDriver::Paste(const XmlObjMgt_Persist
aValueStr = XmlObjMgt::GetStringValue( *aCurElement );
if (aValueStr == NULL)
{
WriteMessage ("Cannot retrieve reference string from element");
myMessageDriver->Send ("Cannot retrieve reference string from element", Message_Fail);
return Standard_False;
}
TCollection_AsciiString anEntry;
@@ -142,7 +142,7 @@ Standard_Boolean XmlMDataStd_ReferenceArrayDriver::Paste(const XmlObjMgt_Persist
TCollection_ExtendedString aMessage =
TCollection_ExtendedString ("Cannot retrieve reference from \"")
+ aValueStr + '\"';
WriteMessage (aMessage);
myMessageDriver->Send (aMessage, Message_Fail);
return Standard_False;
}
// Find label by entry
@@ -178,7 +178,7 @@ void XmlMDataStd_ReferenceArrayDriver::Paste(const Handle(TDF_Attribute)& theSou
TDF_Label L = aReferenceArray->Label();
if (L.IsNull())
{
WriteMessage ("Label of a ReferenceArray is Null.");
myMessageDriver->Send ("Label of a ReferenceArray is Null.", Message_Fail);
return;
}

4
src/XmlMDataStd/XmlMDataStd_ReferenceArrayDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_ReferenceArrayDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_ReferenceArrayDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_ReferenceArrayDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

20
src/XmlMDataStd/XmlMDataStd_ReferenceListDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <LDOM_MemManager.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_ReferenceList.hxx>
@@ -36,7 +36,7 @@ IMPLEMENT_DOMSTRING (AttributeIDString, "reflistattguid")
//function : XmlMDataStd_ReferenceListDriver
//purpose : Constructor
//=======================================================================
XmlMDataStd_ReferenceListDriver::XmlMDataStd_ReferenceListDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
XmlMDataStd_ReferenceListDriver::XmlMDataStd_ReferenceListDriver(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{
@@ -72,7 +72,7 @@ Standard_Boolean XmlMDataStd_ReferenceListDriver::Paste(const XmlObjMgt_Persiste
TCollection_ExtendedString("Cannot retrieve the first index"
" for ReferenceList attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -83,7 +83,7 @@ Standard_Boolean XmlMDataStd_ReferenceListDriver::Paste(const XmlObjMgt_Persiste
TCollection_ExtendedString("Cannot retrieve the last index"
" for ReferenceList attribute as \"")
+ aFirstIndex + "\"";
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -93,7 +93,7 @@ Standard_Boolean XmlMDataStd_ReferenceListDriver::Paste(const XmlObjMgt_Persiste
{
TCollection_ExtendedString aMessageString =
TCollection_ExtendedString("Cannot retrieve a list of reference");
WriteMessage (aMessageString);
myMessageDriver->Send (aMessageString, Message_Fail);
return Standard_False;
}
@@ -105,7 +105,7 @@ Standard_Boolean XmlMDataStd_ReferenceListDriver::Paste(const XmlObjMgt_Persiste
aValueStr = XmlObjMgt::GetStringValue( *aCurElement );
if (aValueStr == NULL)
{
WriteMessage ("Cannot retrieve reference string from element");
myMessageDriver->Send ("Cannot retrieve reference string from element", Message_Fail);
return Standard_False;
}
TCollection_AsciiString anEntry;
@@ -114,7 +114,7 @@ Standard_Boolean XmlMDataStd_ReferenceListDriver::Paste(const XmlObjMgt_Persiste
TCollection_ExtendedString aMessage =
TCollection_ExtendedString ("Cannot retrieve reference from \"")
+ aValueStr + '\"';
WriteMessage (aMessage);
myMessageDriver->Send (aMessage, Message_Fail);
return Standard_False;
}
// Find label by entry
@@ -131,7 +131,7 @@ Standard_Boolean XmlMDataStd_ReferenceListDriver::Paste(const XmlObjMgt_Persiste
aValueStr = XmlObjMgt::GetStringValue( *aCurElement );
if (aValueStr == NULL)
{
WriteMessage ("Cannot retrieve reference string from element");
myMessageDriver->Send ("Cannot retrieve reference string from element", Message_Fail);
return Standard_False;
}
TCollection_AsciiString anEntry;
@@ -140,7 +140,7 @@ Standard_Boolean XmlMDataStd_ReferenceListDriver::Paste(const XmlObjMgt_Persiste
TCollection_ExtendedString aMessage =
TCollection_ExtendedString ("Cannot retrieve reference from \"")
+ aValueStr + '\"';
WriteMessage (aMessage);
myMessageDriver->Send (aMessage, Message_Fail);
return Standard_False;
}
// Find label by entry
@@ -176,7 +176,7 @@ void XmlMDataStd_ReferenceListDriver::Paste(const Handle(TDF_Attribute)& theSour
TDF_Label L = aReferenceList->Label();
if (L.IsNull())
{
WriteMessage ("Label of a ReferenceList is Null.");
myMessageDriver->Send ("Label of a ReferenceList is Null.", Message_Fail);
return;
}

4
src/XmlMDataStd/XmlMDataStd_ReferenceListDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_ReferenceListDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_ReferenceListDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_ReferenceListDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

8
src/XmlMDataStd/XmlMDataStd_RelationDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_Relation.hxx>
#include <TDataStd_Variable.hxx>
@@ -32,7 +32,7 @@ IMPLEMENT_DOMSTRING (VariablesString, "variables")
//purpose : Constructor
//=======================================================================
XmlMDataStd_RelationDriver::XmlMDataStd_RelationDriver
(const Handle(CDM_MessageDriver)& theMsgDriver)
(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{}
@@ -65,7 +65,7 @@ Standard_Boolean XmlMDataStd_RelationDriver::Paste
TCollection_ExtendedString aString;
if (!XmlObjMgt::GetExtendedString (theSource, aString))
{
WriteMessage("error retrieving ExtendedString for type TDataStd_Relation");
myMessageDriver->Send("error retrieving ExtendedString for type TDataStd_Relation", Message_Fail);
return Standard_False;
}
aC->SetRelation(aString);
@@ -82,7 +82,7 @@ Standard_Boolean XmlMDataStd_RelationDriver::Paste
aMsgString = TCollection_ExtendedString
("XmlMDataStd_RelationDriver: Cannot retrieve reference on first variable from \"")
+ aDOMStr + "\"";
WriteMessage (aMsgString);
myMessageDriver->Send (aMsgString, Message_Fail);
return Standard_False;
}
Standard_Integer i = 1;

4
src/XmlMDataStd/XmlMDataStd_RelationDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_RelationDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_RelationDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_RelationDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

4
src/XmlMDataStd/XmlMDataStd_TickDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_Tick.hxx>
#include <TDF_Attribute.hxx>
@@ -27,7 +27,7 @@ IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_TickDriver,XmlMDF_ADriver)
//function : XmlMDataStd_TickDriver
//purpose : Constructor
//=======================================================================
XmlMDataStd_TickDriver::XmlMDataStd_TickDriver(const Handle(CDM_MessageDriver)& theMsgDriver)
XmlMDataStd_TickDriver::XmlMDataStd_TickDriver(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{

4
src/XmlMDataStd/XmlMDataStd_TickDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_TickDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_TickDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_TickDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

4
src/XmlMDataStd/XmlMDataStd_TreeNodeDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <NCollection_LocalArray.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_TreeNode.hxx>
@@ -34,7 +34,7 @@ IMPLEMENT_DOMSTRING (ChildrenString, "children")
//=======================================================================
XmlMDataStd_TreeNodeDriver::XmlMDataStd_TreeNodeDriver
(const Handle(CDM_MessageDriver)& theMsgDriver)
(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{}

4
src/XmlMDataStd/XmlMDataStd_TreeNodeDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_TreeNodeDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_TreeNodeDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_TreeNodeDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

6
src/XmlMDataStd/XmlMDataStd_UAttributeDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_UAttribute.hxx>
#include <TDF_Attribute.hxx>
@@ -30,7 +30,7 @@ IMPLEMENT_DOMSTRING (GuidString, "guid")
//=======================================================================
XmlMDataStd_UAttributeDriver::XmlMDataStd_UAttributeDriver
(const Handle(CDM_MessageDriver)& theMsgDriver)
(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{}
@@ -56,7 +56,7 @@ Standard_Boolean XmlMDataStd_UAttributeDriver::Paste
theSource.Element().getAttribute (::GuidString());
Standard_CString aGuidStr = (Standard_CString)aGuidDomStr.GetString();
if (aGuidStr[0] == '\0') {
WriteMessage ("error retrieving GUID for type TDataStd_UAttribute");
myMessageDriver->Send ("error retrieving GUID for type TDataStd_UAttribute", Message_Fail);
return Standard_False;
}

4
src/XmlMDataStd/XmlMDataStd_UAttributeDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_UAttributeDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_UAttributeDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_UAttributeDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

4
src/XmlMDataStd/XmlMDataStd_VariableDriver.cxx
View File

@@ -14,7 +14,7 @@
// commercial license or contractual agreement.
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <Standard_Type.hxx>
#include <TDataStd_Variable.hxx>
#include <TDF_Attribute.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_DOMSTRING (ConstString, "true")
//purpose : Constructor
//=======================================================================
XmlMDataStd_VariableDriver::XmlMDataStd_VariableDriver
(const Handle(CDM_MessageDriver)& theMsgDriver)
(const Handle(Message_Messenger)& theMsgDriver)
: XmlMDF_ADriver (theMsgDriver, NULL)
{}

4
src/XmlMDataStd/XmlMDataStd_VariableDriver.hxx
View File

@@ -23,7 +23,7 @@
#include <Standard_Boolean.hxx>
#include <XmlObjMgt_RRelocationTable.hxx>
#include <XmlObjMgt_SRelocationTable.hxx>
class CDM_MessageDriver;
class Message_Messenger;
class TDF_Attribute;
class XmlObjMgt_Persistent;
@@ -38,7 +38,7 @@ class XmlMDataStd_VariableDriver : public XmlMDF_ADriver
public:
Standard_EXPORT XmlMDataStd_VariableDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
Standard_EXPORT XmlMDataStd_VariableDriver(const Handle(Message_Messenger)& theMessageDriver);
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;