Changeset dfed1c for src/base/factory.hpp

Timestamp:

Nov 22, 2011, 9:22:10 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

facba0

Parents:

66f24d

Message:

Major vmg update.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1136 5161e1c8-67bf-11de-9fd5-51895aff932f

File:

• src/base/factory.hpp (modified) (2 diffs)

src/base/factory.hpp

@@ -3 +3 @@
  * @author Julian Iseringhausen <isering@ins.uni-bonn.de>
  * @date   Tue Apr  5 20:40:41 2011
- * 
+ *
  * @brief  Factory class that holds commands and arbitrary objects.
- * 
- * 
+ *
+ *
  */
 
-#ifndef COMMAND_FACTORY_HPP_
-#define COMMAND_FACTORY_HPP_
+#ifndef FACTORY_HPP_
+#define FACTORY_HPP_
 
-#include <iostream>
 #include <map>
 #include <string>
 
 #include "base/object.hpp"
-#include "base/proxy.hpp"
 
 namespace VMG
 {
 
-class Object;
-
 class Factory
 {
 public:
-  typedef std::map<std::string, CommandProxyBase*>::iterator command_iterator;
-  typedef std::map<std::string, Command*>::iterator instance_iterator;
-  typedef std::map<std::string, Object*>::iterator object_iterator;
-
   Factory();
   virtual ~Factory();
 
-  void Destroy();
+  void Register(Object* object); ///< Registers an object
+  template <class T> T& RegisterObjectStorage(std::string id, const T& val);
+  template <class T> T* RegisterObjectStorageArray(std::string id, const vmg_int& size);
 
-  void RegisterCommand(CommandProxyBase* command); ///< Register a command
-  void RegisterObject(Object* object);             ///< Register an object
+  Object* Get(std::string id);   ///< Returns an object.
+  template <class T> T& GetObjectStorageVal(std::string id);
+  template <class T> T* GetObjectStorageArray(std::string id);
 
-  /**
-   * Register an arbitrary object that is not derived from Object.
-   * Similar functionality can be achieved by calling
-   * "new ObjectStorage<T>(id, data);"
-   */
-  template <class T> void RegisterObjectStorage(std::string id, const T& data);
-  template <class T> T& GetObjectStorageVal(std::string id);
+  void Delete(std::string id);   ///< Deletes an object
 
-  void DeleteCommand(std::string id);  ///< Delete a command
-  void DeleteObject(std::string id);   ///< Delete an object
-
-  Command* GetCommand(std::string id); ///< Returns a command.
-  Object* GetObject(std::string id);   ///< Returns an object.
-
-  /**
-   * Checks for the correct number of arguments. This check is
-   * automatically performed, whenever a command is executed from
-   * a command list (if the library has not been compiled with NDEBUG).
-   */
-  bool CheckNumberOfArguments(std::string id, const int& num_arguments);
-
-  void PrintAvailableCommands(); ///< Prints the name of all commands that have been registered to the factory.
   void PrintAvailableObjects();  ///< Prints the name of all objects that have been registered to the factory.
 
 private:
-  std::map<std::string, CommandProxyBase*> command_map;
-  std::map<std::string, Command*> command_instance_map;
   std::map<std::string, Object*> object_map;
 };
 
 template <class T>
-void Factory::RegisterObjectStorage(std::string id, const T& data)
+T& Factory::RegisterObjectStorage(std::string id, const T& val)
 {
-  new ObjectStorage<T>(id, data);
+  Object* object = new ObjectStorage<T>(id, val);
+  return object->Cast< ObjectStorage<T> >()->Val();
+}
+
+template <class T>
+T* Factory::RegisterObjectStorageArray(std::string id, const vmg_int& size)
+{
+  Object* object = new ObjectStorageArray<T>(id, size);
+  return object->Cast< ObjectStorage<T*> >()->Val();
 }
 
@@ -78 +59 @@
 T& Factory::GetObjectStorageVal(std::string id)
 {
-  return GetObject(id)->Cast< ObjectStorage<T> >()->Val();
+  return Get(id)->Cast< ObjectStorage<T> >()->Val();
+}
+
+template <class T>
+T* Factory::GetObjectStorageArray(std::string id)
+{
+  return Get(id)->Cast< ObjectStorage<T*> >()->Val();
 }
 
 }
 
-#endif /* COMMAND_FACTORY_HPP_ */
+#endif /* FACTORY_HPP_ */