From 5169738478fdb3f6238b1e06f3f68bedea7cba2c Mon Sep 17 00:00:00 2001
From: jcambon <jcambon@localhost>
Date: Tue, 15 Jul 2008 15:17:18 +0000
Subject: [PATCH] Fix for issue #3460 : configuration reference guide : wrong pointers on hidden components
---
opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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 293e9b2..2a20fcd 100644
--- a/opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java
+++ b/opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java
@@ -582,6 +582,27 @@
}
}
+ // Check if something to print in reverse aggregation relations
+ // (even if the list not empty, it may contain only relations from
+ // hidden component)
+ boolean isReverseAggregPropsEmpty = true;
+ if (!reverseAggregProps.isEmpty()) {
+ for (AggregationPropertyDefinition agg : reverseAggregProps) {
+ AbstractManagedObjectDefinition fromMo =
+ agg.getManagedObjectDefinition();
+ @SuppressWarnings("unchecked")
+ Collection<RelationDefinition> rels =
+ fromMo.getAllReverseRelationDefinitions();
+ for (RelationDefinition rel : rels) {
+ if (rel.hasOption(RelationOption.HIDDEN)) {
+ continue;
+ }
+ isReverseAggregPropsEmpty = false;
+ }
+ }
+ }
+
+
//
// Relations FROM this component
//
@@ -629,7 +650,7 @@
// Relations TO this component
//
- if (!isReverseCompRelsEmpty || !reverseAggregProps.isEmpty()) {
+ if (!isReverseCompRelsEmpty || !isReverseAggregPropsEmpty) {
heading3("Relations To this Component");
}
@@ -647,7 +668,7 @@
}
}
}
- if (!reverseAggregProps.isEmpty()) {
+ if (!isReverseAggregPropsEmpty) {
paragraph(
"The following components have a direct AGGREGATION relation TO " +
mo.getUserFriendlyPluralName() + " :");
--
Gitblit v1.10.0