From a463946319020c97a8f3b7ea2aa05f0192b37a14 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 17 Feb 2015 08:38:16 +0000
Subject: [PATCH] OPENDJ-1242 (CR-5982) Enable dsconfig to generate doc for properties changed through subcommand options
---
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
index 9b60586..f9f10c7 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
@@ -260,7 +260,7 @@
AbstractManagedObjectDefinition<?, ?> defn) {
final ArrayList<AbstractManagedObjectDefinition<?, ?>> results =
new ArrayList<AbstractManagedObjectDefinition<?, ?>>();
- addLeafChildren(results, defn);
+ addIfLeaf(results, defn);
Collections.sort(results, new Comparator<AbstractManagedObjectDefinition<?, ?>>() {
@Override
public int compare(AbstractManagedObjectDefinition<?, ?> o1, AbstractManagedObjectDefinition<?, ?> o2) {
@@ -270,13 +270,13 @@
return results;
}
- private void addLeafChildren(final Collection<AbstractManagedObjectDefinition<?, ?>> results,
+ private void addIfLeaf(final Collection<AbstractManagedObjectDefinition<?, ?>> results,
final AbstractManagedObjectDefinition<?, ?> defn) {
- for (AbstractManagedObjectDefinition<?, ?> child : defn.getChildren()) {
- if (child.getChildren().isEmpty()) {
- results.add(child);
- } else {
- addLeafChildren(results, child);
+ if (defn.getChildren().isEmpty()) {
+ results.add(defn);
+ } else {
+ for (AbstractManagedObjectDefinition<?, ?> child : defn.getChildren()) {
+ addIfLeaf(results, child);
}
}
}
--
Gitblit v1.10.0