Partial fix of issue 1952: only display managed object descriptions in verb...

matthew_swift

17.30.2007 5aa897a97468bee8f5b693662ff098dbfd58fda6

Partial fix of issue 1952: only display managed object descriptions in verbose mode when they have some properties.

 opends/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java

@@ -772,10 +772,29 @@
    // Display help for each managed object.
    boolean isFirstManagedObject = true;
    for (AbstractManagedObjectDefinition<?, ?> mod : defns) {
      // Display help for each property.
      Set<PropertyDefinition<?>> pds =
        new TreeSet<PropertyDefinition<?>>(mod.getAllPropertyDefinitions());
      boolean isFirstProperty = true;
      for (PropertyDefinition<?> pd : pds) {
        if (pd.hasOption(PropertyOption.HIDDEN)) {
          continue;
        }

        if (!propertyNames.isEmpty() && !propertyNames.contains(pd.getName())) {
          continue;
        }

        if (isFirstProperty) {
          // User has requested properties relating to this managed
          // object definition, so display the summary of the managed
          // object.
      if (!isFirstManagedObject) {
        out.println();
        out.println(c1);
        out.println();
          } else {
            isFirstManagedObject = false;
      }

      // Display the title.
@@ -788,17 +807,6 @@
        out.println();
        out.println(wrapText(mod.getDescription(), MAX_LINE_WIDTH));
      }

      // Display help for each property.
      Set<PropertyDefinition<?>> pds =
        new TreeSet<PropertyDefinition<?>>(mod.getAllPropertyDefinitions());
      for (PropertyDefinition<?> pd : pds) {
        if (pd.hasOption(PropertyOption.HIDDEN)) {
          continue;
        }

        if (!propertyNames.isEmpty() && !propertyNames.contains(pd.getName())) {
          continue;
        }

        out.println();
@@ -806,9 +814,8 @@
        out.println();

        displayVerboseSingleProperty(mod, pd.getName(), out);
        isFirstProperty = false;
      }

      isFirstManagedObject = false;
    }
  }