From 18320d54c115617483a0912b496cdcc3ecd78b19 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 17 Feb 2014 14:52:00 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support

---
 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
index 2e4b616..674288f 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
@@ -27,8 +27,6 @@
 
 package org.opends.guitools.controlpanel.browser;
 
-import static org.opends.messages.AdminToolMessages.*;
-
 import java.util.ArrayList;
 import java.util.Set;
 
@@ -44,6 +42,7 @@
 import javax.swing.SwingUtilities;
 import javax.swing.tree.TreeNode;
 
+import org.forgerock.opendj.ldap.SearchScope;
 import org.opends.admin.ads.util.ConnectionUtils;
 import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
 import org.opends.messages.AdminToolMessages;
@@ -53,7 +52,8 @@
 import org.opends.server.types.LDAPURL;
 import org.opends.server.types.OpenDsException;
 import org.opends.server.types.RDN;
-import org.opends.server.types.SearchScope;
+
+import static org.opends.messages.AdminToolMessages.*;
 
 /**
  * The class that is in charge of doing the LDAP searches required to update a
@@ -301,6 +301,7 @@
         {
           SwingUtilities.invokeLater(new Runnable()
           {
+            @Override
             public void run()
             {
               controller.expandNode(node);
@@ -890,6 +891,7 @@
                 {
                   SwingUtilities.invokeAndWait(new Runnable()
                   {
+                    @Override
                     public void run()
                     {
                       for (int i=0; i<getNode().getChildCount(); i++)
@@ -1129,7 +1131,7 @@
     int scope;
     if (url.getScope() != null)
     {
-      switch (url.getScope())
+      switch (url.getScope().asEnum())
       {
       case BASE_OBJECT:
         scope = SearchControls.OBJECT_SCOPE;

--
Gitblit v1.10.0