QPID-2857: address a further 60 or so issues identified by running FindBugs across the Java codebase

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

27 files changed, 195 insertions, 153 deletions

diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java b/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java
index c03b782987..40202c2679 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java
+++ b/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java
@@ -137,7 +137,7 @@ public class JMXConnnectionFactory {
 	    Map<String, Object> env = new HashMap<String, Object>();
 	    JMXServiceURL jmxUrl = null;
 	    
-        if (connectionType == "RMI")
+        if (connectionType.equalsIgnoreCase("RMI"))
         {
             jmxUrl = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://" + host + ":" + port + "/jmxrmi");
 
@@ -167,7 +167,7 @@ public class JMXConnnectionFactory {
              * jmxremote.sasl plugin (from the jmxremote_optional.jar) */
             env.put("jmx.remote.protocol.provider.pkgs", "com.sun.jmx.remote.protocol");
 
-            if (connectionType == "JMXMP_CRAM-MD5")
+            if (connectionType.equalsIgnoreCase("JMXMP_CRAM-MD5"))
             {
                 Map<String, Class<? extends SaslClientFactory>> map = new HashMap<String, Class<? extends SaslClientFactory>>();
                 map.put("CRAM-MD5-HASHED", CRAMMD5HashedSaslClientFactory.class);
@@ -178,7 +178,7 @@ public class JMXConnnectionFactory {
                 env.put("jmx.remote.profiles", Constants.SASL_CRAMMD5);
                 env.put("jmx.remote.sasl.callback.handler", handler);
             }
-            else if (connectionType == "JMXMP_PLAIN")
+            else if (connectionType.equalsIgnoreCase("JMXMP_PLAIN"))
             {
                 Security.addProvider(new SaslProvider());
                 CallbackHandler handler = new UserPasswordCallbackHandler(userName, password);
@@ -233,9 +233,15 @@ public class JMXConnnectionFactory {
         {
             try
             {
-                _jmxc = null;
-                _connectionRetrieved = false;
-                _connectionException = null;
+                synchronized (this)
+                {
+                    if(_connectionRetrieved)
+                    {
+                        _jmxc = null;
+                        _connectionRetrieved = false;
+                        _connectionException = null;
+                    }
+                }
                 
                 JMXConnector conn = JMXConnectorFactory.connect(_jmxUrl, _env);
                 
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
index dfdd43ba1a..6d15869f0c 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
+++ b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
@@ -21,6 +21,9 @@
 package org.apache.qpid.management.common.mbeans;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 import org.apache.qpid.management.common.mbeans.annotations.MBeanAttribute;
 import org.apache.qpid.management.common.mbeans.annotations.MBeanOperation;
@@ -38,10 +41,12 @@ public interface LoggingManagement
     String TYPE = "LoggingManagement";
     
     //TabularType and contained CompositeType key/description information
-    //For compatibility reasons, DONT MODIFY the existing key values if expanding the set. 
-    String[] COMPOSITE_ITEM_NAMES = {"LoggerName", "Level"};
-    String[] COMPOSITE_ITEM_DESCRIPTIONS = {"Name of the logger", "Level of the logger"};
-    String[] TABULAR_UNIQUE_INDEX = {COMPOSITE_ITEM_NAMES[0]};
+    //For compatibility reasons, DONT MODIFY the existing key values if expanding the set.
+    String LOGGER_NAME = "LoggerName";
+    String LOGGER_LEVEL = "Level";
+    List<String> COMPOSITE_ITEM_NAMES = Collections.unmodifiableList(Arrays.asList(LOGGER_NAME, LOGGER_LEVEL));
+    List<String> COMPOSITE_ITEM_DESCRIPTIONS = Collections.unmodifiableList(Arrays.asList("Name of the logger", "Level of the logger"));
+    List<String> TABULAR_UNIQUE_INDEX = Collections.unmodifiableList(Arrays.asList(LOGGER_NAME));
     
     /**
      * Attribute to represent the log4j xml configuration file's LogWatch interval.
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
index ff096aa22b..d6b79d1dde 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
+++ b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
@@ -22,8 +22,10 @@
 package org.apache.qpid.management.common.mbeans;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
-import java.security.Principal;
+import java.util.List;
 
 import javax.management.JMException;
 import javax.management.MBeanOperationInfo;
@@ -45,9 +47,13 @@ public interface ManagedConnection
     //TabularType and contained CompositeType key/description information
     //For compatibility reasons, DONT MODIFY the existing key values if expanding the set. 
     //"Flow Blocked" added in Qpid JMX API 1.5
-    String[] COMPOSITE_ITEM_NAMES = {"Channel Id", "Transactional", "Default Queue", "Unacknowledged Message Count", "Flow Blocked"};
-    String[] COMPOSITE_ITEM_DESCRIPTIONS = {"Channel Id", "Transactional", "Default Queue", "Unacknowledged Message Count", "Flow Blocked"};
-    String[] TABULAR_UNIQUE_INDEX = {COMPOSITE_ITEM_NAMES[0]};
+    String CHAN_ID = "Channel Id";
+    String TRANSACTIONAL = "Transactional";
+    String DEFAULT_QUEUE = "Default Queue";
+    String UNACKED_COUNT = "Unacknowledged Message Count";
+    String FLOW_BLOCKED = "Flow Blocked";
+    List<String> COMPOSITE_ITEM_NAMES_DESC = Collections.unmodifiableList(Arrays.asList(CHAN_ID, TRANSACTIONAL, DEFAULT_QUEUE, UNACKED_COUNT, FLOW_BLOCKED));
+    List<String> TABULAR_UNIQUE_INDEX = Collections.unmodifiableList(Arrays.asList(CHAN_ID));
 
     @MBeanAttribute(name = "ClientId", description = "Client Id")
     String getClientId();
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
index 970f5913d5..78a1eb964f 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
+++ b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
@@ -49,17 +49,17 @@ public interface ManagedExchange
 
     List<String> COMPOSITE_ITEM_NAMES = Collections.unmodifiableList(Arrays.asList(BINDING_KEY, QUEUE_NAMES));
     List<String> COMPOSITE_ITEM_DESCRIPTIONS = Collections.unmodifiableList(Arrays.asList(BINDING_KEY, QUEUE_NAMES));
-    String[] TABULAR_UNIQUE_INDEX = {BINDING_KEY};
+    List<String> TABULAR_UNIQUE_INDEX = Collections.unmodifiableList(Arrays.asList(BINDING_KEY));
 
     //TabularType and contained CompositeType key/description info for HEADERS exchange only.
     //For compatibility reasons, DONT MODIFY the existing key values if expanding the set. 
-    String BINDING_NUMBER = "Binding No";
-    String QUEUE_NAME = "Queue  Name";
-    String QUEUE_BINDINGS = "Queue Bindings";
+    String HDR_BINDING_NUMBER = "Binding No";
+    String HDR_QUEUE_NAME = "Queue  Name";
+    String HDR_QUEUE_BINDINGS = "Queue Bindings";
 
-    String[] HEADERS_COMPOSITE_ITEM_NAMES = new String[]{BINDING_NUMBER, QUEUE_NAME, QUEUE_BINDINGS};
-    String[] HEADERS_COMPOSITE_ITEM_DESC = new String[]{BINDING_NUMBER, QUEUE_NAME, QUEUE_BINDINGS};
-    String[] HEADERS_TABULAR_UNIQUE_INDEX = new String[]{BINDING_NUMBER};
+    List<String> HEADERS_COMPOSITE_ITEM_NAMES = Collections.unmodifiableList(Arrays.asList(HDR_BINDING_NUMBER, HDR_QUEUE_NAME, HDR_QUEUE_BINDINGS));
+    List<String> HEADERS_COMPOSITE_ITEM_DESC = Collections.unmodifiableList(Arrays.asList(HDR_BINDING_NUMBER, HDR_QUEUE_NAME, HDR_QUEUE_BINDINGS));
+    List<String> HEADERS_TABULAR_UNIQUE_INDEX = Collections.unmodifiableList(Arrays.asList(HDR_BINDING_NUMBER));
 
     /**
      * Returns the name of the managed exchange.
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
index 7d61d32f71..be31d8ef88 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
+++ b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
@@ -45,14 +45,20 @@ public interface ManagedQueue
     //TabularType and contained CompositeType key/description information for message list
     //For compatibility reasons, DONT MODIFY the existing key values if expanding the set. 
     //"Queue Position" added in Qpid JMX API 1.3
-    String[] VIEW_MSGS_COMPOSITE_ITEM_NAMES = {"AMQ MessageId", "Header", "Size(bytes)", "Redelivered", "Queue Position"};
-    String[] VIEW_MSGS_COMPOSITE_ITEM_DESCRIPTIONS = {"AMQ MessageId", "Header", "Size(bytes)", "Redelivered", "Queue Position"};
-    String[] VIEW_MSGS_TABULAR_UNIQUE_INDEX = {VIEW_MSGS_COMPOSITE_ITEM_NAMES[0]};
-
+    String MSG_AMQ_ID = "AMQ MessageId";
+    String MSG_HEADER = "Header";
+    String MSG_SIZE = "Size(bytes)";
+    String MSG_REDELIVERED = "Redelivered";
+    String MSG_QUEUE_POS = "Queue Position";
+    List<String> VIEW_MSGS_COMPOSITE_ITEM_NAMES_DESC = Collections.unmodifiableList(Arrays.asList(MSG_AMQ_ID, MSG_HEADER, MSG_SIZE, MSG_REDELIVERED, MSG_QUEUE_POS));
+    List<String> VIEW_MSGS_TABULAR_UNIQUE_INDEX = Collections.unmodifiableList(Arrays.asList(MSG_QUEUE_POS));
+  
     //CompositeType key/description information for message content
-    //For compatibility reasons, DONT MODIFY the existing key values if expanding the set. 
-    String[] VIEW_MSG_CONTENT_COMPOSITE_ITEM_NAMES = { "AMQ MessageId", "MimeType", "Encoding", "Content" };
-    String[] VIEW_MSG_CONTENT_COMPOSITE_ITEM_DESCRIPTIONS = { "AMQ MessageId", "MimeType", "Encoding", "Content" };
+    //For compatibility reasons, DONT MODIFY the existing key values if expanding the set.
+    String MIME = "MimeType";
+    String ENCODING = "Encoding";
+    String CONTENT = "Content";
+    List<String> VIEW_MSG_CONTENT_COMPOSITE_ITEM_NAMES_DESC = Collections.unmodifiableList(Arrays.asList(MSG_AMQ_ID, MIME, ENCODING, CONTENT));
     
     //Individual attribute name constants
     static final String ATTR_NAME = "Name";
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
index d83d534428..2bd00d5802 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
+++ b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
@@ -20,6 +20,10 @@
  */
 package org.apache.qpid.management.common.mbeans;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import org.apache.qpid.management.common.mbeans.annotations.MBeanOperation;
 import org.apache.qpid.management.common.mbeans.annotations.MBeanOperationParameter;
 
@@ -33,12 +37,17 @@ public interface UserManagement
     
     //TabularType and contained CompositeType key/description information.
     //For compatibility reasons, DONT MODIFY the existing key values if expanding the set.
-    String[] COMPOSITE_ITEM_NAMES = {"Username", "read", "write", "admin"};
-    String[] COMPOSITE_ITEM_DESCRIPTIONS = {"Broker Login username", 
+    String USERNAME = "Username";
+    String RIGHTS_READ_ONLY = "read";
+    String RIGHTS_READ_WRITE = "write";
+    String RIGHTS_ADMIN = "admin";
+    List<String> COMPOSITE_ITEM_NAMES = Collections.unmodifiableList(Arrays.asList(USERNAME, RIGHTS_READ_ONLY, RIGHTS_READ_WRITE, RIGHTS_ADMIN));
+    List<String> COMPOSITE_ITEM_DESCRIPTIONS = Collections.unmodifiableList(
+                              Arrays.asList("Broker Login username", 
                                             "Management Console Read Permission", 
                                             "Management Console Write Permission", 
-                                            "Management Console Admin Permission"};
-    String[] TABULAR_UNIQUE_INDEX = {COMPOSITE_ITEM_NAMES[0]};
+                                            "Management Console Admin Permission"));
+    List<String> TABULAR_UNIQUE_INDEX = Collections.unmodifiableList(Arrays.asList(USERNAME));
 
     //********** Operations *****************//
     /**
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java
index 5eab267c28..d6a9c0b0c6 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java
@@ -34,14 +34,14 @@ public class Activator extends AbstractUIPlugin
 	public static final String PLUGIN_ID = "org.apache.qpid.management.ui";
 
 	// The shared instance
-	private static Activator plugin;
-	
+	private static final Activator PLUGIN = new Activator();
+
 	/**
 	 * The constructor
 	 */
 	public Activator()
     {
-		plugin = this;
+		
 	}
 
 	/*
@@ -57,7 +57,6 @@ public class Activator extends AbstractUIPlugin
 	 */
 	public void stop(BundleContext context) throws Exception
     {
-		plugin = null;
 		super.stop(context);
 	}
 
@@ -68,7 +67,7 @@ public class Activator extends AbstractUIPlugin
 	 */
 	public static Activator getDefault()
     {
-		return plugin;
+		return PLUGIN;
 	}
 
 	/**
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApiVersion.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApiVersion.java
index a8eda3f3d1..2bdcd77f08 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApiVersion.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApiVersion.java
@@ -104,7 +104,7 @@ public class ApiVersion
 
     public String toString()
     {
-        return new String("major=" + major + ",minor=" + minor);
+        return "major=" + major + ",minor=" + minor;
     }
 
 }
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 9bf1b91c49..c8f95dd8cb 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
@@ -20,6 +20,10 @@
  */
 package org.apache.qpid.management.ui;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Contains constants for the application
  * @author Bhupendra Bhardwaj
@@ -83,9 +87,10 @@ public class Constants
     public final static String FANOUT_EXCHANGE = "fanout";
     public final static String HEADERS_EXCHANGE = "headers";
     public final static String TOPIC_EXCHANGE = "topic";
-    public final static String[] DEFAULT_EXCHANGE_TYPE_VALUES = {DIRECT_EXCHANGE, FANOUT_EXCHANGE, HEADERS_EXCHANGE, TOPIC_EXCHANGE};
-    public final static String[] BOOLEAN_TYPE_VALUES = {"false", "true"};
-    public final static String[] ATTRIBUTE_TABLE_TITLES = {"Attribute Name", "Value"};  
+    public final static List<String> DEFAULT_EXCHANGE_TYPE_VALUES = Collections.unmodifiableList(
+            Arrays.asList(DIRECT_EXCHANGE, FANOUT_EXCHANGE, HEADERS_EXCHANGE, TOPIC_EXCHANGE));
+    public final static List<String> ATTRIBUTE_TABLE_TITLES = Collections.unmodifiableList(
+            Arrays.asList("Attribute Name", "Value"));  
     
     public final static String ACTION_ADDSERVER = "New Connection";
     public final static String ACTION_RECONNECT = "Reconnect";
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
index 694f7ba86b..6fa78b1d36 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
@@ -43,18 +43,20 @@ public class ClientListener implements NotificationListener
     
     public void handleNotification(Notification notification, Object handback)
     {
-        ObjectName objName = null;
-        String     type = notification.getType();
+        String type = notification.getType();
         
-        if (MBeanServerNotification.REGISTRATION_NOTIFICATION.equals(type))
+        if(notification instanceof MBeanServerNotification)
         {
-            objName = ((MBeanServerNotification)notification).getMBeanName();
-            getServerRegistry().registerManagedObject(objName);
-        }
-        else if (MBeanServerNotification.UNREGISTRATION_NOTIFICATION.equals(type))
-        {
-            objName = ((MBeanServerNotification)notification).getMBeanName();
-            getServerRegistry().unregisterManagedObject(objName);
+            ObjectName objName = ((MBeanServerNotification)notification).getMBeanName();
+            
+            if (MBeanServerNotification.REGISTRATION_NOTIFICATION.equals(type))
+            {
+                getServerRegistry().registerManagedObject(objName);
+            }
+            else if (MBeanServerNotification.UNREGISTRATION_NOTIFICATION.equals(type))
+            {
+                getServerRegistry().unregisterManagedObject(objName);
+            }
         }
         else if (JMXConnectionNotification.FAILED.equals(type))
         {
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
index 7c34085e0e..6d6aa80f4d 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
@@ -327,7 +327,7 @@ public class MBeanUtility
                     }
                     else
                     {
-                        attributeValues.add(new String("-"));
+                        attributeValues.add("-");
                     }
                 }
                 
@@ -417,7 +417,7 @@ public class MBeanUtility
                 throw new ManagementConsoleException("Entered value is too big for \"" +
                                                      ViewUtility.getDisplayText(attribute.getName()) + "\"");
             }
-            newValue = new Long(Long.parseLong(value));
+            newValue = Long.parseLong(value);
         }
         else if (attribute.getDataType().equals(Integer.class.getName()))
         {
@@ -425,7 +425,7 @@ public class MBeanUtility
             {
                 throw new ManagementConsoleException("Entered value is too big for " + attribute.getName());
             }
-            newValue = new Integer(Integer.parseInt(value));
+            newValue = Integer.parseInt(value);
         }
         else if (attribute.getDataType().equals(Boolean.class.getName()))
         {
@@ -434,7 +434,7 @@ public class MBeanUtility
                 throw new ManagementConsoleException("Entered value was not true or false");
             }
 
-            newValue = new Boolean(Boolean.valueOf(value)); 
+            newValue = Boolean.valueOf(value); 
         }
         
         mbsc.setAttribute(jmxbean.getObjectName(), new Attribute(attribute.getName(), newValue));           
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
index 36aed6f9ab..2b9f5042dc 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
@@ -156,10 +156,10 @@ public class AttributesTabControl extends TabControl
         GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
         _table.setLayoutData(gridData);
         
-        for (int i = 0; i < ATTRIBUTE_TABLE_TITLES.length; ++i)
+        for (int i = 0; i < ATTRIBUTE_TABLE_TITLES.size(); ++i)
         {
             final TableColumn column = new TableColumn(_table, SWT.NONE);
-            column.setText(ATTRIBUTE_TABLE_TITLES[i]);
+            column.setText(ATTRIBUTE_TABLE_TITLES.get(i));
             column.setWidth(tableWidths[i]);
             column.setResizable(true);
         }
@@ -175,7 +175,8 @@ public class AttributesTabControl extends TabControl
     {
         _tableViewer = new TableViewer(_table);
         _tableViewer.setUseHashlookup(true);
-        _tableViewer.setColumnProperties(ATTRIBUTE_TABLE_TITLES);
+        _tableViewer.setColumnProperties(
+                ATTRIBUTE_TABLE_TITLES.toArray(new String[ATTRIBUTE_TABLE_TITLES.size()]));
         _tableViewer.setContentProvider(new ContentProviderImpl());
         _tableViewer.setLabelProvider(new LabelProviderImpl());
         _tableViewer.setSorter(new ViewerSorterImpl());
@@ -451,7 +452,7 @@ public class AttributesTabControl extends TabControl
         parent.setLayout(layout);
 
         // Name
-        Label label = _toolkit.createLabel(parent, ATTRIBUTE_TABLE_TITLES[0], SWT.NONE);       
+        Label label = _toolkit.createLabel(parent, ATTRIBUTE_TABLE_TITLES.get(0), SWT.NONE);       
         GridData layoutData = new GridData(SWT.TRAIL, SWT.TOP, false, false);
         label.setLayoutData(layoutData);
         int textStyle = SWT.BEGINNING | SWT.BORDER |SWT.READ_ONLY;
@@ -466,7 +467,7 @@ public class AttributesTabControl extends TabControl
         value.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
         
         // value
-        label = _toolkit.createLabel(parent, ATTRIBUTE_TABLE_TITLES[1], SWT.NONE);
+        label = _toolkit.createLabel(parent, ATTRIBUTE_TABLE_TITLES.get(1), SWT.NONE);
         label.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, false, false));
         
         if (!attribute.isReadable())
@@ -480,7 +481,7 @@ public class AttributesTabControl extends TabControl
             {
                 if (attribute.getValue() instanceof String[])
                 {
-                    String result = new String("");
+                    String result = "";
                     for(String val : (String[]) attribute.getValue()){
                         result = result.concat(val+ "; ");
                     }
@@ -813,7 +814,7 @@ public class AttributesTabControl extends TabControl
      * Content Provider class for the table viewer
      * @author Bhupendra Bhardwaj
      */
-    private class ContentProviderImpl  implements IStructuredContentProvider
+    private static class ContentProviderImpl  implements IStructuredContentProvider
     {
         
         public void inputChanged(Viewer v, Object oldInput, Object newInput)
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
index 1ca6c2b71d..417734e5fb 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
@@ -115,7 +115,6 @@ public class NavigationView extends ViewPart
 
         // layout the tree viewer below the label field, to cover the area
         GridData layoutData = new GridData();
-        layoutData = new GridData();
         layoutData.grabExcessHorizontalSpace = true;
         layoutData.grabExcessVerticalSpace = true;
         layoutData.horizontalAlignment = GridData.FILL;
@@ -903,7 +902,7 @@ public class NavigationView extends ViewPart
      */
     private void addConfiguredItems(List<String> items, List<ManagedBean> mbeans)
     {
-        if ((items == null) || (items.isEmpty() | (mbeans == null)) || mbeans.isEmpty())
+        if ((items == null) || (items.isEmpty() || (mbeans == null)) || mbeans.isEmpty())
         {
             return;
         }
@@ -1097,7 +1096,7 @@ public class NavigationView extends ViewPart
     /**
      * Content provider class for the tree viewer
      */
-    private class ContentProviderImpl implements ITreeContentProvider
+    private static class ContentProviderImpl implements ITreeContentProvider
     {
         public Object[] getElements(Object parent)
         {
@@ -1233,7 +1232,7 @@ public class NavigationView extends ViewPart
         }
     } // End of LabelProviderImpl
 
-    private class ViewerSorterImpl extends ViewerSorter
+    private static class ViewerSorterImpl extends ViewerSorter
     {
         public int category(Object element)
         {
@@ -1271,8 +1270,10 @@ public class NavigationView extends ViewPart
                 {
                     Thread.sleep(2000);
                 }
-                catch (Exception ex)
-                { }
+                catch (InterruptedException ex)
+                {
+                    //ignore
+                }
 
             } // end of while loop
         } // end of run method.
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 ff2005e4bb..d0b70f4340 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
@@ -221,7 +221,7 @@ public class OperationTabControl extends TabControl
         
         // Customised parameter widgets        
         if (_mbean.isExchange() &&
-            DEFAULT_EXCHANGE_TYPE_VALUES[2].equals(_mbean.getProperty(EXCHANGE_TYPE)) &&
+            HEADERS_EXCHANGE.equals(_mbean.getProperty(EXCHANGE_TYPE)) &&
             _opData.getName().equalsIgnoreCase(OPERATION_CREATE_BINDING))
         {                                  
             customCreateNewBinding(); 
@@ -274,7 +274,7 @@ public class OperationTabControl extends TabControl
             }
             else if (param.getName().equals(EXCHANGE_TYPE))
             {
-                items = DEFAULT_EXCHANGE_TYPE_VALUES;
+                items = DEFAULT_EXCHANGE_TYPE_VALUES.toArray(new String[DEFAULT_EXCHANGE_TYPE_VALUES.size()]);
             }
             else if (isUserListParameter(param))
             {
@@ -783,7 +783,7 @@ public class OperationTabControl extends TabControl
     /**
      * Listener class for the operation parameters widget
      */
-    private class ParameterSelectionListener extends SelectionAdapter
+    private static class ParameterSelectionListener extends SelectionAdapter
     {
         public void widgetSelected(SelectionEvent e)
         {
@@ -813,7 +813,7 @@ public class OperationTabControl extends TabControl
     /**
      * Listener class for boolean parameter widgets
      */
-    private class BooleanSelectionListener extends SelectionAdapter
+    private static class BooleanSelectionListener extends SelectionAdapter
     {
         public void widgetSelected(SelectionEvent e)
         {
@@ -835,7 +835,7 @@ public class OperationTabControl extends TabControl
     /**
      * Listener class for the operation parameter value widget (Text field)
      */
-    private class KeyListenerImpl extends KeyAdapter
+    private static class KeyListenerImpl extends KeyAdapter
     {
         public void keyReleased(KeyEvent e) 
         {
@@ -892,7 +892,7 @@ public class OperationTabControl extends TabControl
     /**
      * Listener class for verifying the user input with parameter type
      */
-    private class VerifyListenerImpl implements VerifyListener
+    private static class VerifyListenerImpl implements VerifyListener
     {
         public void verifyText(VerifyEvent event)
         {
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java
index 4e21e9e865..d23355501f 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java
@@ -76,7 +76,7 @@ public class VHNotificationsTabControl extends TabControl
     private static final String COLUMN_TIME = "TimeStamp";
     private static final String COLUMN_TYPE  = "Type";
     private static final String COLUMN_MSG  = "Notification Message";
-    protected static final String[] _tableTitles = new String [] {
+    private static final String[] TABLE_TITLES = new String [] {
             COLUMN_OBJ,
             COLUMN_SEQ,
             COLUMN_TIME,
@@ -174,23 +174,23 @@ public class VHNotificationsTabControl extends TabControl
         _table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
         
         TableColumn column = new TableColumn(_table, SWT.NONE);
-        column.setText(_tableTitles[0]);
+        column.setText(TABLE_TITLES[0]);
         column.setWidth(100);
         
         column = new TableColumn(_table, SWT.NONE);
-        column.setText(_tableTitles[1]);
+        column.setText(TABLE_TITLES[1]);
         column.setWidth(100); 
 
         column = new TableColumn(_table, SWT.NONE);
-        column.setText(_tableTitles[2]);
+        column.setText(TABLE_TITLES[2]);
         column.setWidth(130);
         
         column = new TableColumn(_table, SWT.NONE);
-        column.setText(_tableTitles[3]);
+        column.setText(TABLE_TITLES[3]);
         column.setWidth(100);
         
         column = new TableColumn(_table, SWT.NONE);
-        column.setText(_tableTitles[4]);
+        column.setText(TABLE_TITLES[4]);
         column.setWidth(500);
         
         _table.setHeaderVisible(true);
@@ -207,7 +207,7 @@ public class VHNotificationsTabControl extends TabControl
         _tableViewer.setUseHashlookup(true);
         _tableViewer.setContentProvider(new ContentProviderImpl());
         _tableViewer.setLabelProvider(new LabelProviderImpl());
-        _tableViewer.setColumnProperties(_tableTitles);
+        _tableViewer.setColumnProperties(TABLE_TITLES);
         
         addTableListeners();
     }
@@ -322,7 +322,10 @@ public class VHNotificationsTabControl extends TabControl
         }
         public Object[] getElements(Object parent) 
         {
-            return _notifications.toArray(new NotificationObject[0]);
+            synchronized(VHNotificationsTabControl.this)
+            {
+                return _notifications.toArray(new NotificationObject[0]);
+            }
         }
         public void addNotification(NotificationObject notification)
         {
@@ -338,7 +341,7 @@ public class VHNotificationsTabControl extends TabControl
     /**
      * Label provider for the table viewer
      */
-    protected class LabelProviderImpl implements ITableLabelProvider
+    protected static class LabelProviderImpl implements ITableLabelProvider
     {
         List<ILabelProviderListener> listeners = new ArrayList<ILabelProviderListener>();       
         public void addListener(ILabelProviderListener listener)
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 d95ca8b2e4..8e4bea39e9 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
@@ -490,7 +490,7 @@ public class ViewUtility
             //create a text to display the hexadecimal views of object messages, it takes more space than ascii view as 
             //a hex uses 2 chars and 1 space, while ascii only uses 1 char and 1 space.
             final Text hexText = toolkit.createText(localComposite,
-                    new String(displayByteFormat(localComposite, byteArray, startContentSize * 2, thisEncoding, "<<", true)),
+                    displayByteFormat(localComposite, byteArray, startContentSize * 2, thisEncoding, "<<", true),
                     SWT.READ_ONLY | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL | SWT.BORDER);
             GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
             gridData.widthHint = 144; //set to 222 if not using any fonts
@@ -498,7 +498,7 @@ public class ViewUtility
             hexText.setLayoutData(gridData);
 
             final Text asciiText = toolkit.createText(localComposite,
-                    new String(displayByteFormat(localComposite, byteArray, startContentSize * 2, thisEncoding, "<<", false)),
+                    displayByteFormat(localComposite, byteArray, startContentSize * 2, thisEncoding, "<<", false),
                     SWT.READ_ONLY | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL | SWT.BORDER);
 
 
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
index 24935fcae3..35171773ad 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
@@ -20,6 +20,12 @@
  */
 package org.apache.qpid.management.ui.views.connection;
 
+import static org.apache.qpid.management.common.mbeans.ManagedConnection.CHAN_ID;
+import static org.apache.qpid.management.common.mbeans.ManagedConnection.DEFAULT_QUEUE;
+import static org.apache.qpid.management.common.mbeans.ManagedConnection.FLOW_BLOCKED;
+import static org.apache.qpid.management.common.mbeans.ManagedConnection.TRANSACTIONAL;
+import static org.apache.qpid.management.common.mbeans.ManagedConnection.UNACKED_COUNT;
+
 import java.util.Collection;
 
 import javax.management.MBeanServerConnection;
@@ -82,12 +88,6 @@ public class ConnectionOperationsTabControl extends TabControl
     private ManagedConnection _cmb;
     private ApiVersion _ApiVersion;
     
-    static final String CHAN_ID = ManagedConnection.COMPOSITE_ITEM_NAMES[0];
-    static final String TRANSACTIONAL = ManagedConnection.COMPOSITE_ITEM_NAMES[1];
-    static final String DEFAULT_QUEUE = ManagedConnection.COMPOSITE_ITEM_NAMES[2];
-    static final String UNACKED_COUNT = ManagedConnection.COMPOSITE_ITEM_NAMES[3];
-    static final String FLOW_BLOCKED = ManagedConnection.COMPOSITE_ITEM_NAMES[4];
-    
     public ConnectionOperationsTabControl(TabFolder tabFolder, JMXManagedObject mbean, MBeanServerConnection mbsc)
     {
         super(tabFolder);
@@ -380,7 +380,7 @@ public class ConnectionOperationsTabControl extends TabControl
     /**
      * Content Provider class for the table viewer
      */
-    private class ContentProviderImpl  implements IStructuredContentProvider
+    private static class ContentProviderImpl  implements IStructuredContentProvider
     {
         
         public void inputChanged(Viewer v, Object oldInput, Object newInput)
@@ -436,7 +436,7 @@ public class ConnectionOperationsTabControl extends TabControl
      * Sorter class for the table viewer.
      *
      */
-    public class TableSorter extends ViewerSorter
+    public static class TableSorter extends ViewerSorter
     {
         private int column;
         private static final int ASCENDING = 0;
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
index b633b3e889..e22898fb93 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
@@ -20,6 +20,10 @@
  */
 package org.apache.qpid.management.ui.views.exchange;
 
+import static org.apache.qpid.management.common.mbeans.ManagedExchange.HDR_BINDING_NUMBER;
+import static org.apache.qpid.management.common.mbeans.ManagedExchange.HDR_QUEUE_BINDINGS;
+import static org.apache.qpid.management.common.mbeans.ManagedExchange.HDR_QUEUE_NAME;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -90,10 +94,6 @@ public class HeadersExchangeOperationsTabControl extends TabControl
     private TabularDataSupport _bindings = null;
     private ManagedExchange _emb;
     
-    static final String BINDING_NUM = ManagedExchange.HEADERS_COMPOSITE_ITEM_NAMES[0];
-    static final String QUEUE_NAME = ManagedExchange.HEADERS_COMPOSITE_ITEM_NAMES[1];
-    static final String HEADER_BINDINGS = ManagedExchange.HEADERS_COMPOSITE_ITEM_NAMES[2];
-    
     public HeadersExchangeOperationsTabControl(TabFolder tabFolder, JMXManagedObject mbean, MBeanServerConnection mbsc)
     {
         super(tabFolder);
@@ -182,7 +182,7 @@ public class HeadersExchangeOperationsTabControl extends TabControl
         _bindingNumberTable.setLayoutData(data);
         
         _bindingNumberTableViewer = new TableViewer(_bindingNumberTable);
-        final TableSorter tableSorter = new TableSorter(BINDING_NUM);
+        final TableSorter tableSorter = new TableSorter(HDR_BINDING_NUMBER);
         
         String[] titles = {"Binding Number", "Queue Name"};
         int[] bounds = {135, 175};
@@ -220,8 +220,8 @@ public class HeadersExchangeOperationsTabControl extends TabControl
 
         }
         
-        _bindingNumberTableViewer.setContentProvider(new ContentProviderImpl(BINDING_NUM));
-        _bindingNumberTableViewer.setLabelProvider(new LabelProviderImpl(BINDING_NUM));
+        _bindingNumberTableViewer.setContentProvider(new ContentProviderImpl(HDR_BINDING_NUMBER));
+        _bindingNumberTableViewer.setLabelProvider(new LabelProviderImpl(HDR_BINDING_NUMBER));
         _bindingNumberTableViewer.setSorter(tableSorter);
         _bindingNumberTable.setSortColumn(_bindingNumberTable.getColumn(0));
         _bindingNumberTable.setSortDirection(SWT.UP);
@@ -236,7 +236,7 @@ public class HeadersExchangeOperationsTabControl extends TabControl
         _headersTable.setLayoutData(data);
         
         _headersTableViewer = new TableViewer(_headersTable);
-        final TableSorter queuesTableSorter = new TableSorter(HEADER_BINDINGS);
+        final TableSorter queuesTableSorter = new TableSorter(HDR_QUEUE_BINDINGS);
         
         titles = new String[]{"Header Bindings"};
         bounds = new int[]{225};
@@ -274,8 +274,8 @@ public class HeadersExchangeOperationsTabControl extends TabControl
 
         }
         
-        _headersTableViewer.setContentProvider(new ContentProviderImpl(HEADER_BINDINGS));
-        _headersTableViewer.setLabelProvider(new LabelProviderImpl(HEADER_BINDINGS));
+        _headersTableViewer.setContentProvider(new ContentProviderImpl(HDR_QUEUE_BINDINGS));
+        _headersTableViewer.setLabelProvider(new LabelProviderImpl(HDR_QUEUE_BINDINGS));
         _headersTableViewer.setSorter(queuesTableSorter);
         _headersTable.setSortColumn(_headersTable.getColumn(0));
         _headersTable.setSortDirection(SWT.UP);
@@ -290,7 +290,7 @@ public class HeadersExchangeOperationsTabControl extends TabControl
                 {
                 	final CompositeData selectedMsg = (CompositeData)_bindingNumberTable.getItem(selectionIndex).getData();
 
-                	String[] bindings = (String[]) selectedMsg.get(HEADER_BINDINGS);
+                	String[] bindings = (String[]) selectedMsg.get(HDR_QUEUE_BINDINGS);
                 	_headersTableViewer.setInput(bindings);
                 }
                 else
@@ -334,7 +334,7 @@ public class HeadersExchangeOperationsTabControl extends TabControl
     /**
      * Content Provider class for the table viewer
      */
-    private class ContentProviderImpl implements IStructuredContentProvider
+    private static class ContentProviderImpl implements IStructuredContentProvider
     {
     	String type;
     	
@@ -355,7 +355,7 @@ public class HeadersExchangeOperationsTabControl extends TabControl
         
         public Object[] getElements(Object parent)
         {
-        	if(type.equals(BINDING_NUM))
+        	if(type.equals(HDR_BINDING_NUMBER))
         	{
         		Collection<Object> rowCollection = ((TabularDataSupport) parent).values();
 
@@ -383,14 +383,14 @@ public class HeadersExchangeOperationsTabControl extends TabControl
 
         public String getColumnText(Object element, int columnIndex)
         {
-        	if(type.equals(BINDING_NUM)) //binding num and queue name table
+        	if(type.equals(HDR_BINDING_NUMBER)) //binding num and queue name table
         	{
         		switch (columnIndex)
         		{
         			case 0 : // binding number column 
-        				return String.valueOf(((CompositeDataSupport) element).get(BINDING_NUM));
+        				return String.valueOf(((CompositeDataSupport) element).get(HDR_BINDING_NUMBER));
                     case 1 : // queue name column 
-                        return (String) ((CompositeDataSupport) element).get(QUEUE_NAME);
+                        return (String) ((CompositeDataSupport) element).get(HDR_QUEUE_NAME);
         			default :
         				return "";
         		}
@@ -417,7 +417,7 @@ public class HeadersExchangeOperationsTabControl extends TabControl
      * Sorter class for the table viewer.
      *
      */
-    public class TableSorter extends ViewerSorter
+    public static class TableSorter extends ViewerSorter
     {
         private int column;
         private static final int ASCENDING = 0;
@@ -454,7 +454,7 @@ public class HeadersExchangeOperationsTabControl extends TabControl
         {
             int comparison = 0;
 
-            if(type.equals(BINDING_NUM)) //binding num and queue name table
+            if(type.equals(HDR_BINDING_NUMBER)) //binding num and queue name table
             {
                 CompositeData binding1 = (CompositeData) e1;
                 CompositeData binding2 = (CompositeData) e2;
@@ -462,10 +462,10 @@ public class HeadersExchangeOperationsTabControl extends TabControl
                 switch(column)
                 {
                     case 0: // binding number column 
-                        comparison = ((Integer) binding1.get(BINDING_NUM)).compareTo((Integer) binding2.get(BINDING_NUM));
+                        comparison = ((Integer) binding1.get(HDR_BINDING_NUMBER)).compareTo((Integer) binding2.get(HDR_BINDING_NUMBER));
                         break;
                     case 1: // queue name column 
-                        comparison = ((String) binding1.get(QUEUE_NAME)).compareTo((String) binding2.get(QUEUE_NAME));
+                        comparison = ((String) binding1.get(HDR_QUEUE_NAME)).compareTo((String) binding2.get(HDR_QUEUE_NAME));
                         break;
                     default:
                         comparison = 0;
@@ -687,7 +687,7 @@ public class HeadersExchangeOperationsTabControl extends TabControl
         }
         
         CompositeData bindingResult = (CompositeData) table.getItem(selectionIndex).getData();
-        String queueName = (String) bindingResult.get(QUEUE_NAME);
+        String queueName = (String) bindingResult.get(HDR_QUEUE_NAME);
         ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(_mbean);
         ManagedBean selectedMBean = serverRegistry.getQueue(queueName, _mbean.getVirtualHostName());
 
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java
index 536033368f..1ae48f5c6c 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java
@@ -20,6 +20,9 @@
  */
 package org.apache.qpid.management.ui.views.logging;
 
+import static org.apache.qpid.management.common.mbeans.LoggingManagement.LOGGER_LEVEL;
+import static org.apache.qpid.management.common.mbeans.LoggingManagement.LOGGER_NAME;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 
@@ -83,9 +86,6 @@ public class ConfigurationFileTabControl extends TabControl
     private LoggingManagement _lmmb;
     private ApiVersion _ApiVersion;
     
-    static final String LOGGER_NAME = LoggingManagement.COMPOSITE_ITEM_NAMES[0];
-    static final String LOGGER_LEVEL = LoggingManagement.COMPOSITE_ITEM_NAMES[1];
-    
     public ConfigurationFileTabControl(TabFolder tabFolder, JMXManagedObject mbean, MBeanServerConnection mbsc)
     {
         super(tabFolder);
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableLabelProvider.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableLabelProvider.java
index 27f6040d7d..3156e3f1c4 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableLabelProvider.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableLabelProvider.java
@@ -20,9 +20,12 @@
  */
 package org.apache.qpid.management.ui.views.logging;
 
+import static org.apache.qpid.management.common.mbeans.LoggingManagement.LOGGER_LEVEL;
+import static org.apache.qpid.management.common.mbeans.LoggingManagement.LOGGER_NAME;
+
+
 import javax.management.openmbean.CompositeDataSupport;
 
-import org.apache.qpid.management.common.mbeans.LoggingManagement;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
@@ -31,10 +34,7 @@ import org.eclipse.swt.graphics.Image;
  * Label Provider class for the LoggingManagement table viewers
  */
 public class LoggingTableLabelProvider extends LabelProvider implements ITableLabelProvider
-{
-    private static final String LOGGER_NAME = LoggingManagement.COMPOSITE_ITEM_NAMES[0];
-    private static final String LOGGER_LEVEL = LoggingManagement.COMPOSITE_ITEM_NAMES[1];
-    
+{    
     @Override
     public String getColumnText(Object element, int columnIndex)
     {
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableSorter.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableSorter.java
index c1833148d7..99d22f2cb8 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableSorter.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableSorter.java
@@ -20,9 +20,11 @@
  */
 package org.apache.qpid.management.ui.views.logging;
 
+import static org.apache.qpid.management.common.mbeans.LoggingManagement.LOGGER_LEVEL;
+import static org.apache.qpid.management.common.mbeans.LoggingManagement.LOGGER_NAME;
+
 import javax.management.openmbean.CompositeData;
 
-import org.apache.qpid.management.common.mbeans.LoggingManagement;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
 
@@ -31,8 +33,6 @@ import org.eclipse.jface.viewers.ViewerSorter;
  */
 public class LoggingTableSorter extends ViewerSorter
 {
-    private static final String LOGGER_NAME = LoggingManagement.COMPOSITE_ITEM_NAMES[0];
-    private static final String LOGGER_LEVEL = LoggingManagement.COMPOSITE_ITEM_NAMES[1];
     private static final int ASCENDING = 0;
     private static final int DESCENDING = 1;
     
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java
index 9834cd729a..1ae97cfcb6 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java
@@ -20,6 +20,9 @@
  */
 package org.apache.qpid.management.ui.views.logging;
 
+import static org.apache.qpid.management.common.mbeans.LoggingManagement.LOGGER_LEVEL;
+import static org.apache.qpid.management.common.mbeans.LoggingManagement.LOGGER_NAME;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 
@@ -31,9 +34,9 @@ import javax.management.openmbean.TabularDataSupport;
 
 import static org.apache.qpid.management.ui.Constants.FONT_BOLD;
 
+import org.apache.qpid.management.common.mbeans.LoggingManagement;
 import org.apache.qpid.management.ui.ApplicationRegistry;
 import org.apache.qpid.management.ui.ManagedBean;
-import org.apache.qpid.management.common.mbeans.LoggingManagement;
 import org.apache.qpid.management.ui.jmx.JMXManagedObject;
 import org.apache.qpid.management.ui.jmx.MBeanUtility;
 import org.apache.qpid.management.ui.views.TabControl;
@@ -88,9 +91,6 @@ public class RuntimeTabControl extends TabControl
     private ArrayList<String> _configFileLoggerNames = new ArrayList<String>();
     private LoggingManagement _lmmb;
     
-    private static final String LOGGER_NAME = LoggingManagement.COMPOSITE_ITEM_NAMES[0];
-    private static final String LOGGER_LEVEL = LoggingManagement.COMPOSITE_ITEM_NAMES[1];
-    
     public RuntimeTabControl(TabFolder tabFolder, JMXManagedObject mbean, MBeanServerConnection mbsc)
     {
         super(tabFolder);
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
index 71586a5a5b..ee6bd3522b 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
@@ -20,6 +20,11 @@
  */
 package org.apache.qpid.management.ui.views.queue;
 
+import static org.apache.qpid.management.common.mbeans.ManagedQueue.MSG_AMQ_ID;
+import static org.apache.qpid.management.common.mbeans.ManagedQueue.MSG_HEADER;
+import static org.apache.qpid.management.common.mbeans.ManagedQueue.MSG_QUEUE_POS;
+import static org.apache.qpid.management.common.mbeans.ManagedQueue.MSG_REDELIVERED;
+import static org.apache.qpid.management.common.mbeans.ManagedQueue.MSG_SIZE;
 import static org.apache.qpid.management.ui.Constants.CONSOLE_IMAGE;
 import static org.apache.qpid.management.ui.Constants.RESULT;
 
@@ -105,12 +110,6 @@ public class QueueOperationsTabControl extends TabControl
     private Button _previousButton;
     private Button _nextButton;
     
-    private static final String MSG_AMQ_ID = ManagedQueue.VIEW_MSGS_COMPOSITE_ITEM_NAMES[0];
-    private static final String MSG_HEADER = ManagedQueue.VIEW_MSGS_COMPOSITE_ITEM_NAMES[1];
-    private static final String MSG_SIZE = ManagedQueue.VIEW_MSGS_COMPOSITE_ITEM_NAMES[2];
-    private static final String MSG_REDELIVERED = ManagedQueue.VIEW_MSGS_COMPOSITE_ITEM_NAMES[3];
-    private static final String MSG_QUEUE_POS = ManagedQueue.VIEW_MSGS_COMPOSITE_ITEM_NAMES[4];
-    
     public QueueOperationsTabControl(TabFolder tabFolder, JMXManagedObject mbean, MBeanServerConnection mbsc)
     {
         super(tabFolder);
@@ -651,7 +650,7 @@ public class QueueOperationsTabControl extends TabControl
     /**
      * Content Provider class for the table viewer
      */
-    private class ContentProviderImpl  implements IStructuredContentProvider
+    private static class ContentProviderImpl  implements IStructuredContentProvider
     {
         
         public void inputChanged(Viewer v, Object oldInput, Object newInput)
@@ -703,7 +702,7 @@ public class QueueOperationsTabControl extends TabControl
      * Sorter class for the table viewer.
      *
      */
-    public class TableSorter extends ViewerSorter
+    public static class TableSorter extends ViewerSorter
     {
         private int column;
         private static final int ASCENDING = 0;
@@ -1079,7 +1078,7 @@ public class QueueOperationsTabControl extends TabControl
     
     private String getRangesString(ArrayList<Long> starts, ArrayList<Long> ends)
     {
-        String idRangesString = new String("");
+        String idRangesString = "";
 
         for(int i=0 ; i < starts.size() ; i++)
         {
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
index 0479c4e1c0..a4574b8d22 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
@@ -295,7 +295,7 @@ public abstract class MBeanTypeTabControl extends TabControl
     /**
      * Content Provider class for the table viewer
      */
-    private class ContentProviderImpl  implements IStructuredContentProvider
+    private static class ContentProviderImpl  implements IStructuredContentProvider
     {
         
         public void inputChanged(Viewer v, Object oldInput, Object newInput)
@@ -342,7 +342,7 @@ public abstract class MBeanTypeTabControl extends TabControl
      * Sorter class for the table viewer.
      *
      */
-    private class TableSorter extends ViewerSorter
+    private static class TableSorter extends ViewerSorter
     {
         private int column;
         private static final int ASCENDING = 0;
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
index 285dcfc0ee..406ef08326 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
@@ -567,7 +567,7 @@ public class QueueTypeTabControl extends MBeanTypeTabControl
      * sorter class for the table viewer.
      *
      */
-    private class QueueTableSorter extends ViewerSorter
+    private static class QueueTableSorter extends ViewerSorter
     {
         protected int column;
         protected static final int ASCENDING = 0;
@@ -624,7 +624,7 @@ public class QueueTypeTabControl extends MBeanTypeTabControl
     /**
      * Content Provider class for the table viewer for Qpid JMX API 1.3 and above.
      */
-    private class QueueContentProviderImpl  implements IStructuredContentProvider
+    private static class QueueContentProviderImpl  implements IStructuredContentProvider
     {
         
         public void inputChanged(Viewer v, Object oldInput, Object newInput)
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java
index d7cd19e705..fdcc25d337 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java
@@ -20,6 +20,11 @@
  */
 package org.apache.qpid.management.ui.views.users;
 
+import static org.apache.qpid.management.common.mbeans.UserManagement.RIGHTS_ADMIN;
+import static org.apache.qpid.management.common.mbeans.UserManagement.RIGHTS_READ_ONLY;
+import static org.apache.qpid.management.common.mbeans.UserManagement.RIGHTS_READ_WRITE;
+import static org.apache.qpid.management.common.mbeans.UserManagement.USERNAME;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -81,11 +86,6 @@ public class UserManagementTabControl extends TabControl
     private UserManagement _ummb;
     private ApiVersion _ApiVersion;
     
-    static final String USERNAME = UserManagement.COMPOSITE_ITEM_NAMES[0];
-    static final String RIGHTS_READ_ONLY = UserManagement.COMPOSITE_ITEM_NAMES[1];
-    static final String RIGHTS_READ_WRITE = UserManagement.COMPOSITE_ITEM_NAMES[2];
-    static final String RIGHTS_ADMIN = UserManagement.COMPOSITE_ITEM_NAMES[3];
-    
     public UserManagementTabControl(TabFolder tabFolder, JMXManagedObject mbean, MBeanServerConnection mbsc)
     {
         super(tabFolder);
@@ -420,7 +420,7 @@ public class UserManagementTabControl extends TabControl
     /**
      * Content Provider class for the table viewer
      */
-    private class ContentProviderImpl  implements IStructuredContentProvider
+    private static class ContentProviderImpl  implements IStructuredContentProvider
     {
         
         public void inputChanged(Viewer v, Object oldInput, Object newInput)
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java
index 3b03aeaff1..0cbb1389d8 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java
@@ -379,7 +379,7 @@ public class VHostTabControl extends TabControl
     /**
      * Content Provider class for the table viewer
      */
-    private class ContentProviderImpl  implements IStructuredContentProvider
+    private static class ContentProviderImpl  implements IStructuredContentProvider
     {
         
         public void inputChanged(Viewer v, Object oldInput, Object newInput)
@@ -402,7 +402,7 @@ public class VHostTabControl extends TabControl
     /**
      * Label Provider class for the table viewer
      */
-    private class LabelProviderImpl extends LabelProvider implements ITableLabelProvider
+    private static class LabelProviderImpl extends LabelProvider implements ITableLabelProvider
     {
         @Override
         public String getColumnText(Object element, int columnIndex)
@@ -428,7 +428,7 @@ public class VHostTabControl extends TabControl
      * Sorter class for the table viewer.
      *
      */
-    public class TableSorter extends ViewerSorter
+    public static class TableSorter extends ViewerSorter
     {
         private int column;
         private static final int ASCENDING = 0;
@@ -614,12 +614,12 @@ public class VHostTabControl extends TabControl
             }
             catch (IOException e1)
             {
-                exchangeTypes = DEFAULT_EXCHANGE_TYPE_VALUES;
+                exchangeTypes = DEFAULT_EXCHANGE_TYPE_VALUES.toArray(new String[DEFAULT_EXCHANGE_TYPE_VALUES.size()]);
             }
         }
         else //use the fallback defaults.
         {
-            exchangeTypes = DEFAULT_EXCHANGE_TYPE_VALUES;
+            exchangeTypes = DEFAULT_EXCHANGE_TYPE_VALUES.toArray(new String[DEFAULT_EXCHANGE_TYPE_VALUES.size()]);
         }
 
         _toolkit.createLabel(typeComposite,"Type:").setBackground(shell.getBackground());