Array.java, [...]: Removed redundant modifiers.

2003-10-11  Michael Koch  <konqueror@gmx.de>

	* java/sql/Array.java,
	java/sql/Blob.java,
	java/sql/CallableStatement.java,
	java/sql/Clob.java,
	java/sql/Connection.java,
	java/sql/DatabaseMetaData.java,
	java/sql/Driver.java,
	java/sql/ParameterMetaData.java,
	java/sql/PreparedStatement.java,
	java/sql/Ref.java,
	java/sql/ResultSet.java,
	java/sql/ResultSetMetaData.java,
	java/sql/SQLData.java,
	java/sql/SQLInput.java,
	java/sql/SQLOutput.java,
	java/sql/Savepoint.java,
	java/sql/Statement.java,
	java/sql/Struct.java:
	Removed redundant modifiers.

From-SVN: r72356

libjava/ChangeLog

 2003-10-11  Michael Koch  <konqueror@gmx.de>
 
+	* java/sql/Array.java,
+	java/sql/Blob.java,
+	java/sql/CallableStatement.java,
+	java/sql/Clob.java,
+	java/sql/Connection.java,
+	java/sql/DatabaseMetaData.java,
+	java/sql/Driver.java,
+	java/sql/ParameterMetaData.java,
+	java/sql/PreparedStatement.java,
+	java/sql/Ref.java,
+	java/sql/ResultSet.java,
+	java/sql/ResultSetMetaData.java,
+	java/sql/SQLData.java,
+	java/sql/SQLInput.java,
+	java/sql/SQLOutput.java,
+	java/sql/Savepoint.java,
+	java/sql/Statement.java,
+	java/sql/Struct.java:
+	Removed redundant modifiers.
+
+2003-10-11  Michael Koch  <konqueror@gmx.de>
+
 	* java/nio/channels/Channel.java,
 	java/nio/channels/GatheringByteChannel.java,
 	java/nio/channels/ReadableByteChannel.java,

libjava/java/sql/Array.java

@@ -53,7 +53,7 @@ public interface Array
    * @param The name of the SQL type of the elements in this array.
    * @exception SQLException If an error occurs.
    */
-  public String getBaseTypeName() throws SQLException;
+  String getBaseTypeName() throws SQLException;
 
   /**
    * Returns the JDBC type identifier of the elements in this
@@ -64,7 +64,7 @@ public interface Array
    * @exception SQLException If an error occurs.
    * @see Types
    */
-  public int getBaseType() throws SQLException;
+  int getBaseType() throws SQLException;
 
   /**
    * Returns the contents of this array.  This object returned
@@ -73,7 +73,7 @@ public interface Array
    * @return The contents of the array as an array of Java objects.
    * @exception SQLException If an error occurs.
    */
-  public Object getArray() throws SQLException;
+  Object getArray() throws SQLException;
 
   /**
    * Returns the contents of this array.  The specified
@@ -84,7 +84,7 @@ public interface Array
    * @return The contents of the array as an array of Java objects.
    * @exception SQLException If an error occurs.
    */
-  public Object getArray(Map map) throws SQLException;
+  Object getArray(Map map) throws SQLException;
 
   /**
    * Returns a portion of this array starting at <code>index</code>
@@ -99,7 +99,7 @@ public interface Array
    * @return The requested portion of the array.
    * @exception SQLException If an error occurs.
    */
-  public Object getArray(long index, int count) throws SQLException;
+  Object getArray(long index, int count) throws SQLException;
 
   /**
    * This method returns a portion of this array starting at <code>index</code>
@@ -116,7 +116,7 @@ public interface Array
    * @return The requested portion of the array.
    * @exception SQLException If an error occurs.
    */
-  public Object getArray(long index, int count, Map map) throws SQLException;
+  Object getArray(long index, int count, Map map) throws SQLException;
 
   /**
    * Returns the elements in the array as a <code>ResultSet</code>.
@@ -128,7 +128,7 @@ public interface Array
    * @exception SQLException If an error occurs.
    * @see ResultSet
    */
-  public ResultSet getResultSet() throws SQLException;
+  ResultSet getResultSet() throws SQLException;
 
   /**
    * This method returns the elements in the array as a <code>ResultSet</code>.
@@ -143,7 +143,7 @@ public interface Array
    * @exception SQLException If an error occurs.
    * @see ResultSet
    */
-  public ResultSet getResultSet(Map map) throws SQLException;
+  ResultSet getResultSet(Map map) throws SQLException;
 
   /**
    * This method returns a portion of the array as a <code>ResultSet</code>.
@@ -160,7 +160,7 @@ public interface Array
    * @exception SQLException If an error occurs.
    * @see ResultSet
    */
