QPID-471

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@533065 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 69 insertions, 7 deletions

diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
index 127ae22a10..d6f895b64a 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
@@ -60,6 +60,7 @@ public class Constants
     public final static String OPERATION_MOVE_MESSAGES = "moveMessages";
     
     public final static String OPERATION_CREATEUSER = "createUser";
+    public final static String OPERATION_DELETEUSER = "deleteUser";
     public final static String OPERATION_VIEWUSERS = "viewUsers";
     public final static String OPERATION_PARAM_USERNAME = "username";
     
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
index 988b22b4cf..4d4b3e87e7 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
@@ -25,6 +25,7 @@ import static org.apache.qpid.management.ui.Constants.*;
 import java.lang.reflect.Constructor;
 import java.security.Security;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -581,6 +582,7 @@ public class JMXServerRegistry extends ServerRegistry
     public void setUserList(List<String> list)
     {
         _usersList = list;
+        Collections.sort(_usersList);
     }
     
     public List<String> getUsernames()
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java
index 2b83645942..bf3b730b3e 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java
@@ -89,4 +89,22 @@ public class OperationData
     {
         return (_returnType.equals("void") || _returnType.equals("java.lang.Void"));
     }
+    
+    public Object getParameterValue(String paramName)
+    {
+        if (_parameters == null)
+        {
+            return null;
+        }
+        
+        for (int i = 0; i < _parameters.size(); i++)
+        {
+            if (paramName.equalsIgnoreCase(_parameters.get(i).getName()))
+            {
+                return _parameters.get(i).getValue();
+            }
+        }
+        
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
index 60d8f7920d..bd168ed24e 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
@@ -278,8 +278,7 @@ public class OperationTabControl extends TabControl
             {
                 items = EXCHANGE_TYPE_VALUES;
             }
-            else if (_mbean.isAdmin() && param.getName().equals(OPERATION_PARAM_USERNAME)
-                                      && !_opData.getName().equals(OPERATION_CREATEUSER))
+            else if (isUserListParameter(param))
             {
                 List<String> list = ApplicationRegistry.getServerRegistry(_mbean).getUsernames();
                 if (list != null && !list.isEmpty())
@@ -361,6 +360,17 @@ public class OperationTabControl extends TabControl
         }
     }
     
+    private boolean isUserListParameter(ParameterData param)
+    {
+        if (_mbean.isAdmin() && param.getName().equals(OPERATION_PARAM_USERNAME)
+                && !_opData.getName().equals(OPERATION_CREATEUSER))
+        {
+            return true;
+        }
+        
+        return false;
+    }
+    
     /**
      * Creates customized dispaly for a method "CreateNewBinding" for Headers exchange
      *
@@ -624,8 +634,16 @@ public class OperationTabControl extends TabControl
             {
                 executeAndShowResults();
             }
-            clearParameters();
-            clearParameterValues(_paramsComposite);
+            
+            if (_mbean.isAdmin() && _opData.getName().equals(OPERATION_DELETEUSER))
+            {
+                refresh(_mbean);
+            }
+            else
+            {
+                clearParameters();
+                clearParameterValues(_paramsComposite);
+            }
         }
     }
     
@@ -659,9 +677,32 @@ public class OperationTabControl extends TabControl
          * Here we are adding the users to a list, which will be used to list username to be selected on
          * pages like "delete user", "set password" instead of typing the username
         */
-        if (_mbean.isAdmin() && _opData.getName().equals(OPERATION_VIEWUSERS))
+        if (_mbean.isAdmin())
         {
-            ApplicationRegistry.getServerRegistry(_mbean).setUserList(extractUserList(result));
+            if (_opData.getName().equals(OPERATION_VIEWUSERS))
+            {
+                ApplicationRegistry.getServerRegistry(_mbean).setUserList(extractUserList(result));
+            }
+            else if (_opData.getName().equals(OPERATION_DELETEUSER))
+            {
+                List<String> list = ApplicationRegistry.getServerRegistry(_mbean).getUsernames();
+                Object userName = _opData.getParameterValue(OPERATION_PARAM_USERNAME);
+                if ((list != null) && !list.isEmpty() && (userName != null))
+                {
+                    list.remove(userName);
+                    ApplicationRegistry.getServerRegistry(_mbean).setUserList(list);
+                }                
+            }
+            else if (_opData.getName().equals(OPERATION_CREATEUSER))
+            {
+                List<String> list = ApplicationRegistry.getServerRegistry(_mbean).getUsernames();
+                Object userName = _opData.getParameterValue(OPERATION_PARAM_USERNAME);
+                if ((list != null) && !list.isEmpty() && (userName != null))
+                {
+                    list.add(userName.toString());
+                    ApplicationRegistry.getServerRegistry(_mbean).setUserList(list);
+                }                
+            }
         }
         // end of custom code
         
@@ -710,7 +751,7 @@ public class OperationTabControl extends TabControl
         {
             list.add(data.get(USERNAME).toString());
         }
-        Collections.sort(list);
+        
         return list;
     }