Changes in src/Actions/Action.cpp [6d6b54:031f62]

File:

• src/Actions/Action.cpp (modified) (3 diffs)

src/Actions/Action.cpp

@@ -13 +13 @@
 #include "Actions/ActionRegistry.hpp"
 #include "Actions/ActionHistory.hpp"
+#include "Exceptions/MissingValueException.hpp"
+#include "UIElements/Dialog.hpp"
 #include "Helpers/MemDebug.hpp"
+#include "UIElements/UIFactory.hpp"
+
+#include "log.hpp"
+#include "verbose.hpp"
 
 using namespace std;
@@ -29 +35 @@
 {
   if(_doRegister){
-    ActionRegistry::getInstance().registerAction(this);
+    ActionRegistry::getInstance().registerInstance(this);
   }
 }
@@ -40 +46 @@
 }
 
-void Action::call(){
+Dialog * Action::createDialog(){
+  Dialog *dialog = UIFactory::getInstance().makeDialog();
+  return fillDialog(dialog);
+}
+
+void Action::call(enum QueryOptions flag){
   if(!isActive()){
     return;
   }
   // forward to private virtual
-  state_ptr state = performCall();
+  if (flag == Interactive) {
+    Dialog* dialog = createDialog();
+    if (dialog->hasQueries()) {
+      dialog->display();
+    }
+    delete(dialog);
+  }
+  state_ptr state = Action::failure;
+//  try {
+    state = performCall();
+//  } catch(MissingValueException&) {
+//    DoeLog(0) && (eLog() << Verbose(0) << "There is a value missing for action " << getName() << endl);
+//  };
+
   if(shouldUndo() && state != failure){
     if(canUndo()){