diff options
| author | Bhupendra Bhusman Bhardwaj <bhupendrab@apache.org> | 2007-05-03 09:35:11 +0000 |
|---|---|---|
| committer | Bhupendra Bhusman Bhardwaj <bhupendrab@apache.org> | 2007-05-03 09:35:11 +0000 |
| commit | ce27507f991168d0ba5b390a6446ac022566812b (patch) | |
| tree | d0b79a5161ca27445b77ffd1a40c26e4e2f29b82 | |
| parent | 69a5be3b51619317bb5732557532db15844061c6 (diff) | |
| download | qpid-python-ce27507f991168d0ba5b390a6446ac022566812b.tar.gz | |
Management console users list display is updated.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@534763 13f79535-47bb-0310-9956-ffa450edef68
3 files changed, 13 insertions, 6 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java b/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java index fbb80494c1..155afa961e 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java +++ b/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java @@ -72,7 +72,7 @@ public class AMQUserManagementMBean extends AMQManagedObject implements UserMana static TabularType _userlistDataType; // Datatype for representing User Lists static CompositeType _userDataType; // Composite type for representing User - static String[] _userItemNames = {"Username", "Read", "Write", "Admin"}; + static String[] _userItemNames = {"Username", "read", "write", "admin"}; static { 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 bd168ed24e..f5b4a22e03 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 @@ -749,7 +749,10 @@ public class OperationTabControl extends TabControl List<String> list = new ArrayList<String>(); for (CompositeData data : records) { - list.add(data.get(USERNAME).toString()); + if (data.containsKey(USERNAME)) + { + list.add(data.get(USERNAME).toString()); + } } return list; diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java index 89ab360937..4f2b70f869 100644 --- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java +++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java @@ -335,11 +335,15 @@ public class ViewUtility if (data.containsKey("MimeType")) { mimeType = (String)data.get("MimeType"); + } + if (data.containsKey("Encoding")) + { encoding = (String)data.get("Encoding"); - if (encoding == null || encoding.length() == 0) - { - encoding = Charset.defaultCharset().name(); - } + } + + if (encoding == null || encoding.length() == 0) + { + encoding = Charset.defaultCharset().name(); } if ("text/plain".equals(mimeType)) |