From 9defd2349274d077ad120d780a6fac5f6d594c7f Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 22 May 2015 15:58:46 +0000
Subject: [PATCH] OPENDJ-1631 CR-6864 Migrate server to SDK syntaxes
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
index fa93190..3c1d768 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
@@ -86,7 +86,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.opendj.ldap.schema.MatchingRule;
-import org.opends.server.api.AttributeSyntax;
+import org.forgerock.opendj.ldap.schema.Syntax;
import org.opends.server.types.AttributeType;
import org.forgerock.opendj.ldap.schema.AttributeUsage;
import org.opends.server.types.ObjectClass;
@@ -676,7 +676,7 @@
@Override
public void configurationChanged(ConfigurationChangeEvent ev)
{
- ArrayList<AttributeSyntax<?>> newSyntaxes = new ArrayList<>();
+ ArrayList<Syntax> newSyntaxes = new ArrayList<>();
final ServerDescriptor desc = ev.getNewDescriptor();
Schema s = desc.getSchema();
@@ -701,10 +701,10 @@
if (schemaChanged)
{
schema = s;
- HashMap<String, AttributeSyntax<?>> syntaxNameMap = new HashMap<>();
+ HashMap<String, Syntax> syntaxNameMap = new HashMap<>();
for (String key : schema.getSyntaxes().keySet())
{
- AttributeSyntax<?> syntax = schema.getSyntax(key);
+ Syntax syntax = schema.getSyntax(key);
String name = syntax.getName();
if (name == null)
{
@@ -1246,7 +1246,7 @@
getOID(),
getDescription(),
getSuperior(),
- (AttributeSyntax<?>)syntax.getSelectedItem(),
+ (Syntax)syntax.getSelectedItem(),
getApproximateMatchingRule(),
getEqualityMatchingRule(),
getOrderingMatchingRule(),
@@ -1259,7 +1259,7 @@
private void updateDefaultMatchingRuleNames()
{
- AttributeSyntax<?> syn = (AttributeSyntax<?>)syntax.getSelectedItem();
+ Syntax syn = (Syntax)syntax.getSelectedItem();
if (syn != null)
{
MatchingRule[] rules = {syn.getApproximateMatchingRule(),
--
Gitblit v1.10.0