[ObjectHandler-cvs] ObjectHandler/oh objecthandler.cpp, 1.3, 1.4 objecthandler.hpp, 1.12, 1.13 utilities.cpp, 1.14, 1.15 utilities.hpp, 1.11, 1.12

[Eric E. <eri...@us...>]

Update of /cvsroot/objecthandler/ObjectHandler/oh
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18276/oh

Modified Files:
	objecthandler.cpp objecthandler.hpp utilities.cpp 
	utilities.hpp 
Log Message:
instanceName -> objectID

Index: utilities.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/oh/utilities.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** utilities.cpp	31 Aug 2006 11:00:46 -0000	1.14
--- utilities.cpp	4 Oct 2006 09:37:43 -0000	1.15
***************
*** 61,68 ****
              ObjectHandler::instance().retrieveObjectImpl(objectID);
          if (object) {
!             msg << "log dump of object with instance name = " << objectID << std::endl;
              msg << *object.get();
          } else {
!             msg << "no object in repository with instance name = " << objectID << std::endl;
          }
          Logger::instance().logMessage(msg.str());
--- 61,68 ----
              ObjectHandler::instance().retrieveObjectImpl(objectID);
          if (object) {
!             msg << "log dump of object with ID = " << objectID << std::endl;
              msg << *object.get();
          } else {
!             msg << "no object in repository with ID = " << objectID << std::endl;
          }
          Logger::instance().logMessage(msg.str());

Index: utilities.hpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/oh/utilities.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** utilities.hpp	1 Sep 2006 21:28:10 -0000	1.11
--- utilities.hpp	4 Oct 2006 09:37:43 -0000	1.12
***************
*** 67,73 ****
          const int &logLevel = 4);
  
!     //! Write Object with given instance name to log file.
      /*! Writes a warning message to log file
!         if no object is found with given instance name.
      */
      void logObject(const std::string &objectID);
--- 67,73 ----
          const int &logLevel = 4);
  
!     //! Write Object with given ID to log file.
      /*! Writes a warning message to log file
!         if no object is found with given ID.
      */
      void logObject(const std::string &objectID);

Index: objecthandler.hpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/oh/objecthandler.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** objecthandler.hpp	31 Aug 2006 11:00:46 -0000	1.12
--- objecthandler.hpp	4 Oct 2006 09:37:43 -0000	1.13
***************
*** 44,55 ****
          //! \name storing / retrieving / deleting Objects
          //@{
!         //! Store Object with given instance name.
!         /*! Any existing Object with that instance name is deleted.
          */
          virtual std::string storeObject(std::string objectID, 
                                          const boost::shared_ptr < Object > &object);
  
!         //! Retrieve Object with given instance name.
!         /*! Throws exception if no Object exists with that instance name.
          */
          virtual boost::shared_ptr<Object> retrieveObjectImpl(const std::string &objectID) const;
--- 44,55 ----
          //! \name storing / retrieving / deleting Objects
          //@{
!         //! Store Object with given ID.
!         /*! Any existing Object with that ID is deleted.
          */
          virtual std::string storeObject(std::string objectID, 
                                          const boost::shared_ptr < Object > &object);
  
!         //! Retrieve Object with given ID.
!         /*! Throws exception if no Object exists with that ID.
          */
          virtual boost::shared_ptr<Object> retrieveObjectImpl(const std::string &objectID) const;
***************
*** 71,76 ****
          }
  
!         //! Delete Object with given instance name.
!         /*! Does nothing if no Object exists with that instance name.
          */
          virtual void deleteObject(const std::string &objectID);
--- 71,76 ----
          }
  
!         //! Delete Object with given ID.
!         /*! Does nothing if no Object exists with that ID.
          */
          virtual void deleteObject(const std::string &objectID);

Index: objecthandler.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/oh/objecthandler.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** objecthandler.cpp	17 Jul 2006 10:11:39 -0000	1.3
--- objecthandler.cpp	4 Oct 2006 09:37:43 -0000	1.4
***************
*** 62,66 ****
              std::ostringstream msg;
              msg << "ObjectHandler error: attempt to retrieve object "
!                 << "with unknown instance name '" << objectID << "'";
              throw Exception(msg.str());
          } else
--- 62,66 ----
              std::ostringstream msg;
              msg << "ObjectHandler error: attempt to retrieve object "
!                 << "with unknown ID '" << objectID << "'";
              throw Exception(msg.str());
          } else
***************
*** 125,129 ****
              std::ostringstream msg;
              msg << "ObjectHandler error: cannot create object "
!                 "with instance name '" << objectID <<
                  "' because an object with that name already exists";
              throw Exception(msg.str());
--- 125,129 ----
              std::ostringstream msg;
              msg << "ObjectHandler error: cannot create object "
!                 "with ID '" << objectID <<
                  "' because an object with that name already exists";
              throw Exception(msg.str());