OPENDJ-1343 Migrate dsconfig - Removed some printVerbose() and replaced the...

Violette Roche-Montane

24.38.2014 288f117ffff3921da19f509c13fca924797515bb

OPENDJ-1343 Migrate dsconfig
- Removed some printVerbose() and replaced them by println to fix a minor bug in which the final action - e.g: modifying an element and apply; did not display a success (or failure) message in interactive mode.

 opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java

@@ -739,8 +739,8 @@
        if (result.isQuit()) {
          if (!app.isMenuDrivenMode()) {
            // User chose to cancel any changes.
            LocalizableMessage msg = INFO_DSCFG_CONFIRM_CREATE_FAIL.get(ufn);
            app.printVerboseMessage(msg);
            app.println();
            app.println(INFO_DSCFG_CONFIRM_CREATE_FAIL.get(ufn));
          }
          return MenuResult.quit();
        } else if (result.isCancel()) {
@@ -756,9 +756,8 @@
        if (app.isInteractive() || app.isVerbose())
        {
          app.println();
          app.println(INFO_DSCFG_CONFIRM_CREATE_SUCCESS.get(ufn));
        }
        LocalizableMessage msg = INFO_DSCFG_CONFIRM_CREATE_SUCCESS.get(ufn);
        app.printVerboseMessage(msg);

        if (handler != null) {
          for (PropertyEditorModification<?> mod : editor.getModifications()) {
@@ -810,16 +809,16 @@
              .getMessageObject(), e);
        }
      } catch (ErrorResultException e) {
        LocalizableMessage msg = ERR_DSCFG_ERROR_CREATE_CE.get(ufn, e.getMessage());
        final LocalizableMessage msg = ERR_DSCFG_ERROR_CREATE_CE.get(ufn, e.getMessage());
        if (app.isInteractive()) {
          app.println();
          app.printVerboseMessage(msg);
          return MenuResult.cancel();
        } else {
          throw new ClientException(ReturnCode.OTHER, msg);
          throw new ClientException(ReturnCode.CLIENT_SIDE_SERVER_DOWN, msg);
        }
      } catch (ManagedObjectAlreadyExistsException e) {
        LocalizableMessage msg = ERR_DSCFG_ERROR_CREATE_MOAEE.get(ufn);
        final LocalizableMessage msg = ERR_DSCFG_ERROR_CREATE_MOAEE.get(ufn);
        if (app.isInteractive()) {
          app.println();
          app.printVerboseMessage(msg);
@@ -1194,8 +1193,8 @@
    if (result.isQuit()) {
      if (!app.isMenuDrivenMode()) {
        // User chose to cancel creation.
        LocalizableMessage msg = INFO_DSCFG_CONFIRM_CREATE_FAIL.get(ufn);
        app.printVerboseMessage(msg);
        app.println();
        app.println(INFO_DSCFG_CONFIRM_CREATE_FAIL.get(ufn));
      }
      return MenuResult.quit();
    } else if (result.isCancel()) {
@@ -1257,7 +1256,8 @@
        } else {
          // Must be quit.
          if (!app.isMenuDrivenMode()) {
            app.printVerboseMessage(INFO_DSCFG_CONFIRM_CREATE_FAIL.get(ufn));
            app.println();
            app.println(INFO_DSCFG_CONFIRM_CREATE_FAIL.get(ufn));
          }
          return MenuResult.quit();
        }

 opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DeleteSubCommandHandler.java

@@ -268,8 +268,8 @@
    if (result.isQuit()) {
      if (!app.isMenuDrivenMode()) {
        // User chose to cancel deletion.
        LocalizableMessage msg = INFO_DSCFG_CONFIRM_DELETE_FAIL.get(ufn);
        app.printVerboseMessage(msg);
        app.println();
        app.println(INFO_DSCFG_CONFIRM_DELETE_FAIL.get(ufn));
      }
      return MenuResult.quit();
    } else if (result.isCancel()) {
@@ -290,8 +290,8 @@
          if (sresult.isQuit()) {
            if (!app.isMenuDrivenMode()) {
              // User chose to cancel deletion.
              LocalizableMessage msg = INFO_DSCFG_CONFIRM_DELETE_FAIL.get(ufn);
              app.printVerboseMessage(msg);
              app.println();
              app.println(INFO_DSCFG_CONFIRM_DELETE_FAIL.get(ufn));
            }
            return MenuResult.quit();
          } else if (sresult.isCancel()) {
@@ -397,8 +397,8 @@
    }

    // Output success message.
    LocalizableMessage msg = INFO_DSCFG_CONFIRM_DELETE_SUCCESS.get(ufn);
    app.printVerboseMessage(msg);
    app.println();
    app.println(INFO_DSCFG_CONFIRM_DELETE_SUCCESS.get(ufn));

    return MenuResult.success(0);
  }
@@ -415,7 +415,7 @@
        // Output failure message.
        LocalizableMessage msg = INFO_DSCFG_CONFIRM_DELETE_FAIL.get(relation
            .getUserFriendlyName());
        app.printVerboseMessage(msg);
        app.println(msg);
        return false;
      }
    }

 opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java

@@ -293,8 +293,8 @@
        if (result.isQuit()) {
          if (!app.isMenuDrivenMode()) {
            // User chose to cancel any changes.
            LocalizableMessage msg = INFO_DSCFG_CONFIRM_MODIFY_FAIL.get(ufn);
            app.printVerboseMessage(msg);
            app.println();
            app.println(INFO_DSCFG_CONFIRM_MODIFY_FAIL.get(ufn));
          }
          return MenuResult.quit();
        } else if (result.isCancel()) {
@@ -311,8 +311,7 @@
          if (app.isVerbose() || app.isInteractive())
          {
            app.println();
            LocalizableMessage msg = INFO_DSCFG_CONFIRM_MODIFY_SUCCESS.get(ufn);
            app.printVerboseMessage(msg);
            app.println(INFO_DSCFG_CONFIRM_MODIFY_SUCCESS.get(ufn));
          }

          for (PropertyEditorModification<?> mod : editor.getModifications())
@@ -325,7 +324,7 @@
            {
              // This is a bug
              throw new RuntimeException(
                  "Unexpected error generating the command builder: "+ae, ae);
                  "Unexpected error generating the command builder: " + ae, ae);
            }
          }

@@ -752,8 +751,8 @@
    if (result.isQuit()) {
      if (!app.isMenuDrivenMode()) {
        // User chose to quit.
        LocalizableMessage msg = INFO_DSCFG_CONFIRM_MODIFY_FAIL.get(ufn);
        app.printVerboseMessage(msg);
        app.println();
        app.println(INFO_DSCFG_CONFIRM_MODIFY_FAIL.get(ufn));
      }
      return MenuResult.quit();
    } else if (result.isCancel()) {