OPENDJ-2096 Wrong entry title in dsconfig "Replication Server management menu"

Jean-Noel Rouvignac

11.42.2015 7d5a7df219d4acc2f97000d54174413f54bfd406

OPENDJ-2096 Wrong entry title in dsconfig "Replication Server management menu"

Fixed regression introduced in r11808.

 opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java

@@ -683,10 +683,10 @@

            if (lh != null) {
                final SubCommandHandlerMenuCallback callback = new SubCommandHandlerMenuCallback(lh);
                final Arg1<Object> msg = userFriendlyPluralName != null
                    ? INFO_DSCFG_OPTION_COMPONENT_MENU_LIST_PLURAL
                    : INFO_DSCFG_OPTION_COMPONENT_MENU_LIST_SINGULAR;
                builder.addNumberedOption(msg.get(userFriendlyPluralName), callback);
                final LocalizableMessage msg = getMsg(
                    INFO_DSCFG_OPTION_COMPONENT_MENU_LIST_SINGULAR, userFriendlyName,
                    INFO_DSCFG_OPTION_COMPONENT_MENU_LIST_PLURAL, userFriendlyPluralName);
                builder.addNumberedOption(msg, callback);
            }

            if (ch != null) {
@@ -696,10 +696,10 @@

            if (sh != null) {
                final SubCommandHandlerMenuCallback callback = new SubCommandHandlerMenuCallback(sh);
                final Arg1<Object> msg = userFriendlyPluralName != null
                    ? INFO_DSCFG_OPTION_COMPONENT_MENU_MODIFY_PLURAL
                    : INFO_DSCFG_OPTION_COMPONENT_MENU_MODIFY_SINGULAR;
                builder.addNumberedOption(msg.get(userFriendlyName), callback);
                final LocalizableMessage msg = getMsg(
                    INFO_DSCFG_OPTION_COMPONENT_MENU_MODIFY_SINGULAR, userFriendlyName,
                    INFO_DSCFG_OPTION_COMPONENT_MENU_MODIFY_PLURAL, userFriendlyPluralName);
                builder.addNumberedOption(msg, callback);
            }

            if (dh != null) {
@@ -713,6 +713,14 @@
            this.menu = builder.toMenu();
        }

        private LocalizableMessage getMsg(Arg1<Object> singularMsg, LocalizableMessage userFriendlyName,
            Arg1<Object> pluralMsg, LocalizableMessage userFriendlyPluralName)
        {
          return userFriendlyPluralName != null
              ? pluralMsg.get(userFriendlyPluralName)
              : singularMsg.get(userFriendlyName);
        }

        /** {@inheritDoc} */
        @Override
        public final MenuResult<Integer> invoke(ConsoleApplication app) throws ClientException {