From 79b330a7786edfea4a1baad9795b39ba58221301 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 21 Apr 2016 15:56:56 +0000
Subject: [PATCH] Revert some changes as checkstyle cannot cope with them :X
---
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
index ea1cb07..e9d1cb0 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
@@ -65,8 +65,6 @@
import org.forgerock.opendj.config.AttributeTypePropertyDefinition;
import org.forgerock.opendj.config.BooleanPropertyDefinition;
import org.forgerock.opendj.config.ClassPropertyDefinition;
-import org.forgerock.opendj.config.Configuration;
-import org.forgerock.opendj.config.ConfigurationClient;
import org.forgerock.opendj.config.ConfigurationFramework;
import org.forgerock.opendj.config.DNPropertyDefinition;
import org.forgerock.opendj.config.DefaultBehaviorProvider;
@@ -415,8 +413,7 @@
}
@Override
- public <C extends ConfigurationClient, S extends Configuration> String visitAggregation(
- AggregationPropertyDefinition<C, S> prop, Void p) {
+ public String visitAggregation(AggregationPropertyDefinition prop, Void p) {
b.append(op);
final RelationDefinition<?, ?> rel = prop.getRelationDefinition();
if (isHidden(rel)) {
@@ -493,12 +490,12 @@
}
@Override
- public <E extends Enum<E>> String visitEnum(EnumPropertyDefinition<E> prop, Void p) {
+ public String visitEnum(EnumPropertyDefinition prop, Void p) {
b.append("<variablelist>").append(EOL);
final Class<?> en = prop.getEnumClass();
final Object[] constants = en.getEnumConstants();
for (Object enumConstant : constants) {
- final LocalizableMessage valueSynopsis = prop.getValueSynopsis((E) enumConstant);
+ final LocalizableMessage valueSynopsis = prop.getValueSynopsis((Enum) enumConstant);
appendVarListEntry(b, enumConstant.toString(), op + valueSynopsis + cp);
}
b.append("</variablelist>").append(EOL);
@@ -563,7 +560,7 @@
}
@Override
- public <T> String visitUnknown(PropertyDefinition<T> prop, Void p) {
+ public String visitUnknown(PropertyDefinition prop, Void p) {
b.append(op).append(REF_DSCFG_UNKNOWN.get()).append(cp).append(EOL);
return null;
}
--
Gitblit v1.10.0