From 149df264fb7c9c37e6439d00cc33613f57448ac1 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 03 Aug 2016 09:43:06 +0000
Subject: [PATCH] code cleanups
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java | 50 ++++++++++++++++++++------------------------------
1 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
index b7d137e..03a7bfb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
@@ -218,17 +218,13 @@
{
insertNode(realParentNode, newEntry.getName(), false);
}
- else
+ else if (isBaseDN(newEntry.getName()))
{
- if (isBaseDN(newEntry.getName()))
+ int nRootChildren = controller.getTreeModel().getChildCount(controller.getTreeModel().getRoot());
+ if (nRootChildren > 1)
{
- int nRootChildren = controller.getTreeModel().getChildCount(
- controller.getTreeModel().getRoot());
- if (nRootChildren > 1)
- {
- // Insert in the root.
- insertNode(root, newEntry.getName(), true);
- }
+ // Insert in the root.
+ insertNode(root, newEntry.getName(), true);
}
}
}
@@ -303,29 +299,23 @@
private void insertNode(BasicNode parentNode, DN dn, boolean isSuffix)
{
- TreePath parentPath =
- new TreePath(controller.getTreeModel().getPathToRoot(parentNode));
- if (parentPath != null)
+ TreePath parentPath = new TreePath(controller.getTreeModel().getPathToRoot(parentNode));
+ BrowserNodeInfo nodeInfo = controller.getNodeInfoFromPath(parentPath);
+ if (nodeInfo != null)
{
- BrowserNodeInfo nodeInfo =
- controller.getNodeInfoFromPath(parentPath);
- if (nodeInfo != null)
+ TreePath newPath;
+ if (isSuffix)
{
- TreePath newPath;
- if (isSuffix)
- {
- newPath = controller.addSuffix(dn.toString(), parentNode.getDN());
- }
- else
- {
- newPath = controller.notifyEntryAdded(
- controller.getNodeInfoFromPath(parentPath), dn.toString());
- }
- if (newPath != null)
- {
- controller.getTree().setSelectionPath(newPath);
- controller.getTree().scrollPathToVisible(newPath);
- }
+ newPath = controller.addSuffix(dn.toString(), parentNode.getDN());
+ }
+ else
+ {
+ newPath = controller.notifyEntryAdded(controller.getNodeInfoFromPath(parentPath), dn.toString());
+ }
+ if (newPath != null)
+ {
+ controller.getTree().setSelectionPath(newPath);
+ controller.getTree().scrollPathToVisible(newPath);
}
}
}
--
Gitblit v1.10.0