jdk-sandbox: comparison jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java

equal deleted inserted replaced

-:7201f23dae0d
+:39929804f9d4
 Object nullVal[];
 checkParamIndex(parameterIndex);
 nullVal = new Object[2];
 nullVal[0] = null;
-nullVal[1] = new Integer(sqlType);
+nullVal[1] = Integer.valueOf(sqlType);
 if (params == null){
 throw new SQLException("Set initParams() before setNull");
 }
-params.put(new Integer(parameterIndex - 1), nullVal);
+params.put(Integer.valueOf(parameterIndex - 1), nullVal);
 }
 /**
 * Sets the designated parameter to SQL <code>NULL</code>.
 *
 Object nullVal[];
 checkParamIndex(parameterIndex);
 nullVal = new Object[3];
 nullVal[0] = null;
-nullVal[1] = new Integer(sqlType);
+nullVal[1] = Integer.valueOf(sqlType);
 nullVal[2] = typeName;
 if(params == null){
 throw new SQLException("Set initParams() before setNull");
 }
-params.put(new Integer(parameterIndex - 1), nullVal);
+params.put(Integer.valueOf(parameterIndex - 1), nullVal);
 }
 /**
 * Sets the designated parameter to the given <code>boolean</code> in the
 if(params == null){
 throw new SQLException("Set initParams() before setNull");
 }
-params.put(new Integer(parameterIndex - 1), new Boolean(x));
+params.put(Integer.valueOf(parameterIndex - 1), Boolean.valueOf(x));
 }
 /**
 * Sets the designated parameter to the given <code>byte</code> in the Java
 * programming language.  The driver converts this to an SQL
 if(params == null){
 throw new SQLException("Set initParams() before setByte");
 }
-params.put(new Integer(parameterIndex - 1), new Byte(x));
+params.put(Integer.valueOf(parameterIndex - 1), Byte.valueOf(x));
 }
 /**
 * Sets the designated parameter to the given <code>short</code> in the
 * Java programming language.  The driver converts this to an SQL
 if(params == null){
 throw new SQLException("Set initParams() before setShort");
 }
-params.put(new Integer(parameterIndex - 1), new Short(x));
+params.put(Integer.valueOf(parameterIndex - 1), Short.valueOf(x));
 }
 /**
 * Sets the designated parameter to an <code>int</code> in the Java
 * programming language.  The driver converts this to an SQL
 public void setInt(int parameterIndex, int x) throws SQLException {
 checkParamIndex(parameterIndex);
 if(params == null){
 throw new SQLException("Set initParams() before setInt");
 }
-params.put(new Integer(parameterIndex - 1), new Integer(x));
+params.put(Integer.valueOf(parameterIndex - 1), Integer.valueOf(x));
 }
 /**
 * Sets the designated parameter to the given <code>long</code> in the Java
 * programming language.  The driver converts this to an SQL
 public void setLong(int parameterIndex, long x) throws SQLException {
 checkParamIndex(parameterIndex);
 if(params == null){
 throw new SQLException("Set initParams() before setLong");
 }
-params.put(new Integer(parameterIndex - 1), new Long(x));
+params.put(Integer.valueOf(parameterIndex - 1), Long.valueOf(x));
 }
 /**
 * Sets the designated parameter to the given <code>float</code> in the
 * Java programming language.  The driver converts this to an SQL
 public void setFloat(int parameterIndex, float x) throws SQLException {
 checkParamIndex(parameterIndex);
 if(params == null){
 throw new SQLException("Set initParams() before setFloat");
 }
-params.put(new Integer(parameterIndex - 1), new Float(x));
+params.put(Integer.valueOf(parameterIndex - 1), new Float(x));
 }
 /**
 * Sets the designated parameter to the given <code>double</code> in the
 * Java programming language.  The driver converts this to an SQL
 public void setDouble(int parameterIndex, double x) throws SQLException {
 checkParamIndex(parameterIndex);
 if(params == null){
 throw new SQLException("Set initParams() before setDouble");
 }
-params.put(new Integer(parameterIndex - 1), new Double(x));
+params.put(Integer.valueOf(parameterIndex - 1), new Double(x));
 }
 /**
 * Sets the designated parameter to the given
 * <code>java.lang.BigDecimal</code> value.  The driver converts this to
 public void setBigDecimal(int parameterIndex, java.math.BigDecimal x) throws SQLException {
 checkParamIndex(parameterIndex);
 if(params == null){
 throw new SQLException("Set initParams() before setBigDecimal");
 }
-params.put(new Integer(parameterIndex - 1), x);
+params.put(Integer.valueOf(parameterIndex - 1), x);
 }
 /**
 * Sets the designated parameter to the given <code>String</code>
 * value.  The driver converts this to an SQL
 public void setString(int parameterIndex, String x) throws SQLException {
 checkParamIndex(parameterIndex);
 if(params == null){
 throw new SQLException("Set initParams() before setString");
 }
-params.put(new Integer(parameterIndex - 1), x);
+params.put(Integer.valueOf(parameterIndex - 1), x);
 }
 /**
 * Sets the designated parameter to the given array of bytes.
 * The driver converts this to an SQL
 public void setBytes(int parameterIndex, byte x[]) throws SQLException {
 checkParamIndex(parameterIndex);
 if(params == null){
 throw new SQLException("Set initParams() before setBytes");
 }
-params.put(new Integer(parameterIndex - 1), x);
+params.put(Integer.valueOf(parameterIndex - 1), x);
 }
 /**
 * Sets the designated parameter to the given <code>java.sql.Date</code>
 * value. The driver converts this to an SQL
 checkParamIndex(parameterIndex);
 if(params == null){
 throw new SQLException("Set initParams() before setDate");
 }
-params.put(new Integer(parameterIndex - 1), x);
+params.put(Integer.valueOf(parameterIndex - 1), x);
 }
 /**
 * Sets the designated parameter to the given <code>java.sql.Time</code>
 * value.  The driver converts this to an SQL <code>TIME</code> value
 checkParamIndex(parameterIndex);
 if(params == null){
 throw new SQLException("Set initParams() before setTime");
 }
-params.put(new Integer(parameterIndex - 1), x);
+params.put(Integer.valueOf(parameterIndex - 1), x);
 }
 /**
 * Sets the designated parameter to the given
 * <code>java.sql.Timestamp</code> value.
 checkParamIndex(parameterIndex);
 if(params == null){
 throw new SQLException("Set initParams() before setTimestamp");
 }
-params.put(new Integer(parameterIndex - 1), x);
+params.put(Integer.valueOf(parameterIndex - 1), x);
 }
 /**
 * Sets the designated parameter to the given
 * <code>java.io.InputStream</code> object,
 Object asciiStream[];
 checkParamIndex(parameterIndex);
 asciiStream = new Object[3];
 asciiStream[0] = x;
-asciiStream[1] = new Integer(length);
+asciiStream[1] = Integer.valueOf(length);
-asciiStream[2] = new Integer(ASCII_STREAM_PARAM);
+asciiStream[2] = Integer.valueOf(ASCII_STREAM_PARAM);
 if(params == null){
 throw new SQLException("Set initParams() before setAsciiStream");
 }
-params.put(new Integer(parameterIndex - 1), asciiStream);
+params.put(Integer.valueOf(parameterIndex - 1), asciiStream);
 }
 /**
 * Sets the designated parameter in this <code>RowSet</code> object's command
 * to the given input stream.
 Object binaryStream[];
 checkParamIndex(parameterIndex);
 binaryStream = new Object[3];
 binaryStream[0] = x;
-binaryStream[1] = new Integer(length);
+binaryStream[1] = Integer.valueOf(length);
-binaryStream[2] = new Integer(BINARY_STREAM_PARAM);
+binaryStream[2] = Integer.valueOf(BINARY_STREAM_PARAM);
 if(params == null){
 throw new SQLException("Set initParams() before setBinaryStream");
 }
-params.put(new Integer(parameterIndex - 1), binaryStream);
+params.put(Integer.valueOf(parameterIndex - 1), binaryStream);
 }
 /**
 * Sets the designated parameter in this <code>RowSet</code> object's command
 Object unicodeStream[];
 checkParamIndex(parameterIndex);
 unicodeStream = new Object[3];
 unicodeStream[0] = x;
-unicodeStream[1] = new Integer(length);
+unicodeStream[1] = Integer.valueOf(length);
-unicodeStream[2] = new Integer(UNICODE_STREAM_PARAM);
+unicodeStream[2] = Integer.valueOf(UNICODE_STREAM_PARAM);
 if(params == null){
 throw new SQLException("Set initParams() before setUnicodeStream");
 }
-params.put(new Integer(parameterIndex - 1), unicodeStream);
+params.put(Integer.valueOf(parameterIndex - 1), unicodeStream);
 }
 /**
 * Sets the designated parameter to the given <code>java.io.Reader</code>
 * object, which will have the specified number of characters. The
 Object charStream[];
 checkParamIndex(parameterIndex);
 charStream = new Object[2];
 charStream[0] = reader;
-charStream[1] = new Integer(length);
+charStream[1] = Integer.valueOf(length);
 if(params == null){
 throw new SQLException("Set initParams() before setCharacterStream");
 }
-params.put(new Integer(parameterIndex - 1), charStream);
+params.put(Integer.valueOf(parameterIndex - 1), charStream);
 }
 /**
 * Sets the designated parameter in this <code>RowSet</code> object's command
 * to the given <code>Reader</code>
 Object obj[];
 checkParamIndex(parameterIndex);
 obj = new Object[3];
 obj[0] = x;
-obj[1] = new Integer(targetSqlType);
+obj[1] = Integer.valueOf(targetSqlType);
-obj[2] = new Integer(scale);
+obj[2] = Integer.valueOf(scale);
 if(params == null){
 throw new SQLException("Set initParams() before setObject");
 }
-params.put(new Integer(parameterIndex - 1), obj);
+params.put(Integer.valueOf(parameterIndex - 1), obj);
 }
 /**
 * Sets the value of the designated parameter with the given
 * <code>Object</code> value.
 Object obj[];
 checkParamIndex(parameterIndex);
 obj = new Object[2];
 obj[0] = x;
-obj[1] = new Integer(targetSqlType);
+obj[1] = Integer.valueOf(targetSqlType);
 if (params == null){
 throw new SQLException("Set initParams() before setObject");
 }
-params.put(new Integer(parameterIndex - 1), obj);
+params.put(Integer.valueOf(parameterIndex - 1), obj);
 }
 /**
 * Sets the designated parameter to an <code>Object</code> in the Java
 * programming language. The second parameter must be an
 public void setObject(int parameterIndex, Object x) throws SQLException {
 checkParamIndex(parameterIndex);
 if (params == null) {
 throw new SQLException("Set initParams() before setObject");
 }
-params.put(new Integer(parameterIndex - 1), x);
+params.put(Integer.valueOf(parameterIndex - 1), x);
 }
 /**
 * Sets the designated parameter to the given <code>Ref</code> object in
 * the Java programming language.  The driver converts this to an SQL
 public void setRef (int parameterIndex, Ref ref) throws SQLException {
 checkParamIndex(parameterIndex);
 if (params == null) {
 throw new SQLException("Set initParams() before setRef");
 }
-params.put(new Integer(parameterIndex - 1), new SerialRef(ref));
+params.put(Integer.valueOf(parameterIndex - 1), new SerialRef(ref));
 }
 /**
 * Sets the designated parameter to the given <code>Blob</code> object in
 * the Java programming language.  The driver converts this to an SQL
 public void setBlob (int parameterIndex, Blob x) throws SQLException {
 checkParamIndex(parameterIndex);
 if(params == null){
 throw new SQLException("Set initParams() before setBlob");
 }
-params.put(new Integer(parameterIndex - 1), new SerialBlob(x));
+params.put(Integer.valueOf(parameterIndex - 1), new SerialBlob(x));
 }
 /**
 * Sets the designated parameter to the given <code>Clob</code> object in
 * the Java programming language.  The driver converts this to an SQL
 public void setClob (int parameterIndex, Clob x) throws SQLException {
 checkParamIndex(parameterIndex);
 if(params == null){
 throw new SQLException("Set initParams() before setClob");
 }
-params.put(new Integer(parameterIndex - 1), new SerialClob(x));
+params.put(Integer.valueOf(parameterIndex - 1), new SerialClob(x));
 }
 /**
 * Sets the designated parameter to an <code>Array</code> object in the
 * Java programming language.  The driver converts this to an SQL
 public void setArray (int parameterIndex, Array array) throws SQLException {
 checkParamIndex(parameterIndex);
 if (params == null){
 throw new SQLException("Set initParams() before setArray");
 }
-params.put(new Integer(parameterIndex - 1), new SerialArray(array));
+params.put(Integer.valueOf(parameterIndex - 1), new SerialArray(array));
 }
 /**
 * Sets the designated parameter to the given <code>java.sql.Date</code>
 * object.
 date[0] = x;
 date[1] = cal;
 if(params == null){
 throw new SQLException("Set initParams() before setDate");
 }
-params.put(new Integer(parameterIndex - 1), date);
+params.put(Integer.valueOf(parameterIndex - 1), date);
 }
 /**
 * Sets the designated parameter to the given <code>java.sql.Time</code>
 * object.  The driver converts this
 time[0] = x;
 time[1] = cal;
 if(params == null){
 throw new SQLException("Set initParams() before setTime");
 }
-params.put(new Integer(parameterIndex - 1), time);
+params.put(Integer.valueOf(parameterIndex - 1), time);
 }
 /**
 * Sets the designated parameter to the given
 * <code>java.sql.Timestamp</code> object.  The driver converts this
 timestamp[0] = x;
 timestamp[1] = cal;
 if(params == null){
 throw new SQLException("Set initParams() before setTimestamp");
 }
-params.put(new Integer(parameterIndex - 1), timestamp);
+params.put(Integer.valueOf(parameterIndex - 1), timestamp);
 }
 /**
 * Clears all of the current parameter values in this <code>RowSet</code>
 * object's internal representation of the parameters to be set in
 // have been set till the last parameter
 // else throw exception.
 Object[] paramsArray = new Object[params.size()];
 for (int i = 0; i < params.size(); i++) {
-paramsArray[i] = params.get(new Integer(i));
+paramsArray[i] = params.get(Integer.valueOf(i));
 if (paramsArray[i] == null) {
 throw new SQLException("missing parameter: " + (i + 1));
 } //end if
 } //end for
 return paramsArray;

changeset 6697	39929804f9d4
parent 6692	aef4e294026f
child 9257	53e6d7bc31b0