-  public ResultSet getResultSet(long index, int count) throws SQLException;
+  ResultSet getResultSet(long index, int count) throws SQLException;
   
   /**
    * This method returns a portion of the array as a <code>ResultSet</code>.
@@ -180,6 +180,6 @@ public interface Array
    * @exception SQLException If an error occurs.
    * @see ResultSet
    */  
-  public ResultSet getResultSet(long index, int count, Map map)
+  ResultSet getResultSet(long index, int count, Map map)
     throws SQLException;
 }

libjava/java/sql/Blob.java

@@ -55,7 +55,7 @@ public interface Blob
    * @return The number of bytes in the BLOB.
    * @exception SQLException If an error occurs.
    */
-  public long length() throws SQLException;
+  long length() throws SQLException;
 
   /**
    * This method returns up to the requested bytes of this BLOB as a 
@@ -66,7 +66,7 @@ public interface Blob
    * @return The requested bytes from the BLOB.
    * @exception SQLException If an error occurs.
    */
-  public byte[] getBytes(long pos, int length) throws SQLException;
+  byte[] getBytes(long pos, int length) throws SQLException;
 
   /**
    * This method returns a stream that will read the bytes of the BLOB.
@@ -74,7 +74,7 @@ public interface Blob
    * @return A stream that will read the bytes of the BLOB.
    * @exception SQLException If an error occurs.
    */
-  public InputStream getBinaryStream() throws SQLException;
+  InputStream getBinaryStream() throws SQLException;
 
   /**
    * This method returns the index into the BLOB at which the first instance
@@ -87,7 +87,7 @@ public interface Blob
    *         pattern is not found.
    * @exception SQLException If an error occurs.
    */
-  public long position(byte[] pattern, long start) throws SQLException;
+  long position(byte[] pattern, long start) throws SQLException;
 
   /**
    * This method returns the index into the BLOB at which the first instance
@@ -102,30 +102,30 @@ public interface Blob
    *         pattern is not found.
    * @exception SQLException If an error occurs.
    */
-  public long position(Blob pattern, long start) throws SQLException;
+  long position(Blob pattern, long start) throws SQLException;
 
   /**
    * @exception SQLException If an error occurs.
    * @since 1.4
    */
-  public int setBytes(long pos, byte[] bytes) throws SQLException;
+  int setBytes(long pos, byte[] bytes) throws SQLException;
 
   /**
    * @exception SQLException If an error occurs.
    * @since 1.4
    */
-  public int setBytes(long pos, byte[] bytes, int offset, int len)
+  int setBytes(long pos, byte[] bytes, int offset, int len)
     throws SQLException;
 
   /**
    * @exception SQLException If an error occurs.
    * @since 1.4
    */
-  public OutputStream setBinaryStream(long pos) throws SQLException;
+  OutputStream setBinaryStream(long pos) throws SQLException;
 
   /**
    * @exception SQLException If an error occurs.
    * @since 1.4
    */
-  public void truncate(long len) throws SQLException;
+  void truncate(long len) throws SQLException;
 }

libjava/java/sql/Clob.java

@@ -57,7 +57,7 @@ public interface Clob
   * @exception SQLException If an error occurs.
   * @since 1.2
   */
-  public long length() throws SQLException;
+  long length() throws SQLException;
 
   /**
    * This method returns the specified portion of the CLOB as a 
@@ -70,7 +70,7 @@ public interface Clob
    * @exception SQLException If an error occurs.
    * @since 1.2
    */
-  public String getSubString(long pos, int length) throws SQLException;
+  String getSubString(long pos, int length) throws SQLException;
 
   /**
    * This method returns a character stream that reads the contents of the
@@ -80,7 +80,7 @@ public interface Clob
    * @exception SQLException If an error occurs.
    * @since 1.2
    */
-  public Reader getCharacterStream() throws SQLException;
+  Reader getCharacterStream() throws SQLException;
 
   /**
    * This method returns a byte stream that reads the contents of the
@@ -90,7 +90,7 @@ public interface Clob
    * @exception SQLException If an error occurs.
    * @since 1.2
    */
-  public InputStream getAsciiStream() throws SQLException;
+  InputStream getAsciiStream() throws SQLException;
 
   /**
    * This method returns the index into the CLOB of the first occurrence of
@@ -106,7 +106,7 @@ public interface Clob
    * @exception SQLException If an error occurs.
    * @since 1.2
    */
-  public long position(String searchstr, long start) throws SQLException;
+  long position(String searchstr, long start) throws SQLException;
 
   /**
    * This method returns the index into the CLOB of the first occurrence of
@@ -122,31 +122,31 @@ public interface Clob
    * @exception SQLException If an error occurs.
    * @since 1.2
    */
