Changeset 8dd38e for src/Patterns/PrototypeFactory.hpp

Timestamp:

Jan 10, 2011, 8:06:49 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

192c04

Parents:

9f39db

git-author:

Frederik Heber <heber@…> (01/06/11 23:48:30)

git-committer:

Frederik Heber <heber@…> (01/10/11 20:06:49)

Message:

New patterns ManipulableClone and ManipulablePrototypeFactory, changed PrototypeFactory.

• ManipulableClone is a Clone that can spawn a manipulated copy varied by given parameters.
• prototypes in PrototypeFactory cannot be manipulated anymore.
• PrototypeFactory::getPrototypeManipulator() -> getPrototype() and returned reference is const (and a ref, no pointer. Preventing its accidental deletion).
• ManipulablePrototypeFactory then has non-const references returned by getProduct().
• ManipulablePrototypeFactory::manipulatePrototype() allows direct manipulation of the prototype by a given parameter set.
• Added unit tests for the new patterns.
• Changed unit tests for PrototypeFactory.
• Library version is now 4:0:0, API version is 1.0.7.

File:

• src/Patterns/PrototypeFactory.hpp (modified) (4 diffs)

src/Patterns/PrototypeFactory.hpp

@@ -374 +374 @@
   *
   * @param instance_name name of product
-  * @return reference to prototype stored in this factory
+  * @return const reference to prototype stored in this factory, i.e. read-only
   */
-  T* getPrototypeManipulator(const std::string instance_name)
+  const T& getPrototype(const std::string instance_name)
   {
     ASSERT(enums.count(instance_name) != 0,
         "PrototypeFactory<"+toString(typeid(T).name())+">::getPrototypeManipulator() - type name "+instance_name+" is not registered.");
     T* prototype = dynamic_cast<T *>(PrototypeTable[ enums[instance_name] ]);
-    return prototype;
+    return *prototype;
   }
 
@@ -391 +391 @@
   *
   * @param enumeration index of product
-  * @return reference to prototype stored in this factory
+  * @return const reference to prototype stored in this factory, i.e. read-only
   */
-  T* getPrototypeManipulator(TypeList instance_type)
+  const T& getPrototype(TypeList instance_type)
   {
     ASSERT(names.count(instance_type) != 0,
         "PrototypeFactory<"+toString(typeid(T).name())+">::getPrototypeManipulator() - enum type "+toString(instance_type)+" is not registered.");
     T* prototype = dynamic_cast<T *>(PrototypeTable[instance_type]);
-    return prototype;
+    return *prototype;
   }
 
@@ -408 +408 @@
   *
   * @param instance_type_info object of the desired type
-  * @return reference to prototype stored in this factory
+  * @return const reference to prototype stored in this factory, i.e. read-only
   */
-  T* getPrototypeManipulator(const std::type_info &instance_type_info)
+  const T& getPrototype(const std::type_info &instance_type_info)
   {
     ASSERT(types.count(instance_type_info.name()) != 0,
         "PrototypeFactory<"+toString(typeid(T).name())+">::getPrototypeManipulator() - type info name "+instance_type_info.name()+" is not registered.");
     T* prototype = dynamic_cast<T *>(PrototypeTable[ types[instance_type_info.name()] ]);
-    return prototype;
+    return *prototype;
   }
 
@@ -424 +424 @@
   * specific friends are allowed to access it.
   *
-  * @return reference to prototype stored in this factory
+  * @return const reference to prototype stored in this factory, i.e. read-only
   */
-  T* getPrototypeManipulator()
+  const T& getPrototype()
   {
     T* prototype = dynamic_cast<T *>(PrototypeTable[ currenttype ]);
-    return prototype;
-  }
-
-  /** Allows returning (a possibly different) prototype which is stored in
-   *  PrototypeTable.
-   *
-   * @warning a prototype has to be delivered by getPrototypeManipulator()
-   * before it can be returned again.
-   *
-   * @param _newprototype reference to new prototype
-   * @param instance_name name of particular type
-   */
-  void installPrototype(Clone<T> *_newprototype, const std::string instance_name)
-  {
-    ASSERT(enums.count(instance_name) != 0,
-        "PrototypeFactory<"+toString(typeid(T).name())+">::getPrototypeManipulator() - type name "+instance_name+" is not registered.");
-    ASSERT(typeid(PrototypeTable[ enums[instance_name] ]) == typeid(_newprototype),
-        "PrototypeFactory<"+toString(typeid(T).name())+">::installPrototype() - new prototype is not of the necessary type "+instance_name+".");
-    // TODO: use boost::shared_ptr to store prototypes instead!
-    delete PrototypeTable[ enums[instance_name] ];
-    PrototypeTable[ enums[instance_name] ] = _newprototype;
-  }
-
-  /** Allows returning (a possibly different) prototype which is stored in
-   *  PrototypeTable.
-   *
-   * @warning a prototype has to be delivered by getPrototypeManipulator()
-   * before it can be returned again.
-   *
-   * @param _newprototype reference to new prototype
-   * @param instance_type enumeration index of particular type
-   */
-  void installPrototype(Clone<T> *_newprototype, TypeList instance_type)
-  {
-    ASSERT(names.count(instance_type) != 0,
-        "PrototypeFactory<"+toString(typeid(T).name())+">::getPrototypeManipulator() - enum type "+toString(instance_type)+" is not registered.");
-    ASSERT( typeid(PrototypeTable[ instance_type ]) == typeid(_newprototype),
-        "PrototypeFactory<"+toString(typeid(T).name())+">::installPrototype() - new prototype is not of the necessary type "+names[instance_type]+".");
-    // TODO: use boost::shared_ptr to store prototypes instead!
-    delete PrototypeTable[ instance_type ];
-    PrototypeTable[ instance_type ] = _newprototype;
-  }
-
-  /** Allows returning (a possibly different) prototype which is stored in
-   *  PrototypeTable.
-   *
-   * @warning a prototype has to be delivered by getPrototypeManipulator()
-   * before it can be returned again.
-   *
-   * @param _newprototype reference to new prototype
-   * @param instance_type_info type_info of particular type
-   */
-  void installPrototype(Clone<T> *_newprototype, const std::type_info &instance_type_info)
-  {
-    ASSERT(types.count(instance_type_info.name()) != 0,
-        "PrototypeFactory<"+toString(typeid(T).name())+">::getPrototypeManipulator() - type info name "+instance_type_info.name()+" is not registered.");
-    ASSERT( typeid(PrototypeTable[ types[instance_type_info.name()] ]) == typeid(_newprototype),
-        "PrototypeFactory<"+toString(typeid(T).name())+">::installPrototype() - new prototype is not of the necessary type "+instance_type_info.name()+".");
-    // TODO: use boost::shared_ptr to store prototypes instead!
-    PrototypeTable[ types[instance_type_info.name()] ] = _newprototype;
-  }
-
-  /** Allows returning (a possibly different) prototype which is stored in
-   *  PrototypeTable.
-   *
-   * @warning a prototype has to be delivered by getPrototypeManipulator()
-   * before it can be returned again.
-   *
-   * @param _newprototype reference to new prototype
-   * @param instance_type_info type_info of particular type
-   */
-  void installPrototype(Clone<T> *_newprototype)
-  {
-    ASSERT( typeid(PrototypeTable[ currenttype ]) == typeid(_newprototype),
-        "PrototypeFactory<"+toString(typeid(T).name())+">::installPrototype() - new prototype is not of the necessary type "+names[currenttype]+".");
-    // TODO: use boost::shared_ptr to store prototypes instead!
-    PrototypeTable[ currenttype ] = _newprototype;
+    return *prototype;
   }