Index: trunk/src/lib/util/executor/executor.cc
===================================================================
--- trunk/src/lib/util/executor/executor.cc	(revision 7711)
+++ trunk/src/lib/util/executor/executor.cc	(revision 7714)
@@ -18,19 +18,9 @@
 #include "executor.h"
 
-#include "debug.h"
-#include "class_list.h"
-
-#include "key_names.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-using namespace std;
-
 ////////////////////////
 // SHELL COMMAND BASE //
 ////////////////////////
 /**
- * constructs and registers a new Command
+ * @brief constructs and registers a new Command
  * @param commandName the name of the Command
  * @param className the name of the class to apply this command to
@@ -43,5 +33,5 @@
                    const MultiType& param4)
 {
-  this->setClassID(CL_EXECUTOR, "Executor");
+//  this->setClassID(CL_EXECUTOR, "Executor");
 
   // What Parameters have we got
Index: trunk/src/lib/util/executor/executor.h
===================================================================
--- trunk/src/lib/util/executor/executor.h	(revision 7711)
+++ trunk/src/lib/util/executor/executor.h	(revision 7714)
@@ -36,43 +36,43 @@
  *  Functions with many types (@see functor_list.h)
  */
-class Executor: public BaseObject
+class Executor : public BaseObject
 {
-  public:
-    virtual ~Executor();
-
-    virtual Executor* clone () const = 0;
-
-    // SETTING up the EXECUTOR
-    Executor* defaultValues(const MultiType& value0 = MT_NULL, const MultiType& value1 = MT_NULL,
-                            const MultiType& value2 = MT_NULL, const MultiType& value3 = MT_NULL,
-                            const MultiType& value4 = MT_NULL);
-    /** @param i the i'th defaultValue, @returns reference to the MultiType */
-    inline MultiType& getDefaultValue(unsigned int i) { return defaultValue[i]; };
-
-    // EXECUTE
-    /** executes a Command @param object the object to apply this to @param parameters the parameters the command takes */
-    virtual void operator()(BaseObject* object, const SubString& sub = SubString()) const = 0;
-    /** executes a Command @param object the object to apply this to @param parameters the parameters the command takes @brief here for your convenience*/
-    void execute (BaseObject* object, const std::string& parameters = "") const { (*this)(object, parameters); };
-
-    // RETRIEVE INFORMATION
-    /** @returns the Type of this Function (either static or objective) */
-    inline long getType() const { return this->functorType; };
-    /** @returns the Count of Parameters this Executor takes */
-    inline unsigned int getParamCount() const { return this->paramCount; };
-
-    static void debug();
-
-  protected:
-    Executor(const MultiType& param0 = MT_NULL, const MultiType& param1 = MT_NULL,
-             const MultiType& param2 = MT_NULL, const MultiType& param3 = MT_NULL,
-             const MultiType& param4 = MT_NULL);
-
-    void cloning(Executor* executor) const;
-
-  protected:
-    short                       functorType;      //!< The type of Function we've got (either static or objective).
-    unsigned int                paramCount;       //!< the count of parameters.
-    MultiType                   defaultValue[5];  //!< Default Values.
+public:
+  virtual ~Executor();
+
+  virtual Executor* clone () const = 0;
+
+  // SETTING up the EXECUTOR
+  Executor* defaultValues(const MultiType& value0 = MT_NULL, const MultiType& value1 = MT_NULL,
+                          const MultiType& value2 = MT_NULL, const MultiType& value3 = MT_NULL,
+                          const MultiType& value4 = MT_NULL);
+  /** @param i the i'th defaultValue, @returns reference to the MultiType */
+  inline MultiType& getDefaultValue(unsigned int i) { return defaultValue[i]; };
+
+  // EXECUTE
+  /** executes a Command @param object the object to apply this to @param parameters the parameters the command takes */
+  virtual void operator()(BaseObject* object, const SubString& sub = SubString()) const = 0;
+  /** executes a Command @param object the object to apply this to @param parameters the parameters the command takes @brief here for your convenience*/
+  void execute (BaseObject* object, const std::string& parameters = "") const { (*this)(object, parameters); };
+
+  // RETRIEVE INFORMATION
+  /** @returns the Type of this Function (either static or objective) */
+  inline long getType() const { return this->functorType; };
+  /** @returns the Count of Parameters this Executor takes */
+  inline unsigned int getParamCount() const { return this->paramCount; };
+
+  static void debug();
+
+protected:
+  Executor(const MultiType& param0 = MT_NULL, const MultiType& param1 = MT_NULL,
+           const MultiType& param2 = MT_NULL, const MultiType& param3 = MT_NULL,
+           const MultiType& param4 = MT_NULL);
+
+  void cloning(Executor* executor) const;
+
+protected:
+  short                       functorType;      //!< The type of Function we've got (either static or objective).
+  unsigned int                paramCount;       //!< the count of parameters.
+  MultiType                   defaultValue[5];  //!< Default Values.
 };
 
