From 2a3158aad80fc910b83336485b3e545dea50066c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 20 Apr 2016 09:23:30 +0000
Subject: [PATCH] guitools + quicksetup: added @Override + Autorefactor'ed comments
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java | 81 +++++++++++++---------------------------
1 files changed, 26 insertions(+), 55 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
index 27ad183..cf3532b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
@@ -234,7 +234,7 @@
private ApplicationException applicationException;
- /** Actually performs the install in this thread. The thread is blocked. */
+ /** Actually performs the install in this thread. The thread is blocked. */
@Override
public void run()
{
@@ -469,7 +469,7 @@
try
{
File newConfig = fm.copy(installation.getBaseConfigurationFile(),
- installation.getConfigurationDirectory(), /*overwrite=*/ true);
+ installation.getConfigurationDirectory(), true);
fm.rename(newConfig, installation.getCurrentConfigurationFile());
}
catch (ApplicationException ae)
@@ -864,16 +864,10 @@
final QuickSetupDialog fDlg = dlg;
errPanel.addButtonActionListener(new ButtonActionListener()
{
- /**
- * ButtonActionListener implementation. It assumes that we are called in
- * the event thread.
- *
- * @param ev
- * the ButtonEvent we receive.
- */
@Override
public void buttonActionPerformed(ButtonEvent ev)
{
+ // assumes that we are called in the event thread.
// Simulate a close button event
fDlg.notifyButtonEvent(ButtonName.QUIT);
}
@@ -2682,12 +2676,6 @@
notifyListeners(getFormattedWithPoints(INFO_PROGRESS_CREATING_ADS.get()));
}
localConn = createLocalConnection();
- // if (isRemoteServer)
- // {
- // /* Create an empty ADS suffix on the local server. */
- // ADSContext localAdsContext = new ADSContext(localCtx);
- // localAdsContext.createAdministrationSuffix(null);
- // }
if (!isRemoteServer)
{
/* Configure local server to have an ADS */
@@ -2802,8 +2790,7 @@
* Tells whether we must create a suffix that we are not going to replicate
* with other servers or not.
*
- * @return <CODE>true</CODE> if we must create a new suffix and
- * <CODE>false</CODE> otherwise.
+ * @return {@code true} if we must create a new suffix and {@code false} otherwise.
*/
protected boolean createNotReplicatedSuffix()
{
@@ -2817,11 +2804,9 @@
}
/**
- * Returns <CODE>true</CODE> if we must configure replication and
- * <CODE>false</CODE> otherwise.
+ * Returns whether we must configure replication.
*
- * @return <CODE>true</CODE> if we must configure replication and
- * <CODE>false</CODE> otherwise.
+ * @return {@code true} if we must configure replication and {@code false} otherwise.
*/
protected boolean mustConfigureReplication()
{
@@ -2829,11 +2814,9 @@
}
/**
- * Returns <CODE>true</CODE> if we must create the ADS and <CODE>false</CODE>
- * otherwise.
+ * Returns whether we must create the ADS.
*
- * @return <CODE>true</CODE> if we must create the ADS and <CODE>false</CODE>
- * otherwise.
+ * @return {@code true} if we must create the ADS and {@code false} otherwise.
*/
protected boolean mustCreateAds()
{
@@ -2841,11 +2824,9 @@
}
/**
- * Returns <CODE>true</CODE> if we must start the server and
- * <CODE>false</CODE> otherwise.
+ * Returns whether we must start the server.
*
- * @return <CODE>true</CODE> if we must start the server and
- * <CODE>false</CODE> otherwise.
+ * @return {@code true} if we must start the server and {@code false} otherwise.
*/
protected boolean mustStart()
{
@@ -2853,13 +2834,12 @@
}
/**
- * Returns <CODE>true</CODE> if the start server must be launched in verbose
- * mode and <CODE>false</CODE> otherwise. The verbose flag is not enough
- * because in the case where many entries have been imported, the startup
- * phase can take long.
+ * Returns whether the start server must be launched in verbose mode.
+ * <p>
+ * The verbose flag is not enough because in the case where many entries have been imported,
+ * the startup phase can take long.
*
- * @return <CODE>true</CODE> if the start server must be launched in verbose
- * mode and <CODE>false</CODE> otherwise.
+ * @return {@code true} if the start server must be launched in verbose mode and {@code false} otherwise.
*/
protected boolean isStartVerbose()
{
@@ -2896,13 +2876,12 @@
}
/**
- * Returns <CODE>true</CODE> if we must stop the server and <CODE>false</CODE>
- * otherwise. The server might be stopped if the user asked not to start it at
- * the end of the installation and it was started temporarily to update its
- * configuration.
+ * Returns whether we must stop the server.
+ * <p>
+ * The server might be stopped if the user asked not to start it at the end
+ * of the installation and it was started temporarily to update its configuration.
*
- * @return <CODE>true</CODE> if we must stop the server and <CODE>false</CODE>
- * otherwise.
+ * @return {@code true} if we must stop the server and {@code false} otherwise.
*/
protected boolean mustStop()
{
@@ -2910,11 +2889,9 @@
}
/**
- * Returns <CODE>true</CODE> if we must initialize suffixes and
- * <CODE>false</CODE> otherwise.
+ * Returns whether we must initialize suffixes.
*
- * @return <CODE>true</CODE> if we must initialize suffixes and
- * <CODE>false</CODE> otherwise.
+ * @return {@code true} if we must initialize suffixes and {@code false} otherwise.
*/
protected boolean mustInitializeSuffixes()
{
@@ -3924,10 +3901,7 @@
return validBaseDn;
}
- /**
- * Update the userData object according to the content of the runtime options
- * panel.
- */
+ /** Update the userData object according to the content of the runtime options panel. */
private void updateUserDataForRuntimeOptionsPanel(QuickSetup qs)
{
getUserData().setJavaArguments(UserData.SERVER_SCRIPT_NAME,
@@ -4703,17 +4677,15 @@
}
/** Class used to be able to cancel long operations. */
-abstract class InvokeThread extends Thread implements Runnable
+abstract class InvokeThread extends Thread
{
protected boolean isOver;
protected ApplicationException ae;
/**
- * Returns <CODE>true</CODE> if the thread is over and <CODE>false</CODE>
- * otherwise.
+ * Returns whether the thread is over.
*
- * @return <CODE>true</CODE> if the thread is over and <CODE>false</CODE>
- * otherwise.
+ * @return {@code true} if the thread is over and {@code false} otherwise.
*/
public boolean isOver()
{
@@ -4730,7 +4702,6 @@
return ae;
}
- /** Runnable implementation. */
@Override
public abstract void run();
--
Gitblit v1.10.0