AutoRefactored: - work with null checked expressions first - revert conditi...

Jean-Noel Rouvignac

03.50.2014 8433427527214c83f56c533259efd7f56a1863b3

 opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java

@@ -751,10 +751,10 @@

        if (allowsTrailingArguments) {
            buffer.append(" ");
            if (trailingArgsDisplayName == null) {
                buffer.append(INFO_ARGPARSER_USAGE_TRAILINGARGS.get());
            } else {
            if (trailingArgsDisplayName != null) {
                buffer.append(trailingArgsDisplayName);
            } else {
                buffer.append(INFO_ARGPARSER_USAGE_TRAILINGARGS.get());
            }
        }
        buffer.append(EOL);
@@ -963,13 +963,6 @@
                        // version information.
                        usageOrVersionDisplayed = true;
                        versionPresent = true;
                        try {
                            // TODO
                            // DirectoryServer.printVersion(usageOutputStream);
                        } catch (final Exception e) {
                            // Ignored.
                        }

                        return;
                    } else {
                        // There is no such argument registered.
@@ -1046,16 +1039,9 @@
                            && !shortIDMap.containsKey(OPTION_SHORT_PRODUCT_VERSION)) {
                        // "-V" will always be interpreted as requesting
                        // version information except if it's already defined
                        // (e.g
                        // in ldap tools).
                        // (e.g in ldap tools).
                        usageOrVersionDisplayed = true;
                        versionPresent = true;
                        try {
                            // TODO
                            // DirectoryServer.printVersion(usageOutputStream);
                        } catch (final Exception e) {
                            // Ignored.
                        }
                        return;
                    } else {
                        // There is no such argument registered.