Dogfood now contains ForLoopsMustUseBraces.

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@6260 51baf565-9d33-0410-a72c-fc3788e3496d
2008-06-24 06:07:28 +00:00
1 parent 43ffde4d9f
commit d5586fe799
@@ -28,7 +28,6 @@

 	<rule ref="rulesets/braces.xml">
 		<!-- TODO Work towards enabling the following, disabled for now because of failing code -->
-		<exclude name="ForLoopsMustUseBraces"/>
 		<exclude name="WhileLoopsMustUseBraces"/>
 	</rule>

@@ -458,7 +458,9 @@ public class GUI implements CPDListener {
    		},"Del", delete, JComponent.WHEN_FOCUSED);
    	
    	int[] alignments = new int[matchColumns.length];
-    	for (int i=0; i<alignments.length; i++) alignments[i] = matchColumns[i].alignment();
+    	for (int i=0; i<alignments.length; i++) {
+    	    alignments[i] = matchColumns[i].alignment();
+    	}

    	resultsTable.setDefaultRenderer(Object.class, new AlignmentRenderer(alignments));
    	
@@ -143,10 +143,11 @@ public class GenericClassCounterRule extends AbstractJavaRule {
 		}
 		// TODO: implements the "operand" functionnality
 		// Is there any names that actually match ?
-		for (Pattern pattern : this.namesMatch)
+		for (Pattern pattern : this.namesMatch) {
 			if ( RegexHelper.isMatch(pattern, classType.getImage())) {
 				addAMatch(classType, data);
 			}
+		}
 		return super.visit(classType, data);
 	}

@@ -187,8 +188,9 @@ public class GenericClassCounterRule extends AbstractJavaRule {
 		AtomicLong total = (AtomicLong)ctx.getAttribute(COUNTER_LABEL);
        // Do we have a violation ?
        if ( total.get() > this.threshold ) {
-        	for (Node node : this.matches)
+        	for (Node node : this.matches) {
        		addViolation(ctx,node , new Object[] { total });
+        	}
 		// Cleaning the context for the others rules
 		ctx.removeAttribute(COUNTER_LABEL);
 		super.start(ctx);
@@ -54,7 +54,9 @@ public abstract class AbstractScalarProperty extends AbstractProperty {
 		String[] strValues = StringUtil.substringsOf(valueString, multiValueDelimiter);
 		
 		Object[] values = arrayFor(strValues.length);
-		for (int i=0; i<strValues.length; i++) values[i] = createFrom(strValues[i]);
+		for (int i=0; i<strValues.length; i++) {
+		    values[i] = createFrom(strValues[i]);
+		}
 		return values;
 	}
 }
@@ -55,7 +55,9 @@ public class BooleanProperty extends AbstractScalarProperty {
 	 */
 	private static final Boolean[] asBooleans(boolean[] bools) {
 		Boolean[] booleans = new Boolean[bools.length];
-		for (int i=0; i<bools.length; i++) booleans[i] = Boolean.valueOf(bools[i]);
+		for (int i=0; i<bools.length; i++) {
+		    booleans[i] = Boolean.valueOf(bools[i]);
+		}
 		return booleans;
 	}
 	
@@ -69,7 +69,9 @@ public class CharacterProperty extends AbstractProperty {
 	 */
 	private static final Character[] asCharacters(char[] chars) {
 		Character[] characters = new Character[chars.length];
-		for (int i=0; i<chars.length; i++) characters[i] = Character.valueOf(chars[i]);
+		for (int i=0; i<chars.length; i++) {
+		    characters[i] = Character.valueOf(chars[i]);
+		}
 		return characters;
 	}
 	
@@ -101,7 +103,9 @@ public class CharacterProperty extends AbstractProperty {
 		String[] values = StringUtil.substringsOf(valueString, multiValueDelimiter);
 		
 		Character[] chars = new Character[values.length];
-		for (int i=0; i<values.length; i++) chars[i] = Character.valueOf(values[i].charAt(0));
+		for (int i=0; i<values.length; i++) {
+		    chars[i] = Character.valueOf(values[i].charAt(0));
+		}
 		return chars;
 	}
 }
@@ -63,7 +63,9 @@ public class DoubleProperty extends AbstractScalarProperty {
 	 */
 	private static final Double[] asDoubles(double[] doubles) {
 		Double[] Doubles = new Double[doubles.length];
-		for (int i=0; i<doubles.length; i++) Doubles[i] = new Double(doubles[i]);
+		for (int i=0; i<doubles.length; i++) {
+		    Doubles[i] = new Double(doubles[i]);
+		}
 		return Doubles;
 	}

@@ -115,7 +115,9 @@ public class EnumeratedProperty<E> extends AbstractProperty {
 		String[] strValues = StringUtil.substringsOf(value, multiValueDelimiter);
 		
 		Object[] values = new Object[strValues.length];
-		for (int i=0;i<values.length; i++) values[i] = choiceFrom(strValues[i]);
+		for (int i=0;i<values.length; i++) {
+		    values[i] = choiceFrom(strValues[i]);
+		}
 		return values;
 	}
 	
@@ -63,7 +63,9 @@ public class FloatProperty extends AbstractScalarProperty {
 	 */
 	private static final Float[] asFloats(float[] floats) {
 		Float[] Floats = new Float[floats.length];
-		for (int i=0; i<floats.length; i++) Floats[i] = new Float(floats[i]);
+		for (int i=0; i<floats.length; i++) {
+		    Floats[i] = new Float(floats[i]);
+		}
 		return Floats;
 	}

@@ -54,7 +54,9 @@ public class IntegerProperty extends AbstractScalarProperty {
 	 */
 	private static final Integer[] asIntegers(int[] ints) {
 		Integer[] integers = new Integer[ints.length];
-		for (int i=0; i<ints.length; i++) integers[i] = Integer.valueOf(ints[i]);
+		for (int i=0; i<ints.length; i++) {
+		    integers[i] = Integer.valueOf(ints[i]);
+		}
 		return integers;
 	}
 	
@@ -26,7 +26,9 @@ public class SymbolTableViewer extends JavaParserVisitorAdapter {

    private String spaces() {
        StringBuffer sb = new StringBuffer(depth);
-        for (int i=0; i<depth; i++) sb.append(' ');
+        for (int i=0; i<depth; i++) {
+            sb.append(' ');
+        }
        return sb.toString();
    }

@@ -52,10 +52,11 @@ public class ASTModel implements TreeModel {
     */
    public int getIndexOfChild(Object parent, Object child) {
 	Node node = (Node) parent;
-        for (int i = 0; i < node.jjtGetNumChildren(); i++)
+        for (int i = 0; i < node.jjtGetNumChildren(); i++) {
            if (node.jjtGetChild(i).equals(child)) {
                return i;
            }
+        }
        return -1;
    }