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/BrowseSchemaPanel.java | 10 +++-------
1 files changed, 3 insertions(+), 7 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 53e9ae9..c4f2012 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
@@ -136,7 +136,6 @@
private CommonSchemaElements lastCreatedElement;
-
private final CategoryTreeNode attributes = new CategoryTreeNode(INFO_CTRL_PANEL_ATTRIBUTES_CATEGORY_NODE.get());
private final CategoryTreeNode objectClasses =
new CategoryTreeNode(INFO_CTRL_PANEL_OBJECTCLASSES_CATEGORY_NODE.get());
@@ -1172,18 +1171,15 @@
return mustAdd(ocName, oc.getOID(), oc.getPrimaryName(), oc.getNormalizedNames());
}
- private boolean mustAdd(String name, String oid, String primaryName, Iterable<String> names)
+ private boolean mustAdd(String name, String oid, String primaryName, Set<String> names)
{
- List<String> values = new ArrayList<>();
+ List<String> values = new ArrayList<>(names.size() + 2);
values.add(oid);
if (primaryName != null)
{
values.add(primaryName);
}
- for (String v : names)
- {
- values.add(v);
- }
+ values.addAll(names);
return matchFilter(values, name, false);
}
--
Gitblit v1.10.0