From 43b4a69d0f8b04dcda144ba4089fab077e0c7d1b Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Fri, 23 Sep 2011 16:58:55 +0000
Subject: [PATCH] Fix OpenDJ-299 NPE when trying to delete a base DN using control panel The menus should have been disabled when no authenticated.
---
opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
index 5e03473..338c53d 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -524,6 +525,8 @@
private void updateMenus(ServerDescriptor desc)
{
menuBar.newEntryFromLDIFMenuItem.setEnabled(desc.isAuthenticated());
+ menuBar.deleteBackendMenuItem.setEnabled(desc.isAuthenticated());
+ menuBar.deleteBaseDNMenuItem.setEnabled(desc.isAuthenticated());
}
/**
@@ -1195,6 +1198,8 @@
JMenuItem newDomainMenuItem;
JMenuItem newEntryFromLDIFMenuItem;
JMenuItem duplicateEntryMenuItem;
+ JMenuItem deleteBaseDNMenuItem;
+ JMenuItem deleteBackendMenuItem;
/**
* Constructor.
@@ -1560,7 +1565,7 @@
deleteMenuItem.setEnabled(false);
menu.add(deleteMenuItem);
menu.add(new JSeparator());
- JMenuItem deleteBaseDNMenuItem = Utilities.createMenuItem(
+ deleteBaseDNMenuItem = Utilities.createMenuItem(
INFO_CTRL_PANEL_DELETE_BASE_DN_MENU.get());
deleteBaseDNMenuItem.addActionListener(new ActionListener()
{
@@ -1572,9 +1577,10 @@
deleteBaseDN();
}
});
+ deleteBaseDNMenuItem.setEnabled(false);
menu.add(deleteBaseDNMenuItem);
- JMenuItem deleteBackendMenuItem = Utilities.createMenuItem(
+ deleteBackendMenuItem = Utilities.createMenuItem(
INFO_CTRL_PANEL_DELETE_BACKEND_MENU.get());
deleteBackendMenuItem.addActionListener(new ActionListener()
{
@@ -1586,6 +1592,7 @@
deleteBackend();
}
});
+ deleteBackendMenuItem.setEnabled(false);
menu.add(deleteBackendMenuItem);
return menu;
}
--
Gitblit v1.10.0