From b562bb7b23759b1ba50c4618eb35010054965226 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 21 Apr 2016 14:06:47 +0000
Subject: [PATCH] Fix warnings during build
---
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 dfaa33c..ea1cb07 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,6 +65,8 @@
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;
@@ -230,7 +232,7 @@
return rd.getChildDefinition();
}
- private boolean isHidden(RelationDefinition defn) {
+ private boolean isHidden(RelationDefinition<?, ?> defn) {
return defn == null || defn.hasOption(RelationOption.HIDDEN);
}
@@ -413,7 +415,8 @@
}
@Override
- public String visitAggregation(AggregationPropertyDefinition prop, Void p) {
+ public <C extends ConfigurationClient, S extends Configuration> String visitAggregation(
+ AggregationPropertyDefinition<C, S> prop, Void p) {
b.append(op);
final RelationDefinition<?, ?> rel = prop.getRelationDefinition();
if (isHidden(rel)) {
@@ -490,12 +493,12 @@
}
@Override
- public String visitEnum(EnumPropertyDefinition prop, Void p) {
+ public <E extends Enum<E>> String visitEnum(EnumPropertyDefinition<E> 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((Enum) enumConstant);
+ final LocalizableMessage valueSynopsis = prop.getValueSynopsis((E) enumConstant);
appendVarListEntry(b, enumConstant.toString(), op + valueSynopsis + cp);
}
b.append("</variablelist>").append(EOL);
@@ -560,7 +563,7 @@
}
@Override
- public String visitUnknown(PropertyDefinition prop, Void p) {
+ public <T> String visitUnknown(PropertyDefinition<T> prop, Void p) {
b.append(op).append(REF_DSCFG_UNKNOWN.get()).append(cp).append(EOL);
return null;
}
--
Gitblit v1.10.0