-  public long position(Clob searchstr, long start) throws SQLException;
+  long position(Clob searchstr, long start) throws SQLException;
 
   /**
    * @since 1.4
    */
-  public int setString(long pos, String str) throws SQLException;
+  int setString(long pos, String str) throws SQLException;
 
   /**
    * @since 1.4
    */
-  public int setString(long pos, String str, int offset, int len)
+  int setString(long pos, String str, int offset, int len)
     throws SQLException;
 
   /**
    * @since 1.4
    */
-  public OutputStream setAsciiStream(long pos) throws SQLException;
+  OutputStream setAsciiStream(long pos) throws SQLException;
 
   /**
    * @since 1.4
    */
-  public Writer setCharacterStream(long pos) throws SQLException;
+  Writer setCharacterStream(long pos) throws SQLException;
 
   /**
    * @since 1.4
    */
-  public void truncate(long len) throws SQLException;
+  void truncate(long len) throws SQLException;
 }

libjava/java/sql/Driver.java

@@ -68,7 +68,7 @@ public interface Driver
    *         connection, or <code>null</code> if the URL is not understood.
    * @exception SQLException If an error occurs.
    */
-  public Connection connect(String url, Properties info) throws SQLException;
+  Connection connect(String url, Properties info) throws SQLException;
 
   /**
    * This method tests whether or not the driver believes it can connect to
@@ -81,9 +81,9 @@ public interface Driver
    *         <code>false</code> otherwise.
    * @exception SQLException If an error occurs.
    */
-  public boolean acceptsURL(String url) throws SQLException;
+  boolean acceptsURL(String url) throws SQLException;
 
-   /**
+  /**
    * This method returns an array of possible properties that could be
    * used to connect to the specified database.
    *
@@ -94,7 +94,7 @@ public interface Driver
    *         database.  This list may be empty.
    * @exception SQLException If an error occurs.
    */
-  public DriverPropertyInfo[] getPropertyInfo(String url, Properties properties)
+  DriverPropertyInfo[] getPropertyInfo(String url, Properties properties)
     throws SQLException;
 
   /**
@@ -102,14 +102,14 @@ public interface Driver
    *
    * @return The major version number of the driver.
    */      
-  public int getMajorVersion();
+  int getMajorVersion();
 
   /**
    * This method returns the minor version number of the driver.
    *
    * @return The minor version number of the driver.
    */
-  public int getMinorVersion();
+  int getMinorVersion();
 
   /**
    * This method tests whether or not the driver is JDBC compliant.  This
@@ -119,5 +119,5 @@ public interface Driver
    * @return <code>true</code> if the driver has been certified JDBC compliant,
    *         <code>false</code> otherwise.
    */
-  public boolean jdbcCompliant();
+  boolean jdbcCompliant();
 }

libjava/java/sql/ParameterMetaData.java

@@ -40,64 +40,64 @@ package java.sql;
 /**
  * @since 1.4
  */
-public interface ParameterMetaData 
+interface ParameterMetaData 
 {
-  public static final int parameterNoNulls = 0;
+  int parameterNoNulls = 0;
 
-  public static final int parameterNullable = 1;
+  int parameterNullable = 1;
 
-  public static final int parameterNullableUnknown = 2;
+  int parameterNullableUnknown = 2;
 
-  public static final int parameterModeUnknown = 0;
+  int parameterModeUnknown = 0;
 
-  public static final int parameterModeIn = 1;
+  int parameterModeIn = 1;
 
-  public static final int parameterModeInOut = 2;
+  int parameterModeInOut = 2;
 
-  public static final int parameterModeOut = 4;
+  int parameterModeOut = 4;
 
   /**
    * @since 1.4
    */
-  public int getParameterCount() throws SQLException;
+  int getParameterCount() throws SQLException;
 
   /**
    * @since 1.4
    */
-  public int isNullable(int param) throws SQLException;
+  int isNullable(int param) throws SQLException;
 
   /**
    * @since 1.4
    */
-  public boolean isSigned(int param) throws SQLException;
+  boolean isSigned(int param) throws SQLException;
 
   /**
    * @since 1.4
    */
-  public int getPrecision(int param) throws SQLException;
+  int getPrecision(int param) throws SQLException;
 
   /**
    * @since 1.4
    */
-  public int getScale(int param) throws SQLException;
+  int getScale(int param) throws SQLException;
 
   /**
    * @since 1.4
    */
-  public int getParameterType(int param) throws SQLException;
+  int getParameterType(int param) throws SQLException;
 
   /**
    * @since 1.4
    */
-  public String getParameterTypeName(int param) throws SQLException;
+  String getParameterTypeName(int param) throws SQLException;
 
   /**
    * @since 1.4
    */
-  public String getParameterClassName(int param) throws SQLException;
+  String getParameterClassName(int param) throws SQLException;
 
   /**
    * @since 1.4
    */
-  public int getParameterMode(int param) throws SQLException;
+  int getParameterMode(int param) throws SQLException;
 }

