QPID-2857 : Address issues found by running FindBugs against the Java codebase

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

19 files changed, 57 insertions, 52 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java
index c69d499674..626ceb5d84 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java
@@ -71,7 +71,8 @@ public abstract class AbstractExchangeMBean<T extends AbstractExchange> extends
         _bindingItemTypes[0] = SimpleType.STRING;
         _bindingItemTypes[1] = new ArrayType(1, SimpleType.STRING);
         _bindingDataType = new CompositeType("Exchange Binding", "Binding key and Queue names",
-                COMPOSITE_ITEM_NAMES, COMPOSITE_ITEM_DESCRIPTIONS, _bindingItemTypes);
+                COMPOSITE_ITEM_NAMES.toArray(new String[COMPOSITE_ITEM_NAMES.size()]),
+                COMPOSITE_ITEM_DESCRIPTIONS.toArray(new String[COMPOSITE_ITEM_DESCRIPTIONS.size()]), _bindingItemTypes);
         _bindinglistDataType = new TabularType("Exchange Bindings", "Exchange Bindings for " + getName(),
                                                _bindingDataType, TABULAR_UNIQUE_INDEX);
     }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java
index 086832c045..94fc44d9c7 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java
@@ -67,7 +67,9 @@ final class DirectExchangeMBean extends AbstractExchangeMBean<DirectExchange>
         for(Map.Entry<String, List<String>> entry : bindingMap.entrySet())
         {
             Object[] bindingItemValues = {entry.getKey(), entry.getValue().toArray(new String[0])};
-            CompositeData bindingData = new CompositeDataSupport(_bindingDataType, COMPOSITE_ITEM_NAMES, bindingItemValues);
+            CompositeData bindingData = new CompositeDataSupport(_bindingDataType,
+                    COMPOSITE_ITEM_NAMES.toArray(new String[COMPOSITE_ITEM_NAMES.size()]),
+                    bindingItemValues);
             bindingList.put(bindingData);
         }
 
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java
index d5734f76a5..2c85b7f787 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java
@@ -58,7 +58,9 @@ final class FanoutExchangeMBean extends AbstractExchangeMBean<FanoutExchange>
         }
 
         Object[] bindingItemValues = {BINDING_KEY_SUBSTITUTE, queueNames.toArray(new String[0])};
