From 8b3cd28204e15e0a98ce038b355f100cd7c44e3c Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <capponi.nicolas@gmail.com>
Date: Thu, 28 Jan 2016 08:28:20 +0000
Subject: [PATCH] OPENDJ-1632 (PR-201) Migrate AttributeType in one shot
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
index 5952f58..aa29876 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS
+ * Portions Copyright 2014-2016 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -52,7 +52,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.opendj.ldap.schema.MatchingRule;
-import org.opends.server.types.AttributeType;
+import org.forgerock.opendj.ldap.schema.AttributeType;
+import org.opends.server.schema.SomeSchemaElement;
import org.opends.server.types.ObjectClass;
import org.opends.server.types.Schema;
@@ -246,11 +247,7 @@
*/
public void update(AttributeType attr, Schema schema)
{
- String n = attr.getPrimaryName();
- if (n == null)
- {
- n = NOT_APPLICABLE.toString();
- }
+ String n = attr.getNameOrOID();
titlePanel.setDetails(LocalizableMessage.raw(n));
name.setText(n);
AttributeType superior = attr.getSuperiorType();
@@ -260,15 +257,11 @@
}
else
{
- n = superior.getPrimaryName();
- }
- if (n == null)
- {
- n = NOT_APPLICABLE.toString();
+ n = superior.getNameOrOID();
}
parent.setText(n);
oid.setText(attr.getOID());
- origin.setText(StandardObjectClassPanel.getOrigin(attr).toString());
+ origin.setText(StandardObjectClassPanel.getOrigin(new SomeSchemaElement(attr)).toString());
n = attr.getDescription();
if (n == null)
{
--
Gitblit v1.10.0