[jbehave-scm] [scm-core/jbehave-4.x][3/3] JBEHAVE-985: Added asString() method to Step interface and to model objects where missing.

[Mauro Talevi]

commit ef3a1bf359c6bc8b9140f08778e1e6834ab4ad10
Author:     Mauro Talevi <mauro.tal...@aquilonia.org>
AuthorDate: Sun, 16 Feb 2014 10:54:37 +0100
Commit:     Mauro Talevi <mauro.tal...@aquilonia.org>
CommitDate: Sun, 16 Feb 2014 12:46:20 +0100

    JBEHAVE-985:  Added asString() method to Step interface and to model 
objects where missing.
    
    Conflicts:
        jbehave-core/src/main/java/org/jbehave/core/model/Narrative.java

diff --git a/jbehave-core/src/main/java/org/jbehave/core/model/Narrative.java 
b/jbehave-core/src/main/java/org/jbehave/core/model/Narrative.java
index 2c9fe33..17a3663 100755
--- a/jbehave-core/src/main/java/org/jbehave/core/model/Narrative.java
+++ b/jbehave-core/src/main/java/org/jbehave/core/model/Narrative.java
@@ -1,7 +1,5 @@
 package org.jbehave.core.model;
 
-import java.text.MessageFormat;
-
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 import org.jbehave.core.configuration.Keywords;
@@ -10,6 +8,9 @@ public class Narrative {
 
     public static final Narrative EMPTY = new Narrative("", "", "");
 
+       private static final String NL = "\n";
+       private static final String SPACE = " ";
+
     private final String inOrderTo;
     private final String asA;
     private final String iWantTo;
@@ -51,14 +52,19 @@ public class Narrative {
     }
 
     public String asString(Keywords keywords) {
-               if ( isEmpty() ){
-                       return "";
-               }
+               StringBuffer sb = new StringBuffer();
                if (isAlternative()) {
-            return MessageFormat.format("{0} {1}\n{2} {3}\n{4} {5}", 
keywords.asA(), asA, keywords.iWantTo(), iWantTo, keywords.soThat(), soThat);   
              
+                       
sb.append(keywords.asA()).append(SPACE).append(asA).append(NL);
+                       
sb.append(keywords.iWantTo()).append(SPACE).append(iWantTo)
+                                       .append(NL);
+                       
sb.append(keywords.soThat()).append(SPACE).append(soThat);
                } else {
-                   return MessageFormat.format("{0} {1}\n{2} {3}\n{4} {5}", 
keywords.inOrderTo(), inOrderTo, keywords.asA(), asA, keywords.iWantTo(), 
iWantTo);
+                       
sb.append(keywords.inOrderTo()).append(SPACE).append(inOrderTo)
+                                       .append(NL);
+                       
sb.append(keywords.asA()).append(SPACE).append(asA).append(NL);
+                       
sb.append(keywords.iWantTo()).append(SPACE).append(iWantTo);
                }
+               return sb.toString();
        }
 
     @Override