Changes in / [fc6053:5f5a7b]

Location:

src

Files:

• UIElements/CommandLineUI/CommandLineUIFactory.cpp (modified) (1 diff)
• UIElements/CommandLineUI/CommandLineUIFactory.hpp (modified) (1 diff)
• UIElements/TextUI/TextUIFactory.cpp (modified) (2 diffs)
• UIElements/TextUI/TextUIFactory.hpp (modified) (1 diff)
• UIElements/UIFactory.cpp (modified) (1 diff)
• UIElements/UIFactory.hpp (modified) (3 diffs)
• builder.cpp (modified) (2 diffs)

src/UIElements/CommandLineUI/CommandLineUIFactory.cpp

@@ -32 +32 @@
   return new CommandLineWindow();
 }
+
+CommandLineUIFactory::description::description() :
+    UIFactory::factoryDescription("CommandLine")
+{}
+
+CommandLineUIFactory::description::~description()
+{}
+
+UIFactory* CommandLineUIFactory::description::makeFactory(){
+  return new CommandLineUIFactory();
+}

src/UIElements/CommandLineUI/CommandLineUIFactory.hpp

@@ -21 +21 @@
   virtual MainWindow* makeMainWindow();
 
+  struct description : public UIFactory::factoryDescription {
+    description();
+    virtual ~description();
+
+    virtual UIFactory* makeFactory();
+  };
+
 protected:
   CommandLineUIFactory();

src/UIElements/TextUI/TextUIFactory.cpp

@@ -6 +6 @@
  */
 
-#include "Helpers/MemDebug.hpp"
-
-#include "TextUI/TextUIFactory.hpp"
-#include "TextUI/TextWindow.hpp"
-#include "TextUI/TextDialog.hpp"
+#include "UIElements/TextUI/TextUIFactory.hpp"
+#include "UIElements/TextUI/TextWindow.hpp"
+#include "UIElements/TextUI/TextDialog.hpp"
 
 
 TextUIFactory::TextUIFactory()
-{
-  // TODO Auto-generated constructor stub
-
-}
+{}
 
 TextUIFactory::~TextUIFactory()
-{
-  // TODO Auto-generated destructor stub
-}
+{}
 
 
@@ -33 +26 @@
 }
 
+TextUIFactory::description::description() :
+    UIFactory::factoryDescription("Text")
+{}
+
+TextUIFactory::description::~description()
+{}
+
+UIFactory* TextUIFactory::description::makeFactory(){
+  return new TextUIFactory();
+}
+

src/UIElements/TextUI/TextUIFactory.hpp

@@ -21 +21 @@
   virtual MainWindow* makeMainWindow();
 
+  struct description : public UIFactory::factoryDescription {
+    description();
+    virtual ~description();
+
+    virtual UIFactory* makeFactory();
+  };
+
 protected:
   TextUIFactory();

src/UIElements/UIFactory.cpp

@@ -8 +8 @@
 #include "Helpers/MemDebug.hpp"
 
-#include <cassert>
+#include <utility>
 #include "Patterns/Singleton_impl.hpp"
-#include "UIFactory.hpp"
+#include "UIElements/UIFactory.hpp"
+#include "Helpers/Assert.hpp"
 
-// all factories that can be used:
-#include "TextUI/TextUIFactory.hpp"
-#include "CommandLineUI/CommandLineUIFactory.hpp"
+using namespace std;
+
+std::map<std::string,boost::shared_ptr<UIFactory::factoryDescription> > UIFactory::factories;
 
 UIFactory::UIFactory()
-{
-  // TODO Auto-generated constructor stub
+{}
 
+UIFactory::~UIFactory()
+{}
+
+void UIFactory::makeUserInterface(std::string type) {
+  ASSERT(factories.count(type),"Selected factory was not registered before creation.");
+  // call the factory factory
+  setInstance(factories[type]->makeFactory());
 }
 
-UIFactory::~UIFactory()
-{
-  // TODO Auto-generated destructor stub
-}
-
-void UIFactory::makeUserInterface(InterfaceTypes type) {
-  switch(type) {
-    case Text :
-      setInstance(new TextUIFactory());
-      break;
-    case CommandLine:
-      setInstance(new CommandLineUIFactory());
-      break;
-
-    default:
-      assert(0 && "No such Factory in stock");
-      break;
-  }
+void UIFactory::registerFactory(factoryDescription *factoryDesc) {
+  ASSERT(!factories.count(factoryDesc->name),"Trying to re-register an already registered factory.");
+  factories.insert(make_pair(factoryDesc->name,
+                             boost::shared_ptr<factoryDescription>(factoryDesc)));
 }
 
 CONSTRUCT_SINGLETON(UIFactory)
+
+UIFactory::factoryDescription::factoryDescription(string _name) :
+  name(_name)
+{}
+
+UIFactory::factoryDescription::~factoryDescription()
+{}

src/UIElements/UIFactory.hpp

@@ -15 +15 @@
 #include "Patterns/Singleton.hpp"
 
+#include <string>
+#include <map>
+#include <boost/smart_ptr.hpp>
+
 /**
  * Abstract Factory to create any kind of User interface object needed by the programm.
@@ -24 +28 @@
 class UIFactory : public Singleton<UIFactory,false>
 {
-
+  friend class Singleton<UIFactory,false>;
 public:
-  enum InterfaceTypes {Text, CommandLine};
-  virtual ~UIFactory();
-
   /**
    * Produce some kind of main window, of whichever type was chosen when the factory was created
@@ -42 +43 @@
 protected:
   UIFactory();
+  virtual ~UIFactory();
 
 public:
+  struct factoryDescription {
+    factoryDescription(std::string _name);
+    virtual ~factoryDescription();
+
+    const std::string name;
+    // yes this method really is a factory factory, to allow insertion of
+    // arbitrary factories
+    virtual UIFactory* makeFactory()=0;
+  };
   /**
    * create a Factory of a certain type. From that moment on only those UIElements can be produced by the factory
    */
-  static void makeUserInterface(InterfaceTypes type);
-
+  static void makeUserInterface(std::string type);
+  static void registerFactory(factoryDescription *factoryDesc);
+protected:
+private:
+  static std::map<std::string,boost::shared_ptr<factoryDescription> > factories;
 };
 

src/builder.cpp

@@ -74 +74 @@
 #include "periodentafel.hpp"
 #include "UIElements/UIFactory.hpp"
+#include "UIElements/TextUI/TextUIFactory.hpp"
+#include "UIElements/CommandLineUI/CommandLineUIFactory.hpp"
 #include "UIElements/MainWindow.hpp"
 #include "UIElements/Dialog.hpp"
@@ -2259 +2261 @@
       if (!CommandLineParser::getInstance().isEmpty()) {
         DoLog(0) && (Log() << Verbose(0) << "Setting UI to CommandLine." << endl);
-        UIFactory::makeUserInterface(UIFactory::CommandLine);
+        UIFactory::registerFactory(new CommandLineUIFactory::description());
+        UIFactory::makeUserInterface("CommandLine");
       } else {
         DoLog(0) && (Log() << Verbose(0) << "Setting UI to Text." << endl);
-        UIFactory::makeUserInterface(UIFactory::Text);
+        UIFactory::registerFactory(new TextUIFactory::description());
+        UIFactory::makeUserInterface("Text");
       }
     }