You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by to...@apache.org on 2007/12/20 10:58:51 UTC
svn commit: r605862 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne:
access/types/ dba/openbase/ reflect/
Author: torehalset
Date: Thu Dec 20 01:58:50 2007
New Revision: 605862
URL: http://svn.apache.org/viewvc?rev=605862&view=rev
Log:
java 5: new xxx() -> xxx.valueOf() for Short, Byte and Character
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ByteOrCharArrayFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ByteType.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ShortType.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ByteOrCharArrayFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ByteOrCharArrayFactory.java?rev=605862&r1=605861&r2=605862&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ByteOrCharArrayFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ByteOrCharArrayFactory.java Thu Dec 20 01:58:50 2007
@@ -92,7 +92,7 @@
}
String string = object.toString();
- return (string.length() > 0) ? new Character(string.charAt(0)) : null;
+ return (string.length() > 0) ? Character.valueOf(string.charAt(0)) : null;
}
}
@@ -147,7 +147,7 @@
String string = object.toString();
Character[] chars = new Character[string.length()];
for (int i = 0; i < string.length(); i++) {
- chars[i] = new Character(string.charAt(i));
+ chars[i] = Character.valueOf(string.charAt(i));
}
return chars;
@@ -187,7 +187,7 @@
Byte[] byteWrappers = new Byte[bytes.length];
for (int i = 0; i < bytes.length; i++) {
- byteWrappers[i] = new Byte(bytes[i]);
+ byteWrappers[i] = Byte.valueOf(bytes[i]);
}
return byteWrappers;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ByteType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ByteType.java?rev=605862&r1=605861&r2=605862&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ByteType.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ByteType.java Thu Dec 20 01:58:50 2007
@@ -52,7 +52,7 @@
public Object materializeObject(CallableStatement st, int index, int type)
throws Exception {
byte b = st.getByte(index);
- return (st.wasNull()) ? null : new Byte(b);
+ return (st.wasNull()) ? null : Byte.valueOf(b);
}
public void setJdbcObject(
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ShortType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ShortType.java?rev=605862&r1=605861&r2=605862&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ShortType.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ShortType.java Thu Dec 20 01:58:50 2007
@@ -46,13 +46,13 @@
public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
short s = rs.getShort(index);
- return (rs.wasNull()) ? null : new Short(s);
+ return (rs.wasNull()) ? null : Short.valueOf(s);
}
public Object materializeObject(CallableStatement st, int index, int type)
throws Exception {
short s = st.getShort(index);
- return (st.wasNull()) ? null : new Short(s);
+ return (st.wasNull()) ? null : Short.valueOf(s);
}
public void setJdbcObject(
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java?rev=605862&r1=605861&r2=605862&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java Thu Dec 20 01:58:50 2007
@@ -273,7 +273,7 @@
// read value as int, and then narrow it down
int val = rs.getInt(index);
- return (rs.wasNull()) ? null : new Byte((byte) val);
+ return (rs.wasNull()) ? null : Byte.valueOf((byte) val);
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java?rev=605862&r1=605861&r2=605862&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java Thu Dec 20 01:58:50 2007
@@ -91,7 +91,7 @@
Object convert(Object object, Class type) {
if (object == null) {
- return type.isPrimitive() ? new Byte((byte) 0) : null;
+ return type.isPrimitive() ? Byte.valueOf((byte) 0) : null;
}
if (object instanceof Byte) {
@@ -106,7 +106,7 @@
Object convert(Object object, Class type) {
if (object == null) {
- return type.isPrimitive() ? new Short((short) 0) : null;
+ return type.isPrimitive() ? Short.valueOf((short) 0) : null;
}
if (object instanceof Short) {
@@ -121,7 +121,7 @@
Object convert(Object object, Class type) {
if (object == null) {
- return type.isPrimitive() ? new Character((char) 0) : null;
+ return type.isPrimitive() ? Character.valueOf((char) 0) : null;
}
if (object instanceof Character) {
@@ -129,7 +129,7 @@
}
String string = object.toString();
- return new Character(string.length() > 0 ? string.charAt(0) : 0);
+ return Character.valueOf(string.length() > 0 ? string.charAt(0) : 0);
}
};
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java?rev=605862&r1=605861&r2=605862&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java Thu Dec 20 01:58:50 2007
@@ -308,16 +308,16 @@
String className = type.getName();
if ("byte".equals(className)) {
- return new Byte((byte) 0);
+ return Byte.valueOf((byte) 0);
}
else if ("int".equals(className)) {
return Integer.valueOf(0);
}
else if ("short".equals(className)) {
- return new Short((short) 0);
+ return Short.valueOf((short) 0);
}
else if ("char".equals(className)) {
- return new Character((char) 0);
+ return Character.valueOf((char) 0);
}
else if ("double".equals(className)) {
return new Double(0.0d);