mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-09 13:22:24 +03:00
0029220: Application Framework - replace CDM_MessageDriver interface by Message_Messenger.
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
|
||||
#include <CDM_MessageDriver.hxx>
|
||||
#include <Message_Messenger.hxx>
|
||||
#include <Storage_Schema.hxx>
|
||||
#include <TColStd_MapOfTransient.hxx>
|
||||
#include <TDF_Attribute.hxx>
|
||||
@@ -208,7 +208,7 @@ Standard_Integer XmlMDF::ReadSubTree (const XmlObjMgt_Element& theElement,
|
||||
TCollection_ExtendedString anErrorMessage =
|
||||
TCollection_ExtendedString ("Wrong Tag value for OCAF Label: ")
|
||||
+ aTag;
|
||||
theDriverMap.Find("TDF_TagSource") -> WriteMessage (anErrorMessage);
|
||||
theDriverMap.Find("TDF_TagSource") -> myMessageDriver->Send (anErrorMessage, Message_Fail);
|
||||
return -1;
|
||||
}
|
||||
// create label
|
||||
@@ -248,7 +248,7 @@ Standard_Integer XmlMDF::ReadSubTree (const XmlObjMgt_Element& theElement,
|
||||
TCollection_ExtendedString anErrorMessage =
|
||||
TCollection_ExtendedString("Wrong ID of OCAF attribute with type ")
|
||||
+ aName;
|
||||
driver -> WriteMessage (anErrorMessage);
|
||||
driver -> myMessageDriver->Send (anErrorMessage, Message_Fail);
|
||||
return -1;
|
||||
}
|
||||
Handle(TDF_Attribute) tAtt;
|
||||
@@ -260,17 +260,17 @@ Standard_Integer XmlMDF::ReadSubTree (const XmlObjMgt_Element& theElement,
|
||||
if (tAtt->Label().IsNull())
|
||||
theLabel.AddAttribute (tAtt);
|
||||
else
|
||||
driver->WriteMessage
|
||||
driver->myMessageDriver->Send
|
||||
(TCollection_ExtendedString("XmlDriver warning: ") +
|
||||
"attempt to attach attribute " +
|
||||
aName + " to a second label");
|
||||
aName + " to a second label", Message_Warning);
|
||||
|
||||
if (! driver -> Paste (pAtt, tAtt, theRelocTable))
|
||||
{
|
||||
// error converting persistent to transient
|
||||
driver->WriteMessage
|
||||
driver->myMessageDriver->Send
|
||||
(TCollection_ExtendedString("XmlDriver warning: ") +
|
||||
"failure reading attribute " + aName);
|
||||
"failure reading attribute " + aName, Message_Warning);
|
||||
}
|
||||
else if (isBound == Standard_False)
|
||||
theRelocTable.Bind (anID, tAtt);
|
||||
@@ -303,7 +303,7 @@ Standard_Integer XmlMDF::ReadSubTree (const XmlObjMgt_Element& theElement,
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
void XmlMDF::AddDrivers (const Handle(XmlMDF_ADriverTable)& aDriverTable,
|
||||
const Handle(CDM_MessageDriver)& aMessageDriver)
|
||||
const Handle(Message_Messenger)& aMessageDriver)
|
||||
{
|
||||
aDriverTable->AddDriver (new XmlMDF_TagSourceDriver(aMessageDriver));
|
||||
aDriverTable->AddDriver (new XmlMDF_ReferenceDriver(aMessageDriver));
|
||||
@@ -325,9 +325,9 @@ void XmlMDF::CreateDrvMap (const Handle(XmlMDF_ADriverTable)& theDrivers,
|
||||
if (theAsciiDriverMap.IsBound (aTypeName) == Standard_False)
|
||||
theAsciiDriverMap.Bind (aTypeName, aDriver);
|
||||
else
|
||||
aDriver -> WriteMessage
|
||||
aDriver -> myMessageDriver->Send
|
||||
(TCollection_ExtendedString ("Warning: skipped driver name: \"")
|
||||
+ aTypeName + '\"');
|
||||
+ aTypeName + '\"', Message_Warning);
|
||||
anIter.Next();
|
||||
}
|
||||
}
|
||||
|
@@ -29,7 +29,7 @@
|
||||
class TDF_Data;
|
||||
class XmlMDF_ADriverTable;
|
||||
class TDF_Label;
|
||||
class CDM_MessageDriver;
|
||||
class Message_Messenger;
|
||||
class XmlMDF_ADriver;
|
||||
class XmlMDF_TagSourceDriver;
|
||||
class XmlMDF_ReferenceDriver;
|
||||
@@ -69,7 +69,7 @@ public:
|
||||
Standard_EXPORT static Standard_Boolean FromTo (const XmlObjMgt_Element& aSource, Handle(TDF_Data)& aTarget, XmlObjMgt_RRelocationTable& aReloc, const Handle(XmlMDF_ADriverTable)& aDrivers);
|
||||
|
||||
//! Adds the attribute storage drivers to <aDriverSeq>.
|
||||
Standard_EXPORT static void AddDrivers (const Handle(XmlMDF_ADriverTable)& aDriverTable, const Handle(CDM_MessageDriver)& theMessageDriver);
|
||||
Standard_EXPORT static void AddDrivers (const Handle(XmlMDF_ADriverTable)& aDriverTable, const Handle(Message_Messenger)& theMessageDriver);
|
||||
|
||||
|
||||
|
||||
|
@@ -14,7 +14,7 @@
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
|
||||
#include <CDM_MessageDriver.hxx>
|
||||
#include <Message_Messenger.hxx>
|
||||
#include <Standard_Type.hxx>
|
||||
#include <TCollection_AsciiString.hxx>
|
||||
#include <TCollection_ExtendedString.hxx>
|
||||
@@ -28,7 +28,7 @@ IMPLEMENT_STANDARD_RTTIEXT(XmlMDF_ADriver,Standard_Transient)
|
||||
//function : XmlMDF_ADriver
|
||||
//purpose : Constructor
|
||||
//=======================================================================
|
||||
XmlMDF_ADriver::XmlMDF_ADriver (const Handle(CDM_MessageDriver)& theMsgDriver,
|
||||
XmlMDF_ADriver::XmlMDF_ADriver (const Handle(Message_Messenger)& theMsgDriver,
|
||||
const Standard_CString theNS,
|
||||
const Standard_CString theName)
|
||||
: myMessageDriver (theMsgDriver)
|
||||
@@ -73,15 +73,4 @@ const TCollection_AsciiString& XmlMDF_ADriver::TypeName () const
|
||||
if (myTypeName.Length() == 0 || aString [myTypeName.Length() - 1] == ':')
|
||||
(TCollection_AsciiString&)myTypeName += SourceType() -> Name();
|
||||
return myTypeName;
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
//function : WriteMessage
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
|
||||
void XmlMDF_ADriver::WriteMessage
|
||||
(const TCollection_ExtendedString& aMessage) const
|
||||
{
|
||||
myMessageDriver -> Write (aMessage.ToExtString());
|
||||
}
|
||||
}
|
@@ -27,7 +27,7 @@
|
||||
#include <Standard_Boolean.hxx>
|
||||
#include <XmlObjMgt_RRelocationTable.hxx>
|
||||
#include <XmlObjMgt_SRelocationTable.hxx>
|
||||
class CDM_MessageDriver;
|
||||
class Message_Messenger;
|
||||
class TDF_Attribute;
|
||||
class TCollection_AsciiString;
|
||||
class XmlObjMgt_Persistent;
|
||||
@@ -67,28 +67,20 @@ public:
|
||||
//! into <aTarget>, using the relocation table
|
||||
//! <aRelocTable> to keep the sharings.
|
||||
Standard_EXPORT virtual void Paste (const Handle(TDF_Attribute)& aSource, XmlObjMgt_Persistent& aTarget, XmlObjMgt_SRelocationTable& aRelocTable) const = 0;
|
||||
|
||||
//! Send message to Application (usually when error occurres)
|
||||
Standard_EXPORT void WriteMessage (const TCollection_ExtendedString& theMessage) const;
|
||||
|
||||
|
||||
|
||||
|
||||
DEFINE_STANDARD_RTTIEXT(XmlMDF_ADriver,Standard_Transient)
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
Standard_EXPORT XmlMDF_ADriver(const Handle(CDM_MessageDriver)& theMessageDriver, const Standard_CString theNamespace, const Standard_CString theName = NULL);
|
||||
Standard_EXPORT XmlMDF_ADriver(const Handle(Message_Messenger)& theMessageDriver, const Standard_CString theNamespace, const Standard_CString theName = NULL);
|
||||
|
||||
TCollection_AsciiString myTypeName;
|
||||
|
||||
Handle(Message_Messenger) myMessageDriver;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
Handle(CDM_MessageDriver) myMessageDriver;
|
||||
|
||||
friend class XmlMDF;
|
||||
|
||||
};
|
||||
|
||||
|
@@ -15,7 +15,7 @@
|
||||
|
||||
//AGV 150202: Changed prototype XmlObjMgt::SetStringValue()
|
||||
|
||||
#include <CDM_MessageDriver.hxx>
|
||||
#include <Message_Messenger.hxx>
|
||||
#include <Standard_Type.hxx>
|
||||
#include <TDF_Attribute.hxx>
|
||||
#include <TDF_Reference.hxx>
|
||||
@@ -31,7 +31,7 @@ IMPLEMENT_STANDARD_RTTIEXT(XmlMDF_ReferenceDriver,XmlMDF_ADriver)
|
||||
//purpose : Constructor
|
||||
//=======================================================================
|
||||
XmlMDF_ReferenceDriver::XmlMDF_ReferenceDriver
|
||||
(const Handle(CDM_MessageDriver)& theMsgDriver)
|
||||
(const Handle(Message_Messenger)& theMsgDriver)
|
||||
: XmlMDF_ADriver (theMsgDriver, NULL)
|
||||
{}
|
||||
|
||||
@@ -57,7 +57,7 @@ Standard_Boolean XmlMDF_ReferenceDriver::Paste
|
||||
|
||||
if (anXPath == NULL)
|
||||
{
|
||||
WriteMessage ("Cannot retrieve reference string from element");
|
||||
myMessageDriver->Send ("Cannot retrieve reference string from element", Message_Fail);
|
||||
return Standard_False;
|
||||
}
|
||||
|
||||
@@ -67,7 +67,7 @@ Standard_Boolean XmlMDF_ReferenceDriver::Paste
|
||||
TCollection_ExtendedString aMessage =
|
||||
TCollection_ExtendedString ("Cannot retrieve reference from \"")
|
||||
+ anXPath + '\"';
|
||||
WriteMessage (aMessage);
|
||||
myMessageDriver->Send (aMessage, Message_Fail);
|
||||
return Standard_False;
|
||||
}
|
||||
|
||||
|
@@ -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 XmlMDF_ReferenceDriver : public XmlMDF_ADriver
|
||||
public:
|
||||
|
||||
|
||||
Standard_EXPORT XmlMDF_ReferenceDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
|
||||
Standard_EXPORT XmlMDF_ReferenceDriver(const Handle(Message_Messenger)& theMessageDriver);
|
||||
|
||||
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
|
||||
|
||||
|
@@ -15,7 +15,7 @@
|
||||
|
||||
//AGV 150202: Changed prototype XmlObjMgt::SetStringValue()
|
||||
|
||||
#include <CDM_MessageDriver.hxx>
|
||||
#include <Message_Messenger.hxx>
|
||||
#include <Standard_Type.hxx>
|
||||
#include <TDF_Attribute.hxx>
|
||||
#include <TDF_TagSource.hxx>
|
||||
@@ -30,7 +30,7 @@ IMPLEMENT_STANDARD_RTTIEXT(XmlMDF_TagSourceDriver,XmlMDF_ADriver)
|
||||
//purpose : Constructor
|
||||
//=======================================================================
|
||||
XmlMDF_TagSourceDriver::XmlMDF_TagSourceDriver
|
||||
(const Handle(CDM_MessageDriver)& theMsgDriver)
|
||||
(const Handle(Message_Messenger)& theMsgDriver)
|
||||
: XmlMDF_ADriver (theMsgDriver, NULL)
|
||||
{}
|
||||
|
||||
@@ -59,7 +59,7 @@ Standard_Boolean XmlMDF_TagSourceDriver::Paste
|
||||
TCollection_ExtendedString aMessageString =
|
||||
TCollection_ExtendedString ("Cannot retrieve TagSource attribute from \"")
|
||||
+ aTagStr + "\"";
|
||||
WriteMessage (aMessageString);
|
||||
myMessageDriver->Send (aMessageString, Message_Fail);
|
||||
return Standard_False;
|
||||
}
|
||||
|
||||
@@ -67,7 +67,7 @@ Standard_Boolean XmlMDF_TagSourceDriver::Paste
|
||||
TCollection_ExtendedString aMessageString =
|
||||
TCollection_ExtendedString ("Invalid value of TagSource retrieved: ")
|
||||
+ aTag;
|
||||
WriteMessage (aMessageString);
|
||||
myMessageDriver->Send (aMessageString, Message_Fail);
|
||||
return Standard_False;
|
||||
}
|
||||
|
||||
|
@@ -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 XmlMDF_TagSourceDriver : public XmlMDF_ADriver
|
||||
public:
|
||||
|
||||
|
||||
Standard_EXPORT XmlMDF_TagSourceDriver(const Handle(CDM_MessageDriver)& theMessageDriver);
|
||||
Standard_EXPORT XmlMDF_TagSourceDriver(const Handle(Message_Messenger)& theMessageDriver);
|
||||
|
||||
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;
|
||||
|
||||
|
Reference in New Issue
Block a user