From 3c47c41e9ebd977095879ade126e348ee0b2d5d9 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 14 Feb 2014 09:05:10 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
index 2fc56f0..0d799df 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
@@ -2350,18 +2350,14 @@
*/
public static String getMatchingRuleText(MatchingRule matchingRule)
{
- String returnValue;
- String name = matchingRule.getName();
+ String nameOrOID = matchingRule.getNameOrOID();
String oid = matchingRule.getOID();
- if (name == null)
+ if (!nameOrOID.equals(oid))
{
- returnValue = oid;
+ // This is the name only
+ return nameOrOID + " - " + oid;
}
- else
- {
- returnValue = name+" - "+oid;
- }
- return returnValue;
+ return oid;
}
/**
--
Gitblit v1.10.0