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/NewAttributePanel.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
index 2a763f9..110da6a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
@@ -65,7 +65,7 @@
import org.opends.guitools.controlpanel.ui.renderer.SchemaElementComboBoxCellRenderer;
import org.opends.guitools.controlpanel.util.LowerCaseComparator;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.opends.server.api.AttributeSyntax;
+import org.forgerock.opendj.ldap.schema.Syntax;
import org.opends.server.config.ConfigConstants;
import org.opends.server.types.AttributeType;
import org.opends.server.types.ObjectClass;
@@ -173,7 +173,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();
@@ -203,10 +203,11 @@
{
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)
{
@@ -316,8 +317,7 @@
{
for (int i=0; i<syntax.getModel().getSize(); i++)
{
- AttributeSyntax<?> syn =
- (AttributeSyntax<?>)syntax.getModel().getElementAt(i);
+ Syntax syn = (Syntax)syntax.getModel().getElementAt(i);
if ("DirectoryString".equals(syn.getName()))
{
syntax.setSelectedIndex(i);
@@ -508,7 +508,7 @@
return INFO_CTRL_PANEL_TYPE_MATCHING_RULE.get();
}
- for (AttributeSyntax<?> attr : schema.getSyntaxes().values())
+ for (Syntax attr : schema.getSyntaxes().values())
{
if (name.equalsIgnoreCase(attr.getName()))
{
@@ -675,7 +675,7 @@
private void updateDefaultMatchingRuleNames()
{
- AttributeSyntax<?> syn = (AttributeSyntax<?>)syntax.getSelectedItem();
+ Syntax syn = (Syntax)syntax.getSelectedItem();
if (syn != null)
{
MatchingRule[] rules = {syn.getApproximateMatchingRule(),
@@ -810,7 +810,7 @@
getOID(),
getDescription(),
getSuperior(),
- (AttributeSyntax<?>)syntax.getSelectedItem(),
+ (Syntax)syntax.getSelectedItem(),
getApproximateMatchingRule(),
getEqualityMatchingRule(),
getOrderingMatchingRule(),
--
Gitblit v1.10.0