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

6 files changed, 13 insertions, 23 deletions

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;