libjava/java/sql/Ref.java

@@ -46,7 +46,7 @@ import java.util.Map;
  * @author Aaron M. Renn (arenn@urbanophile.com)
  * @since 1.2
  */
-public interface Ref 
+interface Ref 
 {
   /**
    * This method returns the fully qualified name of the SQL structured
@@ -56,20 +56,20 @@ public interface Ref
    * @exception SQLException If an error occurs.
    * @since 1.2
    */
-  public String getBaseTypeName() throws SQLException;
+  String getBaseTypeName() throws SQLException;
 
   /**
    * @since 1.4
    */
-  public Object getObject(Map map) throws SQLException;
+  Object getObject(Map map) throws SQLException;
 
   /**
    * @since 1.4
    */
-  public Object getObject() throws SQLException;
+  Object getObject() throws SQLException;
 
   /**
    * @since 1.4
    */
-  public void setObject(Object value) throws SQLException;
+  void setObject(Object value) throws SQLException;
 }

libjava/java/sql/ResultSetMetaData.java

@@ -51,17 +51,17 @@ public interface ResultSetMetaData
   /**
    * The column does not allow NULL's.
    */
-  public static final int columnNoNulls = 0;
+  int columnNoNulls = 0;
 
   /**
    * The column allows NULL's.
    */
-  public static final int columnNullable = 1;
+  int columnNullable = 1;
 
   /**
    * It is unknown whether or not the column allows NULL's.
    */
-  public static final int columnNullableUnknown = 2;
+  int columnNullableUnknown = 2;
 
   /**
    * This method returns the number of columns in the result set.
@@ -69,7 +69,7 @@ public interface ResultSetMetaData
    * @return The number of columns in the result set.
    * @exception SQLException If an error occurs.
    */
-  public int getColumnCount() throws SQLException;
+  int getColumnCount() throws SQLException;
 
   /**
    * This method test whether or not the column is an auto-increment column.
@@ -80,7 +80,7 @@ public interface ResultSetMetaData
    *         otherwise.
    * @exception SQLException If an error occurs.
    */
-  public boolean isAutoIncrement(int column) throws SQLException;
+  boolean isAutoIncrement(int column) throws SQLException;
 
   /**
    * This method tests whether or not a column is case sensitive in its values.
@@ -90,7 +90,7 @@ public interface ResultSetMetaData
    *         <code>false</code> otherwise.
    * @exception SQLException If an error occurs.
    */
-  public boolean isCaseSensitive(int column) throws SQLException;
+  boolean isCaseSensitive(int column) throws SQLException;
 
   /**
    * This method tests whether not the specified column can be used in 
@@ -101,7 +101,7 @@ public interface ResultSetMetaData
    *         <code>false</code> otherwise.
    * @exception SQLException If an error occurs.
    */
-  public boolean isSearchable(int column) throws SQLException;
+  boolean isSearchable(int column) throws SQLException;
 
   /**
    * This method tests whether or not the column stores a monetary value.
@@ -111,7 +111,7 @@ public interface ResultSetMetaData
    *         <code>false</code> otherwise.
    * @exception SQLException If an error occurs.
    */
-  public boolean isCurrency(int column) throws SQLException;
+  boolean isCurrency(int column) throws SQLException;
 
   /**
    * This method returns a value indicating whether or not the specified
@@ -123,7 +123,7 @@ public interface ResultSetMetaData
    *         <code>columnNullable</code>, or <code>columnNullableUnknown</code>.
    * @exception SQLException If an error occurs.
    */
-  public int isNullable(int column) throws SQLException;
+  int isNullable(int column) throws SQLException;
 
   /**
    * This method tests whether or not the value of the specified column
@@ -134,7 +134,7 @@ public interface ResultSetMetaData
    *         otherwise.
    * @exception SQLException If an error occurs.
    */
-  public boolean isSigned(int column) throws SQLException;
+  boolean isSigned(int column) throws SQLException;
 
   /**
    * This method returns the maximum number of characters that can be used
@@ -145,7 +145,7 @@ public interface ResultSetMetaData
    *         value for this column.
    * @exception SQLException If an error occurs.
    */
