From c01c421b26e6409febd6af1db1c9db11b7b347a4 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 07 Jan 2014 15:06:31 +0000
Subject: [PATCH] Align server types API with SDK types API

---
 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
index d874034..2931716 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2013 ForgeRock AS.
+ *      Portions Copyright 2013-2014 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -1329,7 +1329,7 @@
 
     try
     {
-      DN.decode(getDisplayedDN());
+      DN.valueOf(getDisplayedDN());
     }
     catch (Throwable t)
     {
@@ -1611,10 +1611,10 @@
     StringBuilder sb = new StringBuilder();
     try
     {
-      DN oldDN = DN.decode(searchResult.getDN());
-      if (oldDN.getNumComponents() > 0)
+      DN oldDN = DN.valueOf(searchResult.getDN());
+      if (oldDN.size() > 0)
       {
-        RDN rdn = oldDN.getRDN();
+        RDN rdn = oldDN.rdn();
         List<AttributeType> attributeTypes = new ArrayList<AttributeType>();
         List<String> attributeNames = new ArrayList<String>();
         List<AttributeValue> attributeValues = new ArrayList<AttributeValue>();
@@ -1694,7 +1694,7 @@
             }
           }
         }
-        DN parent = oldDN.getParent();
+        DN parent = oldDN.parent();
         if (attributeTypes.size() > 0)
         {
           DN newDN;
@@ -1706,7 +1706,7 @@
           }
           else
           {
-            newDN = parent.concat(newRDN);
+            newDN = parent.child(newRDN);
           }
           sb.append(newDN.toString());
         }

--
Gitblit v1.10.0