Suppress some FindBugs warnings.

Also globally replace "for(" with "for (".

Change-Id: I27fe17460e6745b9ca823f42e57c86fe8af31979

28 files changed, 53 insertions, 44 deletions

diff --git a/junit/src/main/java/junit/framework/ComparisonFailure.java b/junit/src/main/java/junit/framework/ComparisonFailure.java
index 0cb2cee..ccd476b 100644
--- a/junit/src/main/java/junit/framework/ComparisonFailure.java
+++ b/junit/src/main/java/junit/framework/ComparisonFailure.java
@@ -34,7 +34,7 @@ public class ComparisonFailure extends AssertionFailedError {
         int end= Math.min(fExpected.length(), fActual.length());
 
         int i= 0;
-        for(; i < end; i++) {
+        for (; i < end; i++) {
             if (fExpected.charAt(i) != fActual.charAt(i))
                 break;
         }
diff --git a/luni/src/main/java/java/lang/Boolean.java b/luni/src/main/java/java/lang/Boolean.java
index f95a38b..2c8ffc8 100644
--- a/luni/src/main/java/java/lang/Boolean.java
+++ b/luni/src/main/java/java/lang/Boolean.java
@@ -101,9 +101,9 @@ public final class Boolean implements Serializable, Comparable<Boolean> {
      *         {@code Boolean}; {@code false} otherwise.
      */
     @Override
+    @FindBugsSuppressWarnings("RC_REF_COMPARISON_BAD_PRACTICE_BOOLEAN")
     public boolean equals(Object o) {
-        return (o == this)
-                || ((o instanceof Boolean) && (value == ((Boolean) o).value));
+        return (o == this) || ((o instanceof Boolean) && (((Boolean) o).value == value));
     }
 
     /**
diff --git a/luni/src/main/java/java/lang/Byte.java b/luni/src/main/java/java/lang/Byte.java
index 7e0b293..bd1a1e4 100644
--- a/luni/src/main/java/java/lang/Byte.java
+++ b/luni/src/main/java/java/lang/Byte.java
@@ -22,6 +22,7 @@ package java.lang;
  *
  * @since 1.1
  */
+@FindBugsSuppressWarnings("DM_NUMBER_CTOR")
 public final class Byte extends Number implements Comparable<Byte> {
 
     private static final long serialVersionUID = -7183698231559129828L;
@@ -155,9 +156,9 @@ public final class Byte extends Number implements Comparable<Byte> {
      *         {@code Byte}; {@code false} otherwise.
      */
     @Override
+    @FindBugsSuppressWarnings("RC_REF_COMPARISON")
     public boolean equals(Object object) {
-        return (object == this) || (object instanceof Byte)
-                && (value == ((Byte) object).value);
+        return (object == this) || ((object instanceof Byte) && (((Byte) object).value == value));
     }
 
     @Override
diff --git a/luni/src/main/java/java/lang/Character.java b/luni/src/main/java/java/lang/Character.java
index 1e39428..67c5c71 100644
--- a/luni/src/main/java/java/lang/Character.java
+++ b/luni/src/main/java/java/lang/Character.java
@@ -96,6 +96,7 @@ import java.util.Arrays;
  *
  * @since 1.0
  */
+@FindBugsSuppressWarnings("DM_NUMBER_CTOR")
 public final class Character implements Serializable, Comparable<Character> {
     private static final long serialVersionUID = 3786198910865385080L;
 
@@ -1641,7 +1642,7 @@ public final class Character implements Serializable, Comparable<Character> {
     private static final Character[] SMALL_VALUES = new Character[128];
 
     static {
-        for(int i = 0; i < 128; i++) {
+        for (int i = 0; i < 128; i++) {
             SMALL_VALUES[i] = new Character((char) i);
         }
     }
@@ -2405,7 +2406,7 @@ public final class Character implements Serializable, Comparable<Character> {
      */
     @Override
     public boolean equals(Object object) {
-        return (object instanceof Character) && (value == ((Character) object).value);
+        return (object instanceof Character) && (((Character) object).value == value);
     }
 
     /**
diff --git a/luni/src/main/java/java/lang/ClassLoader.java b/luni/src/main/java/java/lang/ClassLoader.java
index 2ec066f..0cdc448 100644
--- a/luni/src/main/java/java/lang/ClassLoader.java
+++ b/luni/src/main/java/java/lang/ClassLoader.java
@@ -747,6 +747,7 @@ class BootClassLoader extends ClassLoader {
 
     private static BootClassLoader instance;
 
+    @FindBugsSuppressWarnings("DP_CREATE_CLASSLOADER_INSIDE_DO_PRIVILEGED")
     public static synchronized BootClassLoader getInstance() {
         if (instance == null) {
             instance = new BootClassLoader();
diff --git a/luni/src/main/java/java/lang/Double.java b/luni/src/main/java/java/lang/Double.java
index 9f8ce7e..456529b 100644
--- a/luni/src/main/java/java/lang/Double.java
+++ b/luni/src/main/java/java/lang/Double.java
@@ -206,9 +206,8 @@ public final class Double extends Number implements Comparable<Double> {
      */
     @Override
     public boolean equals(Object object) {
-        return (object == this)
-                || (object instanceof Double)
-                && (doubleToLongBits(this.value) == doubleToLongBits(((Double) object).value));
+        return (object instanceof Double) &&
+                (doubleToLongBits(this.value) == doubleToLongBits(((Double) object).value));
     }
 
     @Override
diff --git a/luni/src/main/java/java/lang/FinalizerThread.java b/luni/src/main/java/java/lang/FinalizerThread.java
index 5f478df..978332c 100644
--- a/luni/src/main/java/java/lang/FinalizerThread.java
+++ b/luni/src/main/java/java/lang/FinalizerThread.java
@@ -67,6 +67,7 @@ public final class FinalizerThread extends Thread {
         }
     }
 
+    @FindBugsSuppressWarnings("FI_EXPLICIT_INVOCATION")
     private void doFinalize(FinalizerReference<Object> reference) {
         FinalizerReference.remove(reference);
         Object obj = reference.get();
diff --git a/luni/src/main/java/java/lang/Float.java b/luni/src/main/java/java/lang/Float.java
index e4dc140..900b2a0 100644
--- a/luni/src/main/java/java/lang/Float.java
+++ b/luni/src/main/java/java/lang/Float.java
@@ -189,9 +189,8 @@ public final class Float extends Number implements Comparable<Float> {
      */
     @Override
     public boolean equals(Object object) {
-        return (object == this)
-                || (object instanceof Float)
-                && (floatToIntBits(this.value) == floatToIntBits(((Float) object).value));
+        return (object instanceof Float) &&
+                (floatToIntBits(this.value) == floatToIntBits(((Float) object).value));
     }
 
     /**
diff --git a/luni/src/main/java/java/lang/Integer.java b/luni/src/main/java/java/lang/Integer.java
index 06d7f90..15511a8 100644
--- a/luni/src/main/java/java/lang/Integer.java
+++ b/luni/src/main/java/java/lang/Integer.java
@@ -29,6 +29,7 @@ package java.lang;
  * @see java.lang.Long
  * @since 1.0
  */
+@FindBugsSuppressWarnings("DM_NUMBER_CTOR")
 public final class Integer extends Number implements Comparable<Integer> {
 
     private static final long serialVersionUID = 1360826667806852920L;
@@ -205,7 +206,7 @@ public final class Integer extends Number implements Comparable<Integer> {
      */
     @Override
     public boolean equals(Object o) {
-        return o instanceof Integer && ((Integer) o).value == value;
+        return (o instanceof Integer) && (((Integer) o).value == value);
     }
 
     @Override
@@ -712,7 +713,7 @@ public final class Integer extends Number implements Comparable<Integer> {
     private static final Integer[] SMALL_VALUES = new Integer[256];
 
     static {
-        for(int i = -128; i < 128; i++) {
+        for (int i = -128; i < 128; i++) {
             SMALL_VALUES[i + 128] = new Integer(i);
         }
     }
diff --git a/luni/src/main/java/java/lang/Long.java b/luni/src/main/java/java/lang/Long.java
index d6605e6..8b592e2 100644
--- a/luni/src/main/java/java/lang/Long.java
+++ b/luni/src/main/java/java/lang/Long.java
@@ -29,6 +29,7 @@ package java.lang;
  * @see java.lang.Integer
  * @since 1.0
  */
+@FindBugsSuppressWarnings("DM_NUMBER_CTOR")
 public final class Long extends Number implements Comparable<Long> {
 
     private static final long serialVersionUID = 4290774380558885855L;
@@ -193,7 +194,7 @@ public final class Long extends Number implements Comparable<Long> {
      */
     @Override
     public boolean equals(Object o) {
-        return o instanceof Long && ((Long) o).value == value;
+        return (o instanceof Long) && (((Long) o).value == value);
     }
 
     @Override
@@ -724,8 +725,7 @@ public final class Long extends Number implements Comparable<Long> {
      * @since 1.5
      */
     public static Long valueOf(long v) {
-        return  v >= 128 || v < -128 ? new Long(v)
-                                     : SMALL_VALUES[((int) v) + 128];
+        return  v >= 128 || v < -128 ? new Long(v) : SMALL_VALUES[((int) v) + 128];
     }
 
     /**
@@ -734,7 +734,7 @@ public final class Long extends Number implements Comparable<Long> {
     private static final Long[] SMALL_VALUES = new Long[256];
 
     static {
-        for(int i = -128; i < 128; i++) {
+        for (int i = -128; i < 128; i++) {
             SMALL_VALUES[i + 128] = new Long(i);
         }
     }
diff --git a/luni/src/main/java/java/lang/Object.java b/luni/src/main/java/java/lang/Object.java
index f6c01fe..7f4b490 100644
--- a/luni/src/main/java/java/lang/Object.java
+++ b/luni/src/main/java/java/lang/Object.java
@@ -219,6 +219,7 @@ public class Object {
      *
      * See <i>Effective Java</i> Item 7, "Avoid finalizers" for more.
      */
+    @FindBugsSuppressWarnings("FI_EMPTY")
     protected void finalize() throws Throwable {
     }
 
diff --git a/luni/src/main/java/java/lang/ProcessManager.java b/luni/src/main/java/java/lang/ProcessManager.java
index d65d04d..f5afedb 100644
--- a/luni/src/main/java/java/lang/ProcessManager.java
+++ b/luni/src/main/java/java/lang/ProcessManager.java
@@ -134,11 +134,8 @@ final class ProcessManager {
     private void waitForMoreChildren() {
         synchronized (processReferences) {
             if (processReferences.isEmpty()) {
-                /*
-                 * There are no eligible children; wait for one to be
-                 * added. The wait() will return due to the
-                 * notifyAll() call below.
-                 */
+                // There are no eligible children; wait for one to be added.
+                // This wait will return because of the notifyAll call in exec.
                 try {
                     processReferences.wait();
                 } catch (InterruptedException ex) {
diff --git a/luni/src/main/java/java/lang/Short.java b/luni/src/main/java/java/lang/Short.java
index 02f7e65..1101805 100644
--- a/luni/src/main/java/java/lang/Short.java
+++ b/luni/src/main/java/java/lang/Short.java
@@ -23,6 +23,7 @@ package java.lang;
  * @see java.lang.Number
  * @since 1.1
  */
+@FindBugsSuppressWarnings("DM_NUMBER_CTOR")
 public final class Short extends Number implements Comparable<Short> {
 
     private static final long serialVersionUID = 7515723908773894738L;
@@ -156,8 +157,7 @@ public final class Short extends Number implements Comparable<Short> {
      */
     @Override
     public boolean equals(Object object) {
-        return (object instanceof Short)
-                && (value == ((Short) object).value);
+        return (object instanceof Short) && (((Short) object).value == value);
     }
 
     @Override
@@ -314,7 +314,7 @@ public final class Short extends Number implements Comparable<Short> {
     private static final Short[] SMALL_VALUES = new Short[256];
 
     static {
-        for(int i = -128; i < 128; i++) {
+        for (int i = -128; i < 128; i++) {
             SMALL_VALUES[i + 128] = new Short((short) i);
         }
     }
diff --git a/luni/src/main/java/java/lang/String.java b/luni/src/main/java/java/lang/String.java
index 56b99f4..a3d2cb4 100644
--- a/luni/src/main/java/java/lang/String.java
+++ b/luni/src/main/java/java/lang/String.java
@@ -136,6 +136,7 @@ public final class String implements Serializable, Comparable<String>, CharSeque
      * Converts the byte array to a string using the system's
      * {@link java.nio.charset.Charset#defaultCharset default charset}.
      */
+    @FindBugsSuppressWarnings("DM_DEFAULT_ENCODING")
     public String(byte[] data) {
         this(data, 0, data.length);
     }
@@ -762,6 +763,7 @@ outer:
      * @return {@code true} if the specified string is equal to this string,
      *         {@code false} otherwise.
      */
+    @FindBugsSuppressWarnings("ES_COMPARING_PARAMETER_STRING_WITH_EQ")
     public boolean equalsIgnoreCase(String string) {
         if (string == this) {
             return true;
@@ -2020,6 +2022,7 @@ outer:
      * where the needle is a constant string, may compute the values cache, md2
      * and lastChar, and change the call to the following method.
      */
+    @FindBugsSuppressWarnings("UPM_UNCALLED_PRIVATE_METHOD")
     @SuppressWarnings("unused")
     private static int indexOf(String haystackString, String needleString,
             int cache, int md2, char lastChar) {
diff --git a/luni/src/main/java/java/lang/UnsafeByteSequence.java b/luni/src/main/java/java/lang/UnsafeByteSequence.java
index 66f904b..228bb01 100644
--- a/luni/src/main/java/java/lang/UnsafeByteSequence.java
+++ b/luni/src/main/java/java/lang/UnsafeByteSequence.java
@@ -67,6 +67,7 @@ public class UnsafeByteSequence {
         bytes[count++] = (byte) b;
     }
 
+    @FindBugsSuppressWarnings("EI_EXPOSE_REP")
     public byte[] toByteArray() {
         if (count == bytes.length) {
             return bytes;
diff --git a/luni/src/main/java/java/lang/reflect/Constructor.java b/luni/src/main/java/java/lang/reflect/Constructor.java
index ceb54c4..b03e28b 100644
--- a/luni/src/main/java/java/lang/reflect/Constructor.java
+++ b/luni/src/main/java/java/lang/reflect/Constructor.java
@@ -344,7 +344,7 @@ public final class Constructor<T> extends AccessibleObject implements GenericDec
         StringBuilder result = new StringBuilder();
 
         result.append('(');
-        for(int i = 0; i < parameterTypes.length; i++) {
+        for (int i = 0; i < parameterTypes.length; i++) {
             result.append(getSignature(parameterTypes[i]));
         }
         result.append(")V");
diff --git a/luni/src/main/java/java/lang/reflect/Method.java b/luni/src/main/java/java/lang/reflect/Method.java
index de1dcbd..8a9c0f1 100644
--- a/luni/src/main/java/java/lang/reflect/Method.java
+++ b/luni/src/main/java/java/lang/reflect/Method.java
@@ -571,7 +571,7 @@ public final class Method extends AccessibleObject implements GenericDeclaration
         StringBuilder result = new StringBuilder();
 
         result.append('(');
-        for(int i = 0; i < parameterTypes.length; i++) {
+        for (int i = 0; i < parameterTypes.length; i++) {
             result.append(getSignature(parameterTypes[i]));
         }
         result.append(')');
diff --git a/luni/src/main/java/java/math/BitLevel.java b/luni/src/main/java/java/math/BitLevel.java
index 607358f..91f7a9b 100644
--- a/luni/src/main/java/java/math/BitLevel.java
+++ b/luni/src/main/java/java/math/BitLevel.java
@@ -113,7 +113,7 @@ class BitLevel {
 
     static void shiftLeftOneBit(int[] result, int[] source, int srcLen) {
         int carry = 0;
-        for(int i = 0; i < srcLen; i++) {
+        for (int i = 0; i < srcLen; i++) {
             int val = source[i];
             result[i] = (val << 1) | carry;
             carry = val >>> 31;
diff --git a/luni/src/main/java/java/math/Conversion.java b/luni/src/main/java/java/math/Conversion.java
index 731f972..585fff4 100644
--- a/luni/src/main/java/java/math/Conversion.java
+++ b/luni/src/main/java/java/math/Conversion.java
@@ -350,7 +350,7 @@ class Conversion {
             if (exponent >= 0) {
                 // special case 1
                 int insertPoint = currentChar + (int) exponent ;
-                for(int j=resLengthInChars-1; j>=insertPoint; j--) {
+                for (int j=resLengthInChars-1; j>=insertPoint; j--) {
                     result[j+1] = result[j];
                 }
                 result[++insertPoint]='.';
diff --git a/luni/src/main/java/java/math/Logical.java b/luni/src/main/java/java/math/Logical.java
index 229a5e8..9de0924 100644
--- a/luni/src/main/java/java/math/Logical.java
+++ b/luni/src/main/java/java/math/Logical.java
@@ -207,7 +207,7 @@ class Logical {
             resDigits[i] = longer.digits[i] | shorter.digits[i];
         }
         // shorter has only the remaining virtual sign bits
-        for( ; i < longer.numberLength; i++){
+        for ( ; i < longer.numberLength; i++){
             resDigits[i] = longer.digits[i];
         }
 
@@ -533,7 +533,7 @@ class Logical {
             i = iPos;
             resDigits[i] = -positive.digits[i];
             limit = Math.min(positive.numberLength, iNeg);
-            for(i++; i < limit; i++ ) {
+            for (i++; i < limit; i++ ) {
                 resDigits[i] = ~positive.digits[i];
             }
             if (i != positive.numberLength) {
@@ -558,7 +558,7 @@ class Logical {
             // resDigits[i] = ~(~negative.digits[i] | positive.digits[i] );
             resDigits[i] = negative.digits[i] & ~positive.digits[i];
         }
-        for( ; i < negative.numberLength; i++) {
+        for ( ; i < negative.numberLength; i++) {
             resDigits[i] = negative.digits[i];
         }
 
@@ -611,7 +611,7 @@ class Logical {
         for ( ; i < shorter.numberLength; i++) {
             resDigits[i] = longer.digits[i] ^ shorter.digits[i];
         }
-        for( ; i < longer.numberLength; i++ ){
+        for ( ; i < longer.numberLength; i++ ){
             resDigits[i] = longer.digits[i];
         }
 
diff --git a/luni/src/main/java/java/net/InetAddress.java b/luni/src/main/java/java/net/InetAddress.java
index 56eb1f4..a507f82 100644
--- a/luni/src/main/java/java/net/InetAddress.java
+++ b/luni/src/main/java/java/net/InetAddress.java
@@ -899,7 +899,7 @@ public class InetAddress implements Serializable {
 
     private static byte[] ipv4MappedToIPv4(byte[] mappedAddress) {
         byte[] ipv4Address = new byte[4];
-        for(int i = 0; i < 4; i++) {
+        for (int i = 0; i < 4; i++) {
             ipv4Address[i] = mappedAddress[12 + i];
         }
         return ipv4Address;
diff --git a/luni/src/main/java/java/net/NetworkInterface.java b/luni/src/main/java/java/net/NetworkInterface.java
index 9aa20a0..c6d9af4 100644
--- a/luni/src/main/java/java/net/NetworkInterface.java
+++ b/luni/src/main/java/java/net/NetworkInterface.java
@@ -184,6 +184,7 @@ public final class NetworkInterface extends Object {
         }
     }
 
+    @FindBugsSuppressWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
     private static boolean isValidInterfaceName(String interfaceName) {
         // Don't just stat because a crafty user might have / or .. in the supposed interface name.
         for (String validName : new File("/sys/class/net").list()) {
@@ -261,6 +262,7 @@ public final class NetworkInterface extends Object {
         return Collections.enumeration(getNetworkInterfacesList());
     }
 
+    @FindBugsSuppressWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
     private static List<NetworkInterface> getNetworkInterfacesList() throws SocketException {
         String[] interfaceNames = new File("/sys/class/net").list();
         NetworkInterface[] interfaces = new NetworkInterface[interfaceNames.length];
diff --git a/luni/src/main/java/java/net/URLClassLoader.java b/luni/src/main/java/java/net/URLClassLoader.java
index efcb4b1..1c8bc43 100644
--- a/luni/src/main/java/java/net/URLClassLoader.java
+++ b/luni/src/main/java/java/net/URLClassLoader.java
@@ -51,6 +51,7 @@ import libcore.io.Streams;
  * loaded by this {@code URLClassLoader} are granted permission to access the
  * URLs contained in the URL search list.
  */
+@FindBugsSuppressWarnings({ "DMI_COLLECTION_OF_URLS", "DP_CREATE_CLASSLOADER_INSIDE_DO_PRIVILEGED" })
 public class URLClassLoader extends SecureClassLoader {
 
     ArrayList<URL> originalUrls;
diff --git a/luni/src/main/java/java/security/KeyStore.java b/luni/src/main/java/java/security/KeyStore.java
index 40f7f9d..c233a5b 100644
--- a/luni/src/main/java/java/security/KeyStore.java
+++ b/luni/src/main/java/java/security/KeyStore.java
@@ -1226,8 +1226,8 @@ public class KeyStore {
             // clone chain - this.chain = (Certificate[])chain.clone();
             boolean isAllX509Certificates = true;
             // assert chain length > 0
-            for(Certificate cert: chain){
-                if(!(cert instanceof X509Certificate)){
+            for (Certificate cert: chain) {
+                if (!(cert instanceof X509Certificate)) {
                     isAllX509Certificates = false;
                     break;
                 }
diff --git a/luni/src/main/java/java/sql/Date.java b/luni/src/main/java/java/sql/Date.java
index adc35aa..2434fbd 100644
--- a/luni/src/main/java/java/sql/Date.java
+++ b/luni/src/main/java/java/sql/Date.java
@@ -32,6 +32,7 @@ package java.sql;
  * java.sql.Date} class are "normalized" to the time 00:00:00.000 GMT on the
  * date implied by the time value.
  */
+@FindBugsSuppressWarnings("NM_SAME_SIMPLE_NAME_AS_SUPERCLASS")
 public class Date extends java.util.Date {
 
     private static final long serialVersionUID = 1511598038487230103L;
diff --git a/luni/src/main/java/java/util/TreeSet.java b/luni/src/main/java/java/util/TreeSet.java
index 63a51c9..502329e 100644
--- a/luni/src/main/java/java/util/TreeSet.java
+++ b/luni/src/main/java/java/util/TreeSet.java
@@ -490,7 +490,7 @@ public class TreeSet<E> extends AbstractSet<E> implements NavigableSet<E>,
                 (Comparator<? super E>) stream.readObject());
         int size = stream.readInt();
         if (size > 0) {
-            for(int i=0; i<size; i++) {
+            for (int i=0; i<size; i++) {
                 E elem = (E)stream.readObject();
                 map.put(elem, Boolean.TRUE);
             }
diff --git a/luni/src/main/java/java/util/prefs/XMLParser.java b/luni/src/main/java/java/util/prefs/XMLParser.java
index 6546b76..6e25c7d 100644
--- a/luni/src/main/java/java/util/prefs/XMLParser.java
+++ b/luni/src/main/java/java/util/prefs/XMLParser.java
@@ -405,7 +405,7 @@ class XMLParser {
         NodeList childNodes = documentElement.getChildNodes();
 
         if(path[0].equals("entry") || path[0].equals("node")) {
-            for(int i = 0; i < childNodes.getLength(); i++) {
+            for (int i = 0; i < childNodes.getLength(); i++) {
                 Object next = childNodes.item(i);
                 if(next instanceof Element) {
                     if(((Element) next).getNodeName().equals(path[0])) {
@@ -414,12 +414,12 @@ class XMLParser {
                 }
             }
         } else if(path[0].equals("map") && path[1].equals("entry")) {
-            for(int i = 0; i < childNodes.getLength(); i++) {
+            for (int i = 0; i < childNodes.getLength(); i++) {
                 Object next = childNodes.item(i);
                 if(next instanceof Element) {
                     if(((Element) next).getNodeName().equals(path[0])) {
                         NodeList nextChildNodes = ((Node)next).getChildNodes();
-                        for(int j = 0; j < nextChildNodes.getLength(); j++) {
+                        for (int j = 0; j < nextChildNodes.getLength(); j++) {
                             Object subnext = nextChildNodes.item(j);
                             if(subnext instanceof Element) {
                                 if(((Element)subnext).getNodeName().equals(path[1])) {
diff --git a/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java b/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java
index 4667416..3fd13f5 100644
--- a/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java
+++ b/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java
@@ -68,7 +68,7 @@ public final class AnnotationFactory implements InvocationHandler, Serializable
             Method[] m = annotationType.getDeclaredMethods();
             desc = new AnnotationMember[m.length];
             int idx = 0;
-            for(Method element : m) {
+            for (Method element : m) {
                 String name = element.getName();
                 Class<?> type = element.getReturnType();
                 try {
@@ -260,7 +260,7 @@ public final class AnnotationFactory implements InvocationHandler, Serializable
         result.append('@');
         result.append(klazz.getName());
         result.append('(');
-        for(int i = 0; i < elements.length; ++i) {
+        for (int i = 0; i < elements.length; ++i) {
             if (i != 0) {
                 result.append(", ");
             }