Commit 9c5a5be8 authored by Victor Kotlyar's avatar Victor Kotlyar
Browse files

Renamed castor::exception::MissingOperand to

cta::exception::MissingOperand
parent 21d7857d
...@@ -76,6 +76,7 @@ set (COMMON_LIB_SRC_FILES ...@@ -76,6 +76,7 @@ set (COMMON_LIB_SRC_FILES
exception/CommandLineNotParsed.cpp exception/CommandLineNotParsed.cpp
exception/InvalidArgument.cpp exception/InvalidArgument.cpp
exception/InvalidConfigEntry.cpp exception/InvalidConfigEntry.cpp
exception/MissingOperand.cpp
log/DummyLogger.cpp log/DummyLogger.cpp
log/LogContext.cpp log/LogContext.cpp
log/Logger.cpp log/Logger.cpp
......
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
* @author Castor Dev team, castor-dev@cern.ch * @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/ *****************************************************************************/
#include "castor/exception/MissingOperand.hpp" #include "common/exception/MissingOperand.hpp"
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Constructor // Constructor
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
castor::exception::MissingOperand::MissingOperand(): cta::exception::MissingOperand::MissingOperand():
cta::exception::Exception() { cta::exception::Exception() {
} }
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "common/exception/Exception.hpp" #include "common/exception/Exception.hpp"
namespace castor { namespace exception { namespace cta { namespace exception {
/** /**
* Missing operand. * Missing operand.
...@@ -41,5 +41,5 @@ namespace castor { namespace exception { ...@@ -41,5 +41,5 @@ namespace castor { namespace exception {
}; // class MissingOperand }; // class MissingOperand
} } // namespace castor exception } } // namespace cta exception
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
#include "castor/mediachanger/CmdLine.hpp" #include "castor/mediachanger/CmdLine.hpp"
#include "common/exception/InvalidArgument.hpp" #include "common/exception/InvalidArgument.hpp"
#include "castor/exception/MissingOperand.hpp" #include "common/exception/MissingOperand.hpp"
#include <getopt.h> #include <getopt.h>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// handleMissingParameter // handleMissingParameter
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void castor::mediachanger::CmdLine::handleMissingParameter(const int opt) { void castor::mediachanger::CmdLine::handleMissingParameter(const int opt) {
castor::exception::MissingOperand ex; cta::exception::MissingOperand ex;
ex.getMessage() << "The -" << (char)opt << " option requires a parameter"; ex.getMessage() << "The -" << (char)opt << " option requires a parameter";
throw ex; throw ex;
} }
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#pragma once #pragma once
#include "common/exception/InvalidArgument.hpp" #include "common/exception/InvalidArgument.hpp"
#include "castor/exception/MissingOperand.hpp" #include "common/exception/MissingOperand.hpp"
#include "castor/mediachanger/CmdLineTool.hpp" #include "castor/mediachanger/CmdLineTool.hpp"
#include "castor/mediachanger/DismountCmdLine.hpp" #include "castor/mediachanger/DismountCmdLine.hpp"
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
* @author Castor Dev team, castor-dev@cern.ch * @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/ *****************************************************************************/
#include "castor/exception/MissingOperand.hpp" #include "common/exception/MissingOperand.hpp"
#include "castor/mediachanger/DismountCmdLine.hpp" #include "castor/mediachanger/DismountCmdLine.hpp"
#include "castor/mediachanger/LibrarySlotParser.hpp" #include "castor/mediachanger/LibrarySlotParser.hpp"
#include "common/exception/Exception.hpp" #include "common/exception/Exception.hpp"
...@@ -74,7 +74,7 @@ castor::mediachanger::DismountCmdLine::DismountCmdLine(const int argc, ...@@ -74,7 +74,7 @@ castor::mediachanger::DismountCmdLine::DismountCmdLine(const int argc,
// Check that both VID and DRIVE_SLOT has been specified // Check that both VID and DRIVE_SLOT has been specified
if(nbArgs < 2) { if(nbArgs < 2) {
castor::exception::MissingOperand ex; cta::exception::MissingOperand ex;
ex.getMessage() << "Both VID and DRIVE_SLOT must be specified"; ex.getMessage() << "Both VID and DRIVE_SLOT must be specified";
throw ex; throw ex;
} }
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#pragma once #pragma once
#include "common/exception/InvalidArgument.hpp" #include "common/exception/InvalidArgument.hpp"
#include "castor/exception/MissingOperand.hpp" #include "common/exception/MissingOperand.hpp"
#include "castor/mediachanger/CmdLineTool.hpp" #include "castor/mediachanger/CmdLineTool.hpp"
#include "castor/mediachanger/MountCmdLine.hpp" #include "castor/mediachanger/MountCmdLine.hpp"
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
* @author Castor Dev team, castor-dev@cern.ch * @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/ *****************************************************************************/
#include "castor/exception/MissingOperand.hpp" #include "common/exception/MissingOperand.hpp"
#include "castor/mediachanger/MountCmdLine.hpp" #include "castor/mediachanger/MountCmdLine.hpp"
#include "common/exception/Exception.hpp" #include "common/exception/Exception.hpp"
...@@ -73,7 +73,7 @@ castor::mediachanger::MountCmdLine::MountCmdLine(const int argc, ...@@ -73,7 +73,7 @@ castor::mediachanger::MountCmdLine::MountCmdLine(const int argc,
// Check that both VID and DRIVE_SLOT has been specified // Check that both VID and DRIVE_SLOT has been specified
if(nbArgs < 2) { if(nbArgs < 2) {
castor::exception::MissingOperand ex; cta::exception::MissingOperand ex;
ex.getMessage() << "Both VID and DRIVE_SLOT must be specified"; ex.getMessage() << "Both VID and DRIVE_SLOT must be specified";
throw ex; throw ex;
} }
......
...@@ -33,7 +33,6 @@ set (UTILS_LIB_SRC_FILES ...@@ -33,7 +33,6 @@ set (UTILS_LIB_SRC_FILES
../exception/NoEntry.cpp ../exception/NoEntry.cpp
../exception/Errnum.cpp ../exception/Errnum.cpp
../exception/NotAnOwner.cpp ../exception/NotAnOwner.cpp
../exception/MissingOperand.cpp
../exception/NoPortInRange.cpp ../exception/NoPortInRange.cpp
../exception/TimeOut.cpp ../exception/TimeOut.cpp
../exception/OutOfMemory.cpp ../exception/OutOfMemory.cpp
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment