From 9029cca391c6cb2e6f77ea3d6b99bf60644fa446 Mon Sep 17 00:00:00 2001
From: Jean-Louis Boudart <jlboudart@apache.org>
Date: Tue, 14 Jan 2014 09:07:55 +0000
Subject: [PATCH] Add missing brackets in if statements

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1557988 13f79535-47bb-0310-9956-ffa450edef68
---
 .../parser/xml/XmlModuleDescriptorUpdater.java       |  3 ++-
 test/java/org/apache/ivy/ant/IvyDeliverTest.java     |  3 ++-
 .../core/cache/ModuleDescriptorMemoryCacheTest.java  |  3 ++-
 .../apache/ivy/core/publish/PublishEventsTest.java   | 12 ++++++++----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
index 6ec43f74..9880f2d1 100644
--- a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
+++ b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
@@ -594,8 +594,9 @@ public final class XmlModuleDescriptorUpdater {
             if (attributes.getIndex("branch") == -1) {
                 if (newBranch != null) {
                     // erase an existing branch attribute if its new value is blank
-                    if (!newBranch.trim().equals(""))
+                    if (!newBranch.trim().equals("")) {
                         write(" branch=\"" + newBranch + "\"");
+                    }
                 } else if (options.isUpdateBranch() && systemMrid.getBranch() != null) {
                     // this dependency is on a specific branch, we set it explicitly in the updated
                     // file
diff --git a/test/java/org/apache/ivy/ant/IvyDeliverTest.java b/test/java/org/apache/ivy/ant/IvyDeliverTest.java
index 6b3b752b..2d2c8dea 100644
--- a/test/java/org/apache/ivy/ant/IvyDeliverTest.java
+++ b/test/java/org/apache/ivy/ant/IvyDeliverTest.java
@@ -147,9 +147,10 @@ public class IvyDeliverTest extends TestCase {
                 mergeLine = mergeLine.trim();
                 expectedLine = expectedLine.trim();
 
-                if (!mergeLine.startsWith("<info"))
+                if (!mergeLine.startsWith("<info")) {
                     assertEquals("published descriptor matches at line[" + lineNo + "]",
                         expectedLine.trim(), mergeLine.trim());
+                }
 
                 ++lineNo;
             }
diff --git a/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java b/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java
index c9e041c6..c13c0832 100644
--- a/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java
+++ b/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java
@@ -157,8 +157,9 @@ public class ModuleDescriptorMemoryCacheTest extends TestCase {
 
         public ModuleDescriptor provideModule(ParserSettings ivySettings, File descriptorFile,
                 boolean validate) {
-            if (ivySettings != null)
+            if (ivySettings != null) {
                 ivySettings.substitute("${val}");
+            }
             called = true;
             return result;
         }
diff --git a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java b/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
index 72775f45..0cd129d9 100644
--- a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
+++ b/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
@@ -149,8 +149,9 @@ public class PublishEventsTest extends TestCase {
             ivy = null;
         }
         publishEngine = null;
-        if (dataFile != null)
+        if (dataFile != null) {
             dataFile.delete();
+        }
         dataFile = null;
         ivyFile = null;
     }
@@ -240,8 +241,9 @@ public class PublishEventsTest extends TestCase {
         // set an error to be thrown during publication of the data file.
         this.publishError = new IOException("boom!");
         // we don't care which artifact is attempted; either will fail with an IOException.
-        for (Iterator it = expectedPublications.values().iterator(); it.hasNext();)
+        for (Iterator it = expectedPublications.values().iterator(); it.hasNext();) {
             ((PublishTestCase) it.next()).expectedSuccess = false;
+        }
 
         try {
             publishEngine.publish(publishModule.getModuleRevisionId(), publishSources, "default",
@@ -341,9 +343,10 @@ public class PublishEventsTest extends TestCase {
                         expectedArtifact.getExt(), "default",
                         String.valueOf(test.expectedOverwrite)};
 
-                for (int i = 0; i < attributes.length; ++i)
+                for (int i = 0; i < attributes.length; ++i) {
                     assertEquals("event declares correct value for " + attributes[i], values[i],
                         event.getAttributes().get(attributes[i]));
+                }
                 // we test file separately, since it is hard to guaranteean exact path match, but we
                 // want
                 // to make sure that both paths point to the same canonical location on the
@@ -474,8 +477,9 @@ public class PublishEventsTest extends TestCase {
                 test.currentTestCase.expectedData.exists());
 
             // simulate a publisher error if the current test case demands it.
-            if (test.publishError != null)
+            if (test.publishError != null) {
                 throw test.publishError;
+            }
 
             // all assertions pass. increment the publication count
             test.currentTestCase.published = true;