@@ -89,4 +89,5 @@
 
 
+
 ///////////////////////
 // FUNCTION POINTERS //
@@ -232,35 +233,36 @@
 template<class T> class EXECUTOR : public Executor
 {
-  public:
-    EXECUTOR() : Executor() { };
-    // COPY constuctor (virtual version)
-    virtual Executor* clone () const
-    {
-      EXECUTOR<T>* executor = new EXECUTOR<T>();
-      this->cloning(executor);
-      executor->fp = this->fp;
-      return executor;
-    }
-
-//! FUNCTOR_LIST is the List of CommandConstructors
+public:
+  EXECUTOR() : Executor() { };
+  // COPY constuctor (virtual version)
+  virtual Executor* clone () const
+  {
+    EXECUTOR<T>* executor = new EXECUTOR<T>();
+    this->cloning(executor);
+    executor->fp = this->fp;
+    return executor;
+  }
+
+  //! FUNCTOR_LIST is the List of CommandConstructors
 #define FUNCTOR_LIST(x) ExecutorConstructor ## x
 #include "functor_list.h"
 #undef FUNCTOR_LIST
 
-  private:
-//! FUNCTOR_LIST is the List of FunctionPointers
-    union FunctionPointers {
+private:
+  //! FUNCTOR_LIST is the List of FunctionPointers
+  union FunctionPointers {
 #define FUNCTOR_LIST(x) ExecutorFunctionPoiter ## x
 #include "functor_list.h"
 #undef FUNCTOR_LIST
-    } fp;
-
-    virtual void operator()(BaseObject* object, const SubString& sub = SubString()) const
-    {
-//! FUNCTOR_LIST is the List of Executive Functions
+  } fp;
+
+  virtual void operator()(BaseObject* object, const SubString& sub = SubString()) const
+  {
+    //! FUNCTOR_LIST is the List of Executive Functions
 #define FUNCTOR_LIST(x) ExecutorExecute ## x
 #include "functor_list.h"
 #undef FUNCTOR_LIST
-    }
+
+  }
 };
 
@@ -292,36 +294,37 @@
 template<class T> class ExecutorStatic : public Executor
 {
-  public:
-    EXECUTOR() : Executor() { };
-    // COPY constuctor
-    virtual Executor* clone () const
-    {
-      EXECUTOR<T>* executor = new EXECUTOR<T>();
-      this->cloning(executor);
-      executor->fp = this->fp;
-      return executor;
-    }
-
-//! FUNCTOR_LIST is the List of CommandConstructors
+public:
+  EXECUTOR() : Executor() { };
+  // COPY constuctor
+  virtual Executor* clone () const
+  {
+    EXECUTOR<T>* executor = new EXECUTOR<T>();
+    this->cloning(executor);
+    executor->fp = this->fp;
+    return executor;
+  }
+
+  //! FUNCTOR_LIST is the List of CommandConstructors
 #define FUNCTOR_LIST(x) ExecutorConstructor ## x
 #include "functor_list.h"
 #undef FUNCTOR_LIST
 
-  private:
-//! FUNCTOR_LIST is the List of FunctionPointers
-    union FunctionPointers {
+private:
+  //! FUNCTOR_LIST is the List of FunctionPointers
+  union FunctionPointers {
 #define FUNCTOR_LIST(x) ExecutorFunctionPoiter ## x
 #include "functor_list.h"
 #undef FUNCTOR_LIST
-    } fp;
-
-
-    virtual void operator()(BaseObject* object, const SubString& sub = SubString()) const
-    {
-//! FUNCTOR_LIST is the List of Executive Functions
+  } fp;
+
+
+  virtual void operator()(BaseObject* object, const SubString& sub = SubString()) const
+  {
+    //! FUNCTOR_LIST is the List of Executive Functions
 #define FUNCTOR_LIST(x) ExecutorExecute ## x
 #include "functor_list.h"
 #undef FUNCTOR_LIST
-    }
+
+  }
 };
 