-  public int getColumnDisplaySize(int column) throws SQLException;
+  int getColumnDisplaySize(int column) throws SQLException;
 
   /**
    * This method returns a string that should be used as a caption for this
@@ -155,7 +155,7 @@ public interface ResultSetMetaData
    * @return A display string for the column.
    * @exception SQLException If an error occurs.
    */
-  public String getColumnLabel(int column) throws SQLException;
+  String getColumnLabel(int column) throws SQLException;
 
   /**
    * This method returns the name of the specified column.
@@ -164,7 +164,7 @@ public interface ResultSetMetaData
    * @return The name of the column.
    * @exception SQLException If an error occurs.
    */
-  public String getColumnName(int column) throws SQLException;
+  String getColumnName(int column) throws SQLException;
 
   /**
    * This method returns the name of the schema that contains the specified
@@ -174,7 +174,7 @@ public interface ResultSetMetaData
    * @return The name of the schema that contains the column.
    * @exception SQLException If an error occurs.
    */
-  public String getSchemaName(int column) throws SQLException;
+  String getSchemaName(int column) throws SQLException;
 
   /**
    * This method returns the precision of the specified column, which is the
@@ -184,7 +184,7 @@ public interface ResultSetMetaData
    * @return The precision of the specified column.
    * @exception SQLException If an error occurs.
    */
-  public int getPrecision(int column) throws SQLException;
+  int getPrecision(int column) throws SQLException;
 
   /**
    * This method returns the scale of the specified column, which is the
@@ -194,7 +194,7 @@ public interface ResultSetMetaData
    * @return The scale of the column.
    * @exception SQLException If an error occurs.
    */
-  public int getScale(int column) throws SQLException;
+  int getScale(int column) throws SQLException;
 
   /**
    * This method returns the name of the table containing the specified
@@ -204,7 +204,7 @@ public interface ResultSetMetaData
    * @return The name of the table containing the column.
    * @exception SQLException If an error occurs.
    */
-  public String getTableName(int column) throws SQLException;
+  String getTableName(int column) throws SQLException;
 
   /**
    * This method returns the name of the catalog containing the specified
@@ -214,7 +214,7 @@ public interface ResultSetMetaData
    * @return The name of the catalog containing the column.
    * @exception SQLException If an error occurs.
    */
-  public String getCatalogName(int column) throws SQLException;
+  String getCatalogName(int column) throws SQLException;
 
   /**
    * This method returns the SQL type of the specified column.  This will
@@ -225,7 +225,7 @@ public interface ResultSetMetaData
    * @exception SQLException If an error occurs.
    * @see Types
    */
-  public int getColumnType(int column) throws SQLException;
+  int getColumnType(int column) throws SQLException;
 
   /**
    * This method returns the name of the SQL type for this column.
@@ -234,7 +234,7 @@ public interface ResultSetMetaData
    * @return The name of the SQL type for this column.
    * @exception SQLException If an error occurs.
    */
-  public String getColumnTypeName(int column) throws SQLException;
+  String getColumnTypeName(int column) throws SQLException;
 
   /**
    * This method tests whether or not the specified column is read only.
@@ -244,7 +244,7 @@ public interface ResultSetMetaData
    *         otherwise.
    * @exception SQLException If an error occurs.
    */
-  public boolean isReadOnly(int column) throws SQLException;
+  boolean isReadOnly(int column) throws SQLException;
 
   /**
    * This method tests whether or not the column may be writable.  This
@@ -255,7 +255,7 @@ public interface ResultSetMetaData
    *         <code>false</code> otherwise.
    * @exception SQLException If an error occurs.
    */
-  public boolean isWritable(int column) throws SQLException;
+  boolean isWritable(int column) throws SQLException;
 
   /**
    * This method tests whether or not the column is writable.  This
@@ -266,7 +266,7 @@ public interface ResultSetMetaData
    *         <code>false</code> otherwise.
    * @exception SQLException If an error occurs.
    */
-  public boolean isDefinitelyWritable(int column) throws SQLException;
+  boolean isDefinitelyWritable(int column) throws SQLException;
 
   /**
    * This method returns the name of the Java class which will be used to
@@ -277,5 +277,5 @@ public interface ResultSetMetaData
    *         this column.
    * @exception SQLException If an error occurs.
    */
-  public String getColumnClassName(int column) throws SQLException;
+  String getColumnClassName(int column) throws SQLException;
 }

libjava/java/sql/SQLData.java

@@ -51,7 +51,7 @@ public interface SQLData
    * @return The user defined data type name for this object.
    * @exception SQLException If an error occurs.
    */
