#28 refactored Location formatting

introducing Location.StringFormatter abstract class

Author: hboutemy

modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java

@@ -920,7 +920,7 @@ private void generateLocationBean( JClass jClass, ModelClass locationClass, Mode
         }
 
         JType fieldType = new JMapType( "java.util.Map", new JType(locationClass.getName()), useJava5 );
-        JType fieldImpl = new JMapType("java.util.LinkedHashMap", new JType(locationClass.getName()), useJava5);
+        JType fieldImpl = new JMapType( "java.util.LinkedHashMap", new JType( locationClass.getName() ), useJava5 );
 
         // public Map<Object, Location> getLocations()
         JMethod jMethod = new JMethod( "get" + capitalise( locationsField ), fieldType, null );
@@ -1044,6 +1044,15 @@ private void generateLocationBean( JClass jClass, ModelClass locationClass, Mode
         sc.add( "" );
         sc.add( "return result;" );
         jClass.addMethod( jMethod );
+
+        JClass stringFormatterClass = jClass.createInnerClass( "StringFormatter" );
+        stringFormatterClass.getModifiers().setStatic( true );
+        stringFormatterClass.getModifiers().setAbstract( true );
+
+        jMethod = new JMethod( "toString", new JType( "String" ), null );
+        jMethod.getModifiers().setAbstract( true );
+        jMethod.addParameter( new JParameter( new JType( locationClass.getName() ), "location" ) );
+        stringFormatterClass.addMethod( jMethod );
     }
 
     /**

modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/AbstractXpp3Generator.java

@@ -61,7 +61,7 @@ protected void initialize( Model model, Properties parameters )
             if ( locationTracker == null )
             {
                 throw new ModelloException( "No model class has been marked as location tracker"
-                    + " via the attribute locationTracker=\"locations\"" + ", cannot generate extended reader." );
+                    + " via the attribute locationTracker=\"locations\", cannot generate extended reader." );
             }
 
             sourceTracker = model.getSourceTracker( getGeneratedVersion() );

modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ExtendedWriterGenerator.java

@@ -23,6 +23,7 @@
  */
 
 import org.codehaus.modello.plugin.java.javasource.JClass;
+import org.codehaus.modello.plugin.java.javasource.JField;
 import org.codehaus.modello.plugin.java.javasource.JMethod;
 import org.codehaus.modello.plugin.java.javasource.JParameter;
 import org.codehaus.modello.plugin.java.javasource.JSourceCode;
@@ -80,12 +81,26 @@ private void createLocationTrackingMethod( JClass jClass )
 
         jClass.addMethod( method );
 
+        JField field = new JField( new JType( locationTracker.getName() + ".StringFormatter" ), "stringFormatter" );
+        field.getModifiers().makeProtected();
+        jClass.addField( field );
+
+        method = new JMethod( "setStringFormatter", null, null );
+        method.addParameter( new JParameter( new JType( locationTracker.getName() + ".StringFormatter" ), "stringFormatter" ) );
+        sc = method.getSourceCode();
+        sc.add( "this.stringFormatter = stringFormatter;" );
+        jClass.addMethod( method );
+
         method = new JMethod( "toString", new JType( "String" ), null );
         method.getModifiers().makeProtected();
 
         method.addParameter( new JParameter( new JType( locationTracker.getName() ), "location" ) );
 
         sc = method.getSourceCode();
+        sc.add( "if ( stringFormatter != null )" );
+        sc.add( "{" );
+        sc.addIndented( "return stringFormatter.toString( location );" );
+        sc.add( "}" );
         sc.add( "return ' ' + " + ( ( sourceTracker == null ) ? "" : "location.getSource().toString() + ':' + " )
             + "location.getLineNumber() + ' ';" );