Changeset 4c60ef for molecuilder/src/World.hpp

Timestamp:

Mar 10, 2010, 5:51:48 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

4fc41a

Parents:

025ca2

Message:

Added generic singleton Pattern that can be inherited to any class making that class a singleton.

File:

• molecuilder/src/World.hpp (modified) (5 diffs)

molecuilder/src/World.hpp

@@ -19 +19 @@
 #include "Patterns/Observer.hpp"
 #include "Patterns/Cacheable.hpp"
+#include "Patterns/Singleton.hpp"
+
 
 // forward declarations
@@ -33 +35 @@
 class AtomsCalculation;
 
-class World : public Observable
+
+
+class World : public Singleton<World>, public Observable
 {
+
+// Make access to constructor and destructor possible from inside the singleton
+friend class Singleton<World>;
+
 // necessary for coupling with descriptors
 friend class AtomDescriptor_impl;
@@ -45 +53 @@
 template<typename> friend class AtomsCalculation;
 public:
+
+  // Types for Atom and Molecule structures
   typedef std::map<atomId_t,atom*> AtomSet;
   typedef std::map<moleculeId_t,molecule*> MoleculeSet;
@@ -272 +282 @@
   MoleculeSet molecules;
   moleculeId_t currMoleculeId;
-
-
-  /***** singleton Stuff *****/
-public:
-
-  /**
-   * get the currently active instance of the World.
-   */
-  static World* get();
-
-  /**
-   * destroy the currently active instance of the World.
-   */
-  static void destroy();
-
-  /**
-   * destroy the currently active instance of the World and immidiately
-   * create a new one. Use this to reset while somebody is still Observing
-   * the world and should reset the observed instance. All observers will be
-   * sent the subjectKille() message from the old world.
-   */
-  static World* reset();
-
 private:
   /**
@@ -307 +294 @@
    */
   virtual ~World();
-
-  static World *theWorld;
-  // this mutex only saves the singleton pattern...
-  // use other mutexes to protect internal data as well
-  // this mutex handles access to the pointer, not to the object!!!
-  static boost::mutex worldLock;
 
   /*****