12 files changed, 158 insertions, 420 deletions
diff --git a/javax/sql/ConnectionEventListener.java b/javax/sql/ConnectionEventListener.java
index 9358e694d..b71531853 100644
--- a/javax/sql/ConnectionEventListener.java
+++ b/javax/sql/ConnectionEventListener.java
@@ -48,10 +48,10 @@ public interface ConnectionEventListener extends EventListener
   /**
    * @since 1.4
    */
-  public void connectionClosed(ConnectionEvent event);
+  void connectionClosed(ConnectionEvent event);
 
   /**
    * @since 1.4
    */
-  public void connectionErrorOccurred(ConnectionEvent event);
+  void connectionErrorOccurred(ConnectionEvent event);
 }
diff --git a/javax/sql/ConnectionPoolDataSource.java b/javax/sql/ConnectionPoolDataSource.java
index e281840bd..7e70ce77c 100644
--- a/javax/sql/ConnectionPoolDataSource.java
+++ b/javax/sql/ConnectionPoolDataSource.java
@@ -49,31 +49,31 @@ public interface ConnectionPoolDataSource
   /**
    * @since 1.4
    */
-  public PooledConnection getPooledConnection() throws SQLException;
+  PooledConnection getPooledConnection() throws SQLException;
 
   /**
    * @since 1.4
    */
-  public PooledConnection getPooledConnection(String user, String password)
+  PooledConnection getPooledConnection(String user, String password)
     throws SQLException;
 
   /**
    * @since 1.4
    */
-  public PrintWriter getLogWriter() throws SQLException;
+  PrintWriter getLogWriter() throws SQLException;
 
   /**
    * @since 1.4
    */
-  public void setLogWriter(PrintWriter out) throws SQLException;
+  void setLogWriter(PrintWriter out) throws SQLException;
 
   /**
    * @since 1.4
    */
-  public void setLoginTimeout(int seconds) throws SQLException;
+  void setLoginTimeout(int seconds) throws SQLException;
 
   /**
    * @since 1.4
    */
-  public int getLoginTimeout() throws SQLException;
+  int getLoginTimeout() throws SQLException;
 }
diff --git a/javax/sql/DataSource.java b/javax/sql/DataSource.java
index 05f97fd4b..3b6830f3d 100644
--- a/javax/sql/DataSource.java
+++ b/javax/sql/DataSource.java
@@ -50,31 +50,31 @@ public interface DataSource
   /**
    * @since 1.4
    */
-  public Connection getConnection() throws SQLException;
+  Connection getConnection() throws SQLException;
 
   /**
    * @since 1.4
    */
-  public Connection getConnection(String username, String password)
+  Connection getConnection(String username, String password)
     throws SQLException;
 
   /**
    * @since 1.4
    */
-  public PrintWriter getLogWriter() throws SQLException;
+  PrintWriter getLogWriter() throws SQLException;
 
   /**
    * @since 1.4
    */
-  public void setLogWriter(PrintWriter out) throws SQLException;
+  void setLogWriter(PrintWriter out) throws SQLException;
 
   /**
    * @since 1.4
    */
-  public void setLoginTimeout(int seconds) throws SQLException;
+  void setLoginTimeout(int seconds) throws SQLException;
 
   /**
    * @since 1.4
    */
-  public int getLoginTimeout() throws SQLException;
+  int getLoginTimeout() throws SQLException;
 }
diff --git a/javax/sql/PooledConnection.java b/javax/sql/PooledConnection.java
index f76ab8c90..a1281192f 100644
--- a/javax/sql/PooledConnection.java
+++ b/javax/sql/PooledConnection.java
@@ -49,20 +49,20 @@ public interface PooledConnection
   /**
    * @since 1.4
    */
-  public Connection getConnection() throws SQLException;
+  Connection getConnection() throws SQLException;
 
   /**
    * @since 1.4
    */
-  public void close() throws SQLException;
+  void close() throws SQLException;
 
   /**
    * @since 1.4
    */
-  public void addConnectionEventListener(ConnectionEventListener listener);
+  void addConnectionEventListener(ConnectionEventListener listener);
 
   /**
    * @since 1.4
    */
-  public void removeConnectionEventListener(ConnectionEventListener listener);
+  void removeConnectionEventListener(ConnectionEventListener listener);
 }
