From 02805157fa504b3dbf701a62280ca9aaf82183b5 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 05 Sep 2007 20:12:11 +0000
Subject: [PATCH] Partial fix for issue 1449: administration framework aggregation support

---
 opends/src/server/org/opends/server/admin/client/spi/Driver.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/opends/src/server/org/opends/server/admin/client/spi/Driver.java b/opends/src/server/org/opends/server/admin/client/spi/Driver.java
index c39601d..e7b0a19 100644
--- a/opends/src/server/org/opends/server/admin/client/spi/Driver.java
+++ b/opends/src/server/org/opends/server/admin/client/spi/Driver.java
@@ -430,6 +430,12 @@
    * Gets the effective value of a property in the named managed
    * object.
    *
+   * @param <C>
+   *          The type of client managed object configuration that the
+   *          path definition refers to.
+   * @param <S>
+   *          The type of server managed object configuration that the
+   *          path definition refers to.
    * @param <PD>
    *          The type of the property to be retrieved.
    * @param path
@@ -458,7 +464,8 @@
    *           If the client cannot contact the server due to an
    *           underlying communication problem.
    */
-  public final <PD> PD getPropertyValue(ManagedObjectPath<?, ?> path,
+  public final <C extends ConfigurationClient, S extends Configuration, PD>
+  PD getPropertyValue(ManagedObjectPath<C, S> path,
       PropertyDefinition<PD> pd) throws IllegalArgumentException,
       DefinitionDecodingException, AuthorizationException,
       ManagedObjectNotFoundException, CommunicationException,
@@ -486,6 +493,12 @@
    * managed object contains a property which inherits default values
    * from another property in the same managed object.
    *
+   * @param <C>
+   *          The type of client managed object configuration that the
+   *          path definition refers to.
+   * @param <S>
+   *          The type of server managed object configuration that the
+   *          path definition refers to.
    * @param <PD>
    *          The type of the property to be retrieved.
    * @param path
@@ -514,8 +527,9 @@
    *           If the client cannot contact the server due to an
    *           underlying communication problem.
    */
-  public abstract <PD> SortedSet<PD> getPropertyValues(
-      ManagedObjectPath<?, ?> path, PropertyDefinition<PD> pd)
+  public abstract <C extends ConfigurationClient, S extends Configuration, PD>
+  SortedSet<PD> getPropertyValues(
+      ManagedObjectPath<C, S> path, PropertyDefinition<PD> pd)
       throws IllegalArgumentException, DefinitionDecodingException,
       AuthorizationException, ManagedObjectNotFoundException,
       CommunicationException, PropertyException;

--
Gitblit v1.10.0