From a29c1c0cdab34386c2da80032ebfca19b0c4763d Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 07 Apr 2016 08:47:04 +0000
Subject: [PATCH] Replace uses of Utilities.getAttributeNameWithoutOptions()
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
index 9569378..54d8ef4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
@@ -35,6 +35,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.AVA;
+import org.forgerock.opendj.ldap.AttributeDescription;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.ObjectClassType;
@@ -462,7 +463,7 @@
// Check all the attributes that we consider binaries.
if (schema != null)
{
- String attributeName = Utilities.getAttributeNameWithoutOptions(attrName).toLowerCase();
+ String attributeName = AttributeDescription.valueOf(attrName).getNameOrOID().toLowerCase();
if (schema.hasAttributeType(attributeName))
{
AttributeType attr = schema.getAttributeType(attributeName);
@@ -541,7 +542,7 @@
*/
public static boolean isEditable(String attrName, Schema schema)
{
- attrName = Utilities.getAttributeNameWithoutOptions(attrName);
+ attrName = AttributeDescription.valueOf(attrName).getNameOrOID();
if (schema != null && schema.hasAttributeType(attrName))
{
AttributeType attrType = schema.getAttributeType(attrName);
--
Gitblit v1.10.0