From 98e8aab354a385055392de7154758c1890a3265a Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 13 Feb 2015 16:40:03 +0000
Subject: [PATCH] AutoRefactor: use Collection.addAll()
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
index 01ad7d4..65d4666 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -501,14 +501,8 @@
inheritedRequiredAttributes.clear();
for (ObjectClass oc : superiors.getSelectedSuperiors())
{
- for (AttributeType attr : oc.getRequiredAttributeChain())
- {
- inheritedRequiredAttributes.add(attr);
- }
- for (AttributeType attr : oc.getOptionalAttributeChain())
- {
- inheritedOptionalAttributes.add(attr);
- }
+ inheritedRequiredAttributes.addAll(oc.getRequiredAttributeChain());
+ inheritedOptionalAttributes.addAll(oc.getOptionalAttributeChain());
}
for (AttributeType attr : inheritedRequiredAttributes)
{
@@ -752,24 +746,24 @@
private Set<AttributeType> getRequiredAttributes()
{
- HashSet<AttributeType> attrs = new HashSet<AttributeType>();
- attrs.addAll(attributes.getSelectedListModel1().getData());
- attrs.removeAll(inheritedRequiredAttributes);
- return attrs;
+ return intersect(attributes.getSelectedListModel1().getData(), inheritedRequiredAttributes);
}
private Set<AttributeType> getOptionalAttributes()
{
- HashSet<AttributeType> attrs = new HashSet<AttributeType>();
- attrs.addAll(attributes.getSelectedListModel2().getData());
- attrs.removeAll(inheritedOptionalAttributes);
+ return intersect(attributes.getSelectedListModel2().getData(), inheritedOptionalAttributes);
+ }
+
+ private Set<AttributeType> intersect(Set<AttributeType> set1, Set<AttributeType> set2)
+ {
+ HashSet<AttributeType> attrs = new HashSet<AttributeType>(set1);
+ attrs.removeAll(set2);
return attrs;
}
/**
* A renderer for the attribute lists. The renderer basically marks the
* inherited attributes with an asterisk.
- *
*/
private class AttributeTypeCellRenderer implements ListCellRenderer
{
--
Gitblit v1.10.0