From eaee3f6a42c1a129f07e2364a4c32c59b9e03e19 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 09 Feb 2016 15:22:22 +0000
Subject: [PATCH] Prep work for OPENDJ-1342: align APIs for RDNs
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java
index c6d0b71..8a17ba5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java
@@ -22,9 +22,8 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS
+ * Portions Copyright 2014-2016 ForgeRock AS
*/
-
package org.opends.guitools.controlpanel.ui.nodes;
import javax.swing.Icon;
@@ -35,10 +34,7 @@
import org.opends.server.types.LDAPURL;
import org.opends.server.types.RDN;
-/**
- * The basic node used to render entries in the 'Manage Entries' tree.
- *
- */
+/** The basic node used to render entries in the 'Manage Entries' tree. */
public class BasicNode extends DefaultMutableTreeNode {
private static final long serialVersionUID = 5441658731908509872L;
@@ -203,6 +199,7 @@
* @return <CODE>true</CODE> if the node is a leaf and <CODE>false</CODE>
* otherwise.
*/
+ @Override
public boolean isLeaf() {
return isLeaf;
}
@@ -319,10 +316,11 @@
}
- /**
- * Rendering
- */
- /** {@inheritDoc} */
+ //
+ // Rendering
+ //
+
+ @Override
public String toString() {
return getDisplayName();
}
@@ -419,7 +417,7 @@
}
else
{
- result = rdn.getAttributeValue(0).toString();
+ result = rdn.getFirstAVA().getAttributeValue().toString();
}
}
else {
--
Gitblit v1.10.0