-        CompositeData bindingData = new CompositeDataSupport(_bindingDataType, COMPOSITE_ITEM_NAMES, bindingItemValues);
+        CompositeData bindingData = new CompositeDataSupport(_bindingDataType,
+                COMPOSITE_ITEM_NAMES.toArray(new String[COMPOSITE_ITEM_NAMES.size()]), 
+                bindingItemValues);
         bindingList.put(bindingData);
 
         return bindingList;
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java
index de39822ff7..620c3ce140 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java
@@ -64,7 +64,10 @@ final class TopicExchangeMBean extends AbstractExchangeMBean<TopicExchange>
         for(Map.Entry<String, List<String>> entry : bindingData.entrySet())
         {
             Object[] bindingItemValues = {entry.getKey(), entry.getValue().toArray(new String[entry.getValue().size()]) };
-            CompositeData bindingCompositeData = new CompositeDataSupport(_bindingDataType, COMPOSITE_ITEM_NAMES, bindingItemValues);
+            CompositeData bindingCompositeData =
+                    new CompositeDataSupport(_bindingDataType,
+                            COMPOSITE_ITEM_NAMES.toArray(new String[COMPOSITE_ITEM_NAMES.size()]), 
+                            bindingItemValues);
             bindingList.put(bindingCompositeData);
         }
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
index 22e432a44f..7de09cff45 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
@@ -167,7 +167,7 @@ public class DestinationURLTest extends TestCase
         try
         {
 
-            AMQBindingURL dest = new AMQBindingURL(url);
+            new AMQBindingURL(url);
         }
         catch(URISyntaxException e)
         {
diff --git a/java/management/agent/src/main/java/org/apache/qpid/agent/Agent.java b/java/management/agent/src/main/java/org/apache/qpid/agent/Agent.java
index f6ae6adbc3..b1a4a8c93e 100644
--- a/java/management/agent/src/main/java/org/apache/qpid/agent/Agent.java
+++ b/java/management/agent/src/main/java/org/apache/qpid/agent/Agent.java
@@ -79,7 +79,7 @@ public class Agent implements MessageListener
     protected Map<Long, ManagedObject> objects = new Hashtable<Long, ManagedObject>();
     protected long bbank;
     protected long abank;
-    protected static Log log = LogFactory.getLog(Agent.class);
+    protected static final Log log = LogFactory.getLog(Agent.class);
     protected volatile boolean inside = false;
     protected ClassLoader classLoader = null;
 
@@ -491,7 +491,6 @@ public class Agent implements MessageListener
         try
         {
             byte[] buf = new byte[1024];
-            byte[] body = new byte[1024];
             BytesMessage msg = session.createBytesMessage();
             ByteBuffer slice = enc.segment();
             while (slice.hasRemaining())
diff --git a/java/management/agent/src/main/java/org/apache/qpid/agent/binding/BindingContext.java b/java/management/agent/src/main/java/org/apache/qpid/agent/binding/BindingContext.java
index 835fed0ce1..a60178e8b9 100644
--- a/java/management/agent/src/main/java/org/apache/qpid/agent/binding/BindingContext.java
+++ b/java/management/agent/src/main/java/org/apache/qpid/agent/binding/BindingContext.java
@@ -57,7 +57,7 @@ public class BindingContext
         @Override
         public boolean equals(Object obj)
         {
-            return ((obj.getClass() == Key.class)
+            return (obj instanceof Key
                     && (((Key) obj).packageName.equals(packageName)) && (((Key) obj).className
                     .equals(className)));
         }
diff --git a/java/management/agent/src/main/java/org/apache/qpid/agent/binding/ClassBinding.java b/java/management/agent/src/main/java/org/apache/qpid/agent/binding/ClassBinding.java
index 0a74958023..469939a52f 100644
--- a/java/management/agent/src/main/java/org/apache/qpid/agent/binding/ClassBinding.java
+++ b/java/management/agent/src/main/java/org/apache/qpid/agent/binding/ClassBinding.java
@@ -42,7 +42,7 @@ import org.apache.qpid.transport.codec.Encoder;
  */
 public class ClassBinding implements TypeBinding
 {
-    private static Log log = LogFactory.getLog(ClassBinding.class);
+    private static final Log log = LogFactory.getLog(ClassBinding.class);
 
     private static enum MethodType
     {
@@ -131,7 +131,6 @@ public class ClassBinding implements TypeBinding
             }
             // Look at the superclass, if it is also a
             // QMF object then stop.
-            Class superType = cls.getSuperclass();
             if (!this.hasQMFSupertype(cls))
             {
                 for (Method m : this.getMethods(cls.getSuperclass()))
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 e5ca69eabb..9b4c75c4a5 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
@@ -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 javax.management.JMException;
 import javax.management.MBeanOperationInfo;
@@ -41,15 +44,22 @@ public interface ManagedExchange
     
     //TabularType and contained CompositeType key/description info for DIRECT/TOPIC/FANOUT exchanges.
     //For compatibility reasons, DONT MODIFY the existing key values if expanding the set. 
-    String[] COMPOSITE_ITEM_NAMES = {"Binding Key", "Queue Names"};
-    String[] COMPOSITE_ITEM_DESCRIPTIONS = {"Binding Key", "Queue Names"};
-    String[] TABULAR_UNIQUE_INDEX = {COMPOSITE_ITEM_NAMES[0]};
+    String BINDING_KEY = "Binding Key";
+    String QUEUE_NAMES = "Queue Names";
+
+    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};
 
     //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[] HEADERS_COMPOSITE_ITEM_NAMES = new String[]{"Binding No", "Queue  Name", "Queue Bindings"};
-    String[] HEADERS_COMPOSITE_ITEM_DESC = new String[]{"Binding No", "Queue  Name", "Queue Bindings"};
-    String[] HEADERS_TABULAR_UNIQUE_INDEX = new String[]{HEADERS_COMPOSITE_ITEM_NAMES[0]};
+    String BINDING_NUMBER = "Binding No";
+    String QUEUE_NAME = "Queue  Name";
+    String 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};
 
     /**
      * Returns the name of the managed exchange.
diff --git a/java/management/console/src/main/java/org/apache/qpid/console/Broker.java b/java/management/console/src/main/java/org/apache/qpid/console/Broker.java
index 2ea2ab8a70..16c77449f1 100644
--- a/java/management/console/src/main/java/org/apache/qpid/console/Broker.java
+++ b/java/management/console/src/main/java/org/apache/qpid/console/Broker.java
@@ -56,7 +56,7 @@ public class Broker implements MessageListener
     }
 
     private static Logger log = LoggerFactory.getLogger(Broker.class);
-    public static int SYNC_TIME = 60000;
+    public static final int SYNC_TIME = 60000;
     // JMS Stuff
     private javax.jms.Session session;
     boolean sessionTransacted = false;
@@ -132,7 +132,6 @@ public class Broker implements MessageListener
         try
         {
             byte[] buf = new byte[1024];
-            byte[] body = new byte[1024];
             BBEncoder bbenc = (BBEncoder) enc;
             BytesMessage msg = session.createBytesMessage();
             ByteBuffer slice = bbenc.buffer();
diff --git a/java/management/console/src/main/java/org/apache/qpid/console/ClassKey.java b/java/management/console/src/main/java/org/apache/qpid/console/ClassKey.java
index 9eac8942cb..1fbf4c7f3d 100644
--- a/java/management/console/src/main/java/org/apache/qpid/console/ClassKey.java
+++ b/java/management/console/src/main/java/org/apache/qpid/console/ClassKey.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
 

 public class ClassKey

 {

-    private static Logger log = LoggerFactory.getLogger(ClassKey.class);

+    private static final Logger log = LoggerFactory.getLogger(ClassKey.class);

     private String packageName;

     private String className;

     private long[] hash = new long[4];

@@ -79,7 +79,7 @@ public class ClassKey
     @Override

     public boolean equals(Object obj)

     {

-        if (obj.getClass().equals(this.getClass()))

+        if(obj instanceof ClassKey && obj.getClass().equals(this.getClass()))

         {

             ClassKey other = (ClassKey) obj;

             return (other.getKeyString().equals(this.getKeyString()));

diff --git a/java/management/console/src/main/java/org/apache/qpid/console/SchemaClass.java b/java/management/console/src/main/java/org/apache/qpid/console/SchemaClass.java
index a0faa6c73d..311d81cc8e 100644
--- a/java/management/console/src/main/java/org/apache/qpid/console/SchemaClass.java
+++ b/java/management/console/src/main/java/org/apache/qpid/console/SchemaClass.java
@@ -26,8 +26,8 @@ import org.apache.qpid.transport.codec.*;
 

 public class SchemaClass

 {

-    public static int CLASS_KIND_EVENT = 2;

-    public static int CLASS_KIND_TABLE = 1;

+    public static final int CLASS_KIND_EVENT = 2;

+    public static final int CLASS_KIND_TABLE = 1;

     public ArrayList<SchemaArgument> arguments = new ArrayList<SchemaArgument>();

     private ClassKey classKey;

     private int kind;

diff --git a/java/management/console/src/main/java/org/apache/qpid/console/Session.java b/java/management/console/src/main/java/org/apache/qpid/console/Session.java
index 3bbc8ecdad..a590a95546 100644
--- a/java/management/console/src/main/java/org/apache/qpid/console/Session.java
+++ b/java/management/console/src/main/java/org/apache/qpid/console/Session.java
@@ -39,10 +39,10 @@ import org.slf4j.LoggerFactory;
 public class Session

 {

     private static Logger log = LoggerFactory.getLogger(Session.class);

-    public static int CONTEXT_SYNC = 1;

-    public static int CONTEXT_STARTUP = 2;

-    public static int CONTEXT_MULTIGET = 3;

-    public static int DEFAULT_GET_WAIT_TIME = 60000;

+    public static final int CONTEXT_SYNC = 1;

+    public static final int CONTEXT_STARTUP = 2;

+    public static final int CONTEXT_MULTIGET = 3;

+    public static final int DEFAULT_GET_WAIT_TIME = 60000;

     public boolean recieveObjects = true;

     public boolean recieveEvents = true;

     public boolean recieveHeartbeat = true;

@@ -79,12 +79,12 @@ public class Session
     {

         ArrayList<String> bindings = new ArrayList<String>();

         bindings.add("schema.#");

-        if (recieveObjects & recieveEvents & recieveHeartbeat & !userBindings)

+        if (recieveObjects && recieveEvents && recieveHeartbeat && !userBindings)

         {

             bindings.add("console.#");

         } else

         {

-            if (recieveObjects & !userBindings)

+            if (recieveObjects && !userBindings)

             {

                 bindings.add("console.obj.#");

             } else

@@ -675,7 +675,7 @@ public class Session
             broker.decrementOutstanding();

         } else

         {

-            if ((context.equals(CONTEXT_SYNC)) & broker.getSyncInFlight())

+            if ((context.equals(CONTEXT_SYNC)) && broker.getSyncInFlight())

             {

                 broker.setSyncInFlight(false);

             } else

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 01f81b9d34..36aed6f9ab 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
@@ -895,7 +895,7 @@ public class AttributesTabControl extends TabControl
         }
     }
     
-    private class DisposeListenerImpl implements DisposeListener
+    private static class DisposeListenerImpl implements DisposeListener
     {
         public void widgetDisposed(DisposeEvent e)
         {
@@ -908,7 +908,7 @@ public class AttributesTabControl extends TabControl
      * @author Bhupendra Bhardwaj
      *
      */
-    private class ViewerSorterImpl extends ViewerSorter
+    private static class ViewerSorterImpl extends ViewerSorter
     {
         public int compare(Viewer viewer, Object o1, Object o2) 
         {
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 3281757526..24935fcae3 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
@@ -404,9 +404,8 @@ public class ConnectionOperationsTabControl 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)
         {
             switch (columnIndex)
@@ -426,7 +425,6 @@ public class ConnectionOperationsTabControl extends TabControl
             }
         }
         
-        @Override
         public Image getColumnImage(Object element, int columnIndex)
         {
             return null;
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
index e3dea6e96b..09f5f5c6d8 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
@@ -92,8 +92,8 @@ public class ExchangeOperationsTabControl extends TabControl
     private ManagedExchange _emb;
     private ApiVersion _ApiVersion;
     
-    static final String BINDING_KEY = ManagedExchange.COMPOSITE_ITEM_NAMES[0];
-    static final String QUEUES = ManagedExchange.COMPOSITE_ITEM_NAMES[1];
+    static final String BINDING_KEY = ManagedExchange.BINDING_KEY;
+    static final String QUEUES = ManagedExchange.QUEUE_NAMES;
     
     public ExchangeOperationsTabControl(TabFolder tabFolder, JMXManagedObject mbean, MBeanServerConnection mbsc)
     {
@@ -356,7 +356,7 @@ public class ExchangeOperationsTabControl extends TabControl
     /**
      * Content Provider class for the table viewer
      */
-    private class ContentProviderImpl implements IStructuredContentProvider
+    private static class ContentProviderImpl implements IStructuredContentProvider
     {
     	String type;
     	
@@ -394,7 +394,7 @@ public class ExchangeOperationsTabControl extends TabControl
     /**
      * Label Provider class for the routing key table viewer
      */
-    private class LabelProviderImpl extends LabelProvider implements ITableLabelProvider
+    private static class LabelProviderImpl extends LabelProvider implements ITableLabelProvider
     {
     	String type;
     	
@@ -403,7 +403,6 @@ public class ExchangeOperationsTabControl extends TabControl
     		this.type = type;
     	}
     	
-        @Override
         public String getColumnText(Object element, int columnIndex)
         {
         	if(type.equals(BINDING_KEY)) //binding num and queue name table
@@ -428,7 +427,6 @@ public class ExchangeOperationsTabControl extends TabControl
         	}
         }
         
-        @Override
         public Image getColumnImage(Object element, int columnIndex)
         {
             return null;
@@ -439,7 +437,7 @@ public class ExchangeOperationsTabControl 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 fcce0e67b6..b633b3e889 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
@@ -372,7 +372,7 @@ public class HeadersExchangeOperationsTabControl extends TabControl
     /**
      * Label Provider class for the routing key table viewer
      */
-    private class LabelProviderImpl extends LabelProvider implements ITableLabelProvider
+    private static class LabelProviderImpl extends LabelProvider implements ITableLabelProvider
     {
     	String type;
     	
@@ -380,8 +380,7 @@ public class HeadersExchangeOperationsTabControl extends TabControl
     	{
     		this.type = type;
     	}
-    	
-        @Override
+
         public String getColumnText(Object element, int columnIndex)
         {
         	if(type.equals(BINDING_NUM)) //binding num and queue name table
@@ -408,7 +407,6 @@ public class HeadersExchangeOperationsTabControl extends TabControl
         	}
         }
         
-        @Override
         public Image getColumnImage(Object element, int columnIndex)
         {
             return null;
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 309b84f52b..71586a5a5b 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
@@ -675,9 +675,8 @@ public class QueueOperationsTabControl 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)
         {
             switch (columnIndex)
@@ -693,7 +692,6 @@ public class QueueOperationsTabControl extends TabControl
             }
         }
         
-        @Override
         public Image getColumnImage(Object element, int columnIndex)
         {
             return null;
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 cab9bc9f95..0479c4e1c0 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
@@ -318,9 +318,8 @@ public abstract class MBeanTypeTabControl 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)
         {
             switch (columnIndex)
@@ -331,8 +330,7 @@ public abstract class MBeanTypeTabControl extends TabControl
                     return "-";
             }
         }
-        
-        @Override
+
         public Image getColumnImage(Object element, int columnIndex)
         {
             return null;