From 64089cc9f030d8ef7972adb5d117e0b23f47d62b Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 18 May 2006 17:29:21 +0000 Subject: Imported GNU Classpath 0.90 * scripts/makemake.tcl: LocaleData.java moved to gnu/java/locale. * sources.am: Regenerated. * gcj/javaprims.h: Regenerated. * Makefile.in: Regenerated. * gcj/Makefile.in: Regenerated. * include/Makefile.in: Regenerated. * testsuite/Makefile.in: Regenerated. * gnu/java/lang/VMInstrumentationImpl.java: New override. * gnu/java/net/local/LocalSocketImpl.java: Likewise. * gnu/classpath/jdwp/VMMethod.java: Likewise. * gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest interface. * java/lang/Thread.java: Add UncaughtExceptionHandler. * java/lang/reflect/Method.java: Implements GenericDeclaration and isSynthetic(), * java/lang/reflect/Field.java: Likewise. * java/lang/reflect/Constructor.java * java/lang/Class.java: Implements Type, GenericDeclaration, getSimpleName() and getEnclosing*() methods. * java/lang/Class.h: Add new public methods. * java/lang/Math.java: Add signum(), ulp() and log10(). * java/lang/natMath.cc (log10): New function. * java/security/VMSecureRandom.java: New override. * java/util/logging/Logger.java: Updated to latest classpath version. * java/util/logging/LogManager.java: New override. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113887 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/java/sql/Array.java | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'libjava/classpath/java/sql/Array.java') diff --git a/libjava/classpath/java/sql/Array.java b/libjava/classpath/java/sql/Array.java index 51628757885..c3c42d9cb57 100644 --- a/libjava/classpath/java/sql/Array.java +++ b/libjava/classpath/java/sql/Array.java @@ -1,5 +1,5 @@ /* Array.java -- Interface for accessing SQL array object - Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2002, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,7 +50,7 @@ public interface Array * Returns the name of the SQL type of the elements in this * array. This name is database specific. * - * @param The name of the SQL type of the elements in this array. + * @return The name of the SQL type of the elements in this array. * @exception SQLException If an error occurs. */ String getBaseTypeName() throws SQLException; @@ -87,22 +87,22 @@ public interface Array Object getArray(Map map) throws SQLException; /** - * Returns a portion of this array starting at index + * Returns a portion of this array starting at start * into the array and continuing for count * elements. Fewer than the requested number of elements will be * returned if the array does not contain the requested number of elements. * The object returned will be an array of Java objects of * the appropriate types. * - * @param offset The offset into this array to start returning elements from. + * @param start The index into this array to start returning elements from. * @param count The requested number of elements to return. * @return The requested portion of the array. * @exception SQLException If an error occurs. */ - Object getArray(long index, int count) throws SQLException; + Object getArray(long start, int count) throws SQLException; /** - * This method returns a portion of this array starting at index + * This method returns a portion of this array starting at start * into the array and continuing for count * elements. Fewer than the requested number of elements will be * returned if the array does not contain the requested number of elements. @@ -110,13 +110,13 @@ public interface Array * Map will be used for overriding selected SQL type to * Java class mappings. * - * @param offset The offset into this array to start returning elements from. + * @param start The index into this array to start returning elements from. * @param count The requested number of elements to return. * @param map A mapping of SQL types to Java classes. * @return The requested portion of the array. * @exception SQLException If an error occurs. */ - Object getArray(long index, int count, Map map) throws SQLException; + Object getArray(long start, int count, Map map) throws SQLException; /** * Returns the elements in the array as a ResultSet. @@ -147,24 +147,24 @@ public interface Array /** * This method returns a portion of the array as a ResultSet. - * The returned portion will start at index into the + * The returned portion will start at start into the * array and up to count elements will be returned. *

* Each row of the result set will have two columns. The first will be * the index into the array of that row's contents. The second will be * the actual value of that array element. * - * @param offset The index into the array to start returning elements from. - * @param length The requested number of elements to return. + * @param start The index into the array to start returning elements from. + * @param count The requested number of elements to return. * @return The requested elements of this array as a ResultSet. * @exception SQLException If an error occurs. * @see ResultSet */ - ResultSet getResultSet(long index, int count) throws SQLException; + ResultSet getResultSet(long start, int count) throws SQLException; /** * This method returns a portion of the array as a ResultSet. - * The returned portion will start at index into the + * The returned portion will start at start into the * array and up to count elements will be returned. * *

Each row of the result set will have two columns. The first will be @@ -173,13 +173,13 @@ public interface Array * will be used to override selected default mappings of SQL types to * Java classes.

* - * @param offset The index into the array to start returning elements from. - * @param length The requested number of elements to return. + * @param start The index into the array to start returning elements from. + * @param count The requested number of elements to return. * @param map A mapping of SQL types to Java classes. * @return The requested elements of this array as a ResultSet. * @exception SQLException If an error occurs. * @see ResultSet */ - ResultSet getResultSet(long index, int count, Map map) + ResultSet getResultSet(long start, int count, Map map) throws SQLException; } -- cgit v1.2.3