QPID-2195: only enable moving messages for newer brokers that dont suffer from issues impacting message delivery and results signalling

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

1 files changed, 37 insertions, 18 deletions

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 28f4c5acba..8e0dc7d981 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
@@ -383,22 +383,6 @@ public class QueueOperationsTabControl extends TabControl
             }
         });
         
-        final Button moveMessagesButton = _toolkit.createButton(buttonsComposite, "Move Message(s) ...", SWT.PUSH);
-        moveMessagesButton.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false));
-        moveMessagesButton.setEnabled(false);
-        moveMessagesButton.addSelectionListener(new SelectionAdapter()
-        {
-            public void widgetSelected(SelectionEvent e)
-            {
-                if (_table.getSelectionIndex() == -1)
-                {
-                    return;
-                }
-                
-                moveOrCopyMessages(moveMessagesButton.getShell(), QueueOperations.MOVE);
-            }
-        });
-        
         if(_ApiVersion.lessThan(1, 3)) //if the server predates Qpid JMX API 1.3
         {
             final Button deleteFirstMessageButton = _toolkit.createButton(buttonsComposite, "Delete 1st Unacquired Msg", SWT.PUSH);
@@ -428,6 +412,35 @@ public class QueueOperationsTabControl extends TabControl
             });
         }
         
+        final Button moveMessagesButton;
+        if(_ApiVersion.greaterThanOrEqualTo(1, 3)) 
+        {
+            //If the server supports Qpid JMX API 1.3, show the move message button.
+            //This is being disabled for earlier brokers due to bugs affecting the result appearance
+            //and impacting on the ability of the source queues to deliver further messages.
+            
+            moveMessagesButton = _toolkit.createButton(buttonsComposite, "Move Message(s) ...", SWT.PUSH);
+
+            moveMessagesButton.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false));
+            moveMessagesButton.setEnabled(false);
+            moveMessagesButton.addSelectionListener(new SelectionAdapter()
+            {
+                public void widgetSelected(SelectionEvent e)
+                {
+                    if (_table.getSelectionIndex() == -1)
+                    {
+                        return;
+                    }
+
+                    moveOrCopyMessages(moveMessagesButton.getShell(), QueueOperations.MOVE);
+                }
+            });
+        }
+        else
+        {
+            moveMessagesButton = null;
+        }
+        
         final Button copyMessagesButton;
         if(_ApiVersion.greaterThanOrEqualTo(1, 3))//if the server supports Qpid JMX API 1.3
         {
@@ -570,7 +583,10 @@ public class QueueOperationsTabControl extends TabControl
                     headerText.setText("Select a message to view its header.");
                     redeliveredText.setText("-");
                     viewSelectedMsgButton.setEnabled(false);
-                    moveMessagesButton.setEnabled(false);
+                    if(moveMessagesButton != null)
+                    {
+                        moveMessagesButton.setEnabled(false);
+                    }
                     if(copyMessagesButton != null)
                     {
                         copyMessagesButton.setEnabled(false);
@@ -584,7 +600,10 @@ public class QueueOperationsTabControl extends TabControl
                 }
                 else
                 {   
-                    moveMessagesButton.setEnabled(true);
+                    if(moveMessagesButton != null)
+                    {
+                        moveMessagesButton.setEnabled(true);
+                    }
                     if(copyMessagesButton != null)
                     {
                         copyMessagesButton.setEnabled(true);