-  public String getSQLTypeName() throws SQLException;
+  String getSQLTypeName() throws SQLException;
 
   /**
    * This method populates the data in the object from the specified stream.
@@ -60,7 +60,7 @@ public interface SQLData
    * @param name The data type name of the data on the stream.
    * @exception SQLException If an error occurs.
    */
-  public void readSQL(SQLInput stream, String typeName) throws SQLException;
+  void readSQL(SQLInput stream, String typeName) throws SQLException;
 
   /**
    * This method writes the data in this object to the specified stream.
@@ -68,5 +68,5 @@ public interface SQLData
    * @param stream The stream to write the data to.
    * @exception SQLException If an error occurs.
    */
-  public void writeSQL(SQLOutput stream) throws SQLException;
+  void writeSQL(SQLOutput stream) throws SQLException;
 }

libjava/java/sql/SQLInput.java

@@ -59,7 +59,7 @@ public interface SQLInput
    * @return The value read from the stream as a <code>String</code>.
    * @exception SQLException If an error occurs.
    */
-  public String readString() throws SQLException;
+  String readString() throws SQLException;
 
   /**
    * This method reads the next item from the stream a Java
@@ -68,7 +68,7 @@ public interface SQLInput
    * @return The value read from the stream as a <code>boolean</code>.
    * @exception SQLException If an error occurs.
    */
-  public boolean readBoolean() throws SQLException;
+  boolean readBoolean() throws SQLException;
 
   /**
    * This method reads the next item from the stream a Java
@@ -77,7 +77,7 @@ public interface SQLInput
    * @return The value read from the stream as a <code>byte</code>.
    * @exception SQLException If an error occurs.
    */
-  public byte readByte() throws SQLException;
+  byte readByte() throws SQLException;
 
   /**
    * This method reads the next item from the stream a Java
@@ -86,7 +86,7 @@ public interface SQLInput
    * @return The value read from the stream as a <code>short</code>.
    * @exception SQLException If an error occurs.
    */
-  public short readShort() throws SQLException;
+  short readShort() throws SQLException;
 
   /**
    * This method reads the next item from the stream a Java
@@ -95,7 +95,7 @@ public interface SQLInput
    * @return The value read from the stream as an <code>int</code>.
    * @exception SQLException If an error occurs.
    */
-  public int readInt() throws SQLException;
+  int readInt() throws SQLException;
 
   /**
    * This method reads the next item from the stream a Java
@@ -104,7 +104,7 @@ public interface SQLInput
    * @return The value read from the stream as a <code>long</code>.
    * @exception SQLException If an error occurs.
    */
-  public long readLong() throws SQLException;
+  long readLong() throws SQLException;
 
   /**
    * This method reads the next item from the stream a Java
@@ -113,7 +113,7 @@ public interface SQLInput
    * @return The value read from the stream as a <code>float</code>.
    * @exception SQLException If an error occurs.
    */
-  public float readFloat() throws SQLException;
+  float readFloat() throws SQLException;
 
   /**
    * This method reads the next item from the stream a Java
@@ -122,7 +122,7 @@ public interface SQLInput
    * @return The value read from the stream as a <code>double</code>.
    * @exception SQLException If an error occurs.
    */
-  public double readDouble() throws SQLException;
+  double readDouble() throws SQLException;
 
   /**
    * This method reads the next item from the stream a Java
@@ -131,7 +131,7 @@ public interface SQLInput
    * @return The value read from the stream as a <code>BigDecimal</code>.
    * @exception SQLException If an error occurs.
    */
-  public BigDecimal readBigDecimal() throws SQLException;
+  BigDecimal readBigDecimal() throws SQLException;
 
   /**
    * This method reads the next item from the stream a Java
@@ -140,7 +140,7 @@ public interface SQLInput
    * @return The value read from the stream as a byte array. 
    * @exception SQLException If an error occurs.
    */
-  public byte[] readBytes() throws SQLException;
+  byte[] readBytes() throws SQLException;
 
   /**
    * This method reads the next item from the stream a Java
@@ -149,7 +149,7 @@ public interface SQLInput
    * @return The value read from the stream as a <code>java.sql.Date</code>.
    * @exception SQLException If an error occurs.
    */
-  public Date readDate() throws SQLException;
+  Date readDate() throws SQLException;
 
   /**
    * This method reads the next item from the stream a Java
@@ -158,7 +158,7 @@ public interface SQLInput
    * @return The value read from the stream as a <code>java.sql.Time</code>.
    * @exception SQLException If an error occurs.
    */
-  public Time readTime() throws SQLException;
+  Time readTime() throws SQLException;
 
   /**
    * This method reads the next item from the stream a Java
@@ -167,7 +167,7 @@ public interface SQLInput
    * @return The value read from the stream as a <code>java.sql.Timestamp</code>.
    * @exception SQLException If an error occurs.
    */
