From efa949b25f472d7e4c39733678d8f0e5229f8201 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Thu, 26 Dec 2013 15:31:32 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1235 : Migrate configuration framework
---
opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/SetRelationDefinition.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/SetRelationDefinition.java b/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/SetRelationDefinition.java
index bbe0762..aafa42e 100644
--- a/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/SetRelationDefinition.java
+++ b/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/SetRelationDefinition.java
@@ -47,7 +47,7 @@
* definition refers to.
*/
public final class SetRelationDefinition<C extends ConfigurationClient, S extends Configuration> extends
- RelationDefinition<C, S> {
+ RelationDefinition<C, S> {
/**
* An interface for incrementally constructing set relation definitions.
@@ -60,14 +60,15 @@
* relation definition refers to.
*/
public static final class Builder<C extends ConfigurationClient, S extends Configuration> extends
- AbstractBuilder<C, S, SetRelationDefinition<C, S>> {
+ AbstractBuilder<C, S, SetRelationDefinition<C, S>> {
// The plural name of the relation.
private final String pluralName;
// The optional default managed objects associated with this
// set relation definition.
- private final Map<String, DefaultManagedObject<? extends C, ? extends S>> defaultManagedObjects = new HashMap<String, DefaultManagedObject<? extends C, ? extends S>>();
+ private final Map<String, DefaultManagedObject<? extends C, ? extends S>> defaultManagedObjects =
+ new HashMap<String, DefaultManagedObject<? extends C, ? extends S>>();
/**
* Creates a new builder which can be used to incrementally build a set
@@ -83,7 +84,7 @@
* The child managed object definition.
*/
public Builder(AbstractManagedObjectDefinition<?, ?> pd, String name, String pluralName,
- AbstractManagedObjectDefinition<C, S> cd) {
+ AbstractManagedObjectDefinition<C, S> cd) {
super(pd, name, cd);
this.pluralName = pluralName;
}
@@ -96,7 +97,7 @@
*/
public void setDefaultManagedObject(DefaultManagedObject<? extends C, ? extends S> defaultManagedObject) {
this.defaultManagedObjects.put(defaultManagedObject.getManagedObjectDefinition().getName(),
- defaultManagedObject);
+ defaultManagedObject);
}
/**
@@ -118,7 +119,7 @@
// Private constructor.
private SetRelationDefinition(Common<C, S> common, String pluralName,
- Map<String, DefaultManagedObject<? extends C, ? extends S>> defaultManagedObjects) {
+ Map<String, DefaultManagedObject<? extends C, ? extends S>> defaultManagedObjects) {
super(common);
this.pluralName = pluralName;
this.defaultManagedObjects = defaultManagedObjects;
@@ -144,8 +145,7 @@
* If there is no default managed object associated with the
* provided name.
*/
- public DefaultManagedObject<? extends C, ? extends S> getDefaultManagedObject(String name)
- throws IllegalArgumentException {
+ public DefaultManagedObject<? extends C, ? extends S> getDefaultManagedObject(String name) {
if (!defaultManagedObjects.containsKey(name)) {
throw new IllegalArgumentException("unrecognized default managed object \"" + name + "\"");
}
--
Gitblit v1.10.0