Changeset 4fc41a for molecuilder/src/UIElements

Timestamp:

Mar 11, 2010, 10:37:32 AM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

ff1812

Parents:

4c60ef

Message:

Made the UIFactory an instance of the Singleton Pattern

Location:

molecuilder/src/UIElements

Files:

• UIFactory.cpp (modified) (3 diffs)
• UIFactory.hpp (modified) (4 diffs)

molecuilder/src/UIElements/UIFactory.cpp

@@ -8 +8 @@
 
 #include <cassert>
+#include "Patterns/Singleton_impl.hpp"
 #include "UIElements/UIFactory.hpp"
 
 // all factories that can be used:
 #include "UIElements/TextUIFactory.hpp"
-
-UIFactory *UIFactory::theFactory = 0;
 
 UIFactory::UIFactory()
@@ -27 +26 @@
 
 void UIFactory::makeUserInterface(InterfaceTypes type) {
-  assert(theFactory == 0 && "makeUserInterface should only be called once");
   switch(type) {
     case Text :
-      theFactory = new TextUIFactory();
+      setInstance(new TextUIFactory());
       break;
 
@@ -39 +37 @@
 }
 
-UIFactory* UIFactory::get(){
-  assert(theFactory != 0 && "No UserInterface created prior to factory access");
-  return theFactory;
-}
-
-
-void UIFactory::purgeInstance(){
-  if(theFactory) {
-    delete theFactory;
-    theFactory = 0;
-  }
-}
+CONSTRUCT_SINGLETON(UIFactory)

molecuilder/src/UIElements/UIFactory.hpp

@@ -17 +17 @@
 
 struct menuPopulaters;
+
+#include "Patterns/Singleton.hpp"
+
 /**
  * Abstract Factory to create any kind of User interface object needed by the programm.
@@ -24 +27 @@
  * UIs can be handled in a concise abstract way.
  */
-class UIFactory
+class UIFactory : public Singleton<UIFactory,false>
 {
 
@@ -45 +48 @@
   UIFactory();
 
-// singleton stuff
-private:
-  static UIFactory *theFactory;
-
 public:
   /**
@@ -55 +54 @@
   static void makeUserInterface(InterfaceTypes type);
 
-  /**
-   * get the previously created factory
-   */
-  static UIFactory* get();
-
-  /**
-   * Destroy the created factory.
-   *
-   * Make sure that all UIElements that were created by the factory are destroyed before calling this method.
-   */
-  static void purgeInstance();
 };