Changes in src/UIElements/CommandLineUI/CommandLineParser.cpp [cfc53b:2a0a9e3]

File:

• src/UIElements/CommandLineUI/CommandLineParser.cpp (modified) (6 diffs)

src/UIElements/CommandLineUI/CommandLineParser.cpp

@@ -97 +97 @@
       const OptionTrait* const currentOption = OptionRegistry::getInstance().getOptionByName(optioniter->first);
       // add the option
-      std::cout << "Registering Option "
-          << currentOption->getName()
-          << " with type '" << currentOption->getTypeName() << "' "
-          << " with description '" << currentOption->getDescription() << "' ";
-      if (currentOption->hasShortForm())
-        std::cout << ", with short form " << currentOption->getShortForm();
-      else
-        std::cout << ", with no short form ";
-      if (currentOption->hasDefaultValue())
-        std::cout << ", with default value " << currentOption->getDefaultValue();
-      else
-        std::cout << ", with no default value ";
-      std::cout << std::endl;
+//      std::cout << "Registering Option "
+//          << currentOption->getName()
+//          << " with type '" << currentOption->getTypeName() << "' "
+//          << " with description '" << currentOption->getDescription() << "' ";
+//      if (currentOption->hasShortForm())
+//        std::cout << ", with short form " << currentOption->getShortForm();
+//      else
+//        std::cout << ", with no short form ";
+//      if (currentOption->hasDefaultValue())
+//        std::cout << ", with default value " << currentOption->getDefaultValue();
+//      else
+//        std::cout << ", with no default value ";
+//      std::cout << std::endl;
 
       AddOptionToParser(currentOption, (CmdParserLookup["options"]));
@@ -116 +116 @@
     if (!ActionAlreadyAdded_flag) {
       // add the action
-      std::cout << "Registering Action "
-          << currentAction->Traits.getName()
-          << " in menu " << currentAction->Traits.getMenuName()
-          << " with type '" << currentAction->Traits.getTypeName() << "' "
-          << " with description '" << currentAction->Traits.getDescription() << "' ";
-      if (currentAction->Traits.hasShortForm())
-        std::cout << ", with short form " << currentAction->Traits.getShortForm();
-      else
-        std::cout << ", with no short form ";
-      if (currentAction->Traits.hasDefaultValue())
-        std::cout << ", with default value " << currentAction->Traits.getDefaultValue();
-      else
-        std::cout << ", with no default value ";
-      std::cout  << std::endl;
+//      std::cout << "Registering Action "
+//          << currentAction->Traits.getName()
+//          << " in menu " << currentAction->Traits.getMenuName()
+//          << " with type '" << currentAction->Traits.getTypeName() << "' "
+//          << " with description '" << currentAction->Traits.getDescription() << "' ";
+//      if (currentAction->Traits.hasShortForm())
+//        std::cout << ", with short form " << currentAction->Traits.getShortForm();
+//      else
+//        std::cout << ", with no short form ";
+//      if (currentAction->Traits.hasDefaultValue())
+//        std::cout << ", with default value " << currentAction->Traits.getDefaultValue();
+//      else
+//        std::cout << ", with no default value ";
+//      std::cout  << std::endl;
 
       ASSERT(CmdParserLookup.find(currentAction->Traits.getMenuName()) != CmdParserLookup.end(),
@@ -156 +156 @@
   ASSERT(currentOption != NULL, "CommandLineParser::AddOptionToParser() - currentOption is NULL!");
   // add other options
-  std::cout << "Adding Action " << currentOption->getName() << " with type " << currentOption->getType()->name() << " and KeyandShortform " << currentOption->getKeyAndShortForm() << " to CommandLineParser." << std::endl;
+  //std::cout << "Adding Action " << currentOption->getName() << " with type " << currentOption->getType()->name() << " and KeyandShortform " << currentOption->getKeyAndShortForm() << " to CommandLineParser." << std::endl;
   switch(TypeToEnums.getEnumforType(currentOption->getType())) {
     default:
@@ -369 +369 @@
 {
   std::map <std::string, std::string> ShortFormToActionMap = getShortFormToActionMap();
+  DoLog(0) && (Log() << Verbose(0) << "Scanning command line arguments and recognizing Actions." << std::endl);
   // go through all arguments
   for (int i=1;i<argc;i++) {
-    (std::cout << Verbose(1) << "Checking on " << argv[i] << std::endl);
+    DoLog(2) && (Log() << Verbose(2) << "Checking on " << argv[i] << std::endl);
     // check whether they
     if (argv[i][0] == '-') { // .. begin with -
-      (cout << Verbose(1) << "Possible argument: " << argv[i] << endl);
+      DoLog(2) && (Log() << Verbose(2) << "Possible argument: " << argv[i] << endl);
       if (argv[i][1] == '-') { // .. or --
-        (cout << Verbose(1) << "Putting " << argv[i] << " into the sequence." << endl);
+        DoLog(1) && (Log() << Verbose(1) << "Putting " << argv[i] << " into the sequence." << endl);
         SequenceOfActions.push_back(&(argv[i][2]));
         //  .. and check that next letter is not numeric, if so insert
@@ -382 +383 @@
         std::map <std::string, std::string>::iterator iter = ShortFormToActionMap.find(&(argv[i][1]));
         if (iter != ShortFormToActionMap.end()) {
-          (cout << Verbose(1) << "Putting " << iter->second << " for " << iter->first << " into the sequence." << endl);
+          DoLog(1) && (Log() << Verbose(1) << "Putting " << iter->second << " for " << iter->first << " into the sequence." << endl);
           SequenceOfActions.push_back(iter->second);
         }
@@ -404 +405 @@
  * \return map from Action's ShortForm to token.
  */
-std::map <std::string, std::string> CommandLineParser::getShortFormToActionMap()
+std::map <std::string, std::string> CommandLineParser::getShortFormToActionMap() const
 {
   std::map <std::string, std::string> result;