Changes in src/Actions/CmdAction/FastParsingAction.cpp [bcf653:c89fb4]

File:

• src/Actions/CmdAction/FastParsingAction.cpp (modified) (5 diffs)

src/Actions/CmdAction/FastParsingAction.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.
- */
-
 /*
  * FastParsingAction.cpp
@@ -12 +5 @@
  *      Author: heber
  */
-
-// include config.h
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 
 #include "Helpers/MemDebug.hpp"
@@ -40 +28 @@
 class CommandLineFastParsingState : public ActionState {
 public:
-  CommandLineFastParsingState(const bool _oldvalue, const bool _newvalue) :
-    oldvalue(_oldvalue),
-    newvalue(_newvalue)
+  CommandLineFastParsingState(bool _bool) :
+    boolean(_bool)
   {}
-  bool oldvalue;
-  bool newvalue;
+  bool boolean;
 };
 
@@ -72 +58 @@
 
 Action::state_ptr CommandLineFastParsingAction::performCall() {
+
   config *configuration = World::getInstance().getConfig();
-  bool oldvalue = configuration->FastParsing;
-  bool newvalue;
-  ValueStorage::getInstance().queryCurrentValue(NAME, newvalue);
-  configuration->FastParsing = newvalue;
+  ValueStorage::getInstance().queryCurrentValue(NAME, configuration->FastParsing);
   if (configuration->FastParsing)
     DoLog(0) && (Log() << Verbose(0) << "I won't parse trajectories." << endl);
   else
     DoLog(0) && (Log() << Verbose(0) << "I will parse trajectories." << endl);
-  return Action::state_ptr(new CommandLineFastParsingState(oldvalue, newvalue));
+  return Action::success;
 }
 
@@ -88 +72 @@
 
   config *configuration = World::getInstance().getConfig();
-  configuration->FastParsing = state->oldvalue;
-  if (configuration->FastParsing)
-    DoLog(0) && (Log() << Verbose(0) << "I won't parse trajectories." << endl);
-  else
-    DoLog(0) && (Log() << Verbose(0) << "I will parse trajectories." << endl);
+  configuration->FastParsing = state->boolean;
 
-  return Action::state_ptr(_state);
+  return Action::state_ptr(new CommandLineFastParsingState(!state->boolean));
 }
 
 Action::state_ptr CommandLineFastParsingAction::performRedo(Action::state_ptr _state){
-  CommandLineFastParsingState *state = assert_cast<CommandLineFastParsingState*>(_state.get());
-
-  config *configuration = World::getInstance().getConfig();
-  configuration->FastParsing = state->newvalue;
-  if (configuration->FastParsing)
-    DoLog(0) && (Log() << Verbose(0) << "I won't parse trajectories." << endl);
-  else
-    DoLog(0) && (Log() << Verbose(0) << "I will parse trajectories." << endl);
-
-  return Action::state_ptr(_state);
+  return performUndo(_state);
 }