Changes in src/UIElements/UIFactory.cpp [112b09:bcf653]

File:

• src/UIElements/UIFactory.cpp (modified) (2 diffs)

src/UIElements/UIFactory.cpp

@@ +1 @@
+/*
+ * Project: MoleCuilder
+ * Description: creates and alters molecular systems
+ * Copyright (C)  2010 University of Bonn. All rights reserved.
+ * Please see the LICENSE file or "Copyright notice" in builder.cpp for details.
+ */
+
 /*
  * UIFactory.cpp
@@ -6 +13 @@
  */
 
+// include config.h
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "Helpers/MemDebug.hpp"
 
-#include <cassert>
+#include <utility>
 #include "Patterns/Singleton_impl.hpp"
-#include "UIFactory.hpp"
+#include "UIElements/UIFactory.hpp"
+#include "Helpers/Assert.hpp"
+#include "Helpers/MemDebug.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()
+{}