From 34ad9105d93cad96013d41dd9a3ef95f89d55df3 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 27 Jan 2002 23:53:15 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270973 13f79535-47bb-0310-9956-ffa450edef68 --- .../components/configurer/ConfigTest1.java | 17 ++++++++++------- .../components/configurer/ConfigTest1.java | 17 ++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTest1.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTest1.java index fc78b51ae..a45169128 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTest1.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTest1.java @@ -17,26 +17,29 @@ import java.util.List; */ public class ConfigTest1 { - String m_someProp; - List m_propList = new ArrayList(); - String m_content; + private String m_someProp; + private List m_propList = new ArrayList(); + private String m_content; public boolean equals( final Object obj ) { - ConfigTest1 test = (ConfigTest1)obj; + final ConfigTest1 test = (ConfigTest1)obj; if( !DefaultConfigurerTest.equals( m_someProp, test.m_someProp ) ) { return false; } - if( !m_propList.equals( test.m_propList ) ) + else if( !m_propList.equals( test.m_propList ) ) { return false; } - if( !DefaultConfigurerTest.equals( m_content, test.m_content ) ) + else if( !DefaultConfigurerTest.equals( m_content, test.m_content ) ) { return false; } - return true; + else + { + return true; + } } public void setSomeProp( final String value ) diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTest1.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTest1.java index fc78b51ae..a45169128 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTest1.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTest1.java @@ -17,26 +17,29 @@ import java.util.List; */ public class ConfigTest1 { - String m_someProp; - List m_propList = new ArrayList(); - String m_content; + private String m_someProp; + private List m_propList = new ArrayList(); + private String m_content; public boolean equals( final Object obj ) { - ConfigTest1 test = (ConfigTest1)obj; + final ConfigTest1 test = (ConfigTest1)obj; if( !DefaultConfigurerTest.equals( m_someProp, test.m_someProp ) ) { return false; } - if( !m_propList.equals( test.m_propList ) ) + else if( !m_propList.equals( test.m_propList ) ) { return false; } - if( !DefaultConfigurerTest.equals( m_content, test.m_content ) ) + else if( !DefaultConfigurerTest.equals( m_content, test.m_content ) ) { return false; } - return true; + else + { + return true; + } } public void setSomeProp( final String value )