diff --git a/javax/sql/RowSet.java b/javax/sql/RowSet.java
index f5f7d9b25..085288d6e 100644
--- a/javax/sql/RowSet.java
+++ b/javax/sql/RowSet.java
@@ -58,304 +58,130 @@ import java.util.Map;
  */
 public interface RowSet extends ResultSet 
 {
-  /**
-   * @since 1.4
-   */
-  public String getUrl() throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setUrl(String url) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public String getDataSourceName();
-
-  /**
-   * @since 1.4
-   */
-  public void setDataSourceName(String name) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public String getUsername();
-
-  /**
-   * @since 1.4
-   */
-  public void setUsername(String name) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public String getPassword();
-
-  /**
-   * @since 1.4
-   */
-  public void setPassword(String password) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public int getTransactionIsolation();
-
-  /**
-   * @since 1.4
-   */
-  public void setTransactionIsolation(int level) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public Map getTypeMap() throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setTypeMap(Map map) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public String getCommand();
-
-  /**
-   * @since 1.4
-   */
-  public void setCommand(String cmd) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public boolean isReadOnly();
-
-  /**
-   * @since 1.4
-   */
-  public void setReadOnly(boolean value) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public int getMaxFieldSize() throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setMaxFieldSize(int max) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public int getMaxRows() throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setMaxRows(int max) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public boolean getEscapeProcessing() throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setEscapeProcessing(boolean enable) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public int getQueryTimeout() throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setQueryTimeout(int seconds) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setType(int type) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setConcurrency(int concurrency) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setNull(int parameterIndex, int sqlType) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setNull(int paramIndex, int sqlType, String typeName) throws
+  String getUrl() throws SQLException;
+
+  void setUrl(String url) throws SQLException;
+
+  String getDataSourceName();
+
+  void setDataSourceName(String name) throws SQLException;
+
+  String getUsername();
+
+  void setUsername(String name) throws SQLException;
+
+  String getPassword();
+
+  void setPassword(String password) throws SQLException;
+
+  int getTransactionIsolation();
+
+  void setTransactionIsolation(int level) throws SQLException;
+
+  Map getTypeMap() throws SQLException;
+
+  void setTypeMap(Map map) throws SQLException;
+
+  String getCommand();
+
+  void setCommand(String cmd) throws SQLException;
+
+  boolean isReadOnly();
+
+  void setReadOnly(boolean value) throws SQLException;
+
+  int getMaxFieldSize() throws SQLException;
+
+  void setMaxFieldSize(int max) throws SQLException;
+
+  int getMaxRows() throws SQLException;
+
+  void setMaxRows(int max) throws SQLException;
+
+  boolean getEscapeProcessing() throws SQLException;
+
+  void setEscapeProcessing(boolean enable) throws SQLException;
+
+  int getQueryTimeout() throws SQLException;
+
+  void setQueryTimeout(int seconds) throws SQLException;
+
+  void setType(int type) throws SQLException;
+
+  void setConcurrency(int concurrency) throws SQLException;
+
+  void setNull(int parameterIndex, int sqlType) throws SQLException;
+
+  void setNull(int paramIndex, int sqlType, String typeName) throws
       SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setBoolean(int parameterIndex, boolean x) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setByte(int parameterIndex, byte x) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setShort(int parameterIndex, short x) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setInt(int parameterIndex, int x) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setLong(int parameterIndex, long x) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setFloat(int parameterIndex, float x) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setDouble(int parameterIndex, double x) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setBigDecimal(int parameterIndex, BigDecimal x) throws
+  void setBoolean(int parameterIndex, boolean x) throws SQLException;
+
+  void setByte(int parameterIndex, byte x) throws SQLException;
+
+  void setShort(int parameterIndex, short x) throws SQLException;
+
+  void setInt(int parameterIndex, int x) throws SQLException;
+
+  void setLong(int parameterIndex, long x) throws SQLException;
+
+  void setFloat(int parameterIndex, float x) throws SQLException;
+
+  void setDouble(int parameterIndex, double x) throws SQLException;
+
+  void setBigDecimal(int parameterIndex, BigDecimal x) throws
       SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setString(int parameterIndex, String x) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setBytes(int parameterIndex, byte[] x) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setDate(int parameterIndex, Date x) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setTime(int parameterIndex, Time x) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setTimestamp(int parameterIndex, Timestamp x) throws
+  void setString(int parameterIndex, String x) throws SQLException;
+
+  void setBytes(int parameterIndex, byte[] x) throws SQLException;
+
+  void setDate(int parameterIndex, Date x) throws SQLException;
+
+  void setTime(int parameterIndex, Time x) throws SQLException;
+
+  void setTimestamp(int parameterIndex, Timestamp x) throws
       SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setAsciiStream(int parameterIndex, InputStream x, int length)
+  void setAsciiStream(int parameterIndex, InputStream x, int length)
       throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setBinaryStream(int parameterIndex, InputStream x, int length)
+  void setBinaryStream(int parameterIndex, InputStream x, int length)
       throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setCharacterStream(int parameterIndex, Reader reader, int
+  void setCharacterStream(int parameterIndex, Reader reader, int
       length) throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setObject(int parameterIndex, Object x, int targetSqlType, int
+  void setObject(int parameterIndex, Object x, int targetSqlType, int
       scale) throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setObject(int parameterIndex, Object x, int targetSqlType)
+  void setObject(int parameterIndex, Object x, int targetSqlType)
       throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setObject(int parameterIndex, Object x) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setRef(int i, Ref x) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setBlob(int i, Blob x) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setClob(int i, Clob x) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setArray(int i, Array x) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setDate(int parameterIndex, Date x, Calendar cal) throws
+  void setObject(int parameterIndex, Object x) throws SQLException;
+
+  void setRef(int i, Ref x) throws SQLException;
+
+  void setBlob(int i, Blob x) throws SQLException;
+
+  void setClob(int i, Clob x) throws SQLException;
+
+  void setArray(int i, Array x) throws SQLException;
+
+  void setDate(int parameterIndex, Date x, Calendar cal) throws
       SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setTime(int parameterIndex, Time x, Calendar cal) throws
+  void setTime(int parameterIndex, Time x, Calendar cal) throws
       SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal)
+  void setTimestamp(int parameterIndex, Timestamp x, Calendar cal)
       throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void clearParameters() throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void execute() throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void addRowSetListener(RowSetListener listener);
-
-  /**
-   * @since 1.4
-   */
-  public void removeRowSetListener(RowSetListener listener);
+  void clearParameters() throws SQLException;
+
+  void execute() throws SQLException;
+
+  void addRowSetListener(RowSetListener listener);
+
+  void removeRowSetListener(RowSetListener listener);
 }
diff --git a/javax/sql/RowSetInternal.java b/javax/sql/RowSetInternal.java
index 1fd900bda..8feaa27f9 100644
--- a/javax/sql/RowSetInternal.java
+++ b/javax/sql/RowSetInternal.java
@@ -50,25 +50,25 @@ public interface RowSetInternal
   /**
    * @since 1.4
    */
-  public Object[] getParams() throws SQLException;
+  Object[] getParams() throws SQLException;
 
   /**
    * @since 1.4
    */
-  public Connection getConnection() throws SQLException;
+  Connection getConnection() throws SQLException;
 
   /**
    * @since 1.4
    */
-  public void setMetaData(RowSetMetaData md) throws SQLException;
+  void setMetaData(RowSetMetaData md) throws SQLException;
 
   /**
    * @since 1.4
    */
-  public ResultSet getOriginal() throws SQLException;
+  ResultSet getOriginal() throws SQLException;
 
   /**
    * @since 1.4
    */
-  public ResultSet getOriginalRow() throws SQLException;
+  ResultSet getOriginalRow() throws SQLException;
 }
