From 04f1cc0b5351b6d39dc43cd574d92359573c9ea2 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Tue, 06 Aug 2013 15:39:09 +0000
Subject: [PATCH] CR-2124 Fix OPENDJ-1016 Control panel does not follow static group recommendation from documentation
---
opends/src/guitools/org/opends/guitools/controlpanel/ui/NewGroupPanel.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewGroupPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewGroupPanel.java
index 5d841d7..116e85f 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewGroupPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewGroupPanel.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS.
*/
package org.opends.guitools.controlpanel.ui;
@@ -734,7 +735,7 @@
protected String getLDIF()
{
StringBuilder sb = new StringBuilder();
- sb.append("dn: "+dn.getText()+"\n");
+ sb.append("dn: ").append(dn.getText()).append("\n");
String[] attrNames = {"cn", "description"};
JTextField[] textFields = {name, description};
@@ -743,14 +744,14 @@
String value = textFields[i].getText().trim();
if (value.length() > 0)
{
- sb.append(attrNames[i]+": "+value+"\n");
+ sb.append(attrNames[i]).append(": ").append(value).append("\n");
}
}
sb.append("objectclass: top\n");
if (staticGroup.isSelected())
{
- sb.append("objectClass: "+ServerConstants.OC_GROUP_OF_UNIQUE_NAMES);
+ sb.append("objectClass: ").append(ServerConstants.OC_GROUP_OF_NAMES);
String[] members = staticMembers.getText().split("\n");
LinkedHashSet<DN> dns = new LinkedHashSet<DN>();
for (String member : members)
@@ -772,19 +773,23 @@
for (DN dn : dns)
{
- sb.append("\n"+ServerConstants.ATTR_UNIQUE_MEMBER+": "+dn.toString());
+ sb.append("\n").append(ServerConstants.ATTR_MEMBER)
+ .append(": ").append(dn);
}
}
else if (dynamicGroup.isSelected())
{
- sb.append("objectClass: "+ServerConstants.OC_GROUP_OF_URLS+"\n");
- sb.append(ServerConstants.ATTR_MEMBER_URL+": "+filter.getText().trim());
+ sb.append("objectClass: ").append(ServerConstants.OC_GROUP_OF_URLS)
+ .append("\n");
+ sb.append(ServerConstants.ATTR_MEMBER_URL).append(": ")
+ .append(filter.getText().trim());
}
else
{
sb.append("objectClass: ds-virtual-static-group\n");
- sb.append("objectClass: "+ServerConstants.OC_GROUP_OF_UNIQUE_NAMES+"\n");
- sb.append("ds-target-group-dn: "+referenceGroup.getText().trim());
+ sb.append("objectClass: ").append(ServerConstants.OC_GROUP_OF_NAMES)
+ .append("\n");
+ sb.append("ds-target-group-dn: ").append(referenceGroup.getText().trim());
}
return sb.toString();
--
Gitblit v1.10.0