From 91d372cca007303222f2ec621da6b2e62480fbc3 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 25 Aug 2015 16:02:28 +0000
Subject: [PATCH] Use Collection.contains() Used early exits Removed duplicated code
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java | 63 ++++++++++++-------------------
1 files changed, 25 insertions(+), 38 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
index 396dee8..22bb5b5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
@@ -24,7 +24,6 @@
* Copyright 2008-2009 Sun Microsystems, Inc.
* Portions Copyright 2014-2015 ForgeRock AS
*/
-
package org.opends.guitools.controlpanel.ui;
import static org.opends.messages.AdminToolMessages.*;
@@ -55,6 +54,8 @@
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
@@ -63,38 +64,24 @@
import org.opends.guitools.controlpanel.task.Task;
import org.opends.guitools.controlpanel.ui.renderer.CustomListCellRenderer;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.types.DN;
/**
* The panel displayed when the user clicks on 'Delete Base DN...' in the
* browse entries dialog.
- *
*/
public class DeleteBaseDNPanel extends StatusGenericPanel
{
private static final long serialVersionUID = 2182662824496761087L;
- /**
- * The list containing the base DNs.
- */
+ /** The list containing the base DNs. */
protected JList list;
-
- /**
- * Label indicating that no element was found.
- */
+ /** Label indicating that no element was found. */
protected JLabel lNoElementsFound;
-
- /**
- * The main panel.
- */
+ /** The main panel. */
protected JPanel mainPanel;
- /**
- * Default constructor.
- *
- */
+ /** Default constructor. */
public DeleteBaseDNPanel()
{
super();
@@ -213,9 +200,7 @@
lNoElementsFound.setVisible(list.getModel().getSize() == 0);
}
- /**
- * Creates the layout of the panel (but the contents are not populated here).
- */
+ /** Creates the layout of the panel (but the contents are not populated here). */
private void createLayout()
{
GridBagConstraints gbc = new GridBagConstraints();
@@ -364,23 +349,10 @@
for (Object o : dns)
{
DN dn = (DN)o;
- boolean found = false;
- for (BackendDescriptor backend :
- getInfo().getServerDescriptor().getBackends())
+ BaseDNDescriptor baseDN = findBaseDN(dn);
+ if (baseDN != null)
{
- for (BaseDNDescriptor baseDN : backend.getBaseDns())
- {
- if (baseDN.getDn().equals(dn))
- {
- baseDNsToDelete.add(baseDN);
- found = true;
- break;
- }
- }
- if (found)
- {
- break;
- }
+ baseDNsToDelete.add(baseDN);
}
}
DeleteBaseDNAndBackendTask newTask = new DeleteBaseDNAndBackendTask(
@@ -415,6 +387,21 @@
}
}
+ private BaseDNDescriptor findBaseDN(DN dn)
+ {
+ for (BackendDescriptor backend : getInfo().getServerDescriptor().getBackends())
+ {
+ for (BaseDNDescriptor baseDN : backend.getBaseDns())
+ {
+ if (baseDN.getDn().equals(dn))
+ {
+ return baseDN;
+ }
+ }
+ }
+ return null;
+ }
+
private LocalizableMessage getConfirmationMessage(
Collection<BaseDNDescriptor> baseDNsToDelete)
{
--
Gitblit v1.10.0