NO-JIRA: Ensure all control flow statements use braces (keeping CheckStyle happy)

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

14 files changed, 85 insertions, 2 deletions

diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
index 8d45f76a03..963a821864 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
@@ -179,7 +179,9 @@ public abstract class ApplicationRegistry
     public static List<ManagedServer> getClosedServers()
     {
         if (_closedServerList.isEmpty())
+        {
             return null;
+        }
         
         List<ManagedServer> list = new CopyOnWriteArrayList<ManagedServer>(_closedServerList);
         _closedServerList.clear();
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
index bca29a30ff..f80790ce0c 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
@@ -62,7 +62,9 @@ public class AddServer extends AbstractAction implements IWorkbenchWindowActionD
     public void run(IAction action)
     {
         if(_window == null)
+        {
             return;
+        }
         
         reset();
         createAddServerPopup();
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
index a0fdc2282a..c1634ef8f8 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
@@ -61,7 +61,9 @@ public class ReconnectServer extends AbstractAction implements IWorkbenchWindowA
     public void run(IAction action)
     {
         if(_window == null)
+        {
             return;
+        }
   
         try
         {
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
index fc566952d7..c6cf3e82eb 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
@@ -73,7 +73,9 @@ public class ClientListener implements NotificationListener
     protected JMXServerRegistry getServerRegistry()
     {
         if (serverRegistry == null)
+        {
             serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(server);
+        }
         
         return serverRegistry;
     }
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
index c2d48d23be..5df161823e 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
@@ -515,7 +515,9 @@ public class JMXServerRegistry extends ServerRegistry
     public List<ManagedBean> getObjectsToBeRemoved()
     {
         if (_mbeansToBeRemoved.isEmpty())
+        {
             return null;
+        }
         else
         {
             List<ManagedBean> list = new CopyOnWriteArrayList<ManagedBean>(_mbeansToBeRemoved);
@@ -548,7 +550,9 @@ public class JMXServerRegistry extends ServerRegistry
     {
         List<ManagedBean> list = getQueues(virtualHostName);
         if (list == null)
+        {
             return null;
+        }
         
         List<String> queueNames = new ArrayList<String>();
         for (ManagedBean mbean : list)
@@ -562,7 +566,9 @@ public class JMXServerRegistry extends ServerRegistry
     {
         List<ManagedBean> list = getExchanges(virtualHostName);
         if (list == null)
+        {
             return null;
+        }
         
         String[] exchanges = new String[list.size()];
         int i = 0;
@@ -577,7 +583,9 @@ public class JMXServerRegistry extends ServerRegistry
     {
         List<ManagedBean> list = getExchanges(virtualHostName);
         if (list == null)
+        {
             return null;
+        }
         
         String[] connections = new String[list.size()];
         int i = 0;
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
index 998e2c30e7..be7d488a15 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
@@ -153,7 +153,9 @@ public class MBeanUtility
         {
             String cause = ((MBeanException)ex).getTargetException().getMessage();
             if (cause == null)
+            {
                 cause = ex.toString();
+            }
             ViewUtility.popupInfoMessage(mbean.getInstanceName(), cause);
         }
         else if (ex instanceof JMException)
@@ -465,14 +467,20 @@ public class MBeanUtility
         
         // Check if this mbean sends any notification
         if (info == null || info.length == 0)
+        {
             return null;
+        }
         
         // Create notification model if not already set in the server registry for this mbean
         List<NotificationInfoModel> list = serverRegistry.getNotificationInfo(mbean);
         if (list != null) 
+        {
             return list.toArray(new NotificationInfoModel[0]);
+        }
         else
+        {
             list = new ArrayList<NotificationInfoModel>();
+        }
         
         for (int i = 0; i < info.length; i++)
         {
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
index ccd4cf8df8..5b188d8046 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
@@ -64,7 +64,9 @@ public class AttributeData
     public void setValue(Object value)
     {
         if (value != null)
+        {
             this.value = value;
+        }
     }
     public boolean isReadable()
     {
@@ -91,6 +93,8 @@ public class AttributeData
             return true;
         }
         else
+        {
             return false;
+        }
     }
 }
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
index b3219f15ea..c4d2b91f81 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
@@ -31,7 +31,9 @@ public class ManagedAttributeModel
     public void setAttributeValue(String name, Object value)
     {
         if (value == null)
+        {
             return;
+        }
         
         AttributeData data = null;
         String dataType = value.getClass().getName();
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
index d12217c6eb..bf5301bf93 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
@@ -62,13 +62,21 @@ public class ParameterData
     public void setValueFromString(String strValue)
     {
         if ("int".equals(_type))
+        {
             _value = Integer.parseInt(strValue);
+        }
         else if (isBoolean())
+        {
             _value = Boolean.valueOf(strValue);
+        }
         else if ("long".equals(_type))
+        {
             _value = Long.parseLong(strValue);
+        }
         else
-            _value = strValue; 
+        {
+            _value = strValue;
+        }
     }
     
     public void setValue(Object value)
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
index fad58b992e..f929e73353 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
@@ -297,7 +297,10 @@ public class AttributesTabControl extends TabControl
             if (item != null)
             {
                 AttributeData data = (AttributeData)item.getData();
-                if (tooltipShell != null  && !tooltipShell.isDisposed ()) tooltipShell.dispose ();
+                if (tooltipShell != null  && !tooltipShell.isDisposed ())
+                {
+                    tooltipShell.dispose ();
+                }
                 tooltipShell = new Shell(_table.getShell(), SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL);
                 tooltipShell.setBackground(event.display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
                 FillLayout layout = new FillLayout();
@@ -328,7 +331,9 @@ public class AttributesTabControl extends TabControl
         public void mouseMove(MouseEvent event)
         {
             if (tooltipShell == null)
+            {
                 return;
+            }
             
             tooltipShell.dispose();
             tooltipShell = null;
@@ -339,7 +344,9 @@ public class AttributesTabControl extends TabControl
         public void keyPressed(KeyEvent e)
         {
             if (tooltipShell == null)
+            {
                 return;
+            }
             
             tooltipShell.dispose();
             tooltipShell = null;
@@ -757,7 +764,9 @@ public class AttributesTabControl extends TabControl
     {
         int index = _table.getSelectionIndex();
         if (index == -1)
+        {
             return null;
+        }
         
         return (AttributeData)_table.getItem(index).getData();
     }
@@ -854,6 +863,7 @@ public class AttributesTabControl extends TabControl
                     break;
                 case 1 : // attribute value column 
                     if (attribute.getValue() != null)
+                    {
                         if (attribute.getValue() instanceof String[])
                         {
                             for(String val : (String[]) attribute.getValue()){
@@ -864,6 +874,7 @@ public class AttributesTabControl extends TabControl
                         {
                             result = String.valueOf(attribute.getValue());
                         }
+                    }
                     break;
                 default :
                     result = "";
@@ -886,9 +897,13 @@ public class AttributesTabControl extends TabControl
         {
             attribute = (AttributeData) element;
             if (attribute.isWritable())
+            {
                 return Display.getCurrent().getSystemColor(SWT.COLOR_BLUE);
+            }
             else
+            {
                 return Display.getCurrent().getSystemColor(SWT.COLOR_BLACK);
+            }
         }
         public Color getBackground(Object element)
         {
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
index 300485e23f..1ce31ae3d1 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
@@ -86,7 +86,9 @@ public class MBeanView extends ViewPart
         public void selectionChanged(IWorkbenchPart part, ISelection sel)
         {
             if (!(sel instanceof IStructuredSelection))
+            {
                 return;
+            }
 
             IStructuredSelection ss = (IStructuredSelection) sel;
             _selectedNode = (TreeObject)ss.getFirstElement();
@@ -286,7 +288,9 @@ public class MBeanView extends ViewPart
             }
             
             if (parent != null && parent.getType().equals(NODE_TYPE_SERVER))
+            {
                 _server = (ManagedServer)parent.getManagedObject();
+            }
             
             _virtualHostName = _selectedNode.getVirtualHost();
         }
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
index 09a2aae522..f4bad79afa 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
@@ -300,7 +300,9 @@ public class NotificationsTabControl extends VHNotificationsTabControl
         public void widgetSelected(SelectionEvent e)
         {
             if (_mbean == null)
+            {
                 return;
+            }
             
             Button source = (Button)e.getSource();
             String type = _typesCombo.getItem(_typesCombo.getSelectionIndex());
@@ -340,7 +342,9 @@ public class NotificationsTabControl extends VHNotificationsTabControl
         public void widgetSelected(SelectionEvent e)
         {
             if (_mbean == null)
+            {
                 return;
+            }
             
             Combo combo = (Combo)e.getSource();
             if (combo == _notificationNameCombo)
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
index f2fc4413cd..676389bd96 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
@@ -347,7 +347,9 @@ public class OperationTabControl extends TabControl
                 String str = param.getType();
                 
                 if (param.getType().lastIndexOf(".") != -1)
+                {
                     str = param.getType().substring(1 + param.getType().lastIndexOf("."));
+                }
                 
                 label = _toolkit.createLabel(_paramsComposite, "(" + str + ")");
             }
@@ -554,24 +556,38 @@ public class OperationTabControl extends TabControl
     private void clearParameterValues(Composite control)
     {
         if (control == null || (control.isDisposed()))
+        {
             return;
+        }
         
         Control[] controls = control.getChildren();
         if (controls == null || controls.length == 0)
+        {
             return;
+        }
         
         for (int i = 0; i < controls.length; i++)
         {
             if (controls[i] instanceof Combo)
+            {
                 ((Combo)controls[i]).select(0);
+            }
             if (controls[i] instanceof org.eclipse.swt.widgets.List)
+            {
                 ((org.eclipse.swt.widgets.List)controls[i]).deselectAll();
+            }
             else if (controls[i] instanceof Text)
+            {
                 ((Text)controls[i]).setText("");
+            }
             else if (controls[i] instanceof Button)
+            {
                 ((Button)controls[i]).setSelection(false);
+            }
             else if (controls[i] instanceof Composite)
+            {
                 clearParameterValues((Composite)controls[i]);
+            }
         }
     }
     
@@ -840,7 +856,9 @@ public class OperationTabControl extends TabControl
         public void keyReleased(KeyEvent e) 
         {
             if (!(e.widget instanceof Text))
+            {
                 return;
+            }
             
             Text text = (Text)e.widget;
             // Get the parameters widget and assign the text to the parameter
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
index 43a1da17e5..10e2f78c1c 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
@@ -241,7 +241,9 @@ public class ViewUtility
             public void widgetSelected(SelectionEvent e)
             {
                 if (!(e.widget instanceof Button))
+                {
                     return;
+                }
 
                 Button traverseButton =(Button)e.widget; 
                 // Get the CompositeData respective to the button selected
@@ -895,7 +897,9 @@ public class ViewUtility
     public static void disposeChildren(Composite parent)
     {
         if (parent == null || parent.isDisposed())
+        {
             return;
+        }
         
         Control[] oldControls = parent.getChildren();        
         for (int i = 0; i < oldControls.length; i++)