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/util/ConfigFromDirContext.java |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
index cf1f15e..d0f38aa 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2011 Sun Microsystems, Inc.
- *      Portions copyright 2013 ForgeRock, AS.
+ *      Portions Copyright 2013-2014 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.util;
@@ -102,37 +102,37 @@
   /**
    * The monitor root entry DN.
    */
-  protected DN monitorDN = DN.nullDN();
+  protected DN monitorDN = DN.rootDN();
   /**
    * The JVM memory usage monitoring entry DN.
    */
-  protected DN jvmMemoryUsageDN = DN.nullDN();
+  protected DN jvmMemoryUsageDN = DN.rootDN();
   /**
    * The system information monitoring entry DN.
    */
-  protected DN systemInformationDN = DN.nullDN();
+  protected DN systemInformationDN = DN.rootDN();
   /**
    * The entry cache monitoring entry DN.
    */
-  protected DN entryCachesDN = DN.nullDN();
+  protected DN entryCachesDN = DN.rootDN();
   /**
    * The work queue monitoring entry DN.
    */
-  protected DN workQueueDN = DN.nullDN();
+  protected DN workQueueDN = DN.rootDN();
   /**
    * The version monitoring entry DN.
    */
-  protected DN versionDN = DN.nullDN();
+  protected DN versionDN = DN.rootDN();
 
   {
     try
     {
-      monitorDN = DN.decode("cn=monitor");
-      jvmMemoryUsageDN = DN.decode("cn=JVM Memory Usage,cn=monitor");
-      systemInformationDN = DN.decode("cn=System Information,cn=monitor");
-      entryCachesDN = DN.decode("cn=Entry Caches,cn=monitor");
-      workQueueDN = DN.decode("cn=Work Queue,cn=monitor");
-      versionDN = DN.decode("cn=Version,cn=monitor");
+      monitorDN = DN.valueOf("cn=monitor");
+      jvmMemoryUsageDN = DN.valueOf("cn=JVM Memory Usage,cn=monitor");
+      systemInformationDN = DN.valueOf("cn=System Information,cn=monitor");
+      entryCachesDN = DN.valueOf("cn=Entry Caches,cn=monitor");
+      workQueueDN = DN.valueOf("cn=Work Queue,cn=monitor");
+      versionDN = DN.valueOf("cn=Version,cn=monitor");
     }
     catch (Throwable t)
     {
@@ -631,7 +631,7 @@
         {
           try
           {
-            if (baseDN.getDn().equals(DN.decode(dn)) &&
+            if (baseDN.getDn().equals(DN.valueOf(dn)) &&
                 String.valueOf(baseDN.getReplicaID()).equals(replicaId))
             {
               try
@@ -1007,45 +1007,45 @@
   private boolean isRootMonitor(CustomSearchResult csr)
   throws OpenDsException
   {
-    return monitorDN.equals(DN.decode(csr.getDN()));
+    return monitorDN.equals(DN.valueOf(csr.getDN()));
   }
 
   private boolean isVersionMonitor(CustomSearchResult csr)
   throws OpenDsException
   {
-    return versionDN.equals(DN.decode(csr.getDN()));
+    return versionDN.equals(DN.valueOf(csr.getDN()));
   }
 
   private boolean isSystemInformation(CustomSearchResult csr)
   throws OpenDsException
   {
-    return systemInformationDN.equals(DN.decode(csr.getDN()));
+    return systemInformationDN.equals(DN.valueOf(csr.getDN()));
   }
 
   private boolean isJvmMemoryUsage(CustomSearchResult csr)
   throws OpenDsException
   {
-    return jvmMemoryUsageDN.equals(DN.decode(csr.getDN()));
+    return jvmMemoryUsageDN.equals(DN.valueOf(csr.getDN()));
   }
 
   private boolean isWorkQueue(CustomSearchResult csr)
   throws OpenDsException
   {
-    return workQueueDN.equals(DN.decode(csr.getDN()));
+    return workQueueDN.equals(DN.valueOf(csr.getDN()));
   }
 
   private boolean isEntryCaches(CustomSearchResult csr)
   throws OpenDsException
   {
-    return entryCachesDN.equals(DN.decode(csr.getDN()));
+    return entryCachesDN.equals(DN.valueOf(csr.getDN()));
   }
 
   private boolean isConnectionHandler(CustomSearchResult csr)
   throws OpenDsException
   {
     boolean isConnectionHandler = false;
-    DN dn = DN.decode(csr.getDN());
-    DN parent = dn.getParent();
+    DN dn = DN.valueOf(csr.getDN());
+    DN parent = dn.parent();
     if ((parent != null) && parent.equals(monitorDN))
     {
       List<?> vs = csr.getAttributeValues("cn");

--
Gitblit v1.10.0