diff --git a/javax/sql/RowSetListener.java b/javax/sql/RowSetListener.java
index a29623714..6a6e619dd 100644
--- a/javax/sql/RowSetListener.java
+++ b/javax/sql/RowSetListener.java
@@ -45,18 +45,9 @@ import java.util.EventListener;
  */
 public interface RowSetListener extends EventListener 
 {
-  /**
-   * @since 1.4
-   */
-  public void rowSetChanged(RowSetEvent event);
-
-  /**
-   * @since 1.4
-   */
-  public void rowChanged(RowSetEvent event);
-
-  /**
-   * @since 1.4
-   */
-  public void cursorMoved(RowSetEvent event);
+  void rowSetChanged(RowSetEvent event);
+
+  void rowChanged(RowSetEvent event);
+
+  void cursorMoved(RowSetEvent event);
 }
diff --git a/javax/sql/RowSetMetaData.java b/javax/sql/RowSetMetaData.java
index 9e667f6b9..7f7749234 100644
--- a/javax/sql/RowSetMetaData.java
+++ b/javax/sql/RowSetMetaData.java
@@ -46,102 +46,50 @@ import java.sql.SQLException;
  */
 public interface RowSetMetaData extends ResultSetMetaData 
 {
+  void setColumnCount(int columnCount) throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setColumnCount(int columnCount) throws SQLException;
-
-  /**
-   * @since 1.4
-   */
-  public void setAutoIncrement(int columnIndex, boolean property)
+  void setAutoIncrement(int columnIndex, boolean property)
     throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setCaseSensitive(int columnIndex, boolean property)
+  void setCaseSensitive(int columnIndex, boolean property)
     throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setSearchable(int columnIndex, boolean property)
+  void setSearchable(int columnIndex, boolean property)
     throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setCurrency(int columnIndex, boolean property)
+  void setCurrency(int columnIndex, boolean property)
     throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setNullable(int columnIndex, int property) throws SQLException;
+  void setNullable(int columnIndex, int property) throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setSigned(int columnIndex, boolean property)
+  void setSigned(int columnIndex, boolean property)
     throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setColumnDisplaySize(int columnIndex, int size)
+  void setColumnDisplaySize(int columnIndex, int size)
     throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setColumnLabel(int columnIndex, String label)
+  void setColumnLabel(int columnIndex, String label)
     throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setColumnName(int columnIndex, String columnName)
+  void setColumnName(int columnIndex, String columnName)
     throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setSchemaName(int columnIndex, String schemaName)
+  void setSchemaName(int columnIndex, String schemaName)
     throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setPrecision(int columnIndex, int precision)
+  void setPrecision(int columnIndex, int precision)
     throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setScale(int columnIndex, int scale) throws SQLException;
+  void setScale(int columnIndex, int scale) throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setTableName(int columnIndex, String tableName)
+  void setTableName(int columnIndex, String tableName)
     throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setCatalogName(int columnIndex, String catalogName)
+  void setCatalogName(int columnIndex, String catalogName)
     throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setColumnType(int columnIndex, int SQLType) throws SQLException;
+  void setColumnType(int columnIndex, int SQLType) throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setColumnTypeName(int columnIndex, String typeName)
+  void setColumnTypeName(int columnIndex, String typeName)
     throws SQLException;
 }
