You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2017/08/25 21:50:34 UTC
svn commit: r1806243 - in
/commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3:
./ annotations/addressbook/ annotations/catalog/ annotations/employee/
annotations/person/ annotations/rss/ annotations/servletbean/
Author: ggregory
Date: Fri Aug 25 21:50:34 2017
New Revision: 1806243
URL: http://svn.apache.org/viewvc?rev=1806243&view=rev
Log:
Convert control statement bodies to block.
Modified:
commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java
commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/Employee.java
commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/TestBean.java
commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/TestRule.java
commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/addressbook/Address.java
commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBook.java
commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/addressbook/Person.java
commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/catalog/AudioVisual.java
commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/catalog/Book.java
commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/catalog/Catalog.java
commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/employee/Address.java
commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/employee/Employee.java
commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/person/Person.java
commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/rss/Channel.java
commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/rss/Image.java
commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/rss/Item.java
commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBean.java
Modified: commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java?rev=1806243&r1=1806242&r2=1806243&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java (original)
+++ commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java Fri Aug 25 21:50:34 2017
@@ -258,8 +258,9 @@ public class DigesterTestCase
assertEquals( "Registered two URLs", n, map.size() );
int count[] = new int[n];
- for ( int i = 0; i < n; i++ )
+ for ( int i = 0; i < n; i++ ) {
count[i] = 0;
+ }
for ( String key : map.keySet() )
{
for ( int i = 0; i < n; i++ )
@@ -271,8 +272,9 @@ public class DigesterTestCase
}
}
}
- for ( int i = 0; i < n; i++ )
+ for ( int i = 0; i < n; i++ ) {
assertEquals( "Count for key " + registrations[i * 2], 1, count[i] );
+ }
}
Modified: commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/Employee.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/Employee.java?rev=1806243&r1=1806242&r2=1806243&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/Employee.java (original)
+++ commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/Employee.java Fri Aug 25 21:50:34 2017
@@ -50,8 +50,9 @@ public class Employee
{
for ( Address address : addresses )
{
- if ( type.equals( address.getType() ) )
+ if ( type.equals( address.getType() ) ) {
return ( address );
+ }
}
return ( null );
}
Modified: commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/TestBean.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/TestBean.java?rev=1806243&r1=1806242&r2=1806243&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/TestBean.java (original)
+++ commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/TestBean.java Fri Aug 25 21:50:34 2017
@@ -206,8 +206,9 @@ public class TestBean
public TestBean getNested()
{
- if ( nested == null )
+ if ( nested == null ) {
nested = new TestBean();
+ }
return ( nested );
}
Modified: commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/TestRule.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/TestRule.java?rev=1806243&r1=1806242&r2=1806243&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/TestRule.java (original)
+++ commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/TestRule.java Fri Aug 25 21:50:34 2017
@@ -115,8 +115,9 @@ public class TestRule
*/
protected void appendCall()
{
- if ( order != null )
+ if ( order != null ) {
order.add( this );
+ }
}
/**
Modified: commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/addressbook/Address.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/addressbook/Address.java?rev=1806243&r1=1806242&r2=1806243&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/addressbook/Address.java (original)
+++ commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/addressbook/Address.java Fri Aug 25 21:50:34 2017
@@ -108,55 +108,70 @@ public class Address
@Override
public boolean equals( Object obj )
{
- if ( this == 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 ( 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 ( 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 ( 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 ( 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 ( 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 ( other.zip != null ) {
return false;
+ }
}
- else if ( !zip.equals( other.zip ) )
+ else if ( !zip.equals( other.zip ) ) {
return false;
+ }
return true;
}
Modified: commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBook.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBook.java?rev=1806243&r1=1806242&r2=1806243&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBook.java (original)
+++ commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBook.java Fri Aug 25 21:50:34 2017
@@ -41,20 +41,25 @@ public class AddressBook
@Override
public boolean equals( Object obj )
{
- if ( this == 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 ( other.people != null ) {
return false;
+ }
}
- else if ( !people.equals( other.people ) )
+ else if ( !people.equals( other.people ) ) {
return false;
+ }
return true;
}
Modified: commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/addressbook/Person.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/addressbook/Person.java?rev=1806243&r1=1806242&r2=1806243&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/addressbook/Person.java (original)
+++ commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/addressbook/Person.java Fri Aug 25 21:50:34 2017
@@ -105,43 +105,55 @@ public class Person
@Override
public boolean equals( Object obj )
{
- if ( this == 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 ( 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 ( 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 ( 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 ( other.name != null ) {
return false;
+ }
}
- else if ( !name.equals( other.name ) )
+ else if ( !name.equals( other.name ) ) {
return false;
+ }
return true;
}
Modified: commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/catalog/AudioVisual.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/catalog/AudioVisual.java?rev=1806243&r1=1806242&r2=1806243&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/catalog/AudioVisual.java (original)
+++ commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/catalog/AudioVisual.java Fri Aug 25 21:50:34 2017
@@ -92,38 +92,49 @@ public final class AudioVisual
@Override
public boolean equals( Object obj )
{
- if ( this == 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 ( 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 ( 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 ( 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;
}
Modified: commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/catalog/Book.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/catalog/Book.java?rev=1806243&r1=1806242&r2=1806243&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/catalog/Book.java (original)
+++ commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/catalog/Book.java Fri Aug 25 21:50:34 2017
@@ -82,41 +82,52 @@ public final class Book
@Override
public boolean equals( Object obj )
{
- if ( this == 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 ( 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 ( 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 ( 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 ( other.getTitle() != null ) {
return false;
+ }
}
- else if ( !this.title.equals( other.getTitle() ) )
+ else if ( !this.title.equals( other.getTitle() ) ) {
return false;
+ }
return true;
}
Modified: commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/catalog/Catalog.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/catalog/Catalog.java?rev=1806243&r1=1806242&r2=1806243&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/catalog/Catalog.java (original)
+++ commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/catalog/Catalog.java Fri Aug 25 21:50:34 2017
@@ -46,20 +46,25 @@ public final class Catalog
@Override
public boolean equals( Object obj )
{
- if ( this == 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 ( other.getItems() != null ) {
return false;
+ }
}
- else if ( !this.items.equals( other.getItems() ) )
+ else if ( !this.items.equals( other.getItems() ) ) {
return false;
+ }
return true;
}
Modified: commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/employee/Address.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/employee/Address.java?rev=1806243&r1=1806242&r2=1806243&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/employee/Address.java (original)
+++ commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/employee/Address.java Fri Aug 25 21:50:34 2017
@@ -103,48 +103,61 @@ public class Address
@Override
public boolean equals( Object obj )
{
- if ( this == 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 ( 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 ( 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 ( 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 ( 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 ( other.getZipCode() != null ) {
return false;
+ }
}
- else if ( !this.zipCode.equals( other.getZipCode() ) )
+ else if ( !this.zipCode.equals( other.getZipCode() ) ) {
return false;
+ }
return true;
}
Modified: commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/employee/Employee.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/employee/Employee.java?rev=1806243&r1=1806242&r2=1806243&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/employee/Employee.java (original)
+++ commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/employee/Employee.java Fri Aug 25 21:50:34 2017
@@ -71,34 +71,43 @@ public class Employee
@Override
public boolean equals( Object obj )
{
- if ( this == 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 ( 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 ( 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 ( other.getLastName() != null ) {
return false;
+ }
}
- else if ( !this.lastName.equals( other.getLastName() ) )
+ else if ( !this.lastName.equals( other.getLastName() ) ) {
return false;
+ }
return true;
}
Modified: commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/person/Person.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/person/Person.java?rev=1806243&r1=1806242&r2=1806243&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/person/Person.java (original)
+++ commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/person/Person.java Fri Aug 25 21:50:34 2017
@@ -89,36 +89,46 @@ public class Person
@Override
public boolean equals( Object obj )
{
- if ( this == 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 ( 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 ( 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 ( other.name != null ) {
return false;
+ }
}
- else if ( !name.equals( other.name ) )
+ else if ( !name.equals( other.name ) ) {
return false;
+ }
return true;
}
Modified: commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/rss/Channel.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/rss/Channel.java?rev=1806243&r1=1806242&r2=1806243&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/rss/Channel.java (original)
+++ commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/rss/Channel.java Fri Aug 25 21:50:34 2017
@@ -112,55 +112,70 @@ public final class Channel
@Override
public boolean equals( Object obj )
{
- if ( this == 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 ( 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 ( 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 ( 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 ( 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 ( 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 ( other.title != null ) {
return false;
+ }
}
- else if ( !title.equals( other.title ) )
+ else if ( !title.equals( other.title ) ) {
return false;
+ }
return true;
}
Modified: commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/rss/Image.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/rss/Image.java?rev=1806243&r1=1806242&r2=1806243&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/rss/Image.java (original)
+++ commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/rss/Image.java Fri Aug 25 21:50:34 2017
@@ -108,45 +108,58 @@ public final class Image
@Override
public boolean equals( Object obj )
{
- if ( this == 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 ( 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 ( 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 ( 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 ( 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;
}
Modified: commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/rss/Item.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/rss/Item.java?rev=1806243&r1=1806242&r2=1806243&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/rss/Item.java (original)
+++ commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/rss/Item.java Fri Aug 25 21:50:34 2017
@@ -69,34 +69,43 @@ public final class Item
@Override
public boolean equals( Object obj )
{
- if ( this == 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 ( 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 ( 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 ( other.title != null ) {
return false;
+ }
}
- else if ( !title.equals( other.title ) )
+ else if ( !title.equals( other.title ) ) {
return false;
+ }
return true;
}
Modified: commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBean.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBean.java?rev=1806243&r1=1806242&r2=1806243&view=diff
==============================================================================
--- commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBean.java (original)
+++ commons/proper/digester/trunk/core/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBean.java Fri Aug 25 21:50:34 2017
@@ -75,34 +75,43 @@ public final class ServletBean
@Override
public boolean equals( Object obj )
{
- if ( this == 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 ( 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 ( 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 ( other.servletName != null ) {
return false;
+ }
}
- else if ( !servletName.equals( other.servletName ) )
+ else if ( !servletName.equals( other.servletName ) ) {
return false;
+ }
return true;
}