From 774e15e7836b951da4bf702fbdf11bc8ff789e9d Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 20 Jan 2011 16:02:14 +0000
Subject: [PATCH] Code cleanup removing potential issues detected by FindBugs
---
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java | 10 +++-
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 21 +++++++---
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java | 41 +++++++++++++-------
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java | 3 +
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java | 28 ++++++++-----
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java | 5 ++
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java | 3 +
opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ApplicationTrustManager.java | 3 +
8 files changed, 75 insertions(+), 39 deletions(-)
diff --git a/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ApplicationTrustManager.java b/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ApplicationTrustManager.java
index 553872a..06a8c25 100644
--- a/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ApplicationTrustManager.java
+++ b/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ApplicationTrustManager.java
@@ -24,6 +24,7 @@
*
* Copyright 2008-2009 Sun Microsystems, Inc.
* Portions Copyright 2009 Parametric Technology Corporation (PTC)
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.admin.ads.util;
@@ -506,7 +507,7 @@
boolean hostMatch = h1.length == h2.length;
for (int i=0; i<h1.length && hostMatch; i++)
{
- if (!h1[i].equals("*") && !h2.equals("*"))
+ if (!h1[i].equals("*") && !h2[i].equals("*"))
{
hostMatch = h1[i].equalsIgnoreCase(h2[i]);
}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
index 8b696e6..47ed803c 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -144,7 +145,7 @@
}
if (returnValue == 0)
{
- getBackend().getBackendID().compareTo(
+ returnValue = getBackend().getBackendID().compareTo(
desc.getBackend().getBackendID());
}
if (returnValue == 0)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
index ef6520e..77a1b15 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -214,6 +215,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean requiresBorder()
{
return false;
@@ -222,6 +224,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean requiresScroll()
{
return false;
@@ -230,6 +233,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean callConfigurationChangedInBackground()
{
return true;
@@ -238,6 +242,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setInfo(ControlPanelInfo info)
{
if (controller == null)
@@ -252,6 +257,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public final GenericDialog.ButtonType getButtonType()
{
return GenericDialog.ButtonType.NO_BUTTON;
@@ -269,6 +275,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void toBeDisplayed(boolean visible)
{
super.toBeDisplayed(visible);
@@ -286,6 +293,7 @@
/**
* {@inheritDoc}
*/
+ @Override
protected void setEnabledOK(boolean enable)
{
okButton.setEnabled(enable);
@@ -294,6 +302,7 @@
/**
* {@inheritDoc}
*/
+ @Override
protected void setEnabledCancel(boolean enable)
{
cancelButton.setEnabled(enable);
@@ -502,6 +511,7 @@
INFO_CTRL_PANEL_SUBSTRING_SEARCH_INLINE_HELP.get().toString());
filter.addKeyListener(new KeyAdapter()
{
+ @Override
public void keyReleased(KeyEvent e)
{
if ((e.getKeyCode() == KeyEvent.VK_ENTER) && applyButton.isEnabled())
@@ -659,6 +669,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void cancelClicked()
{
setPrimaryValid(lBaseDN);
@@ -710,7 +721,7 @@
le.getMessageObject().toString()));
setPrimaryInvalid(lFilter);
}
- if (errors.size() == 0)
+ if (errors.isEmpty())
{
lLimit.setVisible(false);
lNumberOfEntries.setVisible(true);
@@ -1209,12 +1220,12 @@
{
String backendID = backend.getBackendID();
backendIDs.add(backendID);
- SortedSet<String> baseDNs = new TreeSet<String>();
+ SortedSet<String> someBaseDNs = new TreeSet<String>();
for (BaseDNDescriptor baseDN : backend.getBaseDns())
{
try
{
- baseDNs.add(Utilities.unescapeUtf8(baseDN.getDn().toString()));
+ someBaseDNs.add(Utilities.unescapeUtf8(baseDN.getDn().toString()));
}
catch (Throwable t)
{
@@ -1226,10 +1237,10 @@
Utilities.unescapeUtf8(baseDN.getDn().toString()), baseDN);
}
}
- hmBaseDNs.put(backendID, baseDNs);
+ hmBaseDNs.put(backendID, someBaseDNs);
if (backendID.equalsIgnoreCase("userRoot"))
{
- for (String baseDN : baseDNs)
+ for (String baseDN : someBaseDNs)
{
baseDNWithEntries = hmBaseDNWithEntries.get(baseDN);
if (baseDNWithEntries != null)
@@ -1251,8 +1262,8 @@
{
baseDNNewElements.add(new CategorizedComboBoxElement(backendID,
CategorizedComboBoxElement.Type.CATEGORY));
- SortedSet<String> baseDNs = hmBaseDNs.get(backendID);
- for (String baseDN : baseDNs)
+ SortedSet<String> someBaseDNs = hmBaseDNs.get(backendID);
+ for (String baseDN : someBaseDNs)
{
baseDNNewElements.add(new CategorizedComboBoxElement(baseDN,
CategorizedComboBoxElement.Type.REGULAR));
@@ -1562,14 +1573,12 @@
{
dn = ALL_BASE_DNS;
}
- else if (OTHER_BASE_DN.equals(dn))
- {
- dn = null;
- }
- }
- else
- {
- dn = null;
+ // The following is never true. OTHER_BASE_DN is a Message
+ // Comment out buggy code
+ // else if (OTHER_BASE_DN.equals(dn))
+ // {
+ // dn = null;
+ // }
}
return dn;
}
@@ -1779,6 +1788,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Component getListCellRendererComponent(JList list, Object value,
int index, boolean isSelected, boolean cellHasFocus)
{
@@ -1894,6 +1904,7 @@
/**
* Executes the updater.
*/
+ @Override
public void run()
{
while (true)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
index 9db380b..2703e9b 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -331,7 +332,7 @@
Component[][] comps = {{parent, aliases, origin, file},
{usage, singleValued, nonModifiable, collective, obsolete},
{approximate, equality, ordering, substring}};
- JLabel[][] labels = {{lSuperior, lAliases, lOrigin, lFile},
+ JLabel[][] someLabels = {{lSuperior, lAliases, lOrigin, lFile},
{lUsage, lType, null, null, null},
{lApproximate, lEquality, lOrdering, lSubstring}};
JLabel[][] inlineHelps = {{null,
@@ -367,7 +368,7 @@
gbc1.fill = GridBagConstraints.HORIZONTAL;
gbc1.gridy = 0;
- add(labels[i], comps[i], inlineHelps[i], p, gbc1);
+ add(someLabels[i], comps[i], inlineHelps[i], p, gbc1);
final BasicExpander expander = expanders[i];
ChangeListener changeListener = new ChangeListener()
{
@@ -444,6 +445,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void mouseClicked(MouseEvent ev)
{
if (ev.getClickCount() == 1)
@@ -459,6 +461,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void keyTyped(KeyEvent ev)
{
if ((ev.getKeyChar() == KeyEvent.VK_SPACE) ||
@@ -529,6 +532,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean mustCheckUnsavedChanges()
{
return saveChanges.isEnabled();
@@ -537,6 +541,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public UnsavedChangesDialog.Result checkUnsavedChanges()
{
UnsavedChangesDialog.Result result;
@@ -565,6 +570,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean requiresScroll()
{
return false;
@@ -603,10 +609,10 @@
{
parent.setSelectedItem(superior);
}
- Set<String> aliases = getAliases(attr);
+ Set<String> someAliases = getAliases(attr);
lastAliases.clear();
- lastAliases.addAll(aliases);
- this.aliases.setText(Utilities.getStringFromCollection(aliases, ", "));
+ lastAliases.addAll(someAliases);
+ this.aliases.setText(Utilities.getStringFromCollection(someAliases, ", "));
String sOrigin = Utilities.getOrigin(attr);
if (sOrigin == null)
@@ -916,7 +922,7 @@
{
errors.add(ERR_CTRL_PANEL_SCHEMA_NOT_FOUND_DETAILS.get());
}
- if (errors.size() == 0)
+ if (errors.isEmpty())
{
MessageBuilder mb = new MessageBuilder();
@@ -1013,12 +1019,12 @@
}
}
- Collection<String> aliases = getAliases();
+ Collection<String> someAliases = getAliases();
Collection<String> oldAliases = getAliases(attribute);
- if (!aliases.equals(oldAliases))
+ if (!someAliases.equals(oldAliases))
{
- for (String alias : aliases)
+ for (String alias : someAliases)
{
if (alias.trim().length() == 0)
{
@@ -1090,7 +1096,7 @@
}
}
- if (errors.size() == 0)
+ if (errors.isEmpty())
{
ProgressDialog dlg = new ProgressDialog(
Utilities.createFrame(),
@@ -1108,7 +1114,7 @@
{
task.canLaunch(newTask, errors);
}
- if (errors.size() == 0)
+ if (errors.isEmpty())
{
launchOperation(newTask,
INFO_CTRL_PANEL_MODIFYING_ATTRIBUTE_SUMMARY.get(attrName),
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
index a13a4e9..cf1c1ec 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -512,7 +513,7 @@
errors.add(INFO_NOT_A_DIRECTORY_MANAGER_DN.get());
}
- if ("".equals(pwd.getPassword().length == 0))
+ if (pwd.getPassword().length == 0)
{
pwdInvalid = true;
errors.add(INFO_EMPTY_PWD.get());
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java
index 468f43c..75341f3 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -152,6 +153,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void toBeDisplayed(boolean visible)
{
super.toBeDisplayed(visible);
@@ -184,7 +186,7 @@
errors.add(INFO_NOT_A_DIRECTORY_MANAGER_DN.get());
}
- if ("".equals(pwd.getPassword().length == 0))
+ if (pwd.getPassword().length == 0)
{
pwdInvalid = true;
errors.add(INFO_EMPTY_PWD.get());
@@ -412,6 +414,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void cancelClicked()
{
setPrimaryValid(dnLabel);
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
index 8a7069e..8cb2ea0 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -231,6 +232,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public GenericDialog.ButtonType getButtonType()
{
return GenericDialog.ButtonType.NO_BUTTON;
@@ -811,7 +813,8 @@
getObfuscatedCommandLineArguments(getDSConfigCommandLineArguments());
for (String arg : args)
{
- sb.append(" "+CommandBuilder.escapeValue(arg));
+ sb.append(" ");
+ sb.append(CommandBuilder.escapeValue(arg));
}
ManagementContext mCtx = LDAPManagementContext.createFromContext(
@@ -833,7 +836,7 @@
{
index.setScope(scope);
}
- if (!indexToModify.getScope().equals(sortOrder))
+ if (!indexToModify.getSortOrder().equals(sortOrder))
{
index.setSortOrder(sortOrderStringValue);
}
@@ -895,6 +898,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void postOperation()
{
if ((lastException == null) && (state == State.FINISHED_SUCCESSFULLY))
@@ -938,7 +942,7 @@
args.add("filter:"+filterValue);
}
- if (!indexToModify.getScope().equals(sortOrder))
+ if (!indexToModify.getSortOrder().equals(sortOrder))
{
args.add("--set");
args.add("sort-order:"+sortOrderStringValue);
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index 62de2fb..f5c74c8 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.quicksetup.installer;
@@ -3513,7 +3514,7 @@
String sPort = qs.getFieldStringValue(FieldName.REMOTE_SERVER_PORT);
checkRemoteHostPortDnAndPwd(host, sPort, dn, pwd, qs, errorMsgs);
- if (errorMsgs.size() == 0)
+ if (errorMsgs.isEmpty())
{
port = Integer.parseInt(sPort);
// Try to connect
@@ -3556,7 +3557,7 @@
type);
}
- if (errorMsgs.size() == 0)
+ if (errorMsgs.isEmpty())
{
AuthenticationData auth = new AuthenticationData();
auth.setHostName(host);
@@ -4008,7 +4009,7 @@
SuffixesToReplicateOptions.Type.REPLICATE_WITH_EXISTING_SUFFIXES)
{
Set<?> s = (Set<?>)qs.getFieldValue(FieldName.SUFFIXES_TO_REPLICATE);
- if (s.size() == 0)
+ if (s.isEmpty())
{
errorMsgs.add(INFO_NO_SUFFIXES_CHOSEN_TO_REPLICATE.get());
qs.displayFieldInvalid(FieldName.SUFFIXES_TO_REPLICATE, true);
@@ -4354,9 +4355,13 @@
lastLoadedCache.setPreferredConnections(cnx);
lastLoadedCache.reloadTopology();
Set<SuffixDescriptor> suffixes = lastLoadedCache.getSuffixes();
-
+ Set<SuffixDescriptor> moreSuffixes = null;
+ if (suf != null)
+ {
+ moreSuffixes = suf.getSuffixes();
+ }
getUserData().setSuffixesToReplicateOptions(
- new SuffixesToReplicateOptions(type, suffixes, suf.getSuffixes()));
+ new SuffixesToReplicateOptions(type, suffixes, moreSuffixes));
/* Analyze if we had any exception while loading servers. For the moment
* only throw the exception found if the user did not provide the
@@ -4402,8 +4407,12 @@
{
suffixes.add(replica.getSuffix());
}
+ Set<SuffixDescriptor> moreSuffixes = null;
+ if (suf != null){
+ moreSuffixes = suf.getSuffixes();
+ }
getUserData().setSuffixesToReplicateOptions(
- new SuffixesToReplicateOptions(type, suffixes, suf.getSuffixes()));
+ new SuffixesToReplicateOptions(type, suffixes, moreSuffixes));
}
/**
--
Gitblit v1.10.0