From 269209b0b1570e397c75521e471c5ae33165644e Mon Sep 17 00:00:00 2001 From: cascade Date: Fri, 13 Feb 2009 18:33:58 +0000 Subject: [PATCH] OCC20850 umake command do not work on SunOS10 --- src/WOKAPI/WOKAPI_BuildProcess.cxx | 70 +++++++++---------- src/WOKAPI/WOKAPI_Command.cxx | 50 +++++++------- src/WOKAPI/WOKAPI_Command_Factory.cxx | 6 +- src/WOKAPI/WOKAPI_Command_Parcel.cxx | 2 +- src/WOKAPI/WOKAPI_Command_TriggeredMake.cxx | 40 +++++------ src/WOKAPI/WOKAPI_Command_Unit.cxx | 42 ++++++------ src/WOKAPI/WOKAPI_Command_Warehouse.cxx | 14 ++-- src/WOKAPI/WOKAPI_Command_Workbench.cxx | 16 ++--- src/WOKAPI/WOKAPI_Command_Workshop.cxx | 8 +-- src/WOKAPI/WOKAPI_Entity.cxx | 40 +++++------ src/WOKAPI/WOKAPI_Factory.cxx | 4 +- src/WOKAPI/WOKAPI_Parcel.cxx | 18 ++--- src/WOKAPI/WOKAPI_Process.cxx | 24 +++---- src/WOKAPI/WOKAPI_Session.cxx | 76 ++++++++++----------- src/WOKAPI/WOKAPI_Unit.cxx | 6 +- src/WOKAPI/WOKAPI_Warehouse.cxx | 6 +- src/WOKAPI/WOKAPI_Workbench.cxx | 34 ++++----- src/WOKAPI/WOKAPI_Workshop.cxx | 10 +-- 18 files changed, 233 insertions(+), 233 deletions(-) diff --git a/src/WOKAPI/WOKAPI_BuildProcess.cxx b/src/WOKAPI/WOKAPI_BuildProcess.cxx index e4db55b..c08f2a2 100755 --- a/src/WOKAPI/WOKAPI_BuildProcess.cxx +++ b/src/WOKAPI/WOKAPI_BuildProcess.cxx @@ -57,7 +57,7 @@ Standard_Boolean WOKAPI_BuildProcess::Init(const WOKAPI_Workbench& abench) if(!abench.IsValid()) { - ErrorMsg << "WOKAPI_BuildProcess::Init" + ErrorMsg() << "WOKAPI_BuildProcess::Init" << "Invalid workbench for build process init" << endm; return myinit= Standard_False; } @@ -119,7 +119,7 @@ void WOKAPI_BuildProcess::Add(const WOKAPI_Unit& adevunit) { if(!myinit) { - ErrorMsg << "WOKAPI_BuildProcess::Add" + ErrorMsg() << "WOKAPI_BuildProcess::Add" << "Build process is not initialized" << endm; return; } @@ -143,13 +143,13 @@ void WOKAPI_BuildProcess::Add(const WOKAPI_Unit& adevunit) if(!ancien.IsNull() && nouveau.IsNull()) { - WarningMsg << "WOKAPI_BuildProcess::Add" + WarningMsg() << "WOKAPI_BuildProcess::Add" << "Unit " << adevunit.Name() << " contains a " << umakename << " file and no " << stepsname << endm; } if(!adevunit.CheckDirs()) { - WarningMsg << "WOKAPI_BuildProcess::Add" + WarningMsg() << "WOKAPI_BuildProcess::Add" << "Unit " << adevunit.Name() << " is missing directories : ignored" << endm; } else @@ -157,7 +157,7 @@ void WOKAPI_BuildProcess::Add(const WOKAPI_Unit& adevunit) } else { - ErrorMsg << "WOKAPI_BuildProcess::Add" + ErrorMsg() << "WOKAPI_BuildProcess::Add" << "Development unit is invalid" << endm; return; } @@ -172,7 +172,7 @@ void WOKAPI_BuildProcess::Add(const WOKAPI_SequenceOfUnit& units) { if(!myinit) { - ErrorMsg << "WOKAPI_BuildProcess::Add" + ErrorMsg() << "WOKAPI_BuildProcess::Add" << "Build process is not initialized" << endm; return; } @@ -219,7 +219,7 @@ Standard_Integer WOKAPI_BuildProcess::SelectOnGroups(const WOKAPI_Unit& aunit, if(!myinit) { - ErrorMsg << "WOKAPI_BuildProcess::Add" + ErrorMsg() << "WOKAPI_BuildProcess::Add" << "Build process is not initialized" << endm; return 0; } @@ -311,7 +311,7 @@ Standard_Integer WOKAPI_BuildProcess::SelectOnGroups(const WOKAPI_SequenceOfUnit if(!myinit) { - ErrorMsg << "WOKAPI_BuildProcess::Add" + ErrorMsg() << "WOKAPI_BuildProcess::Add" << "Build process is not initialized" << endm; return 0; } @@ -340,7 +340,7 @@ Standard_Integer WOKAPI_BuildProcess::SelectOnGroups(const WOKAPI_SequenceOfUnit const TColStd_SequenceOfHAsciiString& aseq = agrp->Steps(); if (aseq.IsEmpty()) { - InfoMsg << "WOKAPI_BuildProcess::SelectOnGroups" + InfoMsg() << "WOKAPI_BuildProcess::SelectOnGroups" << "group " << groups.Value(j) << " is empty " << endm; } for(Standard_Integer i=1; i<=aseq.Length(); i++) @@ -419,7 +419,7 @@ Standard_Integer WOKAPI_BuildProcess::SelectOnTypesAndGroups(const TColStd_Seque if(!myinit) { - ErrorMsg << "WOKAPI_BuildProcess::Add" + ErrorMsg() << "WOKAPI_BuildProcess::Add" << "Build process is not initialized" << endm; return 0; } @@ -520,7 +520,7 @@ Standard_Integer WOKAPI_BuildProcess::SelectOnSteps(const WOKAPI_Unit& aunit, if(!myinit) { - ErrorMsg << "WOKAPI_BuildProcess::Add" + ErrorMsg() << "WOKAPI_BuildProcess::Add" << "Build process is not initialized" << endm; return 0; } @@ -610,7 +610,7 @@ Standard_Integer WOKAPI_BuildProcess::SelectOnSteps(const WOKAPI_Unit& aunit, } if(!endwasfound) { - ErrorMsg << "WOKAPI_BuildProcess::SelectOnSteps" + ErrorMsg() << "WOKAPI_BuildProcess::SelectOnSteps" << "Specified end step (" << aend << " was not found" << endm; UnSelectAll(); return 0; @@ -618,7 +618,7 @@ Standard_Integer WOKAPI_BuildProcess::SelectOnSteps(const WOKAPI_Unit& aunit, } else { - ErrorMsg << "WOKAPI_BuildProcess::SelectOnSteps" + ErrorMsg() << "WOKAPI_BuildProcess::SelectOnSteps" << "Unit is invalid" << endm; return 0; } @@ -638,7 +638,7 @@ Standard_Integer WOKAPI_BuildProcess::SelectOnSteps(const WOKAPI_SequenceOfUnit& { if(!myinit) { - ErrorMsg << "WOKAPI_BuildProcess::Add" + ErrorMsg() << "WOKAPI_BuildProcess::Add" << "Build process is not initialized" << endm; return 0; } @@ -663,7 +663,7 @@ Standard_Integer WOKAPI_BuildProcess::SelectOnDefines(const Handle(WOKTools_HSeq { if(!myinit) { - ErrorMsg << "WOKAPI_BuildProcess::SelectOnDefines" + ErrorMsg() << "WOKAPI_BuildProcess::SelectOnDefines" << "Build process is not initialized" << endm; return 0; } @@ -784,7 +784,7 @@ Standard_Integer WOKAPI_BuildProcess::SelectOnDefines(const Handle(WOKTools_HSeq if(!(amap.IsEmpty() || axmap.IsEmpty()) && !(types.IsEmpty() || xtypes.IsEmpty())) { - ErrorMsg << "WOKAPI_BuildProcess::SelectOnDefines" + ErrorMsg() << "WOKAPI_BuildProcess::SelectOnDefines" << "Cannot use Units or XUnits in conjunction with UnitTypes or XUnitTypes" << endm; return 0; } @@ -1021,35 +1021,35 @@ void WOKAPI_BuildProcess::PrintBanner() const if(asession.IsNull()) return; - InfoMsg.DontPrintHeader(); + InfoMsg().DontPrintHeader(); - InfoMsg << "WOKAPI_BuildProcess::PrintBanner" << "\n" << endm; - InfoMsg << "WOKAPI_BuildProcess::PrintBanner" + InfoMsg() << "WOKAPI_BuildProcess::PrintBanner" << "\n" << endm; + InfoMsg() << "WOKAPI_BuildProcess::PrintBanner" << TIRETS << endm; - InfoMsg << "WOKAPI_BuildProcess::PrintBanner" + InfoMsg() << "WOKAPI_BuildProcess::PrintBanner" << "Workbench : " << mybench.UserPath() << endm; - InfoMsg << "WOKAPI_BuildProcess::PrintBanner" + InfoMsg() << "WOKAPI_BuildProcess::PrintBanner" << "Extraction mode : " << WOKernel_DBMSystem::GetName(asession->DBMSystem()) << endm; - InfoMsg << "WOKAPI_BuildProcess::PrintBanner" + InfoMsg() << "WOKAPI_BuildProcess::PrintBanner" << "Station : " << WOKernel_Station::GetName(asession->Station()) << endm; if(asession->DebugMode()) { - InfoMsg << "WOKAPI_BuildProcess::PrintBanner" + InfoMsg() << "WOKAPI_BuildProcess::PrintBanner" << "Compile mode : Debug" << endm; } else { - InfoMsg << "WOKAPI_BuildProcess::PrintBanner" + InfoMsg() << "WOKAPI_BuildProcess::PrintBanner" << "Compile mode : Optimized" << endm; } - InfoMsg << "WOKAPI_BuildProcess::PrintBanner" + InfoMsg() << "WOKAPI_BuildProcess::PrintBanner" << "Step number : " << myselect << endm; - InfoMsg << "WOKAPI_BuildProcess::PrintBanner" + InfoMsg() << "WOKAPI_BuildProcess::PrintBanner" << TIRETS << endm; const WOKMake_DataMapOfHAsciiStringOfSequenceOfHAsciiString& units = myprocess->Units(); @@ -1080,17 +1080,17 @@ void WOKAPI_BuildProcess::PrintBanner() const if(codes.Length()) { - InfoMsg << "WOKAPI_BuildProcess::PrintBanner" + InfoMsg() << "WOKAPI_BuildProcess::PrintBanner" << "Unit : " << aunit.Type() << " " << aunit.Name() << endm; if(codes.Length() > 1) { - InfoMsg << "WOKAPI_BuildProcess::PrintBanner" + InfoMsg() << "WOKAPI_BuildProcess::PrintBanner" << "Steps : " ; } else { - InfoMsg << "WOKAPI_BuildProcess::PrintBanner" + InfoMsg() << "WOKAPI_BuildProcess::PrintBanner" << "Step : " ; } @@ -1102,22 +1102,22 @@ void WOKAPI_BuildProcess::PrintBanner() const if(len > WIDTH ) { - InfoMsg << endm; - InfoMsg << "WOKAPI_BuildProcess::PrintBanner" << " " ; + InfoMsg() << endm; + InfoMsg() << "WOKAPI_BuildProcess::PrintBanner" << " " ; len = DEBUT; } - InfoMsg << code << " "; + InfoMsg() << code << " "; } - InfoMsg << endm; - InfoMsg << "WOKAPI_BuildProcess::PrintBanner" + InfoMsg() << endm; + InfoMsg() << "WOKAPI_BuildProcess::PrintBanner" << TIRETS << endm; } } anit.Next(); } - InfoMsg.DoPrintHeader(); + InfoMsg().DoPrintHeader(); return; } diff --git a/src/WOKAPI/WOKAPI_Command.cxx b/src/WOKAPI/WOKAPI_Command.cxx index 71df467..72fb4ce 100755 --- a/src/WOKAPI/WOKAPI_Command.cxx +++ b/src/WOKAPI/WOKAPI_Command.cxx @@ -239,7 +239,7 @@ Standard_Integer WOKAPI_Command::MoveTo(const WOKAPI_Session& asession, if(!anentity.IsValid()) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "Could not move to entity : " << apath << endm; return 1; } @@ -374,7 +374,7 @@ Standard_Integer WOKAPI_Command::EnvironmentMgr(const WOKAPI_Session& asession, if(!theent.IsValid()) { - ErrorMsg << argv[0] << "Could not determine entity to operate on." << endm; + ErrorMsg() << argv[0] << "Could not determine entity to operate on." << endm; return 1; } @@ -388,12 +388,12 @@ Standard_Integer WOKAPI_Command::EnvironmentMgr(const WOKAPI_Session& asession, { if(filename.IsNull()) { - ErrorMsg << argv[0] << "Missing file name for test environnement settings" << endm; + ErrorMsg() << argv[0] << "Missing file name for test environnement settings" << endm; return 1; } if(format.IsNull()) { - ErrorMsg << argv[0] << "Missing format for test environnement settings" << endm; + ErrorMsg() << argv[0] << "Missing format for test environnement settings" << endm; return 1; } @@ -401,7 +401,7 @@ Standard_Integer WOKAPI_Command::EnvironmentMgr(const WOKAPI_Session& asession, if(theent.GetEnvActions(asession, actions)) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "Could not obtain informations for test environnement" << endm; return 1; } @@ -414,7 +414,7 @@ Standard_Integer WOKAPI_Command::EnvironmentMgr(const WOKAPI_Session& asession, if(!stream.good()) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "Could not open " << filename << " for writing" << endm; return 1; } @@ -637,18 +637,18 @@ Standard_Integer WOKAPI_Command::ProfileMgt(const WOKAPI_Session& asession, if(getprof) { - InfoMsg << argv[0] << "Profile in : " << asession.GetCWEntity().UserPath() << endm; - InfoMsg << argv[0] << endm; - InfoMsg << argv[0] << "Extractor : " << asession.DBMSystem() << endm; + InfoMsg() << argv[0] << "Profile in : " << asession.GetCWEntity().UserPath() << endm; + InfoMsg() << argv[0] << endm; + InfoMsg() << argv[0] << "Extractor : " << asession.DBMSystem() << endm; if(asession.DebugMode()) { - InfoMsg << argv[0] << "Compile Mode : Debug" << endm; + InfoMsg() << argv[0] << "Compile Mode : Debug" << endm; } else { - InfoMsg << argv[0] << "Compile Mode : Optimized" << endm; + InfoMsg() << argv[0] << "Compile Mode : Optimized" << endm; } - InfoMsg << argv[0] << "Station Type : " << asession.Station() << endm; + InfoMsg() << argv[0] << "Station Type : " << asession.Station() << endm; return 0; } return 0; @@ -766,7 +766,7 @@ Standard_Integer WOKAPI_Command::ParametersMgr(const WOKAPI_Session& asession, if(!theent.IsValid()) { - ErrorMsg << argv[0] << "Could not determine entity to operate on." << endm; + ErrorMsg() << argv[0] << "Could not determine entity to operate on." << endm; return 1; } @@ -802,7 +802,7 @@ Standard_Integer WOKAPI_Command::ParametersMgr(const WOKAPI_Session& asession, if(result.IsNull()) { - ErrorMsg << argv[0] << "Could not eval " << aoptarg << " in " << theent.UserPath() << endm; + ErrorMsg() << argv[0] << "Could not eval " << aoptarg << " in " << theent.UserPath() << endm; return 1; } @@ -817,7 +817,7 @@ Standard_Integer WOKAPI_Command::ParametersMgr(const WOKAPI_Session& asession, if(result.IsNull()) { - ErrorMsg << argv[0] << "No value for " << aoptarg << " in " << theent.UserPath() << endm; + ErrorMsg() << argv[0] << "No value for " << aoptarg << " in " << theent.UserPath() << endm; return 1; } @@ -1025,7 +1025,7 @@ Standard_Integer WOKAPI_Command::EntityInfo(const WOKAPI_Session& asession, if(!theent.IsValid()) { - ErrorMsg << argv[0] << "Invalid Entity specification" << endm; + ErrorMsg() << argv[0] << "Invalid Entity specification" << endm; return 1; } @@ -1054,7 +1054,7 @@ Standard_Integer WOKAPI_Command::EntityInfo(const WOKAPI_Session& asession, { if(!theent.IsFileType(aoptarg)) { - ErrorMsg << argv[0] << aoptarg << " is not a valid type for entity : " << theent.UserPath() << endm; + ErrorMsg() << argv[0] << aoptarg << " is not a valid type for entity : " << theent.UserPath() << endm; return 1; } returns.AddStringValue(theent.GetFileTypeDefinition(aoptarg)); @@ -1064,7 +1064,7 @@ Standard_Integer WOKAPI_Command::EntityInfo(const WOKAPI_Session& asession, { if(!theent.IsFileType(aoptarg)) { - ErrorMsg << argv[0] << aoptarg << " is not a valid type for entity : " << theent.UserPath() << endm; + ErrorMsg() << argv[0] << aoptarg << " is not a valid type for entity : " << theent.UserPath() << endm; return 1; } @@ -1093,7 +1093,7 @@ Standard_Integer WOKAPI_Command::EntityInfo(const WOKAPI_Session& asession, if(!theent.IsFileType(type)) { - ErrorMsg << argv[0] << aoptarg << " is not a valid type for entity : " << theent.UserPath() << endm; + ErrorMsg() << argv[0] << aoptarg << " is not a valid type for entity : " << theent.UserPath() << endm; return 1; } @@ -1103,13 +1103,13 @@ Standard_Integer WOKAPI_Command::EntityInfo(const WOKAPI_Session& asession, { if(!theent.IsFileType(aoptarg)) { - ErrorMsg << argv[0] << aoptarg << " is not a valid type for entity : " << theent.UserPath() << endm; + ErrorMsg() << argv[0] << aoptarg << " is not a valid type for entity : " << theent.UserPath() << endm; return 1; } if(theent.IsFileTypeFileDependent(aoptarg)) { - ErrorMsg << argv[0] << aoptarg << " is a FileDependant type for entity : " << theent.UserPath() << endm; + ErrorMsg() << argv[0] << aoptarg << " is a FileDependant type for entity : " << theent.UserPath() << endm; return 1; } returns.AddStringValue(theent.GetFilePath(aoptarg)); @@ -1129,7 +1129,7 @@ Standard_Integer WOKAPI_Command::EntityInfo(const WOKAPI_Session& asession, if(!nesting.IsValid()) { - ErrorMsg << argv[0] << "Could not obtain nesting of " << theent.UserPath() << endm; + ErrorMsg() << argv[0] << "Could not obtain nesting of " << theent.UserPath() << endm; return 1; } @@ -1289,7 +1289,7 @@ Standard_Integer WOKAPI_Command::EntityClose(const WOKAPI_Session& asession, if(!theent.IsValid()) { - ErrorMsg << argv[0] << "Invalid Entity specification" << endm; + ErrorMsg() << argv[0] << "Invalid Entity specification" << endm; return 1; } theent.Close(); @@ -1377,7 +1377,7 @@ Standard_Integer WOKAPI_Command::Locate(const WOKAPI_Session& asession, if(!bench.IsValid()) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "Could not determine visibility : Specify workbench in command line or use wokcd" << endm; return 1; } @@ -1386,7 +1386,7 @@ Standard_Integer WOKAPI_Command::Locate(const WOKAPI_Session& asession, } else { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "Option -V not yet implemented : use Workbench to determine visibility" << endm; return 1; } diff --git a/src/WOKAPI/WOKAPI_Command_Factory.cxx b/src/WOKAPI/WOKAPI_Command_Factory.cxx index d4ef387..b5948a6 100755 --- a/src/WOKAPI/WOKAPI_Command_Factory.cxx +++ b/src/WOKAPI/WOKAPI_Command_Factory.cxx @@ -163,7 +163,7 @@ Standard_Integer WOKAPI_Command::FactoryInfo(const WOKAPI_Session& asession, if(!afact.IsValid()) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "Could not determine factory : Specify factory in command line or use wokcd" << endm; return 1; } @@ -222,7 +222,7 @@ Standard_Integer WOKAPI_Command::FactoryDestroy(const WOKAPI_Session& asession, switch(opts.Option()) { case 'R': - ErrorMsg << "WOKAPI_Command::FactoryDestroy" << "-R not yet implemented" << endm; + ErrorMsg() << "WOKAPI_Command::FactoryDestroy" << "-R not yet implemented" << endm; return 1; default: break; @@ -246,7 +246,7 @@ Standard_Integer WOKAPI_Command::FactoryDestroy(const WOKAPI_Session& asession, if(!afact.IsValid()) { - ErrorMsg << "WOKAPI_Command::FactoryDestroy" + ErrorMsg() << "WOKAPI_Command::FactoryDestroy" << "Could not determine factory : Specify factory in command line or use wokcd" << endm; return 1; } diff --git a/src/WOKAPI/WOKAPI_Command_Parcel.cxx b/src/WOKAPI/WOKAPI_Command_Parcel.cxx index e883457..d7e660f 100755 --- a/src/WOKAPI/WOKAPI_Command_Parcel.cxx +++ b/src/WOKAPI/WOKAPI_Command_Parcel.cxx @@ -82,7 +82,7 @@ Standard_Integer WOKAPI_Command::ParcelInfo(const WOKAPI_Session& asession, if(!aparcel.IsValid()) { - ErrorMsg << "WOKAPI_Command::WarehouseInfo" + ErrorMsg() << "WOKAPI_Command::WarehouseInfo" << "Could not determine Warehouse : Specify Warehouse in command line or use wokcd" << endm; return 1; } diff --git a/src/WOKAPI/WOKAPI_Command_TriggeredMake.cxx b/src/WOKAPI/WOKAPI_Command_TriggeredMake.cxx index 7f2cd8e..d692bf5 100755 --- a/src/WOKAPI/WOKAPI_Command_TriggeredMake.cxx +++ b/src/WOKAPI/WOKAPI_Command_TriggeredMake.cxx @@ -103,9 +103,9 @@ Standard_Integer WOKAPI_Command::AddInputFile(const WOKAPI_Session& , if(thestep.IsNull()) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "No Tiggered Step currently in run" << endm; - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << argv[0] << " can only be called during a umake process" << endm; return 1; } @@ -119,7 +119,7 @@ Standard_Integer WOKAPI_Command::AddInputFile(const WOKAPI_Session& , if(file.IsNull()) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "Cannot locate file (locateable and physical) : " << anid << " while processing " << thestep->Unit()->UserPathName() << endm; return 1; @@ -136,7 +136,7 @@ Standard_Integer WOKAPI_Command::AddInputFile(const WOKAPI_Session& , } else { - WarningMsg << argv[0] + WarningMsg() << argv[0] << "Ingnoring given path for locateable physical file" << endm; } } @@ -215,9 +215,9 @@ Standard_Integer WOKAPI_Command::InputFileInfo(const WOKAPI_Session& , if(thestep.IsNull()) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "No Tiggered Step currently in run" << endm; - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << argv[0] << " can only be called during a umake process" << endm; return 1; } @@ -226,7 +226,7 @@ Standard_Integer WOKAPI_Command::InputFileInfo(const WOKAPI_Session& , if(infile.IsNull()) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << anid << " is not an input of step " << thestep->Code() << endm; return 1; } @@ -250,7 +250,7 @@ Standard_Integer WOKAPI_Command::InputFileInfo(const WOKAPI_Session& , } else { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "Cannot obtain path for ID : " << anid << endm; return 1; } @@ -356,9 +356,9 @@ Standard_Integer WOKAPI_Command::AddOutputFile(const WOKAPI_Session& , if(thestep.IsNull()) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "No Tiggered Step currently in run" << endm; - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << argv[0] << " can only be called during a umake process" << endm; return 1; } @@ -372,7 +372,7 @@ Standard_Integer WOKAPI_Command::AddOutputFile(const WOKAPI_Session& , if(file.IsNull()) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "Cannot locate file (locateable and physical) : " << anid << " while processing " << thestep->Unit()->UserPathName() << endm; return 1; @@ -389,7 +389,7 @@ Standard_Integer WOKAPI_Command::AddOutputFile(const WOKAPI_Session& , } else { - WarningMsg << argv[0] + WarningMsg() << argv[0] << "Ingnoring given path for locateable physical file" << endm; } } @@ -478,9 +478,9 @@ Standard_Integer WOKAPI_Command::OutputFileInfo(const WOKAPI_Session& , if(thestep.IsNull()) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "No Tiggered Step currently in run" << endm; - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << argv[0] << " can only be called during a umake process" << endm; return 1; } @@ -489,7 +489,7 @@ Standard_Integer WOKAPI_Command::OutputFileInfo(const WOKAPI_Session& , if(infile.IsNull()) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << anid << " is not an Output of step " << thestep->Code() << endm; return 1; } @@ -513,7 +513,7 @@ Standard_Integer WOKAPI_Command::OutputFileInfo(const WOKAPI_Session& , } else { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "Cannot obtain path for ID : " << anid << endm; return 1; } @@ -579,9 +579,9 @@ Standard_Integer WOKAPI_Command::AddExecDepItem(const WOKAPI_Session& , if(thestep.IsNull()) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "No Tiggered Step currently in run" << endm; - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << argv[0] << " can only be called during a umake process" << endm; return 1; } @@ -591,7 +591,7 @@ Standard_Integer WOKAPI_Command::AddExecDepItem(const WOKAPI_Session& , if(infile.IsNull()) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "Input file ID : " << inid << " is not an input of this step" << endm; return 1; } @@ -600,7 +600,7 @@ Standard_Integer WOKAPI_Command::AddExecDepItem(const WOKAPI_Session& , if(outfile.IsNull()) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "Output file ID : " << outid << " is not an output of this step" << endm; return 1; } diff --git a/src/WOKAPI/WOKAPI_Command_Unit.cxx b/src/WOKAPI/WOKAPI_Command_Unit.cxx index 45f83cb..d4190a1 100755 --- a/src/WOKAPI/WOKAPI_Command_Unit.cxx +++ b/src/WOKAPI/WOKAPI_Command_Unit.cxx @@ -136,7 +136,7 @@ Standard_Integer WOKAPI_Command::UnitCreate(const WOKAPI_Session& asession, if(typecode != 0 && !typesstr.IsNull()) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "Option -T cannot be used in conjunction with type key!" << endm; return 1; } @@ -157,12 +157,12 @@ Standard_Integer WOKAPI_Command::UnitCreate(const WOKAPI_Session& asession, if(aprev.IsValid()) { typecode = aprev.TypeKey(); - InfoMsg << argv[0] + InfoMsg() << argv[0] << "No type specified : using type of " << aprev.UserPath() << " : " << aprev.Type() << " (eq : ucreate -" << typecode << ")" << endm; } else { - InfoMsg << argv[0] + InfoMsg() << argv[0] << "No type specified : using package (eq : ucreate -p)" << endm; typecode = 'p'; } @@ -186,7 +186,7 @@ Standard_Integer WOKAPI_Command::UnitCreate(const WOKAPI_Session& asession, } if(!found) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "Invalid type specification : " << typesstr << " (see ucreate -P for possibilities)" << endm; return 1; } @@ -206,7 +206,7 @@ Standard_Integer WOKAPI_Command::UnitCreate(const WOKAPI_Session& asession, { if(typecode == keys->Value(i)) { - InfoMsg << argv[0] + InfoMsg() << argv[0] << "Creating " << aseq.Value(i) << " " << aname << " in " << abench.UserPath() << endm; found = Standard_True; @@ -214,7 +214,7 @@ Standard_Integer WOKAPI_Command::UnitCreate(const WOKAPI_Session& asession, } if(!found) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "Invalid type key specified : " << typecode << endm; return 1; } @@ -324,19 +324,19 @@ Standard_Integer WOKAPI_Command::UnitInfo(const WOKAPI_Session& asession, if(missingfilter && localfilter) { - ErrorMsg << argv[0] << "Mixing -l and -m is nonsense" << endm; + ErrorMsg() << argv[0] << "Mixing -l and -m is nonsense" << endm; return 1; } if(missingfilter && existsfilter) { - ErrorMsg << argv[0] << "Mixing -e and -m is nonsense" << endm; + ErrorMsg() << argv[0] << "Mixing -e and -m is nonsense" << endm; return 1; } if(missingfilter && getpathes) { - ErrorMsg << argv[0] << "Mixing -m and -p is nonsense" << endm; + ErrorMsg() << argv[0] << "Mixing -m and -p is nonsense" << endm; return 1; } @@ -356,7 +356,7 @@ Standard_Integer WOKAPI_Command::UnitInfo(const WOKAPI_Session& asession, if(!aunit.IsValid()) { - ErrorMsg << argv[0] << "Could not determine unit : Specify unit in command line or use wokcd" << endm; + ErrorMsg() << argv[0] << "Could not determine unit : Specify unit in command line or use wokcd" << endm; return 1; } @@ -374,7 +374,7 @@ Standard_Integer WOKAPI_Command::UnitInfo(const WOKAPI_Session& asession, if(!abench.IsValid()) { - ErrorMsg << argv[0] << "Could not determine workbench" << endm; + ErrorMsg() << argv[0] << "Could not determine workbench" << endm; return 1; } @@ -385,7 +385,7 @@ Standard_Integer WOKAPI_Command::UnitInfo(const WOKAPI_Session& asession, if(!aparcel.IsValid()) { - ErrorMsg << argv[0] << "Could not determine parcel" << endm; + ErrorMsg() << argv[0] << "Could not determine parcel" << endm; return 1; } @@ -396,7 +396,7 @@ Standard_Integer WOKAPI_Command::UnitInfo(const WOKAPI_Session& asession, if(!locator.IsValid()) { - ErrorMsg << argv[0] << "Could not initialize locator with " << aunit.NestingEntity().UserPath() << endm; + ErrorMsg() << argv[0] << "Could not initialize locator with " << aunit.NestingEntity().UserPath() << endm; return 1; } @@ -569,7 +569,7 @@ Standard_Integer WOKAPI_Command::UnitMake(const WOKAPI_Session& asession, // only if(hasstart||hasend) { - ErrorMsg << "WOKAPI_Unit::Make" << "Only option associated with start, end or until option is illegal" << endm; + ErrorMsg() << "WOKAPI_Unit::Make" << "Only option associated with start, end or until option is illegal" << endm; WOKAPI_UnitMake_Usage(argv[0]); return 1; } @@ -580,7 +580,7 @@ Standard_Integer WOKAPI_Command::UnitMake(const WOKAPI_Session& asession, case 's': if(hasonly||hasstart) { - ErrorMsg << "WOKAPI_Unit::Make" << "Start option associated with start, only or until option is illegal" << endm; + ErrorMsg() << "WOKAPI_Unit::Make" << "Start option associated with start, only or until option is illegal" << endm; WOKAPI_UnitMake_Usage(argv[0]); return 1; } @@ -591,7 +591,7 @@ Standard_Integer WOKAPI_Command::UnitMake(const WOKAPI_Session& asession, case 'e': if(hasonly||hasend) { - ErrorMsg << "WOKAPI_Unit::Make" << "End option associated to only or until option is illegal" << endm; + ErrorMsg() << "WOKAPI_Unit::Make" << "End option associated to only or until option is illegal" << endm; WOKAPI_UnitMake_Usage(argv[0]); return 1; } @@ -607,7 +607,7 @@ Standard_Integer WOKAPI_Command::UnitMake(const WOKAPI_Session& asession, // no targets for the moment if(curstepcode.IsNull()) { - WarningMsg << argv[0] << "No step code to associate target " << opts.OptionArgument() << " with : target ignored" << endm; + WarningMsg() << argv[0] << "No step code to associate target " << opts.OptionArgument() << " with : target ignored" << endm; } else { @@ -644,7 +644,7 @@ Standard_Integer WOKAPI_Command::UnitMake(const WOKAPI_Session& asession, if(!aunit.IsValid()) { - ErrorMsg << argv[0] << "Could not determine unit : Specify unit in command line or use wokcd" << endm; + ErrorMsg() << argv[0] << "Could not determine unit : Specify unit in command line or use wokcd" << endm; return 1; } @@ -655,7 +655,7 @@ Standard_Integer WOKAPI_Command::UnitMake(const WOKAPI_Session& asession, if(!aprocess.Init(abench)) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "Could not initialize BuildProcess" << endm; return 1; } @@ -712,7 +712,7 @@ Standard_Integer WOKAPI_Command::UnitMake(const WOKAPI_Session& asession, if(!aprocess.SelectedStepsNumber()) { - InfoMsg << argv[0] << "No step to execute : check command line" << endm; + InfoMsg() << argv[0] << "No step to execute : check command line" << endm; } else { @@ -812,7 +812,7 @@ Standard_Integer WOKAPI_Command::UnitDestroy(const WOKAPI_Session& asession, if(!aunit.IsValid()) { - ErrorMsg << "WOKAPI_Command::UnitDestroy" + ErrorMsg() << "WOKAPI_Command::UnitDestroy" << "Could not determine unit : Specify unit in command line or use wokcd" << endm; return 1; } diff --git a/src/WOKAPI/WOKAPI_Command_Warehouse.cxx b/src/WOKAPI/WOKAPI_Command_Warehouse.cxx index b01dbd9..55c1938 100755 --- a/src/WOKAPI/WOKAPI_Command_Warehouse.cxx +++ b/src/WOKAPI/WOKAPI_Command_Warehouse.cxx @@ -157,7 +157,7 @@ Standard_Integer WOKAPI_Command::WarehouseInfo(const WOKAPI_Session& asession, if(!aware.IsValid()) { - ErrorMsg << "WOKAPI_Command::WarehouseInfo" + ErrorMsg() << "WOKAPI_Command::WarehouseInfo" << "Could not determine Warehouse : Specify Warehouse in command line or use wokcd" << endm; return 1; } @@ -201,7 +201,7 @@ Standard_Integer WOKAPI_Command::WarehouseDestroy(const WOKAPI_Session& asession switch(opts.Option()) { case 'R': - ErrorMsg << "WOKAPI_Command::WarehouseDestroy" << "-R not yet implemented" << endm; + ErrorMsg() << "WOKAPI_Command::WarehouseDestroy" << "-R not yet implemented" << endm; return 1; default: break; @@ -225,7 +225,7 @@ Standard_Integer WOKAPI_Command::WarehouseDestroy(const WOKAPI_Session& asession if(!aware.IsValid()) { - ErrorMsg << "WOKAPI_Command::WarehouseDestroy" + ErrorMsg() << "WOKAPI_Command::WarehouseDestroy" << "Could not determine Warehouse : Specify Warehouse in command line or use wokcd" << endm; return 1; } @@ -286,7 +286,7 @@ Standard_Integer WOKAPI_Command::WarehouseDeclare(const WOKAPI_Session& asession } if (parcelname.IsNull()) { - ErrorMsg << "WOKAPI_Command::WarehouseDeclare" + ErrorMsg() << "WOKAPI_Command::WarehouseDeclare" << "Parcel name is missing" << endm; WOKAPI_WarehouseDeclare_Usage(argv[0]); return 1; @@ -310,7 +310,7 @@ Standard_Integer WOKAPI_Command::WarehouseDeclare(const WOKAPI_Session& asession if(!aware.IsValid()) { - ErrorMsg << "WOKAPI_Command::WarehouseDeclare" + ErrorMsg() << "WOKAPI_Command::WarehouseDeclare" << "Could not determine Warehouse : Specify Warehouse in command line or use wokcd" << endm; return 1; } @@ -336,7 +336,7 @@ Standard_Integer WOKAPI_Command::WarehouseDeclare(const WOKAPI_Session& asession WOKAPI_Parcel aparcel(asession,parcelname,Standard_False); if (aparcel.IsValid()) { - ErrorMsg << "WOKAPI_Command::WarehouseDeclare" + ErrorMsg() << "WOKAPI_Command::WarehouseDeclare" << "Parcel " << parcelname << " is already declared in Warehouse " << aware.Name() << endm; return 1; } @@ -347,7 +347,7 @@ Standard_Integer WOKAPI_Command::WarehouseDeclare(const WOKAPI_Session& asession aware, opts.Defines(), getdefault)) { - ErrorMsg << "WOKAPI_Command::WarehouseDeclare" + ErrorMsg() << "WOKAPI_Command::WarehouseDeclare" << "Unable to declare parcel " << parcelname << " in Warehouse " << aware.Name() << endm; return 1; } diff --git a/src/WOKAPI/WOKAPI_Command_Workbench.cxx b/src/WOKAPI/WOKAPI_Command_Workbench.cxx index 9c41202..1f65beb 100755 --- a/src/WOKAPI/WOKAPI_Command_Workbench.cxx +++ b/src/WOKAPI/WOKAPI_Command_Workbench.cxx @@ -238,7 +238,7 @@ Standard_Integer WOKAPI_Command::WorkbenchInfo(const WOKAPI_Session& asession, if(!abench.IsValid()) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "Could not determine workbench : Specify workbench in command line or use wokcd" << endm; return 1; } @@ -410,7 +410,7 @@ Standard_Integer WOKAPI_Command::WorkbenchMove(const WOKAPI_Session& asession, WOKAPI_Workbench abench(asession,name); if (!abench.IsValid()) { - ErrorMsg << "WOKAPI_Command::WorkbenchMove" + ErrorMsg() << "WOKAPI_Command::WorkbenchMove" << "Could not determine workbench : Specify workbench in command line or use wokcd" << endm; return 1; } @@ -418,7 +418,7 @@ Standard_Integer WOKAPI_Command::WorkbenchMove(const WOKAPI_Session& asession, WOKAPI_Workbench afather(asession,father); if (!abench.IsValid()) { - ErrorMsg << "WOKAPI_Command::WorkbenchMove" + ErrorMsg() << "WOKAPI_Command::WorkbenchMove" << "Unable to find father workbench : Try to specify the complete workbench path in command line" << endm; return 1; } @@ -458,7 +458,7 @@ Standard_Integer WOKAPI_Command::WorkbenchDestroy(const WOKAPI_Session& asession switch(opts.Option()) { case 'R': - ErrorMsg << "WOKAPI_Command::WorkbenchDestroy" << "-R not yet implemented" << endm; + ErrorMsg() << "WOKAPI_Command::WorkbenchDestroy" << "-R not yet implemented" << endm; return 1; default: break; @@ -488,7 +488,7 @@ Standard_Integer WOKAPI_Command::WorkbenchDestroy(const WOKAPI_Session& asession if(!abench.IsValid()) { - ErrorMsg << "WOKAPI_Command::WorkbenchDestroy" + ErrorMsg() << "WOKAPI_Command::WorkbenchDestroy" << "Could not determine workbench : Specify workbench in command line or use wokcd" << endm; return 1; } @@ -613,7 +613,7 @@ Standard_Integer WOKAPI_Command::WorkbenchProcess(const WOKAPI_Session& asession { if(debug && optim) { - ErrorMsg << "WOKAPI_Command::WorkbenchProcess" + ErrorMsg() << "WOKAPI_Command::WorkbenchProcess" << "Optimised and debug mode cannot be combined" << endm; return 1; } @@ -651,7 +651,7 @@ Standard_Integer WOKAPI_Command::WorkbenchProcess(const WOKAPI_Session& asession if(!abench.IsValid()) { - ErrorMsg << "WOKAPI_Command::WorkbenchProcess" + ErrorMsg() << "WOKAPI_Command::WorkbenchProcess" << "Could not determine workbench : Specify workbench in command line or use wokcd" << endm; return 1; } @@ -666,7 +666,7 @@ Standard_Integer WOKAPI_Command::WorkbenchProcess(const WOKAPI_Session& asession if(!aproc.SelectedStepsNumber()) { - InfoMsg << argv[0] << "No step to execute : check command line" << endm; + InfoMsg() << argv[0] << "No step to execute : check command line" << endm; } else { diff --git a/src/WOKAPI/WOKAPI_Command_Workshop.cxx b/src/WOKAPI/WOKAPI_Command_Workshop.cxx index 912c555..e0ee5a5 100755 --- a/src/WOKAPI/WOKAPI_Command_Workshop.cxx +++ b/src/WOKAPI/WOKAPI_Command_Workshop.cxx @@ -169,14 +169,14 @@ Standard_Integer WOKAPI_Command::WorkshopInfo(const WOKAPI_Session& asession, if(!ashop.IsValid()) { - ErrorMsg << argv[0] + ErrorMsg() << argv[0] << "Could not determine workshop : Specify workshop in command line or use wokcd" << endm; return 1; } if(gettree == Standard_True) { - ErrorMsg << argv[0] << "Option -t not yet implemented\n"; + ErrorMsg() << argv[0] << "Option -t not yet implemented\n"; return 1; } @@ -232,7 +232,7 @@ Standard_Integer WOKAPI_Command::WorkshopDestroy(const WOKAPI_Session& asession, switch(opts.Option()) { case 'R': - ErrorMsg << "WOKAPI_Command::WorkshopDestroy" << "-R not yet implemented" << endm; + ErrorMsg() << "WOKAPI_Command::WorkshopDestroy" << "-R not yet implemented" << endm; return 1; default: break; @@ -256,7 +256,7 @@ Standard_Integer WOKAPI_Command::WorkshopDestroy(const WOKAPI_Session& asession, if(!ashop.IsValid()) { - ErrorMsg << "WOKAPI_Command::WorkshopDestroy" + ErrorMsg() << "WOKAPI_Command::WorkshopDestroy" << "Could not determine workshop : Specify workshop in command line or use wokcd" << endm; return 1; } diff --git a/src/WOKAPI/WOKAPI_Entity.cxx b/src/WOKAPI/WOKAPI_Entity.cxx index 334add9..d77853a 100755 --- a/src/WOKAPI/WOKAPI_Entity.cxx +++ b/src/WOKAPI/WOKAPI_Entity.cxx @@ -354,7 +354,7 @@ Handle(WOKUtils_HSequenceOfParamItem) WOKAPI_Entity::GetBuildParameters(const WO if(anent.IsValid()) { - ErrorMsg << "WOKAPI_Entity::BuildParameters" + ErrorMsg() << "WOKAPI_Entity::BuildParameters" << "There is already an entity with name : " << myEntity->UserPathName() << endm; return result; } @@ -392,7 +392,7 @@ Standard_Boolean WOKAPI_Entity::BuildEntity(const WOKAPI_Session& asession, if(!anesting.IsValid()) { - ErrorMsg << "WOKAPI_Entity::BuildParameters" + ErrorMsg() << "WOKAPI_Entity::BuildParameters" << "Invalid Nesting : " << anesting.Entity()->UserPathName() << endm; return Standard_True; } @@ -401,7 +401,7 @@ Standard_Boolean WOKAPI_Entity::BuildEntity(const WOKAPI_Session& asession, if(anent.IsValid()) { - ErrorMsg << "WOKAPI_Entity::BuildParameters" + ErrorMsg() << "WOKAPI_Entity::BuildParameters" << "There is already an entity with name : " << myEntity->UserPathName() << endm; return Standard_True; } @@ -417,7 +417,7 @@ Standard_Boolean WOKAPI_Entity::BuildEntity(const WOKAPI_Session& asession, if(item.Value().IsNull()) { - ErrorMsg << "WOKAPI_Entity::Build" + ErrorMsg() << "WOKAPI_Entity::Build" << "Needed parameter : " << item.Name() << " is not setted" << endm; failed = Standard_True; } @@ -427,7 +427,7 @@ Standard_Boolean WOKAPI_Entity::BuildEntity(const WOKAPI_Session& asession, Handle(WOKUtils_Path) apathname = new WOKUtils_Path(item.Value()); if (!apathname->FileName()->IsSameString(aname)) { failed = Standard_True; - ErrorMsg << "WOKAPI_Entity::Build" + ErrorMsg() << "WOKAPI_Entity::Build" << "Invalid home directory " << apathname->Name() << " for entity " << Name() << endm; } } @@ -435,7 +435,7 @@ Standard_Boolean WOKAPI_Entity::BuildEntity(const WOKAPI_Session& asession, } if (!myEntity->IsValidName()) { - ErrorMsg << "WOKAPI_Entity::Build" + ErrorMsg() << "WOKAPI_Entity::Build" << "Invalid name for entity : " << Name() << endm; failed = Standard_True; } @@ -482,7 +482,7 @@ void WOKAPI_Entity::UpdateBeforeDestroy(const Handle(WOKernel_Entity)& anesting) if(!IsValid()) { - ErrorMsg << "WOKAPI_Entity::UpdateEntityList" + ErrorMsg() << "WOKAPI_Entity::UpdateEntityList" << "Entity " << ausername << " no longer exists" << endm; return; } @@ -751,7 +751,7 @@ void WOKAPI_Entity::ParameterSet(const Handle(TCollection_HAsciiString)& aname, if(aname->Value(1) != '%') { - ErrorMsg << "WOKAPI_Entity::ParameterSet" << "Variable name must begin with %" << endm; + ErrorMsg() << "WOKAPI_Entity::ParameterSet" << "Variable name must begin with %" << endm; return; } if(!myEntity->IsOpened()) myEntity->Open(); @@ -769,7 +769,7 @@ void WOKAPI_Entity::ParameterUnSet(const Handle(TCollection_HAsciiString)& aname if(!myEntity->IsOpened()) myEntity->Open(); if(aname->Value(1) != '%') { - ErrorMsg << "WOKAPI_Entity::ParameterUnSet" << "Variable name must begin with %" << endm; + ErrorMsg() << "WOKAPI_Entity::ParameterUnSet" << "Variable name must begin with %" << endm; return; } @@ -920,12 +920,12 @@ Standard_Boolean WOKAPI_Entity::CheckDirs(const Standard_Boolean createifmissing { if(createifmissing) { - WarningMsg << "WOKAPI_Entity::CheckDirs" + WarningMsg() << "WOKAPI_Entity::CheckDirs" << "Creating missing directory " << Kdirseq->Value(i) << " in " << UserPath() << endm; } else { - WarningMsg << "WOKAPI_Entity::CheckDirs" + WarningMsg() << "WOKAPI_Entity::CheckDirs" << "Missing directory " << Kdirseq->Value(i) << " in " << UserPath() << endm; } } @@ -939,7 +939,7 @@ Standard_Boolean WOKAPI_Entity::CheckDirs(const Standard_Boolean createifmissing } else { - ErrorMsg << "WOKAPI_Entity::CheckDirs" + ErrorMsg() << "WOKAPI_Entity::CheckDirs" << Kdirseq->Value(i) << " exists and is not a directory" << endm; status = Standard_False; } @@ -1209,7 +1209,7 @@ Standard_Integer WOKAPI_Entity::GetEnvActions(const WOKAPI_Session& asession, if(!thefact.IsValid()) { - ErrorMsg << "WOKAPI_Entity::GetEnvActions" + ErrorMsg() << "WOKAPI_Entity::GetEnvActions" << "Could not determine factory : Nothing done" << endm; return 1; } @@ -1218,7 +1218,7 @@ Standard_Integer WOKAPI_Entity::GetEnvActions(const WOKAPI_Session& asession, if(!theshop.IsValid()) { - ErrorMsg << "WOKAPI_Entity::GetEnvActions" + ErrorMsg() << "WOKAPI_Entity::GetEnvActions" << "Could not determine workshop : Nothing done" << endm; return 1; } @@ -1227,7 +1227,7 @@ Standard_Integer WOKAPI_Entity::GetEnvActions(const WOKAPI_Session& asession, if(!thebench.IsValid()) { - ErrorMsg << "WOKAPI_Entity::GetEnvActions" + ErrorMsg() << "WOKAPI_Entity::GetEnvActions" << "Could not determine workbench : Nothing done" << endm; return 1; } @@ -1259,7 +1259,7 @@ Standard_Integer WOKAPI_Entity::GetEnvActions(const WOKAPI_Session& asession, if(homedir.IsNull()) { - ErrorMsg << "WOKAPI_Entity::GetEnvActions" + ErrorMsg() << "WOKAPI_Entity::GetEnvActions" << "Could not determine HomeDir of parcel : " << parcel.UserPath() << endm; return 1; } @@ -1286,7 +1286,7 @@ Standard_Integer WOKAPI_Entity::GetEnvActions(const WOKAPI_Session& asession, if(pathvarname.IsNull()) { - ErrorMsg << "WOKAPI_Entity::GetEnvActions" + ErrorMsg() << "WOKAPI_Entity::GetEnvActions" << "Could not eval %ENV_PATH (path environment variable name)" << endm; return 1; } @@ -1299,7 +1299,7 @@ Standard_Integer WOKAPI_Entity::GetEnvActions(const WOKAPI_Session& asession, if(PATH.Value().IsEmpty()) { - WarningMsg << "WOKAPI_Entity::GetEnvActions" + WarningMsg() << "WOKAPI_Entity::GetEnvActions" << "Environment variable " << pathvarname << " is not setted" << endm; } @@ -1311,7 +1311,7 @@ Standard_Integer WOKAPI_Entity::GetEnvActions(const WOKAPI_Session& asession, if(ldpathvarname.IsNull()) { - ErrorMsg << "WOKAPI_Entity::GetEnvActions" + ErrorMsg() << "WOKAPI_Entity::GetEnvActions" << "Could not eval %ENV_LDPATH (library path environment variable name)" << endm; return 1; } @@ -1329,7 +1329,7 @@ Standard_Integer WOKAPI_Entity::GetEnvActions(const WOKAPI_Session& asession, if(LDPATH.Value().IsEmpty()) { - WarningMsg << "WOKAPI_Entity::GetEnvActions" + WarningMsg() << "WOKAPI_Entity::GetEnvActions" << "Environment variable " << ldpathvarname << " is not setted" << endm; } diff --git a/src/WOKAPI/WOKAPI_Factory.cxx b/src/WOKAPI/WOKAPI_Factory.cxx index 37ad714..15513a3 100755 --- a/src/WOKAPI/WOKAPI_Factory.cxx +++ b/src/WOKAPI/WOKAPI_Factory.cxx @@ -98,7 +98,7 @@ Standard_Boolean WOKAPI_Factory::Build(const WOKAPI_Session& asession, if(!asession.IsValid()) { - ErrorMsg << "WOKAPI_Factory::Build" + ErrorMsg() << "WOKAPI_Factory::Build" << "Invalid session to create factory : " << name << endm; return Standard_True; } @@ -130,7 +130,7 @@ Standard_Boolean WOKAPI_Factory::Destroy() if(afact->Workshops()->Length()) { - ErrorMsg << "WOKAPI_Factory::Destroy" + ErrorMsg() << "WOKAPI_Factory::Destroy" << "Cannot destroy not empty factory" << endm; return Standard_True; } diff --git a/src/WOKAPI/WOKAPI_Parcel.cxx b/src/WOKAPI/WOKAPI_Parcel.cxx index 7a34c38..5a04aff 100755 --- a/src/WOKAPI/WOKAPI_Parcel.cxx +++ b/src/WOKAPI/WOKAPI_Parcel.cxx @@ -72,7 +72,7 @@ Handle(WOKUtils_HSequenceOfParamItem) WOKAPI_Parcel::BuildParameters(const WOKAP if (!anesting.IsValid()) { - ErrorMsg << "WOKAPI_Parcel::BuildParameters" + ErrorMsg() << "WOKAPI_Parcel::BuildParameters" << "Invalid nesting to create parcel : " << name << endm; return aseq; } @@ -138,7 +138,7 @@ Standard_Boolean WOKAPI_Parcel::Declare(const WOKAPI_Session& , Handle(WOKUtils_HSequenceOfParamItem) aseq = aparc->BuildParameters(someparams, usedefaults); if (valnamedel.IsNull()) { - ErrorMsg << "WOKAPI_Parcel::Declare" + ErrorMsg() << "WOKAPI_Parcel::Declare" << "Delivery name not given" << endm; return Standard_False; } @@ -193,20 +193,20 @@ void WOKAPI_Parcel::Delivery(WOKAPI_Unit& unit) const if(aunit.IsNull()) { - ErrorMsg << "WOKAPI_Parcel::Deliveries" + ErrorMsg() << "WOKAPI_Parcel::Deliveries" << "Invalid name : " << adel << " in parcel " << aparcel->UserPathName() << endm; return; } if(!WOKernel_IsDelivery(aunit)) { - ErrorMsg << "WOKAPI_Parcel::Deliveries" + ErrorMsg() << "WOKAPI_Parcel::Deliveries" << "Invalid type for " << adel << " in parcel " << aparcel->UserPathName() << endm; return; } } else { - ErrorMsg << "WOKAPI_Parcel::Units" + ErrorMsg() << "WOKAPI_Parcel::Units" << "Invalid name : " << adel << " in parcel " << aparcel->UserPathName() << endm; return; } @@ -250,7 +250,7 @@ Standard_Boolean WOKAPI_Parcel::NestedEntities(WOKAPI_SequenceOfEntity& aseq) co if(aunit.IsNull()) { - ErrorMsg << "WOKAPI_Parcel::NestedEntities" + ErrorMsg() << "WOKAPI_Parcel::NestedEntities" << "Invalid name : " << afullseq->Value(i) << " in allcomponents of " << aparcel->UserPathName() << endm; aseq.Clear(); return Standard_False; @@ -258,7 +258,7 @@ Standard_Boolean WOKAPI_Parcel::NestedEntities(WOKAPI_SequenceOfEntity& aseq) co } else { - ErrorMsg << "WOKAPI_Parcel::NestedEntities" + ErrorMsg() << "WOKAPI_Parcel::NestedEntities" << "Invalid name : " << afullseq->Value(i) << " in allcomponents of " << aparcel->UserPathName() << endm; aseq.Clear(); return Standard_False; @@ -300,7 +300,7 @@ void WOKAPI_Parcel::Units(WOKAPI_SequenceOfUnit& units) const if(aunit.IsNull()) { - ErrorMsg << "WOKAPI_Parcel::Units" + ErrorMsg() << "WOKAPI_Parcel::Units" << "Invalid name : " << afullseq->Value(i) << " in allcomponents of " << aparcel->UserPathName() << endm; units.Clear(); return; @@ -308,7 +308,7 @@ void WOKAPI_Parcel::Units(WOKAPI_SequenceOfUnit& units) const } else { - ErrorMsg << "WOKAPI_Parcel::Units" + ErrorMsg() << "WOKAPI_Parcel::Units" << "Invalid name : " << afullseq->Value(i) << " in allcomponents of " << aparcel->UserPathName() << endm; units.Clear(); return; diff --git a/src/WOKAPI/WOKAPI_Process.cxx b/src/WOKAPI/WOKAPI_Process.cxx index 45a31b8..1a658c6 100755 --- a/src/WOKAPI/WOKAPI_Process.cxx +++ b/src/WOKAPI/WOKAPI_Process.cxx @@ -61,7 +61,7 @@ Standard_Boolean WOKAPI_Process::Init(const Handle(TCollection_HAsciiString)& ab if(!mybp.Init(thebench)) { - ErrorMsg << "WOKAPI_Process::Init" + ErrorMsg() << "WOKAPI_Process::Init" << "Could not initialize build process" << endm; return Standard_False; } @@ -121,7 +121,7 @@ Standard_Integer WOKAPI_Process::ExploreInitSection(const Handle(TColStd_HSequen initcomplete = Standard_True; else { - ErrorMsg << "WOKAPI_Process::ExploreInitSection" + ErrorMsg() << "WOKAPI_Process::ExploreInitSection" << "Section flag " << line << " inside :Init section" << endm; return -1; } @@ -150,14 +150,14 @@ Standard_Integer WOKAPI_Process::ExploreInitSection(const Handle(TColStd_HSequen error = right; else { - ErrorMsg << "WOKAPI_Process::ExploreInitSection" + ErrorMsg() << "WOKAPI_Process::ExploreInitSection" << "Unrecognized line in :Init section : " << line << endm; return -1; } } else { - ErrorMsg << "WOKAPI_Process::ExploreInitSection" + ErrorMsg() << "WOKAPI_Process::ExploreInitSection" << "Malformed line in :Init section: " << line << endm; return -1; } @@ -171,14 +171,14 @@ Standard_Integer WOKAPI_Process::ExploreInitSection(const Handle(TColStd_HSequen if(!initcomplete) { - ErrorMsg << "WOKAPI_Process::ExploreInitSection" + ErrorMsg() << "WOKAPI_Process::ExploreInitSection" << "Could not find :Init section in file" << endm; return Standard_False; } if(workbench.IsNull()) { - ErrorMsg << "WOKAPI_Process::ExploreInitSection" + ErrorMsg() << "WOKAPI_Process::ExploreInitSection" << "Could not find required field Workbench= in :Init section" << endm; return -1; } @@ -187,7 +187,7 @@ Standard_Integer WOKAPI_Process::ExploreInitSection(const Handle(TColStd_HSequen if(!abench.IsValid()) { - ErrorMsg << "WOKAPI_Process::ExploreInitSection" + ErrorMsg() << "WOKAPI_Process::ExploreInitSection" << "Could not find " << workbench << " or this is not a workbench name" << endm; return -1; } @@ -206,7 +206,7 @@ Standard_Integer WOKAPI_Process::ExploreInitSection(const Handle(TColStd_HSequen } else { - ErrorMsg << "WOKAPI_Process::ExploreInitSection" + ErrorMsg() << "WOKAPI_Process::ExploreInitSection" << "Invalid mode specification " << mode << " is ignored" << endm; return -1; } @@ -218,7 +218,7 @@ Standard_Integer WOKAPI_Process::ExploreInitSection(const Handle(TColStd_HSequen { if(!WOKernel_DBMSystem::IsNameKnown(dbms)) { - ErrorMsg << "WOKAPI_::SetDBMSystem" + ErrorMsg() << "WOKAPI_::SetDBMSystem" << dbms << " is not known as a DBMSystem" << endm; return -1; } @@ -279,7 +279,7 @@ Standard_Integer WOKAPI_Process::AdvanceToNextValidSection(const Handle(TColStd_ } else { - ErrorMsg << "WOKAPI_Process::AdvanceToNextValidSection" + ErrorMsg() << "WOKAPI_Process::AdvanceToNextValidSection" << "Unrecognized conditional (" << token << ") in line: " << line << endm; return -1; } @@ -345,7 +345,7 @@ Standard_Integer WOKAPI_Process::ExploreTclSection(const Handle(TColStd_HSequenc tclcomplete = Standard_True; else { - ErrorMsg << "WOKAPI_Process::ExploreTclSection" + ErrorMsg() << "WOKAPI_Process::ExploreTclSection" << "Section flag " << line << " inside :Tcl section" << endm; return -1; } @@ -403,7 +403,7 @@ Standard_Integer WOKAPI_Process::ExploreBuildSection(const Handle(TColStd_HSeque buildcomplete = Standard_True; else { - ErrorMsg << "WOKAPI_Process::ExploreBuildSection" + ErrorMsg() << "WOKAPI_Process::ExploreBuildSection" << "Section flag " << line << " inside :Build section" << endm; return -1; } diff --git a/src/WOKAPI/WOKAPI_Session.cxx b/src/WOKAPI/WOKAPI_Session.cxx index 8aa2643..b4c8e6a 100755 --- a/src/WOKAPI/WOKAPI_Session.cxx +++ b/src/WOKAPI/WOKAPI_Session.cxx @@ -103,14 +103,14 @@ Standard_Integer WOKAPI_Session::Open(const Handle(TCollection_HAsciiString)& al if(sessionname->IsEmpty() == Standard_True) { - ErrorMsg << "WOKAPI_Session::Open" << "Symbol WOK_SESSIONID is not setted" << endm; + ErrorMsg() << "WOKAPI_Session::Open" << "Symbol WOK_SESSIONID is not setted" << endm; return 1; } Handle(TCollection_HAsciiString) rootname = new TCollection_HAsciiString(root.Value()); if(rootname->IsEmpty() == Standard_True) { - ErrorMsg << "WOKAPI_Session::Open" << "Symbol WOK_ROOTADMDIR is not setted" << endm; + ErrorMsg() << "WOKAPI_Session::Open" << "Symbol WOK_ROOTADMDIR is not setted" << endm; return 1; } @@ -118,7 +118,7 @@ Standard_Integer WOKAPI_Session::Open(const Handle(TCollection_HAsciiString)& al if(libpathname->IsEmpty() == Standard_True) { - ErrorMsg << "WOKAPI_Session::Open" << "Symbol WOK_LIBPATH is not setted" << endm; + ErrorMsg() << "WOKAPI_Session::Open" << "Symbol WOK_LIBPATH is not setted" << endm; return 1; } @@ -126,7 +126,7 @@ Standard_Integer WOKAPI_Session::Open(const Handle(TCollection_HAsciiString)& al apath = new WOKUtils_Path(sessionname); if (!apath->CreateDirectory()) { - ErrorMsg << "WOKAPI_Session::Open" << "Unable to create directory " << sessionname->ToCString() << endm; + ErrorMsg() << "WOKAPI_Session::Open" << "Unable to create directory " << sessionname->ToCString() << endm; return 1; } @@ -165,7 +165,7 @@ Standard_Integer WOKAPI_Session::Open(const Handle(TCollection_HAsciiString)& al apath = new WOKUtils_Path(apath->Name()->ToCString(), "WOK.edl"); if (!apath->CreateFile()) { - ErrorMsg << "WOKAPI_Session::Open" << "Unable to create directory " << apath->Name()->ToCString() << endm; + ErrorMsg() << "WOKAPI_Session::Open" << "Unable to create directory " << apath->Name()->ToCString() << endm; return 1; } @@ -207,7 +207,7 @@ Standard_Integer WOKAPI_Session::Open(const Handle(TCollection_HAsciiString)& al } else { - ErrorMsg << "WOKAPI_Session::Open" + ErrorMsg() << "WOKAPI_Session::Open" << "Wrong value : " << astr << " for session parameter : " << WOK_DEBUG << " (has to be : True|False" << endm; } } @@ -308,13 +308,13 @@ void WOKAPI_Session::GeneralFailure(const Handle(Standard_Failure)& ) WOK_TRACE { - VerboseMsg("WOK_API") << "WOKAPI_Session::GeneralFailure" + VerboseMsg()("WOK_API") << "WOKAPI_Session::GeneralFailure" << "Killing processes" << endm; } WOKUtils_ProcessManager::KillAll(); WOK_TRACE { - VerboseMsg("WOK_API") << "WOKAPI_Session::GeneralFailure" + VerboseMsg()("WOK_API") << "WOKAPI_Session::GeneralFailure" << "Reopen session" << endm; } Close(); @@ -331,9 +331,9 @@ void WOKAPI_Session::GeneralFailure(const Handle(Standard_Failure)& ) Handle(Standard_Failure) E = Standard_Failure::Caught(); Standard_SStream astream; astream << E << ends; - ErrorMsg << "WOKAPI_Session::GeneralFailure" + ErrorMsg() << "WOKAPI_Session::GeneralFailure" << "Exception was raised : " << GetSString(astream) << endm; - ErrorMsg << "WOKAPI_Session::GeneralFailure" + ErrorMsg() << "WOKAPI_Session::GeneralFailure" << "Could not recover session after Failure : Session is reinitialized" << endm; WOKUtils_ProcessManager::UnArm(); @@ -348,7 +348,7 @@ void WOKAPI_Session::GeneralFailure(const Handle(Standard_Failure)& ) FailedInOpen = Standard_False; } else { - ErrorMsg << "WOKAPI_Session::GeneralFailure" + ErrorMsg() << "WOKAPI_Session::GeneralFailure" << "Session recovering Failed" << endm; } } @@ -401,7 +401,7 @@ void WOKAPI_Session::SaveToFile() const if(!myparams.Write(mypath, aseq)) { - ErrorMsg << "WOKAPI_Session::SaveToFile" + ErrorMsg() << "WOKAPI_Session::SaveToFile" << "Could not save session parameters to file : " << mypath->Name() << endm; } } @@ -504,7 +504,7 @@ Handle(WOKernel_Factory) WOKAPI_Session::GetFactory(const Handle(TCollection_HAs { if(fatal) { - ErrorMsg << "WOKAPI_Session::GetFactory" + ErrorMsg() << "WOKAPI_Session::GetFactory" << "Could not find any nesting factory to your current position : " << cwe.Entity()->UserPathName() << endm; } return NULLRESULT; @@ -532,7 +532,7 @@ Handle(WOKernel_Factory) WOKAPI_Session::GetFactory(const Handle(TCollection_HAs { if(fatal) { - ErrorMsg << "WOKAPI_Session::GetFactory" + ErrorMsg() << "WOKAPI_Session::GetFactory" << "Entity " << apath << " is not a factory" << endm; } return NULLRESULT; @@ -571,7 +571,7 @@ Handle(WOKernel_Warehouse) WOKAPI_Session::GetWarehouse(const Handle(TCollection { if(fatal) { - ErrorMsg << "WOKAPI_Session::GetWarehouse" + ErrorMsg() << "WOKAPI_Session::GetWarehouse" << "Could not find any nesting warehouse to your current position : " << cwe.Entity()->UserPathName() << endm; } return NULLRESULT; @@ -596,7 +596,7 @@ Handle(WOKernel_Warehouse) WOKAPI_Session::GetWarehouse(const Handle(TCollection { if(fatal) { - ErrorMsg << "WOKAPI_Session::GetWarehouse" + ErrorMsg() << "WOKAPI_Session::GetWarehouse" << "Entity " << apath << " is not a warehouse" << endm; } return NULLRESULT; @@ -635,7 +635,7 @@ Handle(WOKernel_Parcel) WOKAPI_Session::GetParcel(const Handle(TCollection_HAsci { if(fatal) { - ErrorMsg << "WOKAPI_Session::GetParcel" + ErrorMsg() << "WOKAPI_Session::GetParcel" << "Could not find any parcel from your current position : " << cwe.Entity()->UserPathName() << endm; } return NULLRESULT; @@ -658,7 +658,7 @@ Handle(WOKernel_Parcel) WOKAPI_Session::GetParcel(const Handle(TCollection_HAsci { if(fatal) { - ErrorMsg << "WOKAPI_Session::GetParcel" + ErrorMsg() << "WOKAPI_Session::GetParcel" << "Entity " << apath << " is not a parcel" << endm; } return NULLRESULT; @@ -698,7 +698,7 @@ Handle(WOKernel_Workshop) WOKAPI_Session::GetWorkshop(const Handle(TCollection_H { if(fatal) { - ErrorMsg << "WOKAPI_Session::GetWorkshop" + ErrorMsg() << "WOKAPI_Session::GetWorkshop" << "Could not find any nesting workshop to your current position : " << cwe.Entity()->UserPathName() << endm; } return NULLRESULT; @@ -723,7 +723,7 @@ Handle(WOKernel_Workshop) WOKAPI_Session::GetWorkshop(const Handle(TCollection_H { if(fatal) { - ErrorMsg << "WOKAPI_Session::GetWorkshop" + ErrorMsg() << "WOKAPI_Session::GetWorkshop" << "Entity " << apath << " is not a workshop" << endm; } return NULLRESULT; @@ -763,7 +763,7 @@ Handle(WOKernel_Workbench) WOKAPI_Session::GetWorkbench(const Handle(TCollection { if(fatal) { - ErrorMsg << "WOKAPI_Session::GetWorkbench" + ErrorMsg() << "WOKAPI_Session::GetWorkbench" << "Could not find any workbench from your current position : " << cwe.Entity()->UserPathName() << endm; } return NULLRESULT; @@ -787,7 +787,7 @@ Handle(WOKernel_Workbench) WOKAPI_Session::GetWorkbench(const Handle(TCollection { if(fatal) { - ErrorMsg << "WOKAPI_Session::GetWorkbench" + ErrorMsg() << "WOKAPI_Session::GetWorkbench" << "Entity " << apath << " is not a workbench" << endm; } return NULLRESULT; @@ -823,7 +823,7 @@ Handle(WOKernel_DevUnit) WOKAPI_Session::GetDevUnit(const Handle(TCollection_HAs { if(fatal) { - ErrorMsg << "WOKAPI_Session::GetDevUnit" + ErrorMsg() << "WOKAPI_Session::GetDevUnit" << "Could not find any Dev Unit from your current position : " << cwe.Entity()->UserPathName() << endm; } return NULLRESULT; @@ -843,7 +843,7 @@ Handle(WOKernel_DevUnit) WOKAPI_Session::GetDevUnit(const Handle(TCollection_HAs { if(fatal) { - ErrorMsg << "WOKAPI_Session::GetDevUnit" + ErrorMsg() << "WOKAPI_Session::GetDevUnit" << "Entity " << apath << " is not a devunit" << endm; } return NULLRESULT; @@ -863,7 +863,7 @@ void WOKAPI_Session::Factories( WOKAPI_SequenceOfFactory& factseq) const if(!myEntity->IsOpened()) { - ErrorMsg << "WOKAPI_Session::Factories" + ErrorMsg() << "WOKAPI_Session::Factories" << "Internal Error : Session is not opened" << endm; return; } @@ -913,9 +913,9 @@ Standard_Boolean WOKAPI_Session::SetStation(const Handle(TCollection_HAsciiStrin if(!WOKernel_Station::IsNameKnown(astation)) { - ErrorMsg << "WOKAPI_Session::SetStation" + ErrorMsg() << "WOKAPI_Session::SetStation" << astation << " is not known as a " << endm; - ErrorMsg << "WOKAPI_Session::SetStation" + ErrorMsg() << "WOKAPI_Session::SetStation" << "Station is unchanged" << endm; return Standard_True; } @@ -951,9 +951,9 @@ Standard_Boolean WOKAPI_Session::SetDBMSystem(const Handle(TCollection_HAsciiStr if(!WOKernel_DBMSystem::IsNameKnown(adbms)) { - ErrorMsg << "WOKAPI_Session::SetDBMSystem" + ErrorMsg() << "WOKAPI_Session::SetDBMSystem" << adbms << " is not known as a DBMSystem" << endm; - ErrorMsg << "WOKAPI_Session::SetDBMSystem" + ErrorMsg() << "WOKAPI_Session::SetDBMSystem" << "DBMS is unchanged" << endm; return Standard_True; } @@ -1012,7 +1012,7 @@ Handle(WOKernel_Entity) WOKAPI_Session::OpenPath(const Handle(TCollection_HAscii if(apath.IsNull()) { - ErrorMsg << "WOKAPI_Session::OpenPath" << "Invalid NULL input" << endm; + ErrorMsg() << "WOKAPI_Session::OpenPath" << "Invalid NULL input" << endm; return anentity; } @@ -1048,7 +1048,7 @@ Handle(WOKernel_Entity) WOKAPI_Session::OpenPath(const Handle(TCollection_HAscii { if(!besilent) { - ErrorMsg << "WOKAPI_Session::OpenPath" << "You cannot move in " << apath << endm; + ErrorMsg() << "WOKAPI_Session::OpenPath" << "You cannot move in " << apath << endm; } } return anentity; @@ -1082,7 +1082,7 @@ Handle(WOKernel_Entity) WOKAPI_Session::OpenPath(const Handle(TCollection_HAscii { if(!besilent) { - ErrorMsg << "WOKAPI_Session::OpenPath" + ErrorMsg() << "WOKAPI_Session::OpenPath" << "No entity is matching path: " << thepath << endm; } return Handle(WOKernel_Entity)(); @@ -1100,7 +1100,7 @@ Handle(WOKernel_Entity) WOKAPI_Session::OpenPath(const Handle(TCollection_HAscii { if(!besilent) { - ErrorMsg << "WOKAPI_Session::OpenPath" + ErrorMsg() << "WOKAPI_Session::OpenPath" << "No entity is matching path: " << thepath << endm; } return Handle(WOKernel_Entity)(); @@ -1194,14 +1194,14 @@ Handle(WOKernel_Entity) WOKAPI_Session::OpenPath(const Handle(TCollection_HAscii { if(!besilent) { - ErrorMsg << "WOKAPI_Session::OpenPath" + ErrorMsg() << "WOKAPI_Session::OpenPath" << "No entity is matching your path be more precise in: " << endm; for(i=1; i<=apartialseq->Length(); i++) { anentity = Session()->GetEntity(apartialseq->Value(i)); if(!anentity.IsNull()) { - ErrorMsg << "WOKAPI_Session::OpenPath" << "\t" << anentity->UserPathName() << endm; + ErrorMsg() << "WOKAPI_Session::OpenPath" << "\t" << anentity->UserPathName() << endm; } } } @@ -1211,7 +1211,7 @@ Handle(WOKernel_Entity) WOKAPI_Session::OpenPath(const Handle(TCollection_HAscii { if(!besilent) { - ErrorMsg << "WOKAPI_Session::OpenPath" + ErrorMsg() << "WOKAPI_Session::OpenPath" << "No entity is matching path: " << apath << endm; } return Handle(WOKernel_Entity)(); @@ -1223,10 +1223,10 @@ Handle(WOKernel_Entity) WOKAPI_Session::OpenPath(const Handle(TCollection_HAscii default: if(!besilent) { - ErrorMsg << "WOKAPI_Session::OpenPath" << "Abnormal Mulitple choice in Nesting : " << endm; + ErrorMsg() << "WOKAPI_Session::OpenPath" << "Abnormal Mulitple choice in Nesting : " << endm; for(Standard_Integer i=1; i<=aseq->Length(); i++) { - ErrorMsg << "WOKAPI_Session::OpenPath" << "\t\t" << aseq->Value(i) << endm; + ErrorMsg() << "WOKAPI_Session::OpenPath" << "\t\t" << aseq->Value(i) << endm; } } return Handle(WOKernel_Entity)(); diff --git a/src/WOKAPI/WOKAPI_Unit.cxx b/src/WOKAPI/WOKAPI_Unit.cxx index 4f5c148..b4b2c81 100755 --- a/src/WOKAPI/WOKAPI_Unit.cxx +++ b/src/WOKAPI/WOKAPI_Unit.cxx @@ -121,7 +121,7 @@ Handle(WOKUtils_HSequenceOfParamItem) WOKAPI_Unit::BuildParameters(const WOKAPI_ if(!abench.IsValid()) { - ErrorMsg << "WOKAPI_Unit::Build" + ErrorMsg() << "WOKAPI_Unit::Build" << "Invalid nesting (" << nestname << ") to create workbench : " << name << endm; return aseq; } @@ -160,7 +160,7 @@ Standard_Boolean WOKAPI_Unit::Build(const WOKAPI_Session& asession, if(!abench.IsValid()) { - ErrorMsg << "WOKAPI_Unit::Build" + ErrorMsg() << "WOKAPI_Unit::Build" << "Invalid nesting (" << nestname << ") to create unit : " << name << endm; return Standard_True; } @@ -171,7 +171,7 @@ Standard_Boolean WOKAPI_Unit::Build(const WOKAPI_Session& asession, if(Kunit.IsNull()) { - ErrorMsg << "WOKAPI_Unit::Build" + ErrorMsg() << "WOKAPI_Unit::Build" << "Could not obtain unit : wrong type code : " << acode << endm; return Standard_True; } diff --git a/src/WOKAPI/WOKAPI_Warehouse.cxx b/src/WOKAPI/WOKAPI_Warehouse.cxx index 787f226..56ddde5 100755 --- a/src/WOKAPI/WOKAPI_Warehouse.cxx +++ b/src/WOKAPI/WOKAPI_Warehouse.cxx @@ -94,7 +94,7 @@ Handle(WOKUtils_HSequenceOfParamItem) WOKAPI_Warehouse::BuildParameters(const WO if(!afact.IsValid()) { - ErrorMsg << "WOKAPI_Warehouse::Build" + ErrorMsg() << "WOKAPI_Warehouse::Build" << "Invalid nesting (" << nestname << ") to create Warehouse : " << name << endm; return aseq; } @@ -131,7 +131,7 @@ Standard_Boolean WOKAPI_Warehouse::Build(const WOKAPI_Session& asession, if(!afact.IsValid()) { - ErrorMsg << "WOKAPI_Warehouse::Build" + ErrorMsg() << "WOKAPI_Warehouse::Build" << "Invalid nesting (" << nestname << ") to create Warehouse : " << name << endm; return Standard_True; } @@ -234,7 +234,7 @@ Standard_Boolean WOKAPI_Warehouse::Destroy() if(awarehouse->Parcels()->Length()) { - ErrorMsg << "WOKAPI_Warehouse::Destroy" + ErrorMsg() << "WOKAPI_Warehouse::Destroy" << "Cannot destroy not empty warehouse" << endm; return Standard_True; } diff --git a/src/WOKAPI/WOKAPI_Workbench.cxx b/src/WOKAPI/WOKAPI_Workbench.cxx index b14acbd..65fede0 100755 --- a/src/WOKAPI/WOKAPI_Workbench.cxx +++ b/src/WOKAPI/WOKAPI_Workbench.cxx @@ -87,14 +87,14 @@ Handle(WOKUtils_HSequenceOfParamItem) WOKAPI_Workbench::BuildParameters(const WO if(!ashop.IsValid()) { - ErrorMsg << "WOKAPI_Workbench::BuildParameters" + ErrorMsg() << "WOKAPI_Workbench::BuildParameters" << "Invalid nesting (" << nestname << ") to create workbench : " << name << endm; return aseq; } if(!WOKernel_Entity::IsValidName(name)) { - ErrorMsg << "WOKAPI_Workbench::BuildParameters" + ErrorMsg() << "WOKAPI_Workbench::BuildParameters" << "Invalid name (" << name << ") to create workbench" << endm; return aseq; } @@ -110,7 +110,7 @@ Handle(WOKUtils_HSequenceOfParamItem) WOKAPI_Workbench::BuildParameters(const WO if(!father.IsValid()) { - ErrorMsg << "WOKAPI_Workbench::BuildParameters" + ErrorMsg() << "WOKAPI_Workbench::BuildParameters" << "Invalid father (" << afather << ") to create workbench : " << name << endm; return aseq; } @@ -147,7 +147,7 @@ Standard_Boolean WOKAPI_Workbench::Build(const WOKAPI_Session& asession, if(!ashop.IsValid()) { - ErrorMsg << "WOKAPI_Workbench::Build" + ErrorMsg() << "WOKAPI_Workbench::Build" << "Invalid nesting (" << nestname << ") to create workbench : " << name << endm; return Standard_True; } @@ -155,7 +155,7 @@ Standard_Boolean WOKAPI_Workbench::Build(const WOKAPI_Session& asession, if(!WOKernel_Entity::IsValidName(name)) { - ErrorMsg << "WOKAPI_Workbench::Build" + ErrorMsg() << "WOKAPI_Workbench::Build" << "Invalid name (" << name << ") to create workbench" << endm; return Standard_True; } @@ -174,7 +174,7 @@ Standard_Boolean WOKAPI_Workbench::Build(const WOKAPI_Session& asession, if(!father.IsValid()) { - ErrorMsg << "WOKAPI_Workbench::Build" + ErrorMsg() << "WOKAPI_Workbench::Build" << "Invalid father (" << afather << ") to create workbench : " << name << endm; return Standard_True; } @@ -217,7 +217,7 @@ Standard_Boolean WOKAPI_Workbench::Destroy() if(aworkbench->Units()->Length()) { - ErrorMsg << "WOKAPI_Workbench::Destroy" + ErrorMsg() << "WOKAPI_Workbench::Destroy" << "Cannot destroy not empty workbench" << endm; return Standard_True; } @@ -444,7 +444,7 @@ void WOKAPI_Workbench::UnitsOfType(const Handle(TCollection_HAsciiString)& atype if(typedescr.IsNull()) { - ErrorMsg << "WOKAPI_Workbench::UnitsOfType" + ErrorMsg() << "WOKAPI_Workbench::UnitsOfType" << "Requesting unit type (" << atype << " is not a valid type in " << UserPath() << endm; return; } @@ -551,7 +551,7 @@ void WOKAPI_Workbench::ImplSuppliers(const Handle(TCollection_HAsciiString)& aun if (aunit.IsNull()) { - ErrorMsg << "WOKAPI_Workbench::ImplSuppliers" + ErrorMsg() << "WOKAPI_Workbench::ImplSuppliers" << "Unit " << aname << " : unit does not exist in workbench visibility" << endm; return; } @@ -559,7 +559,7 @@ void WOKAPI_Workbench::ImplSuppliers(const Handle(TCollection_HAsciiString)& aun { if(!WOKernel_IsExecutable(aunit)) { - ErrorMsg << "WOKAPI_Workbench::ImplSuppliers" + ErrorMsg() << "WOKAPI_Workbench::ImplSuppliers" << "Unit " << aname << " is not an executable" << endm; return; } @@ -581,7 +581,7 @@ void WOKAPI_Workbench::ImplSuppliers(const Handle(TCollection_HAsciiString)& aun } else { - ErrorMsg << "WOKAPI_Workbench::ImplSuppliers" + ErrorMsg() << "WOKAPI_Workbench::ImplSuppliers" << "Failed during getting suppliers of " << aunitname << endm; return; } @@ -617,7 +617,7 @@ void WOKAPI_Workbench::ImplClients(const Handle(TCollection_HAsciiString)& aunit if (aunit.IsNull()) { - ErrorMsg << "WOKAPI_Workbench::ImplClients" + ErrorMsg() << "WOKAPI_Workbench::ImplClients" << "Unit " << aunitname << " : unit does not exist in workbench visibility" << endm; return; } @@ -656,7 +656,7 @@ void WOKAPI_Workbench::ImplClients(const Handle(TCollection_HAsciiString)& aunit } else { - ErrorMsg << "WOKAPI_Workbench::ImplClients" + ErrorMsg() << "WOKAPI_Workbench::ImplClients" << "Failed during getting clients of " << aunitname << endm; return; } @@ -727,7 +727,7 @@ void WOKAPI_Workbench::SortUnitList(const Handle(TColStd_HSequenceOfHAsciiString if (aunit.IsNull()) { - ErrorMsg << "WOKAPI_Workbench::SortUnitList" + ErrorMsg() << "WOKAPI_Workbench::SortUnitList" << "Unit " << anexecname << " : unit does not exist in workbench visibility" << endm; return; } @@ -735,7 +735,7 @@ void WOKAPI_Workbench::SortUnitList(const Handle(TColStd_HSequenceOfHAsciiString { if(!WOKernel_IsExecutable(aunit)) { - ErrorMsg << "WOKAPI_Workbench::SortUnitList" + ErrorMsg() << "WOKAPI_Workbench::SortUnitList" << "Unit " << anexecname << " is not an executable" << endm; return; } @@ -746,7 +746,7 @@ void WOKAPI_Workbench::SortUnitList(const Handle(TColStd_HSequenceOfHAsciiString Handle(TColStd_HSequenceOfHAsciiString) execsuppliers = aunit->ImplementationDep(apart,agraph); if ( execsuppliers.IsNull() ) { - ErrorMsg << "WOKAPI_Workbench::SortUnitList" + ErrorMsg() << "WOKAPI_Workbench::SortUnitList" << "Failed during getting sorted unit list" << endm; return; } @@ -769,7 +769,7 @@ void WOKAPI_Workbench::SortUnitList(const Handle(TColStd_HSequenceOfHAsciiString if ( unitsuppliers.IsNull() ) { - ErrorMsg << "WOKAPI_Workbench::SortUnitList" + ErrorMsg() << "WOKAPI_Workbench::SortUnitList" << "Failed during getting sorted unit list" << endm; return; } diff --git a/src/WOKAPI/WOKAPI_Workshop.cxx b/src/WOKAPI/WOKAPI_Workshop.cxx index fda7298..a34d2b7 100755 --- a/src/WOKAPI/WOKAPI_Workshop.cxx +++ b/src/WOKAPI/WOKAPI_Workshop.cxx @@ -191,7 +191,7 @@ Handle(WOKUtils_HSequenceOfParamItem) WOKAPI_Workshop::BuildParameters(const WOK if(!afact.IsValid()) { - ErrorMsg << "WOKAPI_Workshop::Build" + ErrorMsg() << "WOKAPI_Workshop::Build" << "Invalid nesting (" << nestname << ") to create workshop : " << name << endm; return aseq; } @@ -199,7 +199,7 @@ Handle(WOKUtils_HSequenceOfParamItem) WOKAPI_Workshop::BuildParameters(const WOK WOKAPI_Warehouse aware = afact.Warehouse(); if(!aware.IsValid()) { - ErrorMsg << "WOKAPI_Workshop::Build" + ErrorMsg() << "WOKAPI_Workshop::Build" << "No valid warehouse in factory : " << afact.Name() << endm; return aseq; } @@ -236,7 +236,7 @@ Standard_Boolean WOKAPI_Workshop::Build(const WOKAPI_Session& asession, if(!afact.IsValid()) { - ErrorMsg << "WOKAPI_Workshop::Build" + ErrorMsg() << "WOKAPI_Workshop::Build" << "Invalid nesting (" << nestname << ") to create workshop : " << name << endm; return Standard_True; } @@ -245,7 +245,7 @@ Standard_Boolean WOKAPI_Workshop::Build(const WOKAPI_Session& asession, if(!aware.IsValid()) { - ErrorMsg << "WOKAPI_Workshop::Build" + ErrorMsg() << "WOKAPI_Workshop::Build" << "No valid warehouse in factory : " << afact.Name() << endm; return Standard_True; } @@ -284,7 +284,7 @@ Standard_Boolean WOKAPI_Workshop::Destroy() if(aworkshop->Workbenches()->Length()) { - ErrorMsg << "WOKAPI_Workshop::Destroy" + ErrorMsg() << "WOKAPI_Workshop::Destroy" << "Cannot destroy not empty workshop" << endm; return Standard_True; } -- 2.39.5