From 02d3bf611bd9d4c33d8ae74d320790cfb0495d8e Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 03 May 2007 09:37:28 +0000
Subject: [PATCH] Three introspection related changes required in order to support the CLI:
---
opends/src/server/org/opends/server/admin/client/ExampleIntrospection.java | 24 +++---------------------
1 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/opends/src/server/org/opends/server/admin/client/ExampleIntrospection.java b/opends/src/server/org/opends/server/admin/client/ExampleIntrospection.java
index a5f2276..cf22f7c 100644
--- a/opends/src/server/org/opends/server/admin/client/ExampleIntrospection.java
+++ b/opends/src/server/org/opends/server/admin/client/ExampleIntrospection.java
@@ -32,17 +32,14 @@
import static org.opends.server.util.ServerConstants.PROPERTY_SERVER_ROOT;
import java.io.File;
-import java.util.Collections;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.Set;
import org.opends.server.admin.AbstractManagedObjectDefinition;
-import org.opends.server.admin.ClassLoaderProvider;
import org.opends.server.admin.AggregationRelationDefinition;
import org.opends.server.admin.AttributeTypePropertyDefinition;
+import org.opends.server.admin.ClassLoaderProvider;
import org.opends.server.admin.ClassPropertyDefinition;
import org.opends.server.admin.InstantiableRelationDefinition;
import org.opends.server.admin.ManagedObjectDefinition;
@@ -136,7 +133,7 @@
RootCfgDefn d = RootCfgDefn.getInstance();
String operands = "";
- for (RelationDefinition<?, ?> r : d.getRelationDefinitions()) {
+ for (RelationDefinition<?, ?> r : d.getAllRelationDefinitions()) {
r.accept(this, operands);
}
}
@@ -316,22 +313,7 @@
private void processManagedObjectDefinition(
AbstractManagedObjectDefinition<?, ?> parent,
AbstractManagedObjectDefinition<?, ?> child, String operands) {
- Set<RelationDefinition<?, ?>> parentRelations;
- Set<RelationDefinition<?, ?>> childRelations;
-
- if (parent != null) {
- parentRelations = new HashSet<RelationDefinition<?, ?>>(parent
- .getRelationDefinitions());
- } else {
- parentRelations = Collections.emptySet();
- }
-
- // Only process relations not defined in parent.
- childRelations = new HashSet<RelationDefinition<?, ?>>(child
- .getRelationDefinitions());
- childRelations.removeAll(parentRelations);
-
- for (RelationDefinition<?, ?> r : childRelations) {
+ for (RelationDefinition<?, ?> r : child.getRelationDefinitions()) {
r.accept(this, operands);
}
--
Gitblit v1.10.0