Changes in src/Actions/CmdAction/VerboseAction.cpp [92c52f:bf3817]

File:

• src/Actions/CmdAction/VerboseAction.cpp (modified) (4 diffs)

src/Actions/CmdAction/VerboseAction.cpp

@@ -5 +5 @@
  *      Author: heber
  */
+
+// include config.h
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "Helpers/MemDebug.hpp"
@@ -26 +31 @@
 class CommandLineVerboseState : public ActionState {
 public:
-  CommandLineVerboseState(const int _oldverbosity, const int _newverbosity) :
-    oldverbosity(_oldverbosity),
-    newverbosity(_newverbosity)
+  CommandLineVerboseState(int _verbosity) :
+    verbosity(_verbosity)
   {}
-  int oldverbosity;
-  int newverbosity;
+  int verbosity;
 };
 
@@ -58 +61 @@
 
 Action::state_ptr CommandLineVerboseAction::performCall() {
-  int oldverbosity = getVerbosity();
-  int newverbosity = 2;
+  int verbosity = 2;
 
-  ValueStorage::getInstance().queryCurrentValue(NAME, newverbosity);
+  ValueStorage::getInstance().queryCurrentValue(NAME, verbosity);
 
-  if (oldverbosity != newverbosity) {
-    CommandLineVerboseState *UndoState = new CommandLineVerboseState(oldverbosity, newverbosity);
-    setVerbosity(newverbosity);
-    DoLog(0) && (Log() << Verbose(0) << "Setting verbosity from " << oldverbosity << " to " << newverbosity << "." << endl);
-    return Action::state_ptr(UndoState);
-  } else {
-    DoLog(0) && (Log() << Verbose(0) << "Verbosity remains unchanged at " << oldverbosity << "." << endl);
-    return Action::failure;
-  }
+  setVerbosity(verbosity);
+  DoLog(0) && (Log() << Verbose(0) << "Setting verbosity to " << verbosity << "." << endl);
+  return Action::success;
 }
 
@@ -77 +73 @@
   CommandLineVerboseState *state = assert_cast<CommandLineVerboseState*>(_state.get());
 
-  DoLog(0) && (Log() << Verbose(0) << "Setting verbosity from " << state->newverbosity << " to " << state->oldverbosity << "." << endl);
-  setVerbosity(state->oldverbosity);
+  int verbosity = 2;
+  ValueStorage::getInstance().queryCurrentValue(NAME, verbosity);
 
-  return Action::state_ptr(_state);
+  setVerbosity(state->verbosity);
+  return Action::state_ptr(new CommandLineVerboseState(verbosity));
 }
 
 Action::state_ptr CommandLineVerboseAction::performRedo(Action::state_ptr _state){
-  CommandLineVerboseState *state = assert_cast<CommandLineVerboseState*>(_state.get());
-
-  DoLog(0) && (Log() << Verbose(0) << "Setting verbosity from " << state->oldverbosity << " to " << state->newverbosity << "." << endl);
-  setVerbosity(state->newverbosity);
-
-  return Action::state_ptr(_state);
+  return performUndo(_state);
 }