-  public Timestamp readTimestamp() throws SQLException;
+  Timestamp readTimestamp() throws SQLException;
 
   /**
    * This method reads the next item from the stream a character
@@ -176,7 +176,7 @@ public interface SQLInput
    * @return The value read from the stream as a <code>Reader</code>.
    * @exception SQLException If an error occurs.
    */
-  public Reader readCharacterStream() throws SQLException;
+  Reader readCharacterStream() throws SQLException;
 
   /**
    * This method reads the next item from the stream a ASCII text
@@ -185,7 +185,7 @@ public interface SQLInput
    * @return The value read from the stream as an <code>InputStream</code>.
    * @exception SQLException If an error occurs.
    */
-  public InputStream readAsciiStream() throws SQLException;
+  InputStream readAsciiStream() throws SQLException;
 
   /**
    * This method reads the next item from the stream a binary
@@ -194,7 +194,7 @@ public interface SQLInput
    * @return The value read from the stream as an <code>InputStream</code>.
    * @exception SQLException If an error occurs.
    */
-  public InputStream readBinaryStream() throws SQLException;
+  InputStream readBinaryStream() throws SQLException;
 
   /**
    * This method reads the next item from the stream a Java
@@ -203,7 +203,7 @@ public interface SQLInput
    * @return The value read from the stream as an <code>Object</code>.
    * @exception SQLException If an error occurs.
    */
-  public Object readObject() throws SQLException;
+  Object readObject() throws SQLException;
 
   /**
    * This method reads the next item from the stream a Java SQL
@@ -212,7 +212,7 @@ public interface SQLInput
    * @return The value read from the stream as an <code>Ref</code>.
    * @exception SQLException If an error occurs.
    */
-  public Ref readRef() throws SQLException;
+  Ref readRef() throws SQLException;
 
   /**
    * This method reads the next item from the stream a Java SQL
@@ -221,7 +221,7 @@ public interface SQLInput
    * @return The value read from the stream as a <code>Blob</code>.
    * @exception SQLException If an error occurs.
    */
-  public Blob readBlob() throws SQLException;
+  Blob readBlob() throws SQLException;
 
   /**
    * This method reads the next item from the stream a Java SQL
@@ -230,7 +230,7 @@ public interface SQLInput
    * @return The value read from the stream as a <code>Clob</code>.
    * @exception SQLException If an error occurs.
    */
-  public Clob readClob() throws SQLException;
+  Clob readClob() throws SQLException;
 
   /**
    * This method reads the next item from the stream a Java SQL
@@ -239,7 +239,7 @@ public interface SQLInput
    * @return The value read from the stream as an <code>Array</code>.
    * @exception SQLException If an error occurs.
    */
-  public Array readArray() throws SQLException;
+  Array readArray() throws SQLException;
 
   /**
    * This method tests whether or not the last value read was a SQL
@@ -249,11 +249,11 @@ public interface SQLInput
    *         <code>false</code> otherwise.
    * @exception SQLException If an error occurs.
    */
-  public boolean wasNull() throws SQLException;
+  boolean wasNull() throws SQLException;
 
   /**
    * @since 1.4
    */
-  public URL readURL() throws SQLException;
+  URL readURL() throws SQLException;
 }
 

libjava/java/sql/SQLOutput.java

