QPID-2008: Sort the queue names when offering them as an input selection to users during Exchange binding creation and Queue move/copy messages operations

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@798733 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 6 insertions, 0 deletions

diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
index 30a570317f..35b3e8150c 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
@@ -24,6 +24,7 @@ import static org.apache.qpid.management.ui.Constants.EXCHANGE_TYPE;
 import static org.apache.qpid.management.ui.Constants.DEFAULT_EXCHANGE_TYPE_VALUES;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import javax.management.MBeanServerConnection;
@@ -552,6 +553,7 @@ public class ExchangeOperationsTabControl extends TabControl
         }
         else
         {
+            Collections.sort(queueList);
             destinationCombo.setItems(queueList.toArray(new String[0]));
         }
         destinationCombo.select(0);
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
index 44834f0048..5146bab74c 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
@@ -21,6 +21,7 @@
 package org.apache.qpid.management.ui.views.exchange;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import javax.management.MBeanServerConnection;
@@ -527,6 +528,7 @@ public class HeadersExchangeOperationsTabControl extends TabControl
         }
         else
         {
+            Collections.sort(queueList);
             destinationCombo.setItems(queueList.toArray(new String[0]));
         }
         destinationCombo.select(0);
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
index bedc5089c7..d04884102d 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
@@ -25,6 +25,7 @@ import static org.apache.qpid.management.ui.Constants.RESULT;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
@@ -829,6 +830,7 @@ public class QueueOperationsTabControl extends TabControl
         }
         else
         {
+            Collections.sort(queueList);
             destinationCombo.setItems(queueList.toArray(new String[0]));
         }
         destinationCombo.select(0);