From 54c2799f45256fef4a981fa2a6a7c97a9708ac8b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 26 Jul 2007 12:01:44 +0000
Subject: [PATCH] Partial fix for issue 1831 - dsconfig interactive mode.
---
opends/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java b/opends/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java
index d6795e6..a1295cd 100644
--- a/opends/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java
+++ b/opends/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java
@@ -334,13 +334,13 @@
* If the specified property name was null or empty or if
* the requested property definition was not found.
*/
- public final PropertyDefinition getPropertyDefinition(String name)
+ public final PropertyDefinition<?> getPropertyDefinition(String name)
throws IllegalArgumentException {
if ((name == null) || (name.length() == 0)) {
throw new IllegalArgumentException("null or empty property name");
}
- PropertyDefinition d = allPropertyDefinitions.get(name);
+ PropertyDefinition<?> d = allPropertyDefinitions.get(name);
if (d == null) {
throw new IllegalArgumentException("property definition \"" + name
+ "\" not found");
@@ -380,13 +380,13 @@
* If the specified relation name was null or empty or if
* the requested relation definition was not found.
*/
- public final RelationDefinition getRelationDefinition(String name)
+ public final RelationDefinition<?, ?> getRelationDefinition(String name)
throws IllegalArgumentException {
if ((name == null) || (name.length() == 0)) {
throw new IllegalArgumentException("null or empty relation name");
}
- RelationDefinition d = allRelationDefinitions.get(name);
+ RelationDefinition<?, ?> d = allRelationDefinitions.get(name);
if (d == null) {
throw new IllegalArgumentException("relation definition \"" + name
+ "\" not found");
@@ -642,7 +642,8 @@
* @param d
* The relation definition to be deregistered.
*/
- protected final void deregisterRelationDefinition(RelationDefinition d) {
+ protected final void deregisterRelationDefinition(
+ RelationDefinition<?, ?> d) {
String name = d.getName();
relationDefinitions.remove(name);
@@ -660,7 +661,7 @@
* @param d
* The property definition to be registered.
*/
- protected final void registerPropertyDefinition(PropertyDefinition d) {
+ protected final void registerPropertyDefinition(PropertyDefinition<?> d) {
String name = d.getName();
propertyDefinitions.put(name, d);
@@ -678,7 +679,7 @@
* @param d
* The relation definition to be registered.
*/
- protected final void registerRelationDefinition(RelationDefinition d) {
+ protected final void registerRelationDefinition(RelationDefinition<?, ?> d) {
String name = d.getName();
relationDefinitions.put(name, d);
--
Gitblit v1.10.0