From 00d37e85955e374be365f1c34de5af1f69a6476c Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SelectAliasDialog.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SelectAliasDialog.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SelectAliasDialog.java
index ee0b585..10a24b0 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SelectAliasDialog.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SelectAliasDialog.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS.
*/
package org.opends.quicksetup.installer.ui;
@@ -34,6 +35,7 @@
import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
+import java.util.Collections;
import java.util.TreeSet;
import javax.swing.Box;
@@ -105,10 +107,7 @@
}
isCanceled = true;
TreeSet<String> s = new TreeSet<String>();
- for (int i=0; i<aliases.length; i++)
- {
- s.add(aliases[i]);
- }
+ Collections.addAll(s, aliases);
String[] orderedAliases = new String[s.size()];
s.toArray(orderedAliases);
comboAliases.setModel(new DefaultComboBoxModel(orderedAliases));
--
Gitblit v1.10.0