1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00

0029220: Application Framework - replace CDM_MessageDriver interface by Message_Messenger.

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

View File

@@ -72,7 +72,7 @@ void BinTObjDrivers::DefineFormat (const Handle(TDocStd_Application)& theApp)
//purpose :
//=======================================================================
void BinTObjDrivers::AddDrivers (const Handle(BinMDF_ADriverTable)& aDriverTable,
const Handle(CDM_MessageDriver)& aMsgDrv)
const Handle(Message_Messenger)& aMsgDrv)
{
aDriverTable -> AddDriver (new BinTObjDrivers_ModelDriver (aMsgDrv));
aDriverTable -> AddDriver (new BinTObjDrivers_ObjectDriver (aMsgDrv));

View File

@@ -22,7 +22,7 @@
#include <Standard_GUID.hxx>
class BinMDF_ADriverTable;
class CDM_MessageDriver;
class Message_Messenger;
class TDocStd_Application;
//! Class for registering storage/retrieval drivers for TObj Bin persistence
@@ -42,7 +42,7 @@ class BinTObjDrivers
Standard_EXPORT static void AddDrivers
(const Handle(BinMDF_ADriverTable)& aDriverTable,
const Handle(CDM_MessageDriver)& aMsgDrv);
const Handle(Message_Messenger)& aMsgDrv);
};

View File

@@ -38,7 +38,7 @@ BinTObjDrivers_DocumentRetrievalDriver::BinTObjDrivers_DocumentRetrievalDriver()
Handle(BinMDF_ADriverTable)
BinTObjDrivers_DocumentRetrievalDriver::AttributeDrivers
(const Handle(CDM_MessageDriver)& theMsgDrv)
(const Handle(Message_Messenger)& theMsgDrv)
{
// Standard drivers
Handle(BinMDF_ADriverTable) aTable = BinLDrivers::AttributeDrivers (theMsgDrv);

View File

@@ -36,7 +36,7 @@ class BinTObjDrivers_DocumentRetrievalDriver :
// Constructor
Standard_EXPORT virtual Handle(BinMDF_ADriverTable) AttributeDrivers
(const Handle(CDM_MessageDriver)& theMsgDriver) Standard_OVERRIDE;
(const Handle(Message_Messenger)& theMsgDriver) Standard_OVERRIDE;
public:
// Declaration of CASCADE RTTI

View File

@@ -38,7 +38,7 @@ BinTObjDrivers_DocumentStorageDriver::BinTObjDrivers_DocumentStorageDriver ()
Handle(BinMDF_ADriverTable)
BinTObjDrivers_DocumentStorageDriver::AttributeDrivers
(const Handle(CDM_MessageDriver)& theMsgDrv)
(const Handle(Message_Messenger)& theMsgDrv)
{
// Standard drivers
Handle(BinMDF_ADriverTable) aTable = BinLDrivers::AttributeDrivers (theMsgDrv);

View File

@@ -36,7 +36,7 @@ class BinTObjDrivers_DocumentStorageDriver :
// Constructor
Standard_EXPORT virtual Handle(BinMDF_ADriverTable) AttributeDrivers
(const Handle(CDM_MessageDriver)& theMsgDriver) Standard_OVERRIDE;
(const Handle(Message_Messenger)& theMsgDriver) Standard_OVERRIDE;
public:
// Declaration of CASCADE RTTI

View File

@@ -16,7 +16,7 @@
// The original implementation Copyright: (C) RINA S.p.A
#include <BinTObjDrivers_IntSparseArrayDriver.hxx>
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <TDF_Attribute.hxx>
#include <BinObjMgt_Persistent.hxx>
#include <TObj_TIntSparseArray.hxx>
@@ -33,7 +33,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_IntSparseArrayDriver,BinMDF_ADriver)
//=======================================================================
BinTObjDrivers_IntSparseArrayDriver::BinTObjDrivers_IntSparseArrayDriver
(const Handle(CDM_MessageDriver)& theMessageDriver)
(const Handle(Message_Messenger)& theMessageDriver)
: BinMDF_ADriver( theMessageDriver, NULL)
{
}

View File

@@ -27,7 +27,7 @@ class BinTObjDrivers_IntSparseArrayDriver : public BinMDF_ADriver
public:
Standard_EXPORT BinTObjDrivers_IntSparseArrayDriver
(const Handle(CDM_MessageDriver)& theMessageDriver);
(const Handle(Message_Messenger)& theMessageDriver);
// constructor
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

View File

@@ -18,7 +18,7 @@
#include <BinTObjDrivers_ModelDriver.hxx>
#include <BinObjMgt_Persistent.hxx>
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <Standard_GUID.hxx>
#include <TDF_Attribute.hxx>
@@ -37,7 +37,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_ModelDriver,BinMDF_ADriver)
//=======================================================================
BinTObjDrivers_ModelDriver::BinTObjDrivers_ModelDriver
(const Handle(CDM_MessageDriver)& theMessageDriver)
(const Handle(Message_Messenger)& theMessageDriver)
: BinMDF_ADriver( theMessageDriver, NULL)
{
}
@@ -73,7 +73,7 @@ Standard_Boolean BinTObjDrivers_ModelDriver::Paste
if (aGUID != aCurrentModel->GetGUID())
{
WriteMessage("TObj_TModel retrieval: wrong model GUID");
myMessageDriver->Send("TObj_TModel retrieval: wrong model GUID", Message_Fail);
return Standard_False;
}