diff --git a/javax/sql/RowSetReader.java b/javax/sql/RowSetReader.java
index d3000c01c..a5e0f81ff 100644
--- a/javax/sql/RowSetReader.java
+++ b/javax/sql/RowSetReader.java
@@ -45,8 +45,5 @@ import java.sql.SQLException;
  */
 public interface RowSetReader 
 {
-  /**
-   * @since 1.4
-   */
-  public void readData(RowSetInternal caller) throws SQLException;
+  void readData(RowSetInternal caller) throws SQLException;
 }
diff --git a/javax/sql/RowSetWriter.java b/javax/sql/RowSetWriter.java
index 4f5c0c2a7..fe4c1e6a1 100644
--- a/javax/sql/RowSetWriter.java
+++ b/javax/sql/RowSetWriter.java
@@ -45,8 +45,5 @@ import java.sql.SQLException;
  */
 public interface RowSetWriter 
 {
-  /**
-   * @since 1.4
-   */
-  public boolean writeData(RowSetInternal caller) throws SQLException;
+  boolean writeData(RowSetInternal caller) throws SQLException;
 }
diff --git a/javax/sql/XAConnection.java b/javax/sql/XAConnection.java
index 3c28c1740..60b83d74c 100644
--- a/javax/sql/XAConnection.java
+++ b/javax/sql/XAConnection.java
@@ -46,8 +46,5 @@ import javax.transaction.xa.XAResource;
  */
 public interface XAConnection extends PooledConnection 
 {
-  /**
-   * @since 1.4
-   */
-  public XAResource getXAResource() throws SQLException;
+  XAResource getXAResource() throws SQLException;
 }
diff --git a/javax/sql/XADataSource.java b/javax/sql/XADataSource.java
index 1d552ddda..ef55a3280 100644
--- a/javax/sql/XADataSource.java
+++ b/javax/sql/XADataSource.java
@@ -46,34 +46,16 @@ import java.sql.SQLException;
  */
 public interface XADataSource 
 {
-  /**
-   * @since 1.4
-   */
-  public XAConnection getXAConnection() throws SQLException;
+  XAConnection getXAConnection() throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public XAConnection getXAConnection(String user, String password) throws
+  XAConnection getXAConnection(String user, String password) throws
       SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public PrintWriter getLogWriter() throws SQLException;
+  PrintWriter getLogWriter() throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setLogWriter(PrintWriter out) throws SQLException;
+  void setLogWriter(PrintWriter out) throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public void setLoginTimeout(int seconds) throws SQLException;
+  void setLoginTimeout(int seconds) throws SQLException;
 
-  /**
-   * @since 1.4
-   */
-  public int getLoginTimeout() throws SQLException;
+  int getLoginTimeout() throws SQLException;
 }