cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From torehal...@apache.org
Subject svn commit: r605850 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne: ./ access/ access/jdbc/ access/types/ dba/ dba/openbase/ dba/oracle/ dba/sqlite/ dba/sqlserver/ exp/parser/ query/ reflect/ util/ wocompat/
Date Thu, 20 Dec 2007 09:44:32 GMT
Author: torehalset
Date: Thu Dec 20 01:44:30 2007
New Revision: 605850

URL: http://svn.apache.org/viewvc?rev=605850&view=rev
Log:
java 5: new Integer(int) -> Integer.valueOf(int)

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/DataObjectUtils.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectId.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryResult.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.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/DefaultType.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/JdbcPkGenerator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/PkRange.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/TypesHandler.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/TypesMapping.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SQLTemplateAction.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectTranslator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/JJTExpressionParserState.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQuery.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/PersistentDescriptor.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/IndexPropertyList.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOQuery.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/DataObjectUtils.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/DataObjectUtils.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/DataObjectUtils.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/DataObjectUtils.java
Thu Dec 20 01:44:30 2007
@@ -133,7 +133,7 @@
             int pk) {
         return (T) objectForPK(
                 context,
-                buildId(context, dataObjectClass, new Integer(pk)));
+                buildId(context, dataObjectClass, Integer.valueOf(pk)));
     }
 
     /**
@@ -189,7 +189,7 @@
      * @see #objectForPK(ObjectContext, ObjectId)
      */
     public static Object objectForPK(ObjectContext context, String objEntityName, int pk)
{
-        return objectForPK(context, buildId(context, objEntityName, new Integer(pk)));
+        return objectForPK(context, buildId(context, objEntityName, Integer.valueOf(pk)));
     }
 
     /**

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectId.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectId.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectId.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectId.java
Thu Dec 20 01:44:30 2007
@@ -92,7 +92,7 @@
      * @since 1.2
      */
     public ObjectId(String entityName, String key, int value) {
-        this(entityName, key, new Integer(value));
+        this(entityName, key, Integer.valueOf(value));
     }
 
     /**

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryResult.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryResult.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryResult.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryResult.java
Thu Dec 20 01:44:30 2007
@@ -191,7 +191,7 @@
             else if (object instanceof int[]) {
                 int[] ints = (int[]) object;
                 for (int i = 0; i < ints.length; i++) {
-                    list.add(new Integer(ints[i]));
+                    list.add(Integer.valueOf(ints[i]));
                 }
             }
         }
@@ -241,7 +241,7 @@
             queries.put(query, list);
         }
 
-        list.add(new Integer(resultCount));
+        list.add(Integer.valueOf(resultCount));
     }
 
     public void nextDataRows(Query query, List dataRows) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java
Thu Dec 20 01:44:30 2007
@@ -242,7 +242,7 @@
     }
 
     String bindPositionalParameter(int position) {
-        return bindParameter(parameters.get(new Integer(position)));
+        return bindParameter(parameters.get(Integer.valueOf(position)));
     }
 
     String bindNamedParameter(String name) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
Thu Dec 20 01:44:30 2007
@@ -175,7 +175,7 @@
                         break;
                     }
 
-                    updateCounts.add(new Integer(updateCount));
+                    updateCounts.add(Integer.valueOf(updateCount));
                     QueryLogger.logUpdateCount(updateCount);
                 }
             }

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=605850&r1=605849&r2=605850&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:44:30 2007
@@ -63,7 +63,7 @@
             int precision) throws Exception {
 
         if (widenBytes && (val instanceof Byte)) {
-            val = new Integer(((Byte) val).intValue());
+            val = Integer.valueOf(((Byte) val).intValue());
         }
 
         super.setJdbcObject(st, val, pos, type, precision);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/DefaultType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/DefaultType.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/DefaultType.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/DefaultType.java
Thu Dec 20 01:44:30 2007
@@ -191,7 +191,7 @@
 
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         Object val = readMethod.invoke(rs, new Object[] {
-            new Integer(index)
+            Integer.valueOf(index)
         });
         return (rs.wasNull()) ? null : val;
     }
@@ -199,7 +199,7 @@
     public Object materializeObject(CallableStatement st, int index, int type)
             throws Exception {
         Object val = procReadMethod.invoke(st, new Object[] {
-            new Integer(index)
+            Integer.valueOf(index)
         });
         return (st.wasNull()) ? null : val;
     }

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=605850&r1=605849&r2=605850&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:44:30 2007
@@ -63,7 +63,7 @@
             int precision) throws Exception {
 
         if (widenShorts && (val instanceof Short)) {
-            val = new Integer(((Short) val).intValue());
+            val = Integer.valueOf(((Short) val).intValue());
         }
 
         super.setJdbcObject(st, val, pos, type, precision);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
Thu Dec 20 01:44:30 2007
@@ -235,7 +235,7 @@
 
         // if no caching, always generate fresh
         if (cacheSize <= 1) {
-            return new Integer(pkFromDatabase(node, ent));
+            return Integer.valueOf(pkFromDatabase(node, ent));
         }
 
         synchronized (pkCache) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/PkRange.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/PkRange.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/PkRange.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/PkRange.java
Thu Dec 20 01:44:30 2007
@@ -49,6 +49,6 @@
 			throw new RuntimeException("PkRange is exhausted and can not be used anymore.");
 		}
 
-		return new Integer(curValue++);
+		return Integer.valueOf(curValue++);
 	}
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/TypesHandler.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/TypesHandler.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/TypesHandler.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/TypesHandler.java
Thu Dec 20 01:44:30 2007
@@ -104,7 +104,7 @@
     }
 
     public String[] externalTypesForJdbcType(int type) {
-        return (String[]) typesMap.get(new Integer(type));
+        return (String[]) typesMap.get(Integer.valueOf(type));
     }
 
     /** 
@@ -151,7 +151,7 @@
             if (JDBC_TYPE_TAG.equals(localName)
                 && currentType != TypesMapping.NOT_DEFINED) {
                 String[] typesAsArray = new String[currentTypes.size()];
-                types.put(new Integer(currentType), currentTypes.toArray(typesAsArray));
+                types.put(Integer.valueOf(currentType), currentTypes.toArray(typesAsArray));
             }
         }
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/TypesMapping.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/TypesMapping.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/TypesMapping.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/TypesMapping.java
Thu Dec 20 01:44:30 2007
@@ -115,103 +115,103 @@
     private static final Map<String, Integer> javaSqlEnum = new HashMap<String,
Integer>();
 
     static {
-        sqlStringType.put(SQL_ARRAY, new Integer(Types.ARRAY));
-        sqlStringType.put(SQL_BIGINT, new Integer(Types.BIGINT));
-        sqlStringType.put(SQL_BINARY, new Integer(Types.BINARY));
-        sqlStringType.put(SQL_BIT, new Integer(Types.BIT));
-        sqlStringType.put(SQL_BLOB, new Integer(Types.BLOB));
-        sqlStringType.put(SQL_BOOLEAN, new Integer(Types.BOOLEAN));
-        sqlStringType.put(SQL_CLOB, new Integer(Types.CLOB));
-        sqlStringType.put(SQL_CHAR, new Integer(Types.CHAR));
-        sqlStringType.put(SQL_DATE, new Integer(Types.DATE));
-        sqlStringType.put(SQL_DECIMAL, new Integer(Types.DECIMAL));
-        sqlStringType.put(SQL_DOUBLE, new Integer(Types.DOUBLE));
-        sqlStringType.put(SQL_FLOAT, new Integer(Types.FLOAT));
-        sqlStringType.put(SQL_INTEGER, new Integer(Types.INTEGER));
-        sqlStringType.put(SQL_LONGVARCHAR, new Integer(Types.LONGVARCHAR));
-        sqlStringType.put(SQL_LONGVARBINARY, new Integer(Types.LONGVARBINARY));
-        sqlStringType.put(SQL_NUMERIC, new Integer(Types.NUMERIC));
-        sqlStringType.put(SQL_REAL, new Integer(Types.REAL));
-        sqlStringType.put(SQL_SMALLINT, new Integer(Types.SMALLINT));
-        sqlStringType.put(SQL_TINYINT, new Integer(Types.TINYINT));
-        sqlStringType.put(SQL_TIME, new Integer(Types.TIME));
-        sqlStringType.put(SQL_TIMESTAMP, new Integer(Types.TIMESTAMP));
-        sqlStringType.put(SQL_VARBINARY, new Integer(Types.VARBINARY));
-        sqlStringType.put(SQL_VARCHAR, new Integer(Types.VARCHAR));
-        sqlStringType.put(SQL_OTHER, new Integer(Types.OTHER));
-
-        sqlEnumType.put(new Integer(Types.ARRAY), SQL_ARRAY);
-        sqlEnumType.put(new Integer(Types.BIGINT), SQL_BIGINT);
-        sqlEnumType.put(new Integer(Types.BINARY), SQL_BINARY);
-        sqlEnumType.put(new Integer(Types.BIT), SQL_BIT);
-        sqlEnumType.put(new Integer(Types.BOOLEAN), SQL_BOOLEAN);
-        sqlEnumType.put(new Integer(Types.BLOB), SQL_BLOB);
-        sqlEnumType.put(new Integer(Types.CLOB), SQL_CLOB);
-        sqlEnumType.put(new Integer(Types.CHAR), SQL_CHAR);
-        sqlEnumType.put(new Integer(Types.DATE), SQL_DATE);
-        sqlEnumType.put(new Integer(Types.DECIMAL), SQL_DECIMAL);
-        sqlEnumType.put(new Integer(Types.DOUBLE), SQL_DOUBLE);
-        sqlEnumType.put(new Integer(Types.FLOAT), SQL_FLOAT);
-        sqlEnumType.put(new Integer(Types.INTEGER), SQL_INTEGER);
-        sqlEnumType.put(new Integer(Types.LONGVARCHAR), SQL_LONGVARCHAR);
-        sqlEnumType.put(new Integer(Types.LONGVARBINARY), SQL_LONGVARBINARY);
-        sqlEnumType.put(new Integer(Types.NUMERIC), SQL_NUMERIC);
-        sqlEnumType.put(new Integer(Types.REAL), SQL_REAL);
-        sqlEnumType.put(new Integer(Types.SMALLINT), SQL_SMALLINT);
-        sqlEnumType.put(new Integer(Types.TINYINT), SQL_TINYINT);
-        sqlEnumType.put(new Integer(Types.TIME), SQL_TIME);
-        sqlEnumType.put(new Integer(Types.TIMESTAMP), SQL_TIMESTAMP);
-        sqlEnumType.put(new Integer(Types.VARBINARY), SQL_VARBINARY);
-        sqlEnumType.put(new Integer(Types.VARCHAR), SQL_VARCHAR);
-        sqlEnumType.put(new Integer(Types.OTHER), SQL_OTHER);
-
-        sqlEnumJava.put(new Integer(Types.BIGINT), JAVA_LONG);
-        sqlEnumJava.put(new Integer(Types.BINARY), JAVA_BYTES);
-        sqlEnumJava.put(new Integer(Types.BIT), JAVA_BOOLEAN);
-        sqlEnumJava.put(new Integer(Types.BOOLEAN), JAVA_BOOLEAN);
-        sqlEnumJava.put(new Integer(Types.BLOB), JAVA_BYTES);
-        sqlEnumJava.put(new Integer(Types.CLOB), JAVA_STRING);
-        sqlEnumJava.put(new Integer(Types.CHAR), JAVA_STRING);
-        sqlEnumJava.put(new Integer(Types.DATE), JAVA_UTILDATE);
-        sqlEnumJava.put(new Integer(Types.DECIMAL), JAVA_BIGDECIMAL);
-        sqlEnumJava.put(new Integer(Types.DOUBLE), JAVA_DOUBLE);
-        sqlEnumJava.put(new Integer(Types.FLOAT), JAVA_FLOAT);
-        sqlEnumJava.put(new Integer(Types.INTEGER), JAVA_INTEGER);
-        sqlEnumJava.put(new Integer(Types.LONGVARCHAR), JAVA_STRING);
-        sqlEnumJava.put(new Integer(Types.LONGVARBINARY), JAVA_BYTES);
-        sqlEnumJava.put(new Integer(Types.NUMERIC), JAVA_BIGDECIMAL);
-        sqlEnumJava.put(new Integer(Types.REAL), JAVA_FLOAT);
-        sqlEnumJava.put(new Integer(Types.SMALLINT), JAVA_SHORT);
-        sqlEnumJava.put(new Integer(Types.TINYINT), JAVA_BYTE);
-        sqlEnumJava.put(new Integer(Types.TIME), JAVA_UTILDATE);
-        sqlEnumJava.put(new Integer(Types.TIMESTAMP), JAVA_UTILDATE);
-        sqlEnumJava.put(new Integer(Types.VARBINARY), JAVA_BYTES);
-        sqlEnumJava.put(new Integer(Types.VARCHAR), JAVA_STRING);
-
-        javaSqlEnum.put(JAVA_LONG, new Integer(Types.BIGINT));
-        javaSqlEnum.put(JAVA_BYTES, new Integer(Types.BINARY));
-        javaSqlEnum.put(JAVA_BOOLEAN, new Integer(Types.BIT));
-        javaSqlEnum.put(JAVA_STRING, new Integer(Types.VARCHAR));
-        javaSqlEnum.put(JAVA_SQLDATE, new Integer(Types.DATE));
-        javaSqlEnum.put(JAVA_TIMESTAMP, new Integer(Types.TIMESTAMP));
-        javaSqlEnum.put(JAVA_BIGDECIMAL, new Integer(Types.DECIMAL));
-        javaSqlEnum.put(JAVA_DOUBLE, new Integer(Types.DOUBLE));
-        javaSqlEnum.put(JAVA_FLOAT, new Integer(Types.FLOAT));
-        javaSqlEnum.put(JAVA_INTEGER, new Integer(Types.INTEGER));
-        javaSqlEnum.put(JAVA_SHORT, new Integer(Types.SMALLINT));
-        javaSqlEnum.put(JAVA_BYTE, new Integer(Types.TINYINT));
-        javaSqlEnum.put(JAVA_TIME, new Integer(Types.TIME));
-        javaSqlEnum.put(JAVA_TIMESTAMP, new Integer(Types.TIMESTAMP));
+        sqlStringType.put(SQL_ARRAY, Integer.valueOf(Types.ARRAY));
+        sqlStringType.put(SQL_BIGINT, Integer.valueOf(Types.BIGINT));
+        sqlStringType.put(SQL_BINARY, Integer.valueOf(Types.BINARY));
+        sqlStringType.put(SQL_BIT, Integer.valueOf(Types.BIT));
+        sqlStringType.put(SQL_BLOB, Integer.valueOf(Types.BLOB));
+        sqlStringType.put(SQL_BOOLEAN, Integer.valueOf(Types.BOOLEAN));
+        sqlStringType.put(SQL_CLOB, Integer.valueOf(Types.CLOB));
+        sqlStringType.put(SQL_CHAR, Integer.valueOf(Types.CHAR));
+        sqlStringType.put(SQL_DATE, Integer.valueOf(Types.DATE));
+        sqlStringType.put(SQL_DECIMAL, Integer.valueOf(Types.DECIMAL));
+        sqlStringType.put(SQL_DOUBLE, Integer.valueOf(Types.DOUBLE));
+        sqlStringType.put(SQL_FLOAT, Integer.valueOf(Types.FLOAT));
+        sqlStringType.put(SQL_INTEGER, Integer.valueOf(Types.INTEGER));
+        sqlStringType.put(SQL_LONGVARCHAR, Integer.valueOf(Types.LONGVARCHAR));
+        sqlStringType.put(SQL_LONGVARBINARY, Integer.valueOf(Types.LONGVARBINARY));
+        sqlStringType.put(SQL_NUMERIC, Integer.valueOf(Types.NUMERIC));
+        sqlStringType.put(SQL_REAL, Integer.valueOf(Types.REAL));
+        sqlStringType.put(SQL_SMALLINT, Integer.valueOf(Types.SMALLINT));
+        sqlStringType.put(SQL_TINYINT, Integer.valueOf(Types.TINYINT));
+        sqlStringType.put(SQL_TIME, Integer.valueOf(Types.TIME));
+        sqlStringType.put(SQL_TIMESTAMP, Integer.valueOf(Types.TIMESTAMP));
+        sqlStringType.put(SQL_VARBINARY, Integer.valueOf(Types.VARBINARY));
+        sqlStringType.put(SQL_VARCHAR, Integer.valueOf(Types.VARCHAR));
+        sqlStringType.put(SQL_OTHER, Integer.valueOf(Types.OTHER));
+
+        sqlEnumType.put(Integer.valueOf(Types.ARRAY), SQL_ARRAY);
+        sqlEnumType.put(Integer.valueOf(Types.BIGINT), SQL_BIGINT);
+        sqlEnumType.put(Integer.valueOf(Types.BINARY), SQL_BINARY);
+        sqlEnumType.put(Integer.valueOf(Types.BIT), SQL_BIT);
+        sqlEnumType.put(Integer.valueOf(Types.BOOLEAN), SQL_BOOLEAN);
+        sqlEnumType.put(Integer.valueOf(Types.BLOB), SQL_BLOB);
+        sqlEnumType.put(Integer.valueOf(Types.CLOB), SQL_CLOB);
+        sqlEnumType.put(Integer.valueOf(Types.CHAR), SQL_CHAR);
+        sqlEnumType.put(Integer.valueOf(Types.DATE), SQL_DATE);
+        sqlEnumType.put(Integer.valueOf(Types.DECIMAL), SQL_DECIMAL);
+        sqlEnumType.put(Integer.valueOf(Types.DOUBLE), SQL_DOUBLE);
+        sqlEnumType.put(Integer.valueOf(Types.FLOAT), SQL_FLOAT);
+        sqlEnumType.put(Integer.valueOf(Types.INTEGER), SQL_INTEGER);
+        sqlEnumType.put(Integer.valueOf(Types.LONGVARCHAR), SQL_LONGVARCHAR);
+        sqlEnumType.put(Integer.valueOf(Types.LONGVARBINARY), SQL_LONGVARBINARY);
+        sqlEnumType.put(Integer.valueOf(Types.NUMERIC), SQL_NUMERIC);
+        sqlEnumType.put(Integer.valueOf(Types.REAL), SQL_REAL);
+        sqlEnumType.put(Integer.valueOf(Types.SMALLINT), SQL_SMALLINT);
+        sqlEnumType.put(Integer.valueOf(Types.TINYINT), SQL_TINYINT);
+        sqlEnumType.put(Integer.valueOf(Types.TIME), SQL_TIME);
+        sqlEnumType.put(Integer.valueOf(Types.TIMESTAMP), SQL_TIMESTAMP);
+        sqlEnumType.put(Integer.valueOf(Types.VARBINARY), SQL_VARBINARY);
+        sqlEnumType.put(Integer.valueOf(Types.VARCHAR), SQL_VARCHAR);
+        sqlEnumType.put(Integer.valueOf(Types.OTHER), SQL_OTHER);
+
+        sqlEnumJava.put(Integer.valueOf(Types.BIGINT), JAVA_LONG);
+        sqlEnumJava.put(Integer.valueOf(Types.BINARY), JAVA_BYTES);
+        sqlEnumJava.put(Integer.valueOf(Types.BIT), JAVA_BOOLEAN);
+        sqlEnumJava.put(Integer.valueOf(Types.BOOLEAN), JAVA_BOOLEAN);
+        sqlEnumJava.put(Integer.valueOf(Types.BLOB), JAVA_BYTES);
+        sqlEnumJava.put(Integer.valueOf(Types.CLOB), JAVA_STRING);
+        sqlEnumJava.put(Integer.valueOf(Types.CHAR), JAVA_STRING);
+        sqlEnumJava.put(Integer.valueOf(Types.DATE), JAVA_UTILDATE);
+        sqlEnumJava.put(Integer.valueOf(Types.DECIMAL), JAVA_BIGDECIMAL);
+        sqlEnumJava.put(Integer.valueOf(Types.DOUBLE), JAVA_DOUBLE);
+        sqlEnumJava.put(Integer.valueOf(Types.FLOAT), JAVA_FLOAT);
+        sqlEnumJava.put(Integer.valueOf(Types.INTEGER), JAVA_INTEGER);
+        sqlEnumJava.put(Integer.valueOf(Types.LONGVARCHAR), JAVA_STRING);
+        sqlEnumJava.put(Integer.valueOf(Types.LONGVARBINARY), JAVA_BYTES);
+        sqlEnumJava.put(Integer.valueOf(Types.NUMERIC), JAVA_BIGDECIMAL);
+        sqlEnumJava.put(Integer.valueOf(Types.REAL), JAVA_FLOAT);
+        sqlEnumJava.put(Integer.valueOf(Types.SMALLINT), JAVA_SHORT);
+        sqlEnumJava.put(Integer.valueOf(Types.TINYINT), JAVA_BYTE);
+        sqlEnumJava.put(Integer.valueOf(Types.TIME), JAVA_UTILDATE);
+        sqlEnumJava.put(Integer.valueOf(Types.TIMESTAMP), JAVA_UTILDATE);
+        sqlEnumJava.put(Integer.valueOf(Types.VARBINARY), JAVA_BYTES);
+        sqlEnumJava.put(Integer.valueOf(Types.VARCHAR), JAVA_STRING);
+
+        javaSqlEnum.put(JAVA_LONG, Integer.valueOf(Types.BIGINT));
+        javaSqlEnum.put(JAVA_BYTES, Integer.valueOf(Types.BINARY));
+        javaSqlEnum.put(JAVA_BOOLEAN, Integer.valueOf(Types.BIT));
+        javaSqlEnum.put(JAVA_STRING, Integer.valueOf(Types.VARCHAR));
+        javaSqlEnum.put(JAVA_SQLDATE, Integer.valueOf(Types.DATE));
+        javaSqlEnum.put(JAVA_TIMESTAMP, Integer.valueOf(Types.TIMESTAMP));
+        javaSqlEnum.put(JAVA_BIGDECIMAL, Integer.valueOf(Types.DECIMAL));
+        javaSqlEnum.put(JAVA_DOUBLE, Integer.valueOf(Types.DOUBLE));
+        javaSqlEnum.put(JAVA_FLOAT, Integer.valueOf(Types.FLOAT));
+        javaSqlEnum.put(JAVA_INTEGER, Integer.valueOf(Types.INTEGER));
+        javaSqlEnum.put(JAVA_SHORT, Integer.valueOf(Types.SMALLINT));
+        javaSqlEnum.put(JAVA_BYTE, Integer.valueOf(Types.TINYINT));
+        javaSqlEnum.put(JAVA_TIME, Integer.valueOf(Types.TIME));
+        javaSqlEnum.put(JAVA_TIMESTAMP, Integer.valueOf(Types.TIMESTAMP));
 
         // add primitives
-        javaSqlEnum.put("byte", new Integer(Types.TINYINT));
-        javaSqlEnum.put("int", new Integer(Types.INTEGER));
-        javaSqlEnum.put("short", new Integer(Types.SMALLINT));
-        javaSqlEnum.put("char", new Integer(Types.CHAR));
-        javaSqlEnum.put("double", new Integer(Types.DOUBLE));
-        javaSqlEnum.put("long", new Integer(Types.BIGINT));
-        javaSqlEnum.put("float", new Integer(Types.FLOAT));
-        javaSqlEnum.put("boolean", new Integer(Types.BIT));
+        javaSqlEnum.put("byte", Integer.valueOf(Types.TINYINT));
+        javaSqlEnum.put("int", Integer.valueOf(Types.INTEGER));
+        javaSqlEnum.put("short", Integer.valueOf(Types.SMALLINT));
+        javaSqlEnum.put("char", Integer.valueOf(Types.CHAR));
+        javaSqlEnum.put("double", Integer.valueOf(Types.DOUBLE));
+        javaSqlEnum.put("long", Integer.valueOf(Types.BIGINT));
+        javaSqlEnum.put("float", Integer.valueOf(Types.FLOAT));
+        javaSqlEnum.put("boolean", Integer.valueOf(Types.BIT));
     }
 
     /**
@@ -336,7 +336,7 @@
      * Returns a String representation of the SQL type from its JDBC code.
      */
     public static String getSqlNameByType(int type) {
-        return sqlEnumType.get(new Integer(type));
+        return sqlEnumType.get(Integer.valueOf(type));
     }
 
     /**
@@ -434,7 +434,7 @@
      * @return Fully qualified Java type name or null if not found.
      */
     public static String getJavaBySqlType(int type) {
-        return sqlEnumJava.get(new Integer(type));
+        return sqlEnumJava.get(Integer.valueOf(type));
     }
 
     /**
@@ -447,7 +447,7 @@
         if (type == Types.NUMERIC && precision == 0) {
             type = Types.INTEGER;
         }
-        return sqlEnumJava.get(new Integer(type));
+        return sqlEnumJava.get(Integer.valueOf(type));
     }
 
     // *************************************************************
@@ -467,7 +467,7 @@
                 info.jdbcType = rs.getInt("DATA_TYPE");
                 info.precision = rs.getLong("PRECISION");
 
-                Integer key = new Integer(info.jdbcType);
+                Integer key = Integer.valueOf(info.jdbcType);
                 List<TypeInfo> infos = databaseTypes.get(key);
 
                 if (infos == null) {
@@ -485,8 +485,8 @@
         // do some tricks to substitute for missing datatypes
 
         // 1. swap TIMESTAMP - DATE
-        Integer ts = new Integer(Types.TIMESTAMP);
-        Integer dt = new Integer(Types.DATE);
+        Integer ts = Integer.valueOf(Types.TIMESTAMP);
+        Integer dt = Integer.valueOf(Types.DATE);
         List<TypeInfo> tsInfo = databaseTypes.get(ts);
         List<TypeInfo> dtInfo = databaseTypes.get(dt);
 
@@ -497,8 +497,8 @@
             databaseTypes.put(ts, dtInfo);
 
         // 2. Swap CLOB - LONGVARCHAR
-        Integer clob = new Integer(Types.CLOB);
-        Integer lvc = new Integer(Types.LONGVARCHAR);
+        Integer clob = Integer.valueOf(Types.CLOB);
+        Integer lvc = Integer.valueOf(Types.LONGVARCHAR);
         List<TypeInfo> clobInfo = databaseTypes.get(clob);
         List<TypeInfo> lvcInfo = databaseTypes.get(lvc);
 
@@ -509,8 +509,8 @@
             databaseTypes.put(clob, lvcInfo);
 
         // 2. Swap BLOB - LONGVARBINARY
-        Integer blob = new Integer(Types.BLOB);
-        Integer lvb = new Integer(Types.LONGVARBINARY);
+        Integer blob = Integer.valueOf(Types.BLOB);
+        Integer lvb = Integer.valueOf(Types.LONGVARBINARY);
         List<TypeInfo> blobInfo = databaseTypes.get(blob);
         List<TypeInfo> lvbInfo = databaseTypes.get(lvb);
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java
Thu Dec 20 01:44:30 2007
@@ -53,7 +53,7 @@
         if (binPK != null) {
             return binPK;
         }
-        return new Integer(pkFromDatabase(node, entity));
+        return Integer.valueOf(pkFromDatabase(node, entity));
     }
 
     /**

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SQLTemplateAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SQLTemplateAction.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SQLTemplateAction.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8SQLTemplateAction.java
Thu Dec 20 01:44:30 2007
@@ -87,7 +87,7 @@
             }
             else {
                 int updateCount = statement.executeUpdate();
-                updateCounts.add(new Integer(updateCount));
+                updateCounts.add(Integer.valueOf(updateCount));
                 QueryLogger.logUpdateCount(updateCount);
             }
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectTranslator.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectTranslator.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleSelectTranslator.java
Thu Dec 20 01:44:30 2007
@@ -40,7 +40,7 @@
     private static Method statementSetRowPrefetch;
 
     private static final Object[] rowPrefetchArgs = new Object[] {
-        new Integer(100)
+        Integer.valueOf(100)
     };
 
     public String createSqlString() throws Exception {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java
Thu Dec 20 01:44:30 2007
@@ -83,7 +83,7 @@
             }
             else {                
                 int updateCount = statement.executeUpdate();
-                updateCounts.add(new Integer(updateCount));
+                updateCounts.add(Integer.valueOf(updateCount));
                 QueryLogger.logUpdateCount(updateCount);
             }
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java
Thu Dec 20 01:44:30 2007
@@ -160,7 +160,7 @@
                 counts = new ArrayList<Integer>();
             }
 
-            counts.add(new Integer(resultCount));
+            counts.add(Integer.valueOf(resultCount));
         }
 
         public void nextDataRows(Query query, List<DataRow> dataRows) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/JJTExpressionParserState.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/JJTExpressionParserState.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/JJTExpressionParserState.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/JJTExpressionParserState.java
Thu Dec 20 01:44:30 2007
@@ -95,7 +95,7 @@
 
 
   void openNodeScope(Node n) {
-    marks.push(new Integer(mk));
+    marks.push(Integer.valueOf(mk));
     mk = sp;
     n.jjtOpen();
   }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQuery.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
Thu Dec 20 01:44:30 2007
@@ -145,7 +145,7 @@
             parameters = new HashMap<Object, Object>();
         }
 
-        parameters.put(new Integer(position), object);
+        parameters.put(Integer.valueOf(position), object);
     }
 
     /**

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=605850&r1=605849&r2=605850&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:44:30 2007
@@ -76,7 +76,7 @@
 
             Object convert(Object object, Class type) {
                 if (object == null) {
-                    return type.isPrimitive() ? new Integer(0) : null;
+                    return type.isPrimitive() ? Integer.valueOf(0) : null;
                 }
 
                 if (object instanceof Integer) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PersistentDescriptor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PersistentDescriptor.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PersistentDescriptor.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PersistentDescriptor.java
Thu Dec 20 01:44:30 2007
@@ -39,9 +39,9 @@
  */
 public class PersistentDescriptor implements ClassDescriptor {
 
-    static final Integer TRANSIENT_STATE = new Integer(PersistenceState.TRANSIENT);
-    static final Integer HOLLOW_STATE = new Integer(PersistenceState.HOLLOW);
-    static final Integer COMMITTED_STATE = new Integer(PersistenceState.COMMITTED);
+    static final Integer TRANSIENT_STATE = Integer.valueOf(PersistenceState.TRANSIENT);
+    static final Integer HOLLOW_STATE = Integer.valueOf(PersistenceState.HOLLOW);
+    static final Integer COMMITTED_STATE = Integer.valueOf(PersistenceState.COMMITTED);
 
     protected ClassDescriptor superclassDescriptor;
 

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=605850&r1=605849&r2=605850&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:44:30 2007
@@ -311,7 +311,7 @@
                 return new Byte((byte) 0);
             }
             else if ("int".equals(className)) {
-                return new Integer(0);
+                return Integer.valueOf(0);
             }
             else if ("short".equals(className)) {
                 return new Short((short) 0);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/IndexPropertyList.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/IndexPropertyList.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/IndexPropertyList.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/IndexPropertyList.java
Thu Dec 20 01:44:30 2007
@@ -243,7 +243,7 @@
     }
 
     protected void setIndexValue(Object object, int index) {
-        PropertyUtils.setProperty(object, indexProperty, new Integer(index));
+        PropertyUtils.setProperty(object, indexProperty, Integer.valueOf(index));
     }
 
     protected void shift(int startIndex, int afterIndexValue) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOQuery.java?rev=605850&r1=605849&r2=605850&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
