From d0f9252e480ac41ab5f7e9a0168ea521e610dc46 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 27 Nov 2009 23:53:01 +0000
Subject: [PATCH] Consolidate some of the code used to display the equivalent command-line in the control panel.
---
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
index 8113ba8..50dc82d 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
@@ -63,7 +63,6 @@
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.util.ServerConstants;
-import org.opends.server.util.cli.CommandBuilder;
/**
* The task that is launched when an entry must be deleted.
@@ -513,7 +512,6 @@
private void printEquivalentCommandToDelete(DN dn, boolean usingControl)
{
ArrayList<String> args = new ArrayList<String>();
- args.add(getCommandLinePath("ldapdelete"));
args.addAll(getObfuscatedCommandLineArguments(
getConnectionCommandLineArguments(useAdminCtx, true)));
args.add(getNoPropertiesFileArgument());
@@ -523,16 +521,8 @@
args.add(ServerConstants.OID_SUBTREE_DELETE_CONTROL);
}
args.add(dn.toString());
- StringBuilder sb = new StringBuilder();
- for (String arg : args)
- {
- sb.append(" "+CommandBuilder.escapeValue(arg));
- }
-
- getProgressDialog().appendProgressHtml(Utilities.applyFont(
- INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_ENTRY.get(dn.toString())+
- "<br><b>"+
- sb.toString()+"</b><br><br>",
- ColorAndFontConstants.progressFont));
+ printEquivalentCommandLine(getCommandLinePath("ldapdelete"),
+ args,
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_ENTRY.get(dn.toString()));
}
}
--
Gitblit v1.10.0