[patch] Patch file to replace new with valueOf, and some valueOf with parse

JspRuntimeLibrary-valueOf.patch (text/plain), 9.13 KB, created by Anthony Whitford on 2009-03-07 23:30:10 UTC

(hide)

Description: Patch file to replace new with valueOf, and some valueOf with parse

Filename:

MIME Type:

Creator: Anthony Whitford

Created: 2009-03-07 23:30:10 UTC

Size: 9.13 KB

patch

obsolete

>Index: JspRuntimeLibrary.java >=================================================================== >--- JspRuntimeLibrary.java (revision 751363) >+++ JspRuntimeLibrary.java (working copy) >@@ -121,14 +121,14 @@ > if (s == null || s.length() == 0) > return false; > else >- return Boolean.valueOf(s).booleanValue(); >+ return Boolean.parseBoolean(s); > } > > public static byte coerceToByte(String s) { > if (s == null || s.length() == 0) > return (byte) 0; > else >- return Byte.valueOf(s).byteValue(); >+ return Byte.parseByte(s); > } > > public static char coerceToChar(String s) { >@@ -144,35 +144,35 @@ > if (s == null || s.length() == 0) > return 0; > else >- return Double.valueOf(s).doubleValue(); >+ return Double.parseDouble(s); > } > > public static float coerceToFloat(String s) { > if (s == null || s.length() == 0) > return 0; > else >- return Float.valueOf(s).floatValue(); >+ return Float.parseFloat(s); > } > > public static int coerceToInt(String s) { > if (s == null || s.length() == 0) > return 0; > else >- return Integer.valueOf(s).intValue(); >+ return Integer.parseInt(s); > } > > public static short coerceToShort(String s) { > if (s == null || s.length() == 0) > return (short) 0; > else >- return Short.valueOf(s).shortValue(); >+ return Short.parseShort(s); > } > > public static long coerceToLong(String s) { > if (s == null || s.length() == 0) > return 0; > else >- return Long.valueOf(s).longValue(); >+ return Long.parseLong(s); > } > > public static Object coerce(String s, Class<?> target) { >@@ -183,42 +183,42 @@ > if (isNullOrEmpty) { > s = "false"; > } >- return new Boolean(s); >+ return Boolean.valueOf(s); > } else if (target == Byte.class) { > if (isNullOrEmpty) >- return new Byte((byte) 0); >+ return Byte.valueOf((byte) 0); > else >- return new Byte(s); >+ return Byte.valueOf(s); > } else if (target == Character.class) { > if (isNullOrEmpty) >- return new Character((char) 0); >+ return Character.valueOf((char) 0); > else >- return new Character(s.charAt(0)); >+ return Character.valueOf(s.charAt(0)); > } else if (target == Double.class) { > if (isNullOrEmpty) >- return new Double(0); >+ return Double.valueOf(0); > else >- return new Double(s); >+ return Double.valueOf(s); > } else if (target == Float.class) { > if (isNullOrEmpty) >- return new Float(0); >+ return Float.valueOf(0); > else >- return new Float(s); >+ return Float.valueOf(s); > } else if (target == Integer.class) { > if (isNullOrEmpty) >- return new Integer(0); >+ return Integer.valueOf(0); > else >- return new Integer(s); >+ return Integer.valueOf(s); > } else if (target == Short.class) { > if (isNullOrEmpty) >- return new Short((short) 0); >+ return Short.valueOf((short) 0); > else >- return new Short(s); >+ return Short.valueOf(s); > } else if (target == Long.class) { > if (isNullOrEmpty) >- return new Long(0); >+ return Long.valueOf(0L); > else >- return new Long(s); >+ return Long.valueOf(s); > } else { > return null; > } >@@ -244,21 +244,21 @@ > s = "true"; > else > s = "false"; >- return new Boolean(s); >+ return Boolean.valueOf(s); > } else if ( t.equals(Byte.class) || t.equals(Byte.TYPE) ) { >- return new Byte(s); >+ return Byte.valueOf(s); > } else if (t.equals(Character.class) || t.equals(Character.TYPE)) { > return s.length() > 0 ? new Character(s.charAt(0)) : null; > } else if ( t.equals(Short.class) || t.equals(Short.TYPE) ) { >- return new Short(s); >+ return Short.valueOf(s); > } else if ( t.equals(Integer.class) || t.equals(Integer.TYPE) ) { >- return new Integer(s); >+ return Integer.valueOf(s); > } else if ( t.equals(Float.class) || t.equals(Float.TYPE) ) { >- return new Float(s); >+ return Float.valueOf(s); > } else if ( t.equals(Long.class) || t.equals(Long.TYPE) ) { >- return new Long(s); >+ return Long.valueOf(s); > } else if ( t.equals(Double.class) || t.equals(Double.TYPE) ) { >- return new Double(s); >+ return Double.valueOf(s); > } else if ( t.equals(String.class) ) { > return s; > } else if ( t.equals(java.io.File.class) ) { >@@ -385,35 +385,35 @@ > } > > public static String toString(byte b) { >- return new Byte(b).toString(); >+ return Byte.toString(b); > } > > public static String toString(boolean b) { >- return new Boolean(b).toString(); >+ return Boolean.toString(b); > } > > public static String toString(short s) { >- return new Short(s).toString(); >+ return Short.toString(s); > } > > public static String toString(int i) { >- return new Integer(i).toString(); >+ return Integer.toString(i); > } > > public static String toString(float f) { >- return new Float(f).toString(); >+ return Float.toString(f); > } > > public static String toString(long l) { >- return new Long(l).toString(); >+ return Long.toString(l); > } > > public static String toString(double d) { >- return new Double(d).toString(); >+ return Double.toString(d); > } > > public static String toString(char c) { >- return new Character(c).toString(); >+ return Character.toString(c); > } > // __end toStringMethod > >@@ -672,7 +672,7 @@ > { > try { > Method method = getWriteMethod(bean.getClass(), prop); >- method.invoke(bean, new Object[] { new Integer(value) }); >+ method.invoke(bean, new Object[] { Integer.valueOf(value) }); > } catch (Exception ex) { > throw new JasperException(ex); > } >@@ -684,7 +684,7 @@ > { > try { > Method method = getWriteMethod(bean.getClass(), prop); >- method.invoke(bean, new Object[] { new Short(value) }); >+ method.invoke(bean, new Object[] { Short.valueOf(value) }); > } catch (Exception ex) { > throw new JasperException(ex); > } >@@ -696,7 +696,7 @@ > { > try { > Method method = getWriteMethod(bean.getClass(), prop); >- method.invoke(bean, new Object[] { new Long(value) }); >+ method.invoke(bean, new Object[] { Long.valueOf(value) }); > } catch (Exception ex) { > throw new JasperException(ex); > } >@@ -708,7 +708,7 @@ > { > try { > Method method = getWriteMethod(bean.getClass(), prop); >- method.invoke(bean, new Object[] { new Double(value) }); >+ method.invoke(bean, new Object[] { Double.valueOf(value) }); > } catch (Exception ex) { > throw new JasperException(ex); > } >@@ -720,7 +720,7 @@ > { > try { > Method method = getWriteMethod(bean.getClass(), prop); >- method.invoke(bean, new Object[] { new Float(value) }); >+ method.invoke(bean, new Object[] { Float.valueOf(value) }); > } catch (Exception ex) { > throw new JasperException(ex); > } >@@ -732,7 +732,7 @@ > { > try { > Method method = getWriteMethod(bean.getClass(), prop); >- method.invoke(bean, new Object[] { new Character(value) }); >+ method.invoke(bean, new Object[] { Character.valueOf(value) }); > } catch (Exception ex) { > throw new JasperException(ex); > } >@@ -744,7 +744,7 @@ > { > try { > Method method = getWriteMethod(bean.getClass(), prop); >- method.invoke(bean, new Object[] { new Byte(value) }); >+ method.invoke(bean, new Object[] { Byte.valueOf(value) }); > } catch (Exception ex) { > throw new JasperException(ex); > } >@@ -756,7 +756,7 @@ > { > try { > Method method = getWriteMethod(bean.getClass(), prop); >- method.invoke(bean, new Object[] { new Boolean(value) }); >+ method.invoke(bean, new Object[] { Boolean.valueOf(value) }); > } catch (Exception ex) { > throw new JasperException(ex); > } View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]