From 1ddad5b6855398936c163f8c3cf2e116fec2bca6 Mon Sep 17 00:00:00 2001
From: jcambon <jcambon@localhost>
Date: Wed, 05 Mar 2008 14:52:49 +0000
Subject: [PATCH] Fix for Issue #3004 (Auto-generated config ref includes hidden components)
---
opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java b/opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java
index b6ee03e..9b068e2 100644
--- a/opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java
+++ b/opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java
@@ -57,6 +57,7 @@
import org.opends.server.admin.PropertyDefinitionVisitor;
import org.opends.server.admin.PropertyOption;
import org.opends.server.admin.RelationDefinition;
+import org.opends.server.admin.RelationOption;
import org.opends.server.admin.RelativeInheritedDefaultBehaviorProvider;
import org.opends.server.admin.SizePropertyDefinition;
import org.opends.server.admin.StringPropertyDefinition;
@@ -152,12 +153,12 @@
private void generate() {
init();
- // Generate the inheritance tree of all the managed objects
- genManagedObjectInheritanceTree(catTopMoList);
-
// Generate the relation tree of all the managed objects
genManagedObjectRelationTree(catTopRelList);
+ // Generate the inheritance tree of all the managed objects
+ genManagedObjectInheritanceTree(catTopMoList);
+
// Generate all the managed objects and their children
genAllManagedObject(topMoList);
@@ -264,6 +265,10 @@
TreeMap<String, AbstractManagedObjectDefinition> catList =
list.get(catName);
for (AbstractManagedObjectDefinition mo : catList.values()) {
+ if ((relList.get(mo.getName()) != null) &&
+ (relList.get(mo.getName()).hasOption(RelationOption.HIDDEN))) {
+ continue;
+ }
paragraph(
getLink(mo.getUserFriendlyName().toString(),
mo.getName() + ".html", MAIN_FRAME));
@@ -339,6 +344,9 @@
AbstractManagedObjectDefinition childMo = rel.getChildDefinition();
AbstractManagedObjectDefinition parentMo = rel.getParentDefinition();
relList.put(childMo.getName(), rel);
+ if (rel.hasOption(RelationOption.HIDDEN)) {
+ continue;
+ }
String linkStr = getLink(childMo.getUserFriendlyName().toString(),
childMo.getName() + ".html", MAIN_FRAME);
String fromStr = "";
@@ -382,6 +390,10 @@
TreeMap<String, AbstractManagedObjectDefinition> list) {
for (AbstractManagedObjectDefinition mo : list.values()) {
+ if ((relList.get(mo.getName()) != null) &&
+ (relList.get(mo.getName()).hasOption(RelationOption.HIDDEN))) {
+ continue;
+ }
moList.put(mo.getName(), mo);
genManagedObject(mo);
if (mo.hasChildren()) {
--
Gitblit v1.10.0