mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

matthew_swift
26.56.2007 809d10707f58d0841af81f69850859ea5564f773
Minor beautifying of the dsconfig interactive mode.
3 files modified
9 ■■■■■ changed files
opends/src/server/org/opends/server/tools/dsconfig/ConsoleApplication.java 6 ●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java 2 ●●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java 1 ●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/tools/dsconfig/ConsoleApplication.java
@@ -155,6 +155,7 @@
        String ninput = input.toLowerCase().trim();
        if (ninput.length() == 0) {
          // Empty input.
          app.println();
          app.printMessage(errMsg);
        } else if (no.startsWith(ninput)) {
          return false;
@@ -162,6 +163,7 @@
          return true;
        } else {
          // Try again...
          app.println();
          app.printMessage(errMsg);
        }
@@ -208,7 +210,7 @@
   *          The verbose message.
   */
  public final void printVerboseMessage(String msg) {
    if (isVerbose()) {
    if (isVerbose() || isInteractive()) {
      err.println(wrapText(msg, MAX_LINE_WIDTH));
    }
  }
@@ -375,7 +377,6 @@
          printMessage(prompt);
          println();
          builder.print(printer);
          println();
          return null;
        } else {
@@ -389,7 +390,6 @@
            app.println();
            String errMsg = getMessage(MSGID_DSCFG_ERROR_GENERAL_CHOICE, size);
            app.printMessage(errMsg);
            app.println();
            return null;
          }
        }
opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
@@ -664,6 +664,7 @@
        } catch (IllegalManagedObjectNameException e) {
          ArgumentException ae = ArgumentExceptionFactory
              .adaptIllegalManagedObjectNameException(e, d);
          app.println();
          app.printMessage(ae.getMessage());
          return null;
        }
@@ -701,6 +702,7 @@
        // A child with the specified name must already exist.
        int msgID = MSGID_DSCFG_ERROR_CREATE_NAME_ALREADY_EXISTS;
        String msg = getMessage(msgID, relation.getUserFriendlyName(), input);
        app.println();
        app.printMessage(msg);
        return null;
      }
opends/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java
@@ -947,6 +947,7 @@
    }
    default: {
      // Display a menu.
      Arrays.sort(children, String.CASE_INSENSITIVE_ORDER);
      List<String> choices = Arrays.asList(children);
      int msgID = MSGID_DSCFG_FINDER_PROMPT_MANY;
      String msg = getMessage(msgID, d.getUserFriendlyName());