View File

@@ -27,7 +27,7 @@ class BinTObjDrivers_ModelDriver : public BinMDF_ADriver
public:
Standard_EXPORT BinTObjDrivers_ModelDriver
(const Handle(CDM_MessageDriver)& theMessageDriver);
(const Handle(Message_Messenger)& theMessageDriver);
// constructor
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

View File

@@ -16,7 +16,7 @@
// The original implementation Copyright: (C) RINA S.p.A
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <BinObjMgt_Persistent.hxx>
#include <TDF_Tool.hxx>
@@ -36,7 +36,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_ObjectDriver,BinMDF_ADriver)
//=======================================================================
BinTObjDrivers_ObjectDriver::BinTObjDrivers_ObjectDriver
(const Handle(CDM_MessageDriver)& theMessageDriver)
(const Handle(Message_Messenger)& theMessageDriver)
: BinMDF_ADriver( theMessageDriver, NULL)
{
}
@@ -81,9 +81,9 @@ Standard_Boolean BinTObjDrivers_ObjectDriver::Paste
{
TCollection_AsciiString anEntry;
TDF_Tool::Entry (theTarget->Label(), anEntry);
WriteMessage (TCollection_ExtendedString
("TObj_TObject retrieval: wrong object type name ") +
aName + ", entry " + anEntry);
myMessageDriver->Send (TCollection_ExtendedString
("TObj_TObject retrieval: wrong object type name ") +
aName + ", entry " + anEntry, Message_Fail);
TObj_Assistant::BindType(0);
return Standard_False;
}

View File

@@ -28,7 +28,7 @@ class BinTObjDrivers_ObjectDriver : public BinMDF_ADriver
public:
Standard_EXPORT BinTObjDrivers_ObjectDriver
(const Handle(CDM_MessageDriver)& theMessageDriver);
(const Handle(Message_Messenger)& theMessageDriver);
// constructor
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

View File

@@ -17,7 +17,7 @@
#include <BinTObjDrivers_ReferenceDriver.hxx>
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <TDF_Attribute.hxx>
#include <TObj_TReference.hxx>
#include <BinObjMgt_Persistent.hxx>
@@ -36,7 +36,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_ReferenceDriver,BinMDF_ADriver)
//=======================================================================
BinTObjDrivers_ReferenceDriver::BinTObjDrivers_ReferenceDriver
(const Handle(CDM_MessageDriver)& theMessageDriver)
(const Handle(Message_Messenger)& theMessageDriver)
: BinMDF_ADriver( theMessageDriver, NULL)
{
}
@@ -81,8 +81,8 @@ Standard_Boolean BinTObjDrivers_ReferenceDriver::Paste
{
TCollection_AsciiString anEntry;
TDF_Tool::Entry (theTarget->Label(), anEntry);
WriteMessage (TCollection_ExtendedString ("TObj_TReference retrieval: ")
+ "wrong model ID " + aName + ", entry " + anEntry);
myMessageDriver->Send (TCollection_ExtendedString ("TObj_TReference retrieval: ")
+ "wrong model ID " + aName + ", entry " + anEntry, Message_Fail);
return Standard_False;
}
aDS = aModel->GetLabel().Data();

View File

@@ -28,7 +28,7 @@ class BinTObjDrivers_ReferenceDriver : public BinMDF_ADriver
public:
Standard_EXPORT BinTObjDrivers_ReferenceDriver
(const Handle(CDM_MessageDriver)& theMessageDriver);
(const Handle(Message_Messenger)& theMessageDriver);
// constructor
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;

View File

@@ -17,7 +17,7 @@
#include <BinTObjDrivers_XYZDriver.hxx>
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <TDF_Attribute.hxx>
#include <BinObjMgt_Persistent.hxx>
#include <TObj_TXYZ.hxx>
@@ -31,7 +31,7 @@ IMPLEMENT_STANDARD_RTTIEXT(BinTObjDrivers_XYZDriver,BinMDF_ADriver)
//=======================================================================
BinTObjDrivers_XYZDriver::BinTObjDrivers_XYZDriver
(const Handle(CDM_MessageDriver)& theMessageDriver)
(const Handle(Message_Messenger)& theMessageDriver)
: BinMDF_ADriver( theMessageDriver, NULL)
{
}

View File

@@ -28,7 +28,7 @@ class BinTObjDrivers_XYZDriver : public BinMDF_ADriver
public:
Standard_EXPORT BinTObjDrivers_XYZDriver
(const Handle(CDM_MessageDriver)& theMessageDriver);
(const Handle(Message_Messenger)& theMessageDriver);
// constructor
Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE;