Changeset b53a7e

Timestamp:

Feb 18, 2010, 10:59:29 AM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

536380, a5471c

Parents:

120f8b

git-author:

Tillmann Crueger <crueger@…> (02/17/10 17:07:35)

git-committer:

Tillmann Crueger <crueger@…> (02/18/10 10:59:29)

Message:

Added a special class of Actions that take some time.

Location:

molecuilder/src

Files:

• Actions/Process.cpp (added)
• Actions/Process.hpp (added)
• Actions/small_actions.hpp (modified) (3 diffs)
• Makefile.am (modified) (1 diff)
• World.cpp (modified) (1 diff)
• builder.cpp (modified) (2 diffs)
• helpers.hpp (modified) (1 diff)

molecuilder/src/Actions/small_actions.hpp

@@ -1 +1 @@
 // All rather small Actions should go into this file for simplicities sake
 
+#ifndef _SMALL_ACTIONS_HPP
+#define _SMALL_ACTIONS_HPP
+
 #include "Actions/Action.hpp"
-
+#include "Actions/Process.hpp"
 
 class MoleculeListClass;
@@ -9 +12 @@
 public:
   ChangeMoleculeNameAction(MoleculeListClass*);
-  ~ChangeMoleculeNameAction();
+  virtual ~ChangeMoleculeNameAction();
 
   void call();
@@ -21 +24 @@
   static char NAME[];
 };
+
+#endif // _SMALL_ACTIONS_HPP

molecuilder/src/Makefile.am

@@ -8 +8 @@
 ANALYSISHEADER = analysis_bonds.hpp analysis_correlation.hpp
 
-ACTIONSSOURCE = Actions/Action.cpp Actions/MethodAction.cpp Actions/ActionSequence.cpp Actions/MakroAction.cpp Actions/ErrorAction.cpp Actions/small_actions.cpp Actions/ActionRegistry.cpp 
-ACTIONSHEADER = Actions/Action.hpp Actions/MethodAction.hpp Actions/ActionSequence.hpp Actions/MakroAction.hpp Actions/ErrorAction.hpp Actions/small_actions.hpp Actions/ActionRegistry.hpp
+ACTIONSSOURCE = Actions/Action.cpp Actions/Process.cpp Actions/MethodAction.cpp Actions/ActionSequence.cpp Actions/MakroAction.cpp Actions/ErrorAction.cpp Actions/small_actions.cpp Actions/ActionRegistry.cpp 
+ACTIONSHEADER = Actions/Action.hpp Actions/Process.hpp Actions/MethodAction.hpp Actions/ActionSequence.hpp Actions/MakroAction.hpp Actions/ErrorAction.hpp Actions/small_actions.hpp Actions/ActionRegistry.hpp
 
 PATTERNSOURCE = Patterns/Observer.cpp

molecuilder/src/World.cpp

@@ -59 +59 @@
     periode(new periodentafel),
     molecules_deprecated(new MoleculeListClass)
-{}
+{
+  molecules_deprecated->signOn(this);
+}
 
 World::~World()

molecuilder/src/builder.cpp

@@ -2166 +2166 @@
 
 void cleanUp(config *configuration){
+  UIFactory::purgeInstance();
   World::destroy();
   delete(configuration);
@@ -2175 +2176 @@
   logger::purgeInstance();
   errorLogger::purgeInstance();
-  UIFactory::purgeInstance();
   ActionRegistry::purgeRegistry();
 }

molecuilder/src/helpers.hpp

@@ -187 +187 @@
 };
 
-
+#define PLURAL_S(v) (((v)==1)?"":"s")
 
 #endif /*HELPERS_HPP_*/