Author: bhupendrab
Date: Thu May 3 02:35:11 2007
New Revision: 534763
URL: http://svn.apache.org/viewvc?view=rev&rev=534763
Log:
Management console users list display is updated.
Modified:
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java
incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
Modified:
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java?view=diff&rev=534763&r1=534762&r2=534763
==============================================================================
---
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java
(original)
+++
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/access/AMQUserManagementMBean.java
Thu May 3 02:35:11 2007
@@ -72,7 +72,7 @@
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
{
Modified:
incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java?view=diff&rev=534763&r1=534762&r2=534763
==============================================================================
---
incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
(original)
+++
incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
Thu May 3 02:35:11 2007
@@ -749,7 +749,10 @@
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;
Modified:
incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java?view=diff&rev=534763&r1=534762&r2=534763
==============================================================================
---
incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
(original)
+++
incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
Thu May 3 02:35:11 2007
@@ -335,11 +335,15 @@
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))