Thu Dec 20 01:44:30 2007
@@ -268,20 +268,20 @@
             if (null == selectorToExpressionBridge) {
                 // initialize selectorToExpressionBridge
                 selectorToExpressionBridge = new HashMap(8);
-                selectorToExpressionBridge.put(IS_EQUAL_TO, new Integer(
+                selectorToExpressionBridge.put(IS_EQUAL_TO, Integer.valueOf(
                         Expression.EQUAL_TO));
-                selectorToExpressionBridge.put(IS_NOT_EQUAL_TO, new Integer(
+                selectorToExpressionBridge.put(IS_NOT_EQUAL_TO, Integer.valueOf(
                         Expression.NOT_EQUAL_TO));
-                selectorToExpressionBridge.put(IS_LIKE, new Integer(Expression.LIKE));
-                selectorToExpressionBridge.put(CASE_INSENSITIVE_LIKE, new Integer(
+                selectorToExpressionBridge.put(IS_LIKE, Integer.valueOf(Expression.LIKE));
+                selectorToExpressionBridge.put(CASE_INSENSITIVE_LIKE, Integer.valueOf(
                         Expression.LIKE_IGNORE_CASE));
-                selectorToExpressionBridge.put(IS_LESS_THAN, new Integer(
+                selectorToExpressionBridge.put(IS_LESS_THAN, Integer.valueOf(
                         Expression.LESS_THAN));
-                selectorToExpressionBridge.put(IS_LESS_THAN_OR_EQUAL_TO, new Integer(
+                selectorToExpressionBridge.put(IS_LESS_THAN_OR_EQUAL_TO, Integer.valueOf(
                         Expression.LESS_THAN_EQUAL_TO));
-                selectorToExpressionBridge.put(IS_GREATER_THAN, new Integer(
+                selectorToExpressionBridge.put(IS_GREATER_THAN, Integer.valueOf(
                         Expression.GREATER_THAN));
-                selectorToExpressionBridge.put(IS_GREATER_THAN_OR_EQUAL_TO, new Integer(
+                selectorToExpressionBridge.put(IS_GREATER_THAN_OR_EQUAL_TO, Integer.valueOf(
                         Expression.GREATER_THAN_EQUAL_TO));
             }
             return selectorToExpressionBridge;



Mime
View raw message