From db61d998ca8e3173da67d2e6e21bd2f896afa81a Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 20 Nov 2009 19:30:46 +0000
Subject: [PATCH] Update the constructor of ControlPanelArgumentParser to make it easier to re-use it.
---
opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java | 3 ++-
opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java | 8 ++++++--
opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java | 9 ++++-----
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java
index fdb88e8..f80f386 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java
@@ -27,6 +27,9 @@
package org.opends.guitools.controlpanel;
+import static org.opends.messages.AdminToolMessages.
+ INFO_CONTROL_PANEL_LAUNCHER_USAGE_DESCRIPTION;
+
import java.awt.Component;
import java.awt.Container;
import java.awt.event.WindowAdapter;
@@ -102,7 +105,8 @@
// Call Installation because the LocalOrRemotePanel uses it to check
// whether the server is running or not and to get the install path.
Installation.getLocal();
- argParser = new ControlPanelArgumentParser(ControlPanel.class.getName());
+ argParser = new ControlPanelArgumentParser(ControlPanel.class.getName(),
+ INFO_CONTROL_PANEL_LAUNCHER_USAGE_DESCRIPTION.get());
try
{
argParser.initializeArguments();
@@ -125,7 +129,7 @@
*/
public void createAndDisplayGUI()
{
- final GenericDialog localOrRemote =
+ GenericDialog localOrRemote =
ControlCenterMainPane.getLocalOrRemoteDialog(info);
Utilities.centerOnScreen(localOrRemote);
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java b/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java
index 04ff2f0..adf08fd 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java
@@ -27,7 +27,6 @@
package org.opends.guitools.controlpanel;
-import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.ToolConstants.OPTION_LONG_BINDDN;
import static org.opends.server.tools.ToolConstants.OPTION_LONG_BINDPWD;
@@ -99,12 +98,12 @@
* The default constructor for this class.
* @param mainClassName the class name of the main class for the command-line
* that is being used.
+ * @param msg the usage message.
*/
- public ControlPanelArgumentParser(String mainClassName)
+ public ControlPanelArgumentParser(String mainClassName,
+ Message msg)
{
- super(mainClassName,
- INFO_CONTROL_PANEL_LAUNCHER_USAGE_DESCRIPTION.get(),
- false);
+ super(mainClassName, msg, false);
}
/**
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java b/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
index 75d81b3..33ba350 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
@@ -81,7 +81,8 @@
}
argParser = new ControlPanelArgumentParser(
- ControlPanelLauncher.class.getName());
+ ControlPanelLauncher.class.getName(),
+ INFO_CONTROL_PANEL_LAUNCHER_USAGE_DESCRIPTION.get());
// Validate user provided data
try
{
--
Gitblit v1.10.0