From ca669ae54f86dbeea277280690584d9f591c7571 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 18 Feb 2015 07:26:26 +0000
Subject: [PATCH] AutoRefactor: collapse if statements
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
index ddb3667..8c9c9ab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
@@ -983,14 +983,12 @@
lastCreatedElement = null;
}
}
- else if ((node instanceof CustomAttributeTreeNode) &&
- (lastCreatedElement instanceof AttributeType))
+ else if (node instanceof CustomAttributeTreeNode
+ && lastCreatedElement instanceof AttributeType
+ && name.equals(lastCreatedElement.getNameOrOID()))
{
- if (name.equals(lastCreatedElement.getNameOrOID()))
- {
- newSelectionPath = new TreePath(node.getPath());
- lastCreatedElement = null;
- }
+ newSelectionPath = new TreePath(node.getPath());
+ lastCreatedElement = null;
}
}
else if (name.equals(lastSelectedNode.getUserObject()))
@@ -1011,13 +1009,10 @@
DefaultMutableTreeNode[] ocAndAttrs = {objectClasses, attributes};
for (DefaultMutableTreeNode node : ocAndAttrs)
{
- if (node.getParent() != null)
+ if (node.getParent() != null && node.getChildCount() == 0)
{
- if (node.getChildCount() == 0)
- {
- model.removeNodeFromParent(node);
- model.nodeStructureChanged(node);
- }
+ model.removeNodeFromParent(node);
+ model.nodeStructureChanged(node);
}
}
--
Gitblit v1.10.0