@@ -59,7 +59,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeString(String x) throws SQLException;
+  void writeString(String x) throws SQLException;
 
   /**
    * This method writes the specified Java <code>boolean</code>
@@ -68,7 +68,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeBoolean(boolean x) throws SQLException;
+  void writeBoolean(boolean x) throws SQLException;
 
   /**
    * This method writes the specified Java <code>byte</code>
@@ -77,7 +77,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeByte(byte x) throws SQLException;
+  void writeByte(byte x) throws SQLException;
 
   /**
    * This method writes the specified Java <code>short</code>
@@ -86,7 +86,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeShort(short x) throws SQLException;
+  void writeShort(short x) throws SQLException;
 
   /**
    * This method writes the specified Java <code>int</code>
@@ -95,7 +95,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeInt(int x) throws SQLException;
+  void writeInt(int x) throws SQLException;
 
   /**
    * This method writes the specified Java <code>long</code>
@@ -104,7 +104,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeLong(long x) throws SQLException;
+  void writeLong(long x) throws SQLException;
 
   /**
    * This method writes the specified Java <code>float</code>
@@ -113,7 +113,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeFloat(float x) throws SQLException;
+  void writeFloat(float x) throws SQLException;
 
   /**
    * This method writes the specified Java <code>double</code>
@@ -122,7 +122,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeDouble(double x) throws SQLException;
+  void writeDouble(double x) throws SQLException;
 
   /**
    * This method writes the specified Java <code>BigDecimal</code>
@@ -131,7 +131,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeBigDecimal(BigDecimal x) throws SQLException;
+  void writeBigDecimal(BigDecimal x) throws SQLException;
 
   /**
    * This method writes the specified Java <code>byte</code> array
@@ -140,7 +140,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeBytes(byte[] x) throws SQLException;
+  void writeBytes(byte[] x) throws SQLException;
 
   /**
    * This method writes the specified Java <code>java.sql.Date</code> 
@@ -149,7 +149,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeDate(Date x) throws SQLException;
+  void writeDate(Date x) throws SQLException;
 
   /**
    * This method writes the specified Java <code>java.sql.Time</code> 
@@ -158,7 +158,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeTime(Time x) throws SQLException;
+  void writeTime(Time x) throws SQLException;
 
   /**
    * This method writes the specified Java <code>java.sql.Timestamp</code> 
@@ -167,7 +167,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeTimestamp(Timestamp x) throws SQLException;
+  void writeTimestamp(Timestamp x) throws SQLException;
 
   /**
    * This method writes the specified Java character stream
@@ -176,7 +176,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeCharacterStream(Reader x) throws SQLException;
+  void writeCharacterStream(Reader x) throws SQLException;
 
   /**
    * This method writes the specified ASCII text stream
@@ -185,7 +185,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeAsciiStream(InputStream x) throws SQLException;
+  void writeAsciiStream(InputStream x) throws SQLException;
 
   /**
    * This method writes the specified uninterpreted binary byte stream
@@ -194,7 +194,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeBinaryStream(InputStream x) throws SQLException;
+  void writeBinaryStream(InputStream x) throws SQLException;
 
   /**
    * This method writes the specified Java <code>SQLData</code> object
@@ -203,7 +203,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeObject(SQLData x) throws SQLException;
+  void writeObject(SQLData x) throws SQLException;
 
   /**
    * This method writes the specified Java SQL <code>Ref</code> object
@@ -212,7 +212,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeRef(Ref x) throws SQLException;
+  void writeRef(Ref x) throws SQLException;
 
   /**
    * This method writes the specified Java SQL <code>Blob</code> object
@@ -221,7 +221,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeBlob(Blob x) throws SQLException;
+  void writeBlob(Blob x) throws SQLException;
 
   /**
    * This method writes the specified Java SQL <code>Clob</code> object
@@ -230,7 +230,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeClob(Clob x) throws SQLException;
+  void writeClob(Clob x) throws SQLException;
 
   /**
    * This method writes the specified Java SQL <code>Struct</code> object
@@ -239,7 +239,7 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeStruct(Struct x) throws SQLException;
+  void writeStruct(Struct x) throws SQLException;
 
   /**
    * This method writes the specified Java SQL <code>Array</code> object
@@ -248,10 +248,10 @@ public interface SQLOutput
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    */
-  public void writeArray(Array x) throws SQLException;
+  void writeArray(Array x) throws SQLException;
 
   /**
    * @since 1.4
    */
-  public void writeURL(URL x) throws SQLException;
+  void writeURL(URL x) throws SQLException;
 }

libjava/java/sql/Savepoint.java

@@ -46,10 +46,10 @@ public interface Savepoint
   /**
    * @since 1.4
    */
-  public int getSavepointId() throws SQLException;
+  int getSavepointId() throws SQLException;
 
   /**
    * @since 1.4
    */
-  public String getSavepointName() throws SQLException;
+  String getSavepointName() throws SQLException;
 }

libjava/java/sql/Struct.java

@@ -55,7 +55,7 @@ public interface Struct
    * @return The SQL structured type name.
    * @exception SQLException If an error occurs.
    */
-  public String getSQLTypeName() throws SQLException;
+  String getSQLTypeName() throws SQLException;
 
   /**
    * This method returns the attributes of this SQL structured type.
@@ -63,7 +63,7 @@ public interface Struct
    * @return The attributes of this structure type.
    * @exception SQLException If an error occurs.
    */
-  public Object[] getAttributes() throws SQLException;
+  Object[] getAttributes() throws SQLException;
 
   /**
    * This method returns the attributes of this SQL structured type.
@@ -73,5 +73,5 @@ public interface Struct
    * @return The attributes of this structure type.
    * @exception SQLException If a error occurs.
    */
-  public Object[] getAttributes(Map map) throws SQLException;
+  Object[] getAttributes(Map map) throws SQLException;
 }