QPID-2072: add missing initialisations of sort column/direction

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

5 files changed, 16 insertions, 0 deletions

diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
index e981ec1c3c..3bb31752ef 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
@@ -199,6 +199,8 @@ public class ConnectionOperationsTabControl extends TabControl
         _tableViewer.setContentProvider(new ContentProviderImpl());
         _tableViewer.setLabelProvider(new LabelProviderImpl());
         _tableViewer.setSorter(tableSorter);
+        _table.setSortColumn(_table.getColumn(0));
+        _table.setSortDirection(SWT.UP);
         
         Composite buttonsComposite = _toolkit.createComposite(viewChannelsGroup);
         gridData = new GridData(SWT.RIGHT, SWT.BOTTOM, false, false);
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
index 35b3e8150c..e3dea6e96b 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
@@ -237,6 +237,8 @@ public class ExchangeOperationsTabControl extends TabControl
         _keysTableViewer.setContentProvider(new ContentProviderImpl(BINDING_KEY));
         _keysTableViewer.setLabelProvider(new LabelProviderImpl(BINDING_KEY));
         _keysTableViewer.setSorter(tableSorter);
+        _keysTable.setSortColumn(_keysTable.getColumn(0));
+        _keysTable.setSortDirection(SWT.UP);
         
         
         _queuesTable = new Table (tablesComposite, SWT.SINGLE | SWT.SCROLL_LINE | SWT.BORDER | SWT.FULL_SELECTION);
@@ -287,6 +289,8 @@ public class ExchangeOperationsTabControl extends TabControl
         _queuesTableViewer.setContentProvider(new ContentProviderImpl(QUEUES));
         _queuesTableViewer.setLabelProvider(new LabelProviderImpl(QUEUES));
         _queuesTableViewer.setSorter(queuesTableSorter);
+        _queuesTable.setSortColumn(_queuesTable.getColumn(0));
+        _queuesTable.setSortDirection(SWT.UP);
         _queuesTableViewer.setInput(new String[]{"Select a binding key to view queues"});
         
         //listener for double clicking to open the selection mbean
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
index 5146bab74c..5811f983fd 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
@@ -220,6 +220,8 @@ public class HeadersExchangeOperationsTabControl extends TabControl
         _bindingNumberTableViewer.setContentProvider(new ContentProviderImpl(BINDING_NUM));
         _bindingNumberTableViewer.setLabelProvider(new LabelProviderImpl(BINDING_NUM));
         _bindingNumberTableViewer.setSorter(tableSorter);
+        _bindingNumberTable.setSortColumn(_bindingNumberTable.getColumn(0));
+        _bindingNumberTable.setSortDirection(SWT.UP);
         
         //table of header bindings
         _headersTable = new Table (tablesComposite, SWT.SINGLE | SWT.SCROLL_LINE | SWT.BORDER | SWT.FULL_SELECTION);
@@ -272,6 +274,8 @@ public class HeadersExchangeOperationsTabControl extends TabControl
         _headersTableViewer.setContentProvider(new ContentProviderImpl(HEADER_BINDINGS));
         _headersTableViewer.setLabelProvider(new LabelProviderImpl(HEADER_BINDINGS));
         _headersTableViewer.setSorter(queuesTableSorter);
+        _headersTable.setSortColumn(_headersTable.getColumn(0));
+        _headersTable.setSortDirection(SWT.UP);
         _headersTableViewer.setInput(new String[]{"Select a binding to view key-value pairs"});
         
         _bindingNumberTableViewer.addSelectionChangedListener(new ISelectionChangedListener(){
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
index c7c7a1791a..a2509616de 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
@@ -358,6 +358,8 @@ public class QueueOperationsTabControl extends TabControl
         _tableViewer.setContentProvider(new ContentProviderImpl());
         _tableViewer.setLabelProvider(new LabelProviderImpl());
         _tableViewer.setSorter(tableSorter);
+        _table.setSortColumn(_table.getColumn(0));
+        _table.setSortDirection(SWT.UP);
         
         //Side Buttons
         Composite buttonsComposite = _toolkit.createComposite(tableAndButtonsComposite);
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java
index fef1e9f887..3b03aeaff1 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java
@@ -205,6 +205,8 @@ public class VHostTabControl extends TabControl
         _queueTableViewer.setContentProvider(new ContentProviderImpl());
         _queueTableViewer.setLabelProvider(new LabelProviderImpl());
         _queueTableViewer.setSorter(tableSorter);
+        _queueTable.setSortColumn(_queueTable.getColumn(0));
+        _queueTable.setSortDirection(SWT.UP);
         
         Composite queuesRightComposite = _toolkit.createComposite(queuesGroup);
         gridData = new GridData(SWT.FILL, SWT.FILL, false, true);
@@ -314,6 +316,8 @@ public class VHostTabControl extends TabControl
         _exchangeTableViewer.setContentProvider(new ContentProviderImpl());
         _exchangeTableViewer.setLabelProvider(new LabelProviderImpl());
         _exchangeTableViewer.setSorter(exchangeTableSorter);
+        _exchangeTable.setSortColumn(_exchangeTable.getColumn(0));
+        _exchangeTable.setSortDirection(SWT.UP);
         
         Composite exchangesRightComposite = _toolkit.createComposite(exchangesGroup);
         gridData = new GridData(SWT.FILL, SWT.FILL, false, true);