dlr 2002/10/11 15:51:27
Modified: src/java/org/apache/maven/app MavenJellyContext.java
Log:
Refactored booleanPassthroughConverter(String) to ignore case for
permutations of "true"/"false" and "on"/"off", and to not choke on
null values.
Revision Changes Path
1.23 +10 -11
jakarta-turbine-maven/src/java/org/apache/maven/app/MavenJellyContext.java
Index: MavenJellyContext.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/MavenJellyContext.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -u -r1.22 -r1.23
--- MavenJellyContext.java 11 Oct 2002 22:46:25 -0000 1.22
+++ MavenJellyContext.java 11 Oct 2002 22:51:27 -0000 1.23
@@ -230,20 +230,21 @@
}
/**
- * Convert a String property to a Boolean based on its
- * contents. Maybe Jelly could deal with this automatically.
+ * Convert a <code>String</code> property to a
+ * <code>Boolean</code> based on its contents. It would be nice
+ * if Jelly would deal with this automatically.
*/
private Object booleanPassthroughConverter(String s)
{
- if (s.equals("true") ||
- s.equals("on") ||
- s.equals("1"))
+ if ("true".equalsIgnoreCase(s) ||
+ "on".equalsIgnoreCase(s) ||
+ "1".equals(s))
{
return Boolean.TRUE;
}
- else if (s.equals("false") ||
- s.equals("off") ||
- s.equals("0"))
+ else if ("false".equalsIgnoreCase(s) ||
+ "off".equalsIgnoreCase(s) ||
+ "0".equals(s))
{
return Boolean.FALSE;
}
@@ -251,6 +252,4 @@
// Passthough the value as it's not a boolean representation.
return s;
}
-
}
-
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>