From 45359adc09ac1d9e48206c549e667ed6965c7cd3 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Mon, 28 May 2007 15:31:13 +0000
Subject: [PATCH] Fix the following issues:
---
opends/src/server/org/opends/server/admin/RelativeInheritedDefaultBehaviorProvider.java | 80 +++++++++++++++++++++++++++-------------
1 files changed, 54 insertions(+), 26 deletions(-)
diff --git a/opends/src/server/org/opends/server/admin/RelativeInheritedDefaultBehaviorProvider.java b/opends/src/server/org/opends/server/admin/RelativeInheritedDefaultBehaviorProvider.java
index 49c52e9..ee9468a 100644
--- a/opends/src/server/org/opends/server/admin/RelativeInheritedDefaultBehaviorProvider.java
+++ b/opends/src/server/org/opends/server/admin/RelativeInheritedDefaultBehaviorProvider.java
@@ -29,9 +29,10 @@
/**
- * A default behavior provider which retrieves default values from a parent
- * managed object. It should be used by properties which inherit their default
- * value(s) from properties held in an other managed object.
+ * A default behavior provider which retrieves default values from a
+ * parent managed object. It should be used by properties which
+ * inherit their default value(s) from properties held in an other
+ * managed object.
*
* @param <T>
* The type of values represented by this provider.
@@ -39,8 +40,11 @@
public final class RelativeInheritedDefaultBehaviorProvider<T> implements
DefaultBehaviorProvider<T> {
- // The relative offset (where 1 = parent, 2 = grandparent) of the managed
- // object containing the property.
+ // The type of managed object expected at the relative offset.
+ private final AbstractManagedObjectDefinition<?, ?> d;
+
+ // The relative offset (where 1 = parent, 2 = grandparent) of the
+ // managed object containing the property.
private final int offset;
// The name of the property containing the inherited default values.
@@ -49,23 +53,33 @@
/**
- * Create a relative inherited default behavior provider associated with a
- * parent managed object.
+ * Create a relative inherited default behavior provider associated
+ * with a parent managed object.
*
- * @param offset
- * The relative location of the parent managed object (where 0 is the
- * managed object itself, 1 is the parent, and 2 is the
- * grand-parent).
+ * @param d
+ * The type of parent managed object expected at the
+ * relative location.
* @param propertyName
- * The name of the property containing the inherited default values.
+ * The name of the property containing the inherited
+ * default values.
+ * @param offset
+ * The relative location of the parent managed object
+ * (where 0 is the managed object itself, 1 is the parent,
+ * and 2 is the grand-parent).
* @throws IllegalArgumentException
* If the offset is less than 0.
*/
- public RelativeInheritedDefaultBehaviorProvider(int offset,
- String propertyName) throws IllegalArgumentException {
+ @SuppressWarnings("unchecked")
+ public RelativeInheritedDefaultBehaviorProvider(
+ AbstractManagedObjectDefinition<?, ?> d, String propertyName, int offset)
+ throws IllegalArgumentException {
+ // We do not decode the property name now because the property
+ // might not have been constructed at this point (e.g. when the
+ // offset is 0).
if (offset < 0) {
throw new IllegalArgumentException("Negative offset");
}
+ this.d = d;
this.propertyName = propertyName;
this.offset = offset;
}
@@ -82,14 +96,27 @@
/**
- * Get the absolute path of the managed object containing the property which
- * has the default values.
+ * Get the definition of the parent managed object containing the
+ * inherited default values.
+ *
+ * @return Returns the definition of the parent managed object
+ * containing the inherited default values.
+ */
+ public AbstractManagedObjectDefinition<?, ?> getManagedObjectDefinition() {
+ return d;
+ }
+
+
+
+ /**
+ * Get the absolute path of the managed object containing the
+ * property which has the default values.
*
* @param path
- * The path of the current managed object from which the relative
- * path should be determined.
- * @return Returns the absolute path of the managed object containing the
- * property which has the default values.
+ * The path of the current managed object from which the
+ * relative path should be determined.
+ * @return Returns the absolute path of the managed object
+ * containing the property which has the default values.
*/
public ManagedObjectPath getManagedObjectPath(ManagedObjectPath path) {
return path.parent(offset);
@@ -98,10 +125,11 @@
/**
- * Get the name of the property containing the inherited default values.
+ * Get the name of the property containing the inherited default
+ * values.
*
- * @return Returns the name of the property containing the inherited default
- * values.
+ * @return Returns the name of the property containing the inherited
+ * default values.
*/
public String getPropertyName() {
return propertyName;
@@ -112,9 +140,9 @@
/**
* Get the relative location of the parent managed object.
*
- * @return Returns the relative location of the parent managed object (where 0
- * is the managed object itself, 1 is the parent, and 2 is the
- * grand-parent).
+ * @return Returns the relative location of the parent managed
+ * object (where 0 is the managed object itself, 1 is the
+ * parent, and 2 is the grand-parent).
*/
public int getRelativeOffset() {
return offset;
--
Gitblit v1.10.0