[jboss-svn-commits] JBL Code SVN: r34931 - in labs/jbossrules/trunk/drools-guvnor/src: test/java/org/drools/guvnor/client/util and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: nheron
Date: 2010-08-30 03:10:00 -0400 (Mon, 30 Aug 2010)
New Revision: 34931

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/Format.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/util/FormatTest.java
Log:
Correction of Guvnor-587 when there are not argument needed for Format.format
You just give an argument that is ignored (see testcase

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/Format.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/Format.java	2010-08-30 01:28:03 UTC (rev 34930)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/util/Format.java	2010-08-30 07:10:00 UTC (rev 34931)
@@ -19,44 +19,43 @@
 /**
  * 
  * @author rikkola
- *
+ * 
  */
 public class Format {
 
-    public static String format(String text,
-                                String... strings) {
+	public static String format(String text, String... strings) {
 
-        StringBuilder result = new StringBuilder( text );
+		StringBuilder result = new StringBuilder(text);
 
-        for ( int i = 0; i < strings.length; i++ ) {
-            String string = strings[i];
-            String placeKeeper = "{" + i + "}";
+		for (int i = 0; i < strings.length; i++) {
+			String string = strings[i];
+			String placeKeeper = "{" + i + "}";
 
-            int start = result.indexOf( placeKeeper );
-            int end = start + placeKeeper.length();
+			int start = result.indexOf(placeKeeper);
+			if (start == -1) {
+				start = 0;
+			} else {
+				int end = start + placeKeeper.length();
+				result.replace(start, end, string);
+			}
+			
+		}
 
-            result.replace( start,
-                            end,
-                            string );
-        }
+		return result.toString();
+	}
 
-        return result.toString();
-    }
+	public static String format(String text, int... ints) {
+		return format(text, toStringArray(ints));
+	}
 
-    public static String format(String text,
-                                int... ints) {
-        return format( text,
-                       toStringArray( ints ) );
-    }
+	private static String[] toStringArray(int[] intArray) {
+		String[] result = new String[intArray.length];
 
-    private static String[] toStringArray(int[] intArray) {
-        String[] result = new String[intArray.length];
+		for (int i = 0; i < intArray.length; i++) {
+			result[i] = String.valueOf(intArray[i]);
 
-        for ( int i = 0; i < intArray.length; i++ ) {
-            result[i] = String.valueOf( intArray[i] );
+		}
 
-        }
-
-        return result;
-    }
+		return result;
+	}
 }

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/util/FormatTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/util/FormatTest.java	2010-08-30 01:28:03 UTC (rev 34930)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/client/util/FormatTest.java	2010-08-30 07:10:00 UTC (rev 34931)
@@ -21,7 +21,7 @@
 import org.junit.Test;
 
 /**
- * ­
+ * �
  * @author rikkola
  *
  */
@@ -102,4 +102,15 @@
         Assert.assertEquals( "Hello, this test called Toni was created by {2}",
                              result );
     }
+    @Test
+    public void FormatNotIndicated() {
+        String test = "number:";
+
+        String result = Format.format( test,
+                                       "tt" );
+
+        Assert.assertEquals( "number:",
+                             result );
+
+    }
 }