From 45a05a46b927f19865e6a748873d70efe9a99ac5 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 05 Aug 2016 18:41:17 +0000
Subject: [PATCH] Partial OPENDJ-2625 Convert all code that uses JNDI to use the SDK instead
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
index 8279219..ab32bea 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
@@ -16,6 +16,7 @@
*/
package org.opends.guitools.controlpanel.task;
+import static org.forgerock.opendj.ldap.requests.Requests.*;
import static org.opends.messages.AdminToolMessages.*;
import java.util.ArrayList;
@@ -32,6 +33,7 @@
import org.forgerock.opendj.ldap.DN;
import org.opends.admin.ads.util.ConnectionWrapper;
import org.opends.guitools.controlpanel.browser.BrowserController;
+import org.opends.guitools.controlpanel.browser.ConnectionWithControls;
import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
@@ -152,33 +154,22 @@
try
{
- ConnectionWrapper conn;
-
if (parentNode != null)
{
- conn = controller.findConnectionForDisplayedEntry(parentNode);
+ ConnectionWithControls conn = controller.findConnectionForDisplayedEntry(parentNode);
useAdminCtx = controller.isConfigurationNode(parentNode);
+ printProgressCreatingEntry();
+ conn.add(newAddRequest(Converters.from(newEntry)));
}
else
{
- conn = getInfo().getConnection();
+ ConnectionWrapper conn = getInfo().getConnection();
useAdminCtx = true;
+ printProgressCreatingEntry();
+ conn.getConnection().add(Converters.from(newEntry));
}
- SwingUtilities.invokeLater(new Runnable()
- {
- @Override
- public void run()
- {
- printEquivalentCommand();
- getProgressDialog().appendProgressHtml(
- Utilities.getProgressWithPoints(
- INFO_CTRL_PANEL_CREATING_ENTRY.get(dn),
- ColorAndFontConstants.progressFont));
- }
- });
- conn.getConnection().add(Converters.from(newEntry));
SwingUtilities.invokeLater(new Runnable()
{
@@ -227,6 +218,22 @@
}
}
+ private void printProgressCreatingEntry()
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ printEquivalentCommand();
+ getProgressDialog().appendProgressHtml(
+ Utilities.getProgressWithPoints(
+ INFO_CTRL_PANEL_CREATING_ENTRY.get(dn),
+ ColorAndFontConstants.progressFont));
+ }
+ });
+ }
+
/** Prints the equivalent command-line in the progress dialog. */
private void printEquivalentCommand()
{
--
Gitblit v1.10.0