diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java b/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java index 995825359..da7b3caad 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java @@ -114,20 +114,6 @@ public class Project return super.getLogger(); } - /** - * returns the boolean equivalent of a string, which is considered true if - * either "on", "true", or "yes" is found, ignoring case. - * - * @param s Description of Parameter - * @return Description of the Returned Value - */ - public static boolean toBoolean( String s ) - { - return ( s.equalsIgnoreCase( "on" ) || - s.equalsIgnoreCase( "true" ) || - s.equalsIgnoreCase( "yes" ) ); - } - /** * get the base directory of the project as a file object * diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java index 328df94e6..4ad2d4bf1 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java @@ -361,15 +361,15 @@ public class JUnitTestRunner implements TestListener { if( args[ i ].startsWith( "haltOnError=" ) ) { - haltError = Project.toBoolean( args[ i ].substring( 12 ) ); + haltError = "true".equals( args[ i ].substring( 12 ) ); } else if( args[ i ].startsWith( "haltOnFailure=" ) ) { - haltFail = Project.toBoolean( args[ i ].substring( 14 ) ); + haltFail = "true".equals( args[ i ].substring( 14 ) ); } else if( args[ i ].startsWith( "filtertrace=" ) ) { - stackfilter = Project.toBoolean( args[ i ].substring( 12 ) ); + stackfilter = "true".equals( args[ i ].substring( 12 ) ); } else if( args[ i ].startsWith( "formatter=" ) ) { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/Project.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/Project.java index 995825359..da7b3caad 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/Project.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/Project.java @@ -114,20 +114,6 @@ public class Project return super.getLogger(); } - /** - * returns the boolean equivalent of a string, which is considered true if - * either "on", "true", or "yes" is found, ignoring case. - * - * @param s Description of Parameter - * @return Description of the Returned Value - */ - public static boolean toBoolean( String s ) - { - return ( s.equalsIgnoreCase( "on" ) || - s.equalsIgnoreCase( "true" ) || - s.equalsIgnoreCase( "yes" ) ); - } - /** * get the base directory of the project as a file object * diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java index 328df94e6..4ad2d4bf1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java @@ -361,15 +361,15 @@ public class JUnitTestRunner implements TestListener { if( args[ i ].startsWith( "haltOnError=" ) ) { - haltError = Project.toBoolean( args[ i ].substring( 12 ) ); + haltError = "true".equals( args[ i ].substring( 12 ) ); } else if( args[ i ].startsWith( "haltOnFailure=" ) ) { - haltFail = Project.toBoolean( args[ i ].substring( 14 ) ); + haltFail = "true".equals( args[ i ].substring( 14 ) ); } else if( args[ i ].startsWith( "filtertrace=" ) ) { - stackfilter = Project.toBoolean( args[ i ].substring( 12 ) ); + stackfilter = "true".equals( args[ i ].substring( 12 ) ); } else if( args[ i ].startsWith( "formatter=" ) ) {