From 2f5f126fe4ad415237755416dfc76f40a98fed94 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Tue, 31 Mar 2015 15:55:43 +0000
Subject: [PATCH] OPENDJ-1895 Fix broken linkends in dsconfig subcommands ref
---
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 925f9fe..e0480b1 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
@@ -153,12 +153,13 @@
final LocalizableMessage name = defn.getUserFriendlyName();
sb.append(op).append(REF_DSCFG_ARG_ADDITIONAL_INFO.get(name, name, nameOption)).append(cp).append(EOL);
} else {
- listSubtypes(sb, a, defn);
+ listSubtypes(sb, sc, a, defn);
}
return sb.toString();
}
- private void listSubtypes(StringBuilder sb, Argument a, AbstractManagedObjectDefinition<?, ?> defn) {
+ private void listSubtypes(StringBuilder sb, SubCommand sc, Argument a,
+ AbstractManagedObjectDefinition<?, ?> defn) {
final LocalizableMessage placeholder = a.getValuePlaceholder();
Map<String, Object> map = new HashMap<String, Object>();
@@ -176,8 +177,7 @@
child.put("default", REF_DSCFG_CHILD_DEFAULT.get(placeholder, childDefn.getUserFriendlyName()));
child.put("enabled", REF_DSCFG_CHILD_ENABLED_BY_DEFAULT.get(propertyExists(childDefn, "enabled")));
- final String link = getLink(getScriptName() + "-" + a.getLongIdentifier()
- + "-" + defn.getName() + "-prop-" + childDefn.getName());
+ final String link = getLink(getScriptName() + "-" + sc.getName() + "-" + defn.getName());
child.put("link", REF_DSCFG_CHILD_LINK.get(link, defn.getUserFriendlyName()));
children.add(child);
@@ -198,12 +198,12 @@
/** {@inheritDoc} */
@Override
public String getProperties(SubCommand sc) {
- StringBuilder sb = new StringBuilder();
final AbstractManagedObjectDefinition<?, ?> defn = getManagedObjectDefinition(sc);
if (defn == null) {
return "";
}
+ StringBuilder sb = new StringBuilder();
for (AbstractManagedObjectDefinition<?, ?> childDefn : getLeafChildren(defn)) {
final List<PropertyDefinition<?>> props =
new ArrayList<PropertyDefinition<?>>(childDefn.getAllPropertyDefinitions());
--
Gitblit v1.10.0