commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1102402 [18/20] - in /commons/sandbox/digester3/trunk/src: main/java/org/apache/commons/digester3/ main/java/org/apache/commons/digester3/annotations/ main/java/org/apache/commons/digester3/annotations/handlers/ main/java/org/apache/common...
Date Thu, 12 May 2011 18:03:33 GMT
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/AbstractAnnotatedPojoTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/AbstractAnnotatedPojoTestCase.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/AbstractAnnotatedPojoTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/AbstractAnnotatedPojoTestCase.java Thu May 12 18:03:26 2011
@@ -29,53 +29,63 @@ import org.junit.Before;
 
 /**
  * Abstract implementation of Class->Digester Rules->parse & confronting.
- *
+ * 
  * @since 2.1
  */
-public abstract class AbstractAnnotatedPojoTestCase {
+public abstract class AbstractAnnotatedPojoTestCase
+{
 
     private DigesterLoader digesterLoader;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp()
+        throws Exception
+    {
         this.digesterLoader = DigesterLoaderBuilder.byDefaultFactories();
     }
 
     @After
-    public void tearDown() throws Exception {
+    public void tearDown()
+        throws Exception
+    {
         this.digesterLoader = null;
     }
 
     /**
-     * Loads the digester rules parsing the expected object class, parses the
-     * XML and verify the digester produces the same result.
-     *
+     * Loads the digester rules parsing the expected object class, parses the XML and verify the digester produces the
+     * same result.
+     * 
      * @param expected the expected object
      * @throws Exception if any error occurs
      */
-    public final void verifyExpectedEqualsToParsed(Object expected) throws Exception {
+    public final void verifyExpectedEqualsToParsed( Object expected )
+        throws Exception
+    {
         Class<?> clazz = expected.getClass();
 
         String resource = clazz.getSimpleName() + ".xml";
-        InputStream input = clazz.getResourceAsStream(resource);
+        InputStream input = clazz.getResourceAsStream( resource );
 
-        Digester digester = this.digesterLoader.createDigester(clazz);
-        this.decorate(digester);
+        Digester digester = this.digesterLoader.createDigester( clazz );
+        this.decorate( digester );
 
-        Object actual = digester.parse(input);
+        Object actual = digester.parse( input );
 
-        if (input != null) {
+        if ( input != null )
+        {
             input.close();
         }
 
-        assertEquals(expected, actual);
-    } 
+        assertEquals( expected, actual );
+    }
 
-    protected DigesterLoader getDigesterLoader() {
+    protected DigesterLoader getDigesterLoader()
+    {
         return this.digesterLoader;
     }
 
-    protected void decorate(Digester digester) {
+    protected void decorate( Digester digester )
+    {
         // do nothing
     }
 

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/Address.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/Address.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/Address.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/Address.java Thu May 12 18:03:26 2011
@@ -21,136 +21,150 @@ import org.apache.commons.digester3.anno
 import org.apache.commons.digester3.annotations.rules.ObjectCreate;
 
 /**
- * 
- *
  * @since 2.1
  */
-@ObjectCreate(pattern = "address-book/person/address")
-public class Address {
+@ObjectCreate( pattern = "address-book/person/address" )
+public class Address
+{
 
-    @BeanPropertySetter(pattern = "address-book/person/address/type")
+    @BeanPropertySetter( pattern = "address-book/person/address/type" )
     private String type;
 
-    @BeanPropertySetter(pattern = "address-book/person/address/street")
+    @BeanPropertySetter( pattern = "address-book/person/address/street" )
     private String street;
 
-    @BeanPropertySetter(pattern = "address-book/person/address/city")
+    @BeanPropertySetter( pattern = "address-book/person/address/city" )
     private String city;
 
-    @BeanPropertySetter(pattern = "address-book/person/address/state")
+    @BeanPropertySetter( pattern = "address-book/person/address/state" )
     private String state;
 
-    @BeanPropertySetter(pattern = "address-book/person/address/zip")
+    @BeanPropertySetter( pattern = "address-book/person/address/zip" )
     private String zip;
 
-    @BeanPropertySetter(pattern = "address-book/person/address/country")
+    @BeanPropertySetter( pattern = "address-book/person/address/country" )
     private String country;
 
-    public String getType() {
+    public String getType()
+    {
         return type;
     }
 
-    public void setType(String type) {
+    public void setType( String type )
+    {
         this.type = type;
     }
 
-    public String getStreet() {
+    public String getStreet()
+    {
         return street;
     }
 
-    public void setStreet(String street) {
+    public void setStreet( String street )
+    {
         this.street = street;
     }
 
-    public String getCity() {
+    public String getCity()
+    {
         return city;
     }
 
-    public void setCity(String city) {
+    public void setCity( String city )
+    {
         this.city = city;
     }
 
-    public String getState() {
+    public String getState()
+    {
         return state;
     }
 
-    public void setState(String state) {
+    public void setState( String state )
+    {
         this.state = state;
     }
 
-    public String getZip() {
+    public String getZip()
+    {
         return zip;
     }
 
-    public void setZip(String zip) {
+    public void setZip( String zip )
+    {
         this.zip = zip;
     }
 
-    public String getCountry() {
+    public String getCountry()
+    {
         return country;
     }
 
-    public void setCountry(String country) {
+    public void setCountry( String country )
+    {
         this.country = country;
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
             return true;
-        if (obj == null)
+        if ( obj == null )
             return false;
-        if (getClass() != obj.getClass())
+        if ( getClass() != obj.getClass() )
             return false;
         Address other = (Address) obj;
-        if (city == null) {
-            if (other.city != null)
+        if ( city == null )
+        {
+            if ( other.city != null )
                 return false;
-        } else if (!city.equals(other.city))
+        }
+        else if ( !city.equals( other.city ) )
             return false;
-        if (country == null) {
-            if (other.country != null)
+        if ( country == null )
+        {
+            if ( other.country != null )
                 return false;
-        } else if (!country.equals(other.country))
+        }
+        else if ( !country.equals( other.country ) )
             return false;
-        if (state == null) {
-            if (other.state != null)
+        if ( state == null )
+        {
+            if ( other.state != null )
                 return false;
-        } else if (!state.equals(other.state))
+        }
+        else if ( !state.equals( other.state ) )
             return false;
-        if (street == null) {
-            if (other.street != null)
+        if ( street == null )
+        {
+            if ( other.street != null )
                 return false;
-        } else if (!street.equals(other.street))
+        }
+        else if ( !street.equals( other.street ) )
             return false;
-        if (type == null) {
-            if (other.type != null)
+        if ( type == null )
+        {
+            if ( other.type != null )
                 return false;
-        } else if (!type.equals(other.type))
+        }
+        else if ( !type.equals( other.type ) )
             return false;
-        if (zip == null) {
-            if (other.zip != null)
+        if ( zip == null )
+        {
+            if ( other.zip != null )
                 return false;
-        } else if (!zip.equals(other.zip))
+        }
+        else if ( !zip.equals( other.zip ) )
             return false;
         return true;
     }
 
     @Override
-    public String toString() {
-        return "Address [city="
-                + city
-                + ", country="
-                + country
-                + ", state="
-                + state
-                + ", street="
-                + street
-                + ", type="
-                + type
-                + ", zip="
-                + zip
-                + "]";
+    public String toString()
+    {
+        return "Address [city=" + city + ", country=" + country + ", state=" + state + ", street=" + street + ", type="
+            + type + ", zip=" + zip + "]";
     }
 
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBook.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBook.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBook.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBook.java Thu May 12 18:03:26 2011
@@ -24,39 +24,43 @@ import org.apache.commons.digester3.anno
 import org.apache.commons.digester3.annotations.rules.SetNext;
 
 /**
- * 
- *
  * @since 2.1
  */
-@ObjectCreate(pattern = "address-book")
-public class AddressBook {
+@ObjectCreate( pattern = "address-book" )
+public class AddressBook
+{
 
     private final List<Person> people = new ArrayList<Person>();
 
     @SetNext
-    public void addPerson(Person p) {
-        this.people.add(p);
+    public void addPerson( Person p )
+    {
+        this.people.add( p );
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
             return true;
-        if (obj == null)
+        if ( obj == null )
             return false;
-        if (getClass() != obj.getClass())
+        if ( getClass() != obj.getClass() )
             return false;
         AddressBook other = (AddressBook) obj;
-        if (people == null) {
-            if (other.people != null)
+        if ( people == null )
+        {
+            if ( other.people != null )
                 return false;
-        } else if (!people.equals(other.people))
+        }
+        else if ( !people.equals( other.people ) )
             return false;
         return true;
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         return "AddressBook [people=" + people + "]";
     }
 

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBookTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBookTestCase.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBookTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBookTestCase.java Thu May 12 18:03:26 2011
@@ -21,61 +21,63 @@ import org.apache.commons.digester3.anno
 import org.junit.Test;
 
 /**
- * 
- *
  * @since 2.1
  */
-public final class AddressBookTestCase extends AbstractAnnotatedPojoTestCase {
+public final class AddressBookTestCase
+    extends AbstractAnnotatedPojoTestCase
+{
 
     @Test
-    public void testAddressBook() throws Exception {
+    public void testAddressBook()
+        throws Exception
+    {
         AddressBook addressBook = new AddressBook();
 
         Person person = new Person();
-        person.setId(1);
-        person.setCategory("acquaintance");
-        person.setName("Gonzo");
-        person.addEmail("business", "gonzo@muppets.com");
+        person.setId( 1 );
+        person.setCategory( "acquaintance" );
+        person.setName( "Gonzo" );
+        person.addEmail( "business", "gonzo@muppets.com" );
 
         Address address = new Address();
-        address.setType("home");
-        address.setStreet("123 Maine Ave.");
-        address.setCity("Las Vegas");
-        address.setState("NV");
-        address.setZip("01234");
-        address.setCountry("USA");
-        person.addAddress(address);
+        address.setType( "home" );
+        address.setStreet( "123 Maine Ave." );
+        address.setCity( "Las Vegas" );
+        address.setState( "NV" );
+        address.setZip( "01234" );
+        address.setCountry( "USA" );
+        person.addAddress( address );
 
         address = new Address();
-        address.setType("business");
-        address.setStreet("234 Maple Dr.");
-        address.setCity("Los Angeles");
-        address.setState("CA");
-        address.setZip("98765");
-        address.setCountry("USA");
-        person.addAddress(address);
+        address.setType( "business" );
+        address.setStreet( "234 Maple Dr." );
+        address.setCity( "Los Angeles" );
+        address.setState( "CA" );
+        address.setZip( "98765" );
+        address.setCountry( "USA" );
+        person.addAddress( address );
 
-        addressBook.addPerson(person);
+        addressBook.addPerson( person );
 
         person = new Person();
-        person.setId(2);
-        person.setCategory("rolemodel");
-        person.setName("Kermit");
-        person.addEmail("business", "kermit@muppets.com");
-        person.addEmail("home", "kermie@acme.com");
+        person.setId( 2 );
+        person.setCategory( "rolemodel" );
+        person.setName( "Kermit" );
+        person.addEmail( "business", "kermit@muppets.com" );
+        person.addEmail( "home", "kermie@acme.com" );
 
         address = new Address();
-        address.setType("business");
-        address.setStreet("987 Brown Rd");
-        address.setCity("Las Cruces");
-        address.setState("NM");
-        address.setZip("75321");
-        address.setCountry("USA");
-        person.addAddress(address);
+        address.setType( "business" );
+        address.setStreet( "987 Brown Rd" );
+        address.setCity( "Las Cruces" );
+        address.setState( "NM" );
+        address.setZip( "75321" );
+        address.setCountry( "USA" );
+        person.addAddress( address );
 
-        addressBook.addPerson(person);
+        addressBook.addPerson( person );
 
-        this.verifyExpectedEqualsToParsed(addressBook);
+        this.verifyExpectedEqualsToParsed( addressBook );
     }
 
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/Person.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/Person.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/Person.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/Person.java Thu May 12 18:03:26 2011
@@ -31,116 +31,126 @@ import org.apache.commons.digester3.anno
 import org.apache.commons.digester3.annotations.rules.SetProperty;
 
 /**
- * 
- *
  * @since 2.1
  */
-@ObjectCreate(pattern = "address-book/person")
-public class Person {
+@ObjectCreate( pattern = "address-book/person" )
+public class Person
+{
 
     private final Map<String, String> emails = new HashMap<String, String>();
 
     private final List<Address> addresses = new ArrayList<Address>();
 
-    @SetProperty(pattern = "address-book/person")
+    @SetProperty( pattern = "address-book/person" )
     private int id;
 
-    @SetProperty(pattern = "address-book/person")
+    @SetProperty( pattern = "address-book/person" )
     private String category;
 
-    @BeanPropertySetter(pattern = "address-book/person/name")
+    @BeanPropertySetter( pattern = "address-book/person/name" )
     private String name;
 
-    public int getId() {
+    public int getId()
+    {
         return id;
     }
 
-    public void setId(int id) {
+    public void setId( int id )
+    {
         this.id = id;
     }
 
-    public String getCategory() {
+    public String getCategory()
+    {
         return category;
     }
 
-    public void setCategory(String category) {
+    public void setCategory( String category )
+    {
         this.category = category;
     }
 
-    public String getName() {
+    public String getName()
+    {
         return name;
     }
 
-    public void setName(String name) {
+    public void setName( String name )
+    {
         this.name = name;
     }
 
-    public Map<String, String> getEmails() {
+    public Map<String, String> getEmails()
+    {
         return emails;
     }
 
-    public List<Address> getAddresses() {
+    public List<Address> getAddresses()
+    {
         return addresses;
     }
 
-    @CallMethod(pattern = "address-book/person/email")
-    public void addEmail(@AttributeCallParam(pattern = "address-book/person/email", attribute = "type") String type,
-            @CallParam(pattern = "address-book/person/email") String address) {
-        this.emails.put(type, address);
+    @CallMethod( pattern = "address-book/person/email" )
+    public void addEmail( @AttributeCallParam( pattern = "address-book/person/email", attribute = "type" ) String type,
+                          @CallParam( pattern = "address-book/person/email" ) String address )
+    {
+        this.emails.put( type, address );
     }
 
     @SetNext
-    public void addAddress(Address addr) {
-        this.addresses.add(addr);
+    public void addAddress( Address addr )
+    {
+        this.addresses.add( addr );
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
             return true;
-        if (obj == null)
+        if ( obj == null )
             return false;
-        if (getClass() != obj.getClass())
+        if ( getClass() != obj.getClass() )
             return false;
         Person other = (Person) obj;
-        if (addresses == null) {
-            if (other.addresses != null)
+        if ( addresses == null )
+        {
+            if ( other.addresses != null )
                 return false;
-        } else if (!addresses.equals(other.addresses))
+        }
+        else if ( !addresses.equals( other.addresses ) )
             return false;
-        if (category == null) {
-            if (other.category != null)
+        if ( category == null )
+        {
+            if ( other.category != null )
                 return false;
-        } else if (!category.equals(other.category))
+        }
+        else if ( !category.equals( other.category ) )
             return false;
-        if (emails == null) {
-            if (other.emails != null)
+        if ( emails == null )
+        {
+            if ( other.emails != null )
                 return false;
-        } else if (!emails.equals(other.emails))
+        }
+        else if ( !emails.equals( other.emails ) )
             return false;
-        if (id != other.id)
+        if ( id != other.id )
             return false;
-        if (name == null) {
-            if (other.name != null)
+        if ( name == null )
+        {
+            if ( other.name != null )
                 return false;
-        } else if (!name.equals(other.name))
+        }
+        else if ( !name.equals( other.name ) )
             return false;
         return true;
     }
 
     @Override
-    public String toString() {
-        return "Person [addresses="
-                + addresses
-                + ", category="
-                + category
-                + ", emails="
-                + emails
-                + ", id="
-                + id
-                + ", name="
-                + name
-                + "]";
+    public String toString()
+    {
+        return "Person [addresses=" + addresses + ", category=" + category + ", emails=" + emails + ", id=" + id
+            + ", name=" + name + "]";
     }
 
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/AudioVisual.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/AudioVisual.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/AudioVisual.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/AudioVisual.java Thu May 12 18:03:26 2011
@@ -21,19 +21,14 @@ import org.apache.commons.digester3.anno
 import org.apache.commons.digester3.annotations.rules.SetProperty;
 
 /**
- * 
- *
  * @since 2.1
  */
-@ObjectCreate.List(
-        @ObjectCreate(pattern = "catalog/dvd")
-)
-public final class AudioVisual implements Item {
-
-    @SetProperty(
-            pattern = "catalog/dvd",
-            attributeName = "year-made"
-    )
+@ObjectCreate.List( @ObjectCreate( pattern = "catalog/dvd" ) )
+public final class AudioVisual
+    implements Item
+{
+
+    @SetProperty( pattern = "catalog/dvd", attributeName = "year-made" )
     private int yearMade;
 
     private String category;
@@ -44,79 +39,97 @@ public final class AudioVisual implement
 
     private int runtime;
 
-    public int getYearMade() {
+    public int getYearMade()
+    {
         return yearMade;
     }
 
-    public void setYearMade(int yearMade) {
+    public void setYearMade( int yearMade )
+    {
         this.yearMade = yearMade;
     }
 
-    public String getCategory() {
+    public String getCategory()
+    {
         return this.category;
     }
 
-    public void setCategory(String category) {
+    public void setCategory( String category )
+    {
         this.category = category;
     }
 
-    public String getName() {
+    public String getName()
+    {
         return this.name;
     }
 
-    public void setName(String name) {
+    public void setName( String name )
+    {
         this.name = name;
     }
 
-    public String getDesc() {
+    public String getDesc()
+    {
         return this.desc;
     }
 
-    public void setDesc(String desc) {
+    public void setDesc( String desc )
+    {
         this.desc = desc;
     }
 
-    public int getRuntime() {
+    public int getRuntime()
+    {
         return this.runtime;
     }
 
-    public void setRuntime(int runtime) {
+    public void setRuntime( int runtime )
+    {
         this.runtime = runtime;
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
             return true;
-        if (obj == null)
+        if ( obj == null )
             return false;
-        if (getClass() != obj.getClass())
+        if ( getClass() != obj.getClass() )
             return false;
         AudioVisual other = (AudioVisual) obj;
-        if (this.category == null) {
-            if (other.getCategory() != null)
+        if ( this.category == null )
+        {
+            if ( other.getCategory() != null )
                 return false;
-        } else if (!this.category.equals(other.getCategory()))
+        }
+        else if ( !this.category.equals( other.getCategory() ) )
             return false;
-        if (this.desc == null) {
-            if (other.getDesc() != null)
+        if ( this.desc == null )
+        {
+            if ( other.getDesc() != null )
                 return false;
-        } else if (!this.desc.equals(other.getDesc()))
+        }
+        else if ( !this.desc.equals( other.getDesc() ) )
             return false;
-        if (this.name == null) {
-            if (other.getName() != null)
+        if ( this.name == null )
+        {
+            if ( other.getName() != null )
                 return false;
-        } else if (!this.name.equals(other.getName()))
+        }
+        else if ( !this.name.equals( other.getName() ) )
             return false;
-        if (this.runtime != other.getRuntime())
+        if ( this.runtime != other.getRuntime() )
             return false;
-        if (this.yearMade != other.getYearMade())
+        if ( this.yearMade != other.getYearMade() )
             return false;
         return true;
     }
 
-    public void print() {
-        System.out.println(this.toString());
+    public void print()
+    {
+        System.out.println( this.toString() );
     }
 
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Book.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Book.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Book.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Book.java Thu May 12 18:03:26 2011
@@ -21,106 +21,114 @@ import org.apache.commons.digester3.anno
 import org.apache.commons.digester3.annotations.rules.FactoryCreate;
 
 /**
- * 
- *
  * @since 2.1
  */
-@FactoryCreate(
-    pattern = "catalog/book",
-    factoryClass = BookFactory.class
-)
-public final class Book implements Item {
+@FactoryCreate( pattern = "catalog/book", factoryClass = BookFactory.class )
+public final class Book
+    implements Item
+{
 
     private final String isbn;
 
-    @BeanPropertySetter(pattern = "catalog/book/title")
+    @BeanPropertySetter( pattern = "catalog/book/title" )
     private String title;
 
-    @BeanPropertySetter(pattern = "catalog/book/author")
+    @BeanPropertySetter( pattern = "catalog/book/author" )
     private String author;
 
-    @BeanPropertySetter(pattern = "catalog/book/desc")
+    @BeanPropertySetter( pattern = "catalog/book/desc" )
     private String desc;
 
-    public Book(String isbn) {
+    public Book( String isbn )
+    {
         this.isbn = isbn;
     }
 
-    public String getTitle() {
+    public String getTitle()
+    {
         return this.title;
     }
 
-    public void setTitle(String title) {
+    public void setTitle( String title )
+    {
         this.title = title;
     }
 
-    public String getAuthor() {
+    public String getAuthor()
+    {
         return this.author;
     }
 
-    public void setAuthor(String author) {
+    public void setAuthor( String author )
+    {
         this.author = author;
     }
 
-    public String getDesc() {
+    public String getDesc()
+    {
         return this.desc;
     }
 
-    public void setDesc(String desc) {
+    public void setDesc( String desc )
+    {
         this.desc = desc;
     }
 
-    public String getIsbn() {
+    public String getIsbn()
+    {
         return this.isbn;
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
             return true;
-        if (obj == null)
+        if ( obj == null )
             return false;
-        if (getClass() != obj.getClass())
+        if ( getClass() != obj.getClass() )
             return false;
         Book other = (Book) obj;
-        if (this.author == null) {
-            if (other.getAuthor() != null)
+        if ( this.author == null )
+        {
+            if ( other.getAuthor() != null )
                 return false;
-        } else if (!this.author.equals(other.getAuthor()))
+        }
+        else if ( !this.author.equals( other.getAuthor() ) )
             return false;
-        if (this.desc == null) {
-            if (other.getDesc() != null)
+        if ( this.desc == null )
+        {
+            if ( other.getDesc() != null )
                 return false;
-        } else if (!this.desc.equals(other.getDesc()))
+        }
+        else if ( !this.desc.equals( other.getDesc() ) )
             return false;
-        if (this.isbn == null) {
-            if (other.getIsbn() != null)
+        if ( this.isbn == null )
+        {
+            if ( other.getIsbn() != null )
                 return false;
-        } else if (!this.isbn.equals(other.getIsbn()))
+        }
+        else if ( !this.isbn.equals( other.getIsbn() ) )
             return false;
-        if (this.title == null) {
-            if (other.getTitle() != null)
+        if ( this.title == null )
+        {
+            if ( other.getTitle() != null )
                 return false;
-        } else if (!this.title.equals(other.getTitle()))
+        }
+        else if ( !this.title.equals( other.getTitle() ) )
             return false;
         return true;
     }
 
     @Override
-    public String toString() {
-        return "Book [author="
-                + author
-                + ", desc="
-                + desc
-                + ", isbn="
-                + isbn
-                + ", title="
-                + title
-                + "]";
+    public String toString()
+    {
+        return "Book [author=" + author + ", desc=" + desc + ", isbn=" + isbn + ", title=" + title + "]";
     }
 
-    public void print() {
-        System.out.println(this.toString());
+    public void print()
+    {
+        System.out.println( this.toString() );
     }
 
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/BookFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/BookFactory.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/BookFactory.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/BookFactory.java Thu May 12 18:03:26 2011
@@ -21,24 +21,26 @@ import org.apache.commons.digester3.Abst
 import org.xml.sax.Attributes;
 
 /**
- * 
- *
  * @since 2.1
  */
-public final class BookFactory extends AbstractObjectCreationFactory {
+public final class BookFactory
+    extends AbstractObjectCreationFactory
+{
 
     private final static String ISBN = "isbn";
 
     @Override
-    public Object createObject(Attributes attributes) throws Exception {
-        String isbn = attributes.getValue(ISBN);
-
-        if (isbn == null) {
-            throw new Exception(
-                    "Mandatory isbn attribute not present on book tag.");
+    public Object createObject( Attributes attributes )
+        throws Exception
+    {
+        String isbn = attributes.getValue( ISBN );
+
+        if ( isbn == null )
+        {
+            throw new Exception( "Mandatory isbn attribute not present on book tag." );
         }
 
-        return new Book(isbn);
+        return new Book( isbn );
     }
 
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Catalog.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Catalog.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Catalog.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Catalog.java Thu May 12 18:03:26 2011
@@ -24,52 +24,57 @@ import org.apache.commons.digester3.anno
 import org.apache.commons.digester3.annotations.rules.SetNext;
 
 /**
- * 
- *
  * @since 2.1
  */
-@ObjectCreate.List(
-        @ObjectCreate(pattern = "catalog")
-)
-public final class Catalog {
+@ObjectCreate.List( @ObjectCreate( pattern = "catalog" ) )
+public final class Catalog
+{
 
     private final List<Item> items = new ArrayList<Item>();
 
-    @SetNext({ AudioVisual.class, Book.class })
-    public void addItem(Item item) {
-        this.items.add(item);
+    @SetNext( { AudioVisual.class, Book.class } )
+    public void addItem( Item item )
+    {
+        this.items.add( item );
     }
 
-    public List<Item> getItems() {
+    public List<Item> getItems()
+    {
         return this.items;
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
             return true;
-        if (obj == null)
+        if ( obj == null )
             return false;
-        if (getClass() != obj.getClass())
+        if ( getClass() != obj.getClass() )
             return false;
         Catalog other = (Catalog) obj;
-        if (this.items == null) {
-            if (other.getItems() != null)
+        if ( this.items == null )
+        {
+            if ( other.getItems() != null )
                 return false;
-        } else if (!this.items.equals(other.getItems()))
+        }
+        else if ( !this.items.equals( other.getItems() ) )
             return false;
         return true;
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         return "Catalog [items=" + items + "]";
     }
 
-    public void print() {
-        System.out.println("This catalog has " + this.items.size() + " items");
+    public void print()
+    {
+        System.out.println( "This catalog has " + this.items.size() + " items" );
 
-        for (Item item : this.items) {
+        for ( Item item : this.items )
+        {
             item.print();
         }
     }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/CatalogTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/CatalogTestCase.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/CatalogTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/CatalogTestCase.java Thu May 12 18:03:26 2011
@@ -22,50 +22,53 @@ import org.apache.commons.digester3.anno
 import org.junit.Test;
 
 /**
- * 
- *
  * @since 2.1
  */
-public final class CatalogTestCase extends AbstractAnnotatedPojoTestCase {
+public final class CatalogTestCase
+    extends AbstractAnnotatedPojoTestCase
+{
 
     @Test
-    public void testCatalog() throws Exception {
+    public void testCatalog()
+        throws Exception
+    {
         Catalog catalog = new Catalog();
 
-        Book book = new Book("0-596-00184-3");
-        book.setTitle("Ant, The Definitive Guide");
-        book.setAuthor("Jesse Tilly & Eric M. Burke");
-        book.setDesc("Complete build management for Java.");
-        catalog.addItem(book);
-
-        book = new Book("0201310058");
-        book.setTitle("Effective Java");
-        book.setAuthor("Joshua Bloch");
-        book.setDesc("Tips for experienced Java software developers.");
-        catalog.addItem(book);
+        Book book = new Book( "0-596-00184-3" );
+        book.setTitle( "Ant, The Definitive Guide" );
+        book.setAuthor( "Jesse Tilly & Eric M. Burke" );
+        book.setDesc( "Complete build management for Java." );
+        catalog.addItem( book );
+
+        book = new Book( "0201310058" );
+        book.setTitle( "Effective Java" );
+        book.setAuthor( "Joshua Bloch" );
+        book.setDesc( "Tips for experienced Java software developers." );
+        catalog.addItem( book );
 
         AudioVisual dvd = new AudioVisual();
-        dvd.setName("Drunken Master");
-        dvd.setCategory("martial arts");
-        dvd.setDesc("Hilarious slapstick starring Jackie Chan.");
-        dvd.setRuntime(106);
-        dvd.setYearMade(1978);
-        catalog.addItem(dvd);
+        dvd.setName( "Drunken Master" );
+        dvd.setCategory( "martial arts" );
+        dvd.setDesc( "Hilarious slapstick starring Jackie Chan." );
+        dvd.setRuntime( 106 );
+        dvd.setYearMade( 1978 );
+        catalog.addItem( dvd );
 
         dvd = new AudioVisual();
-        dvd.setName("The Piano");
-        dvd.setCategory("drama");
-        dvd.setDesc("Character drama set in New Zealand during the Victorian era.");
-        dvd.setRuntime(121);
-        dvd.setYearMade(1993);
-        catalog.addItem(dvd);
+        dvd.setName( "The Piano" );
+        dvd.setCategory( "drama" );
+        dvd.setDesc( "Character drama set in New Zealand during the Victorian era." );
+        dvd.setRuntime( 121 );
+        dvd.setYearMade( 1993 );
+        catalog.addItem( dvd );
 
-        this.verifyExpectedEqualsToParsed(catalog);
+        this.verifyExpectedEqualsToParsed( catalog );
     }
 
     @Override
-    protected void decorate(Digester digester) {
-        digester.addSetProperty("catalog/dvd/attr", "id", "value");
+    protected void decorate( Digester digester )
+    {
+        digester.addSetProperty( "catalog/dvd/attr", "id", "value" );
     }
 
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Item.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Item.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Item.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Item.java Thu May 12 18:03:26 2011
@@ -18,11 +18,10 @@
 package org.apache.commons.digester3.annotations.catalog;
 
 /**
- * 
- *
  * @since 2.1
  */
-public interface Item {
+public interface Item
+{
 
     void print();
 

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/Address.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/Address.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/Address.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/Address.java Thu May 12 18:03:26 2011
@@ -23,125 +23,136 @@ import org.apache.commons.digester3.anno
 import org.apache.commons.digester3.annotations.rules.SetTop;
 
 /**
- * 
  * @since 2.1
  */
-@ObjectCreate(pattern = "employee/address")
-public class Address {
+@ObjectCreate( pattern = "employee/address" )
+public class Address
+{
 
-    @BeanPropertySetter(pattern = "employee/address/city")
+    @BeanPropertySetter( pattern = "employee/address/city" )
     private String city;
 
-    @BeanPropertySetter(pattern = "employee/address/state")
+    @BeanPropertySetter( pattern = "employee/address/state" )
     private String state;
 
-    @BeanPropertySetter(pattern = "employee/address/street")
+    @BeanPropertySetter( pattern = "employee/address/street" )
     private String street;
 
-    @SetProperty(
-            pattern = "employee/address",
-            attributeName = "place"
-    )
+    @SetProperty( pattern = "employee/address", attributeName = "place" )
     private String type;
 
-    @BeanPropertySetter(pattern = "employee/address/zip-code")
+    @BeanPropertySetter( pattern = "employee/address/zip-code" )
     private String zipCode;
 
-    @SetTop(pattern = "employee/address")
-    public void setEmployee(Employee employee) {
-        employee.addAddress(this);
+    @SetTop( pattern = "employee/address" )
+    public void setEmployee( Employee employee )
+    {
+        employee.addAddress( this );
     }
 
-    public String getCity() {
+    public String getCity()
+    {
         return this.city;
     }
 
-    public void setCity(String city) {
+    public void setCity( String city )
+    {
         this.city = city;
     }
 
-    public String getState() {
+    public String getState()
+    {
         return this.state;
     }
 
-    public void setState(String state) {
+    public void setState( String state )
+    {
         this.state = state;
     }
 
-    public String getStreet() {
+    public String getStreet()
+    {
         return this.street;
     }
 
-    public void setStreet(String street) {
+    public void setStreet( String street )
+    {
         this.street = street;
     }
 
-    public String getType() {
+    public String getType()
+    {
         return this.type;
     }
 
-    public void setType(String type) {
+    public void setType( String type )
+    {
         this.type = type;
     }
 
-    public String getZipCode() {
+    public String getZipCode()
+    {
         return this.zipCode;
     }
 
-    public void setZipCode(String zipCode) {
+    public void setZipCode( String zipCode )
+    {
         this.zipCode = zipCode;
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
             return true;
-        if (obj == null)
+        if ( obj == null )
             return false;
-        if (getClass() != obj.getClass())
+        if ( getClass() != obj.getClass() )
             return false;
         Address other = (Address) obj;
-        if (this.city == null) {
-            if (other.getCity() != null)
+        if ( this.city == null )
+        {
+            if ( other.getCity() != null )
                 return false;
-        } else if (!this.city.equals(other.getCity()))
+        }
+        else if ( !this.city.equals( other.getCity() ) )
             return false;
-        if (this.state == null) {
-            if (other.getState() != null)
+        if ( this.state == null )
+        {
+            if ( other.getState() != null )
                 return false;
-        } else if (!this.state.equals(other.getState()))
+        }
+        else if ( !this.state.equals( other.getState() ) )
             return false;
-        if (this.street == null) {
-            if (other.getStreet() != null)
+        if ( this.street == null )
+        {
+            if ( other.getStreet() != null )
                 return false;
-        } else if (!this.street.equals(other.getStreet()))
+        }
+        else if ( !this.street.equals( other.getStreet() ) )
             return false;
-        if (this.type == null) {
-            if (other.getType() != null)
+        if ( this.type == null )
+        {
+            if ( other.getType() != null )
                 return false;
-        } else if (!this.type.equals(other.getType()))
+        }
+        else if ( !this.type.equals( other.getType() ) )
             return false;
-        if (this.zipCode == null) {
-            if (other.getZipCode() != null)
+        if ( this.zipCode == null )
+        {
+            if ( other.getZipCode() != null )
                 return false;
-        } else if (!this.zipCode.equals(other.getZipCode()))
+        }
+        else if ( !this.zipCode.equals( other.getZipCode() ) )
             return false;
         return true;
     }
 
     @Override
-    public String toString() {
-        return "Address [city="
-                + city
-                + ", state="
-                + state
-                + ", street="
-                + street
-                + ", type="
-                + type
-                + ", zipCode="
-                + zipCode
-                + "]";
+    public String toString()
+    {
+        return "Address [city=" + city + ", state=" + state + ", street=" + street + ", type=" + type + ", zipCode="
+            + zipCode + "]";
     }
 
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/Employee.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/Employee.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/Employee.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/Employee.java Thu May 12 18:03:26 2011
@@ -24,86 +24,88 @@ import org.apache.commons.digester3.anno
 import org.apache.commons.digester3.annotations.rules.SetProperty;
 
 /**
- * 
  * @since 2.1
  */
-@ObjectCreate(pattern = "employee")
-public class Employee {
+@ObjectCreate( pattern = "employee" )
+public class Employee
+{
 
     private final List<Address> addresses = new ArrayList<Address>();
 
-    @SetProperty(
-            pattern = "employee",
-            attributeName = "name"
-    )
+    @SetProperty( pattern = "employee", attributeName = "name" )
     private String firstName;
 
-    @SetProperty(
-            pattern = "employee",
-            attributeName = "surname"
-    )
+    @SetProperty( pattern = "employee", attributeName = "surname" )
     private String lastName;
 
-    public void addAddress(Address address) {
-        this.addresses.add(address);
+    public void addAddress( Address address )
+    {
+        this.addresses.add( address );
     }
 
-    public String getFirstName() {
+    public String getFirstName()
+    {
         return this.firstName;
     }
 
-    public void setFirstName(String firstName) {
+    public void setFirstName( String firstName )
+    {
         this.firstName = firstName;
     }
 
-    public String getLastName() {
+    public String getLastName()
+    {
         return this.lastName;
     }
 
-    public void setLastName(String lastName) {
+    public void setLastName( String lastName )
+    {
         this.lastName = lastName;
     }
 
-    public List<Address> getAddresses() {
+    public List<Address> getAddresses()
+    {
         return this.addresses;
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
             return true;
-        if (obj == null)
+        if ( obj == null )
             return false;
-        if (getClass() != obj.getClass())
+        if ( getClass() != obj.getClass() )
             return false;
         Employee other = (Employee) obj;
-        if (this.addresses == null) {
-            if (other.getAddresses() != null)
+        if ( this.addresses == null )
+        {
+            if ( other.getAddresses() != null )
                 return false;
-        } else if (!this.addresses.equals(other.getAddresses()))
+        }
+        else if ( !this.addresses.equals( other.getAddresses() ) )
             return false;
-        if (this.firstName == null) {
-            if (other.getFirstName() != null)
+        if ( this.firstName == null )
+        {
+            if ( other.getFirstName() != null )
                 return false;
-        } else if (!this.firstName.equals(other.getFirstName()))
+        }
+        else if ( !this.firstName.equals( other.getFirstName() ) )
             return false;
-        if (this.lastName == null) {
-            if (other.getLastName() != null)
+        if ( this.lastName == null )
+        {
+            if ( other.getLastName() != null )
                 return false;
-        } else if (!this.lastName.equals(other.getLastName()))
+        }
+        else if ( !this.lastName.equals( other.getLastName() ) )
             return false;
         return true;
     }
 
     @Override
-    public String toString() {
-        return "Employee [addresses="
-                + addresses
-                + ", firstName="
-                + firstName
-                + ", lastName="
-                + lastName
-                + "]";
+    public String toString()
+    {
+        return "Employee [addresses=" + addresses + ", firstName=" + firstName + ", lastName=" + lastName + "]";
     }
 
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/EmployeeTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/EmployeeTestCase.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/EmployeeTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/EmployeeTestCase.java Thu May 12 18:03:26 2011
@@ -22,39 +22,43 @@ import org.apache.commons.digester3.anno
 import org.junit.Test;
 
 /**
- * 
  * @since 2.1
  */
-public final class EmployeeTestCase extends AbstractAnnotatedPojoTestCase {
+public final class EmployeeTestCase
+    extends AbstractAnnotatedPojoTestCase
+{
 
     @Test
-    public void testEmployee() throws Exception {
+    public void testEmployee()
+        throws Exception
+    {
         Employee employee = new Employee();
-        employee.setFirstName("First Name");
-        employee.setLastName("Last Name");
+        employee.setFirstName( "First Name" );
+        employee.setLastName( "Last Name" );
 
         Address address = new Address();
-        address.setCity("Home City");
-        address.setState("HS");
-        address.setStreet("Home Street");
-        address.setType("home");
-        address.setZipCode("HmZip");
-        address.setEmployee(employee);
+        address.setCity( "Home City" );
+        address.setState( "HS" );
+        address.setStreet( "Home Street" );
+        address.setType( "home" );
+        address.setZipCode( "HmZip" );
+        address.setEmployee( employee );
 
         address = new Address();
-        address.setCity("Office City");
-        address.setState("OS");
-        address.setStreet("Office Street");
-        address.setType("office");
-        address.setZipCode("OfZip");
-        address.setEmployee(employee);
+        address.setCity( "Office City" );
+        address.setState( "OS" );
+        address.setStreet( "Office Street" );
+        address.setType( "office" );
+        address.setZipCode( "OfZip" );
+        address.setEmployee( employee );
 
-        this.verifyExpectedEqualsToParsed(employee);
+        this.verifyExpectedEqualsToParsed( employee );
     }
 
     @Override
-    protected void decorate(Digester digester) {
-        this.getDigesterLoader().addRules(Address.class, digester);
+    protected void decorate( Digester digester )
+    {
+        this.getDigesterLoader().addRules( Address.class, digester );
     }
 
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/person/Person.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/person/Person.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/person/Person.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/person/Person.java Thu May 12 18:03:26 2011
@@ -28,97 +28,105 @@ import org.apache.commons.digester3.anno
 import org.apache.commons.digester3.annotations.rules.SetProperty;
 
 /**
- * 
  * @since 2.1
  */
-@ObjectCreate(pattern = "person")
-public class Person {
+@ObjectCreate( pattern = "person" )
+public class Person
+{
 
     private final Map<String, String> emails = new HashMap<String, String>();
 
-    @SetProperty(pattern = "person")
+    @SetProperty( pattern = "person" )
     private int id;
 
-    @SetProperty(pattern = "person")
+    @SetProperty( pattern = "person" )
     private String category;
 
-    @BeanPropertySetter(pattern = "person/name")
+    @BeanPropertySetter( pattern = "person/name" )
     private String name;
 
-    @CallMethod(pattern = "person/email")
-    public void addEmail(@AttributeCallParam(pattern = "person/email", attribute = "type") String type,
-            @CallParam(pattern = "person/email") String address) {
-        this.emails.put(type, address);
+    @CallMethod( pattern = "person/email" )
+    public void addEmail( @AttributeCallParam( pattern = "person/email", attribute = "type" ) String type,
+                          @CallParam( pattern = "person/email" ) String address )
+    {
+        this.emails.put( type, address );
     }
 
-    public int getId() {
+    public int getId()
+    {
         return id;
     }
 
-    public void setId(int id) {
+    public void setId( int id )
+    {
         this.id = id;
     }
 
-    public String getCategory() {
+    public String getCategory()
+    {
         return category;
     }
 
-    public void setCategory(String category) {
+    public void setCategory( String category )
+    {
         this.category = category;
     }
 
-    public String getName() {
+    public String getName()
+    {
         return name;
     }
 
-    public void setName(String name) {
+    public void setName( String name )
+    {
         this.name = name;
     }
 
-    public Map<String, String> getEmails() {
+    public Map<String, String> getEmails()
+    {
         return emails;
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
             return true;
-        if (obj == null)
+        if ( obj == null )
             return false;
-        if (getClass() != obj.getClass())
+        if ( getClass() != obj.getClass() )
             return false;
         Person other = (Person) obj;
-        if (category == null) {
-            if (other.category != null)
+        if ( category == null )
+        {
+            if ( other.category != null )
                 return false;
-        } else if (!category.equals(other.category))
+        }
+        else if ( !category.equals( other.category ) )
             return false;
-        if (emails == null) {
-            if (other.emails != null)
+        if ( emails == null )
+        {
+            if ( other.emails != null )
                 return false;
-        } else if (!emails.equals(other.emails))
+        }
+        else if ( !emails.equals( other.emails ) )
             return false;
-        if (id != other.id)
+        if ( id != other.id )
             return false;
-        if (name == null) {
-            if (other.name != null)
+        if ( name == null )
+        {
+            if ( other.name != null )
                 return false;
-        } else if (!name.equals(other.name))
+        }
+        else if ( !name.equals( other.name ) )
             return false;
         return true;
     }
 
     @Override
-    public String toString() {
-        return "Person [category="
-            + category
-            + ", emails="
-            + emails
-            + ", id="
-            + id
-            + ", name="
-            + name
-            + "]";
+    public String toString()
+    {
+        return "Person [category=" + category + ", emails=" + emails + ", id=" + id + ", name=" + name + "]";
     }
 
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/person/PersonTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/person/PersonTestCase.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/person/PersonTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/person/PersonTestCase.java Thu May 12 18:03:26 2011
@@ -21,21 +21,24 @@ import org.apache.commons.digester3.anno
 import org.junit.Test;
 
 /**
- * 
  * @since 2.1
  */
-public final class PersonTestCase extends AbstractAnnotatedPojoTestCase {
+public final class PersonTestCase
+    extends AbstractAnnotatedPojoTestCase
+{
 
     @Test
-    public void testPerson() throws Exception {
+    public void testPerson()
+        throws Exception
+    {
         Person person = new Person();
-        person.setId(1);
-        person.setName("Gonzo");
-        person.setCategory("acquaintance");
-        person.addEmail("business", "gonzo@muppets.com");
-        person.addEmail("home", "gonzo@mymuppets.com");
+        person.setId( 1 );
+        person.setName( "Gonzo" );
+        person.setCategory( "acquaintance" );
+        person.addEmail( "business", "gonzo@muppets.com" );
+        person.addEmail( "home", "gonzo@mymuppets.com" );
 
-        this.verifyExpectedEqualsToParsed(person);
+        this.verifyExpectedEqualsToParsed( person );
     }
 
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Channel.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Channel.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Channel.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Channel.java Thu May 12 18:03:26 2011
@@ -25,136 +25,150 @@ import org.apache.commons.digester3.anno
 import org.apache.commons.digester3.annotations.rules.SetNext;
 
 /**
- * 
- *
  * @since 2.1
  */
-@ObjectCreate(pattern = "rss/channel")
-public final class Channel {
+@ObjectCreate( pattern = "rss/channel" )
+public final class Channel
+{
 
     private final List<Item> items = new ArrayList<Item>();
 
-    @BeanPropertySetter(pattern = "rss/channel/title")
+    @BeanPropertySetter( pattern = "rss/channel/title" )
     private String title;
 
-    @BeanPropertySetter(pattern = "rss/channel/link")
+    @BeanPropertySetter( pattern = "rss/channel/link" )
     private String link;
 
-    @BeanPropertySetter(pattern = "rss/channel/description")
+    @BeanPropertySetter( pattern = "rss/channel/description" )
     private String description;
 
-    @BeanPropertySetter(pattern = "rss/channel/language")
+    @BeanPropertySetter( pattern = "rss/channel/language" )
     private String language;
 
     private Image image;
 
-    public String getTitle() {
+    public String getTitle()
+    {
         return title;
     }
 
-    public void setTitle(String title) {
+    public void setTitle( String title )
+    {
         this.title = title;
     }
 
-    public String getLink() {
+    public String getLink()
+    {
         return link;
     }
 
-    public void setLink(String link) {
+    public void setLink( String link )
+    {
         this.link = link;
     }
 
-    public String getDescription() {
+    public String getDescription()
+    {
         return description;
     }
 
-    public void setDescription(String description) {
+    public void setDescription( String description )
+    {
         this.description = description;
     }
 
-    public String getLanguage() {
+    public String getLanguage()
+    {
         return language;
     }
 
-    public void setLanguage(String language) {
+    public void setLanguage( String language )
+    {
         this.language = language;
     }
 
-    public List<Item> getItems() {
+    public List<Item> getItems()
+    {
         return items;
     }
 
-    public Image getImage() {
+    public Image getImage()
+    {
         return image;
     }
 
     @SetNext
-    public void setImage(Image image) {
+    public void setImage( Image image )
+    {
         this.image = image;
     }
 
     @SetNext
-    public void addItem(Item item) {
-        this.items.add(item);
+    public void addItem( Item item )
+    {
+        this.items.add( item );
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
             return true;
-        if (obj == null)
+        if ( obj == null )
             return false;
-        if (getClass() != obj.getClass())
+        if ( getClass() != obj.getClass() )
             return false;
         Channel other = (Channel) obj;
-        if (description == null) {
-            if (other.description != null)
+        if ( description == null )
+        {
+            if ( other.description != null )
                 return false;
-        } else if (!description.equals(other.description))
+        }
+        else if ( !description.equals( other.description ) )
             return false;
-        if (image == null) {
-            if (other.image != null)
+        if ( image == null )
+        {
+            if ( other.image != null )
                 return false;
-        } else if (!image.equals(other.image))
+        }
+        else if ( !image.equals( other.image ) )
             return false;
-        if (items == null) {
-            if (other.items != null)
+        if ( items == null )
+        {
+            if ( other.items != null )
                 return false;
-        } else if (!items.equals(other.items))
+        }
+        else if ( !items.equals( other.items ) )
             return false;
-        if (language == null) {
-            if (other.language != null)
+        if ( language == null )
+        {
+            if ( other.language != null )
                 return false;
-        } else if (!language.equals(other.language))
+        }
+        else if ( !language.equals( other.language ) )
             return false;
-        if (link == null) {
-            if (other.link != null)
+        if ( link == null )
+        {
+            if ( other.link != null )
                 return false;
-        } else if (!link.equals(other.link))
+        }
+        else if ( !link.equals( other.link ) )
             return false;
-        if (title == null) {
-            if (other.title != null)
+        if ( title == null )
+        {
+            if ( other.title != null )
                 return false;
-        } else if (!title.equals(other.title))
+        }
+        else if ( !title.equals( other.title ) )
             return false;
         return true;
     }
 
     @Override
-    public String toString() {
-        return "Channel [description="
-                + description
-                + ", image="
-                + image
-                + ", items="
-                + items
-                + ", language="
-                + language
-                + ", link="
-                + link
-                + ", title="
-                + title
-                + "]";
+    public String toString()
+    {
+        return "Channel [description=" + description + ", image=" + image + ", items=" + items + ", language="
+            + language + ", link=" + link + ", title=" + title + "]";
     }
 
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Image.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Image.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Image.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Image.java Thu May 12 18:03:26 2011
@@ -21,129 +21,140 @@ import org.apache.commons.digester3.anno
 import org.apache.commons.digester3.annotations.rules.ObjectCreate;
 
 /**
- * 
- *
  * @since 2.1
  */
-@ObjectCreate(pattern = "rss/channel/image")
-public final class Image {
+@ObjectCreate( pattern = "rss/channel/image" )
+public final class Image
+{
 
-    @BeanPropertySetter(pattern = "rss/channel/image/description")
+    @BeanPropertySetter( pattern = "rss/channel/image/description" )
     private String description;
 
-    @BeanPropertySetter(pattern = "rss/channel/image/width")
+    @BeanPropertySetter( pattern = "rss/channel/image/width" )
     private int width;
 
-    @BeanPropertySetter(pattern = "rss/channel/image/height")
+    @BeanPropertySetter( pattern = "rss/channel/image/height" )
     private int height;
 
-    @BeanPropertySetter(pattern = "rss/channel/image/link")
+    @BeanPropertySetter( pattern = "rss/channel/image/link" )
     private String link;
 
-    @BeanPropertySetter(pattern = "rss/channel/image/title")
+    @BeanPropertySetter( pattern = "rss/channel/image/title" )
     private String title;
 
-    @BeanPropertySetter(pattern = "rss/channel/image/url")
+    @BeanPropertySetter( pattern = "rss/channel/image/url" )
     private String url;
 
-    public String getDescription() {
+    public String getDescription()
+    {
         return description;
     }
 
-    public void setDescription(String description) {
+    public void setDescription( String description )
+    {
         this.description = description;
     }
 
-    public int getWidth() {
+    public int getWidth()
+    {
         return width;
     }
 
-    public void setWidth(int width) {
+    public void setWidth( int width )
+    {
         this.width = width;
     }
 
-    public int getHeight() {
+    public int getHeight()
+    {
         return height;
     }
 
-    public void setHeight(int height) {
+    public void setHeight( int height )
+    {
         this.height = height;
     }
 
-    public String getLink() {
+    public String getLink()
+    {
         return link;
     }
 
-    public void setLink(String link) {
+    public void setLink( String link )
+    {
         this.link = link;
     }
 
-    public String getTitle() {
+    public String getTitle()
+    {
         return title;
     }
 
-    public void setTitle(String title) {
+    public void setTitle( String title )
+    {
         this.title = title;
     }
 
-    public String getUrl() {
+    public String getUrl()
+    {
         return url;
     }
 
-    public void setUrl(String url) {
+    public void setUrl( String url )
+    {
         this.url = url;
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
             return true;
-        if (obj == null)
+        if ( obj == null )
             return false;
-        if (getClass() != obj.getClass())
+        if ( getClass() != obj.getClass() )
             return false;
         Image other = (Image) obj;
-        if (description == null) {
-            if (other.description != null)
+        if ( description == null )
+        {
+            if ( other.description != null )
                 return false;
-        } else if (!description.equals(other.description))
+        }
+        else if ( !description.equals( other.description ) )
             return false;
-        if (height != other.height)
+        if ( height != other.height )
             return false;
-        if (link == null) {
-            if (other.link != null)
+        if ( link == null )
+        {
+            if ( other.link != null )
                 return false;
-        } else if (!link.equals(other.link))
+        }
+        else if ( !link.equals( other.link ) )
             return false;
-        if (title == null) {
-            if (other.title != null)
+        if ( title == null )
+        {
+            if ( other.title != null )
                 return false;
-        } else if (!title.equals(other.title))
+        }
+        else if ( !title.equals( other.title ) )
             return false;
-        if (url == null) {
-            if (other.url != null)
+        if ( url == null )
+        {
+            if ( other.url != null )
                 return false;
-        } else if (!url.equals(other.url))
+        }
+        else if ( !url.equals( other.url ) )
             return false;
-        if (width != other.width)
+        if ( width != other.width )
             return false;
         return true;
     }
 
     @Override
-    public String toString() {
-        return "Image [description="
-                + description
-                + ", height="
-                + height
-                + ", link="
-                + link
-                + ", title="
-                + title
-                + ", url="
-                + url
-                + ", width="
-                + width + "]";
+    public String toString()
+    {
+        return "Image [description=" + description + ", height=" + height + ", link=" + link + ", title=" + title
+            + ", url=" + url + ", width=" + width + "]";
     }
 
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Item.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Item.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Item.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Item.java Thu May 12 18:03:26 2011
@@ -21,82 +21,89 @@ import org.apache.commons.digester3.anno
 import org.apache.commons.digester3.annotations.rules.ObjectCreate;
 
 /**
- * 
- *
  * @since 2.1
  */
-@ObjectCreate(pattern = "rss/channel/item")
-public final class Item {
+@ObjectCreate( pattern = "rss/channel/item" )
+public final class Item
+{
 
-    @BeanPropertySetter(pattern = "rss/channel/item/description")
+    @BeanPropertySetter( pattern = "rss/channel/item/description" )
     private String description;
 
-    @BeanPropertySetter(pattern = "rss/channel/item/link")
+    @BeanPropertySetter( pattern = "rss/channel/item/link" )
     private String link;
 
-    @BeanPropertySetter(pattern = "rss/channel/item/title")
+    @BeanPropertySetter( pattern = "rss/channel/item/title" )
     private String title;
 
-    public String getDescription() {
+    public String getDescription()
+    {
         return description;
     }
 
-    public void setDescription(String description) {
+    public void setDescription( String description )
+    {
         this.description = description;
     }
 
-    public String getLink() {
+    public String getLink()
+    {
         return link;
     }
 
-    public void setLink(String link) {
+    public void setLink( String link )
+    {
         this.link = link;
     }
 
-    public String getTitle() {
+    public String getTitle()
+    {
         return title;
     }
 
-    public void setTitle(String title) {
+    public void setTitle( String title )
+    {
         this.title = title;
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
             return true;
-        if (obj == null)
+        if ( obj == null )
             return false;
-        if (getClass() != obj.getClass())
+        if ( getClass() != obj.getClass() )
             return false;
         Item other = (Item) obj;
-        if (description == null) {
-            if (other.description != null)
+        if ( description == null )
+        {
+            if ( other.description != null )
                 return false;
-        } else if (!description.equals(other.description))
+        }
+        else if ( !description.equals( other.description ) )
             return false;
-        if (link == null) {
-            if (other.link != null)
+        if ( link == null )
+        {
+            if ( other.link != null )
                 return false;
-        } else if (!link.equals(other.link))
+        }
+        else if ( !link.equals( other.link ) )
             return false;
-        if (title == null) {
-            if (other.title != null)
+        if ( title == null )
+        {
+            if ( other.title != null )
                 return false;
-        } else if (!title.equals(other.title))
+        }
+        else if ( !title.equals( other.title ) )
             return false;
         return true;
     }
 
     @Override
-    public String toString() {
-        return "Item [description="
-                + description
-                + ", link="
-                + link
-                + ", title="
-                + title
-                + "]";
+    public String toString()
+    {
+        return "Item [description=" + description + ", link=" + link + ", title=" + title + "]";
     }
 
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/RssTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/RssTestCase.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/RssTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/RssTestCase.java Thu May 12 18:03:26 2011
@@ -21,55 +21,56 @@ import org.apache.commons.digester3.anno
 import org.junit.Test;
 
 /**
- * 
- *
  * @since 2.1
  */
-public final class RssTestCase extends AbstractAnnotatedPojoTestCase {
+public final class RssTestCase
+    extends AbstractAnnotatedPojoTestCase
+{
 
     @Test
-    public void testRss() throws Exception {
+    public void testRss()
+        throws Exception
+    {
         Channel channel = new Channel();
-        channel.setTitle("Apache");
-        channel.setLink("http://www.apache.org");
-        channel.setDescription("The Apache Software Foundation");
-        channel.setLanguage("en-US");
+        channel.setTitle( "Apache" );
+        channel.setLink( "http://www.apache.org" );
+        channel.setDescription( "The Apache Software Foundation" );
+        channel.setLanguage( "en-US" );
 
         Image image = new Image();
-        image.setTitle("Apache");
-        image.setUrl("http://jakarta.apache.org/images/jakarta-logo.gif");
-        image.setLink("http://jakarta.apache.org");
-        image.setDescription(
-                "The Jakarta project. Open source, serverside java.");
-        image.setWidth(505);
-        image.setHeight(480);
-        channel.setImage(image);
+        image.setTitle( "Apache" );
+        image.setUrl( "http://jakarta.apache.org/images/jakarta-logo.gif" );
+        image.setLink( "http://jakarta.apache.org" );
+        image.setDescription( "The Jakarta project. Open source, serverside java." );
+        image.setWidth( 505 );
+        image.setHeight( 480 );
+        channel.setImage( image );
 
         Item item = new Item();
-        item.setTitle("Commons Attributes 2.1 Released");
-        item.setLink("http://jakarta.apache.org/site/news/news-2004-2ndHalf.html#20040815.1");
-        item.setDescription("The Apache Commons team is happy to announce the release of Commons Attributes 2.1. This is the first release of the new Commons-Attributes code.");
-        channel.addItem(item);
+        item.setTitle( "Commons Attributes 2.1 Released" );
+        item.setLink( "http://jakarta.apache.org/site/news/news-2004-2ndHalf.html#20040815.1" );
+        item.setDescription( "The Apache Commons team is happy to announce the release of Commons Attributes 2.1. This is the first release of the new Commons-Attributes code." );
+        channel.addItem( item );
 
         item = new Item();
-        item.setTitle("Cloudscape Becomes Apache Derby");
-        item.setLink("http://jakarta.apache.org/site/news/elsewhere-2004-2ndHalf.html#20040803.1");
-        item.setDescription("IBM has submitted a proposal to the Apache DB project for a Java-based package to be called 'Derby'.");
-        channel.addItem(item);
+        item.setTitle( "Cloudscape Becomes Apache Derby" );
+        item.setLink( "http://jakarta.apache.org/site/news/elsewhere-2004-2ndHalf.html#20040803.1" );
+        item.setDescription( "IBM has submitted a proposal to the Apache DB project for a Java-based package to be called 'Derby'." );
+        channel.addItem( item );
 
         item = new Item();
-        item.setTitle("Commons BeanUtils 1.7 Released");
-        item.setLink("http://jakarta.apache.org/site/news/news-2004-2ndHalf.html#20040802.1");
-        item.setDescription("");
-        channel.addItem(item);
+        item.setTitle( "Commons BeanUtils 1.7 Released" );
+        item.setLink( "http://jakarta.apache.org/site/news/news-2004-2ndHalf.html#20040802.1" );
+        item.setDescription( "" );
+        channel.addItem( item );
 
         item = new Item();
-        item.setTitle("Commons JXPath 1.2 Released");
-        item.setLink("http://jakarta.apache.org/site/news/news-2004-2ndHalf.html#20040801.2");
-        item.setDescription("");
-        channel.addItem(item);
+        item.setTitle( "Commons JXPath 1.2 Released" );
+        item.setLink( "http://jakarta.apache.org/site/news/news-2004-2ndHalf.html#20040801.2" );
+        item.setDescription( "" );
+        channel.addItem( item );
 
-        this.verifyExpectedEqualsToParsed(channel);
+        this.verifyExpectedEqualsToParsed( channel );
     }
 
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBean.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBean.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBean.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBean.java Thu May 12 18:03:26 2011
@@ -26,82 +26,91 @@ import org.apache.commons.digester3.anno
 import org.apache.commons.digester3.annotations.rules.ObjectCreate;
 
 /**
- * 
  * @since 2.1
  */
-@ObjectCreate(pattern = "web-app/servlet")
-public final class ServletBean {
+@ObjectCreate( pattern = "web-app/servlet" )
+public final class ServletBean
+{
 
     private final Map<String, String> initParams = new HashMap<String, String>();
 
-    @BeanPropertySetter(pattern = "web-app/servlet/servlet-name")
+    @BeanPropertySetter( pattern = "web-app/servlet/servlet-name" )
     private String servletName;
 
-    @BeanPropertySetter(pattern = "web-app/servlet/servlet-class")
+    @BeanPropertySetter( pattern = "web-app/servlet/servlet-class" )
     private String servletClass;
 
-    @CallMethod(pattern = "web-app/servlet/init-param")
-    public void addInitParam(@CallParam(pattern = "web-app/servlet/init-param/param-name") String name,
-            @CallParam(pattern = "web-app/servlet/init-param/param-value") String value) {
-        this.initParams.put(name, value);
+    @CallMethod( pattern = "web-app/servlet/init-param" )
+    public void addInitParam( @CallParam( pattern = "web-app/servlet/init-param/param-name" ) String name,
+                              @CallParam( pattern = "web-app/servlet/init-param/param-value" ) String value )
+    {
+        this.initParams.put( name, value );
     }
 
-    public String getServletName() {
+    public String getServletName()
+    {
         return servletName;
     }
 
-    public void setServletName(String servletName) {
+    public void setServletName( String servletName )
+    {
         this.servletName = servletName;
     }
 
-    public String getServletClass() {
+    public String getServletClass()
+    {
         return servletClass;
     }
 
-    public void setServletClass(String servletClass) {
+    public void setServletClass( String servletClass )
+    {
         this.servletClass = servletClass;
     }
 
-    public Map<String, String> getInitParams() {
+    public Map<String, String> getInitParams()
+    {
         return initParams;
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
             return true;
-        if (obj == null)
+        if ( obj == null )
             return false;
-        if (getClass() != obj.getClass())
+        if ( getClass() != obj.getClass() )
             return false;
         ServletBean other = (ServletBean) obj;
-        if (initParams == null) {
-            if (other.initParams != null)
+        if ( initParams == null )
+        {
+            if ( other.initParams != null )
                 return false;
-        } else if (!initParams.equals(other.initParams))
+        }
+        else if ( !initParams.equals( other.initParams ) )
             return false;
-        if (servletClass == null) {
-            if (other.servletClass != null)
+        if ( servletClass == null )
+        {
+            if ( other.servletClass != null )
                 return false;
-        } else if (!servletClass.equals(other.servletClass))
+        }
+        else if ( !servletClass.equals( other.servletClass ) )
             return false;
-        if (servletName == null) {
-            if (other.servletName != null)
+        if ( servletName == null )
+        {
+            if ( other.servletName != null )
                 return false;
-        } else if (!servletName.equals(other.servletName))
+        }
+        else if ( !servletName.equals( other.servletName ) )
             return false;
         return true;
     }
 
     @Override
-    public String toString() {
-        return "ServletBean [initParams="
-                + initParams
-                + ", servletClass="
-                + servletClass
-                + ", servletName="
-                + servletName
-                + "]";
+    public String toString()
+    {
+        return "ServletBean [initParams=" + initParams + ", servletClass=" + servletClass + ", servletName="
+            + servletName + "]";
     }
 
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBeanTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBeanTestCase.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBeanTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBeanTestCase.java Thu May 12 18:03:26 2011
@@ -21,21 +21,23 @@ import org.apache.commons.digester3.anno
 import org.junit.Test;
 
 /**
- * 
  * @since 2.1
  */
-public final class ServletBeanTestCase extends AbstractAnnotatedPojoTestCase {
+public final class ServletBeanTestCase
+    extends AbstractAnnotatedPojoTestCase
+{
 
     @Test
-    public void testServletBean() throws Exception {
+    public void testServletBean()
+        throws Exception
+    {
         ServletBean servletBean = new ServletBean();
-        servletBean.setServletName("action");
-        servletBean.setServletClass("org.apache.struts.action.ActionServlet");
-        servletBean.addInitParam("application",
-                "org.apache.struts.example.ApplicationResources");
-        servletBean.addInitParam("config", "/WEB-INF/struts-config.xml");
+        servletBean.setServletName( "action" );
+        servletBean.setServletClass( "org.apache.struts.action.ActionServlet" );
+        servletBean.addInitParam( "application", "org.apache.struts.example.ApplicationResources" );
+        servletBean.addInitParam( "config", "/WEB-INF/struts-config.xml" );
 
-        this.verifyExpectedEqualsToParsed(servletBean);
+        this.verifyExpectedEqualsToParsed( servletBean );
     }
 
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Container.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Container.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Container.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Container.java Thu May 12 18:03:26 2011
@@ -21,16 +21,22 @@ package org.apache.commons.digester3.plu
 import java.util.List;
 import java.util.LinkedList;
 
-public class Container implements Widget {
+public class Container
+    implements Widget
+{
     private LinkedList<Widget> children = new LinkedList<Widget>();
 
-    public Container() {}
-    
-    public void addChild(Widget child) {
-        children.add(child);
+    public Container()
+    {
     }
 
-    public List<Widget> getChildren() {
+    public void addChild( Widget child )
+    {
+        children.add( child );
+    }
+
+    public List<Widget> getChildren()
+    {
         return children;
     }
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/ContainerCustomRules.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/ContainerCustomRules.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/ContainerCustomRules.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/ContainerCustomRules.java Thu May 12 18:03:26 2011
@@ -22,17 +22,19 @@ import org.apache.commons.digester3.Dige
 import org.apache.commons.digester3.plugins.PluginCreateRule;
 import org.apache.commons.digester3.plugins.PluginDeclarationRule;
 
-public class ContainerCustomRules {
-    public static void addRules(Digester digester, String pattern) {
+public class ContainerCustomRules
+{
+    public static void addRules( Digester digester, String pattern )
+    {
         // A Container object can have subtags called "widget" which
         // define any object of type Widget. Because a Container is
         // itself a widget, this allows us to build trees of objects.
-        PluginCreateRule pcr = new PluginCreateRule(Widget.class);
-        digester.addRule(pattern+"/widget", pcr);
-        digester.addSetNext(pattern+"/widget", "addChild");
-        
+        PluginCreateRule pcr = new PluginCreateRule( Widget.class );
+        digester.addRule( pattern + "/widget", pcr );
+        digester.addSetNext( pattern + "/widget", "addChild" );
+
         // allow users to declare plugins under a container as well
         PluginDeclarationRule pdr = new PluginDeclarationRule();
-        digester.addRule(pattern+"/plugin", pdr);
+        digester.addRule( pattern + "/plugin", pdr );
     }
 }



Mime
View raw message