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/SchemaTask.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/SchemaTask.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/SchemaTask.java
index 9a03fec..67e0fe5 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/SchemaTask.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/task/SchemaTask.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2009 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.task;
@@ -46,10 +46,9 @@
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.OpenDsException;
import org.opends.server.util.LDIFReader;
-import org.opends.server.util.cli.CommandBuilder;
/**
- * An abstract class used to refactor some code between the different tasks
+ * An abstract class used to re-factor some code between the different tasks
* that update the schema.
*
*/
@@ -269,26 +268,27 @@
else
{
ArrayList<String> args = new ArrayList<String>();
- args.add(getCommandLinePath("ldapmodify"));
args.add("-a");
args.addAll(getObfuscatedCommandLineArguments(
getConnectionCommandLineArguments(true, true)));
args.add(getNoPropertiesFileArgument());
+ String equiv = getEquivalentCommandLine(getCommandLinePath("ldapmodify"),
+ args);
+
StringBuilder sb = new StringBuilder();
- for (String arg : args)
- {
- sb.append(" "+CommandBuilder.escapeValue(arg));
- }
+ sb.append(
+ INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_ADD_SCHEMA_ELEMENT_ONLINE.get()+
+ "<br><b>");
+ sb.append(equiv);
sb.append("<br>");
sb.append("dn: cn=schema<br>");
sb.append("changetype: modify<br>");
sb.append("add: "+getSchemaFileAttributeName()+"<br>");
sb.append(getSchemaFileAttributeName()+": "+
getSchemaFileAttributeValue());
- getProgressDialog().appendProgressHtml(Utilities.applyFont(
- INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_ADD_SCHEMA_ELEMENT_ONLINE.get()+
- "<br><b>"+sb.toString()+"</b><br><br>",
+ sb.append("</b><br><br>");
+ getProgressDialog().appendProgressHtml(Utilities.applyFont(sb.toString(),
ColorAndFontConstants.progressFont));
}
}
--
Gitblit v1.10.0