JDBC indenting, comment cleanups.

15 files changed, 69 insertions, 71 deletions

diff --git a/src/interfaces/jdbc/org/postgresql/test/JDBC2Tests.java b/src/interfaces/jdbc/org/postgresql/test/JDBC2Tests.java
index 2512192c981..88e2438f29d 100644
--- a/src/interfaces/jdbc/org/postgresql/test/JDBC2Tests.java
+++ b/src/interfaces/jdbc/org/postgresql/test/JDBC2Tests.java
@@ -6,12 +6,12 @@ import junit.framework.TestCase;
 import org.postgresql.test.jdbc2.*;
 import java.sql.*;
 
-/**
+/*
  * Executes all known tests for JDBC2 and includes some utility methods.
  */
 public class JDBC2Tests extends TestSuite
 {
-	/**
+	/*
 	 * Returns the Test database JDBC URL
 	 */
 	public static String getURL()
@@ -19,7 +19,7 @@ public class JDBC2Tests extends TestSuite
 		return System.getProperty("database");
 	}
 
-	/**
+	/*
 	 * Returns the Postgresql username
 	 */
 	public static String getUser()
@@ -27,7 +27,7 @@ public class JDBC2Tests extends TestSuite
 		return System.getProperty("username");
 	}
 
-	/**
+	/*
 	 * Returns the user's password
 	 */
 	public static String getPassword()
@@ -35,7 +35,7 @@ public class JDBC2Tests extends TestSuite
 		return System.getProperty("password");
 	}
 
-	/**
+	/*
 	 * Helper - opens a connection.
 	 */
 	public static java.sql.Connection openDB()
@@ -56,7 +56,7 @@ public class JDBC2Tests extends TestSuite
 		return null;
 	}
 
-	/**
+	/*
 	 * Helper - closes an open connection. This rewrites SQLException to a failed
 	 * assertion. It's static so other classes can use it.
 	 */
@@ -73,7 +73,7 @@ public class JDBC2Tests extends TestSuite
 		}
 	}
 
-	/**
+	/*
 	 * Helper - creates a test table for use by a test
 	 */
 	public static void createTable(Connection con,
@@ -102,7 +102,7 @@ public class JDBC2Tests extends TestSuite
 		}
 	}
 
-	/**
+	/*
 	 * Helper - drops a table
 	 */
 	public static void dropTable(Connection con, String table)
@@ -125,7 +125,7 @@ public class JDBC2Tests extends TestSuite
 		}
 	}
 
-	/**
+	/*
 	 * Helper - generates INSERT SQL - very simple
 	 */
 	public static String insertSQL(String table, String values)
@@ -143,7 +143,7 @@ public class JDBC2Tests extends TestSuite
 		return s + " VALUES (" + values + ")";
 	}
 
-	/**
+	/*
 	 * Helper - generates SELECT SQL - very simple
 	 */
 	public static String selectSQL(String table, String columns)
@@ -168,7 +168,7 @@ public class JDBC2Tests extends TestSuite
 		return s;
 	}
 
-	/**
+	/*
 	 * Helper to prefix a number with leading zeros - ugly but it works...
 	 * @param v value to prefix
 	 * @param l number of digits (0-10)
@@ -179,7 +179,7 @@ public class JDBC2Tests extends TestSuite
 		return s.substring(s.length() - l);
 	}
 
-	/**
+	/*
 	 * The main entry point for JUnit
 	 */
 	public static TestSuite suite()
diff --git a/src/interfaces/jdbc/org/postgresql/test/README b/src/interfaces/jdbc/org/postgresql/test/README
index 79113b56434..27abba33769 100644
--- a/src/interfaces/jdbc/org/postgresql/test/README
+++ b/src/interfaces/jdbc/org/postgresql/test/README
@@ -172,7 +172,7 @@ import org.postgresql.test.JDBC2Tests;
 import junit.framework.TestCase;
 import java.sql.*;
 
-/**
+/*
  * Test case for ...
  */
 public class FooTest extends TestCase {
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/ANTTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/ANTTest.java
index 6f61d73eab0..b503ff422b9 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/ANTTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/ANTTest.java
@@ -9,7 +9,7 @@ public class ANTTest extends TestCase
 		super(name);
 	}
 
-	/**
+	/*
 	 * This tests the acceptsURL() method with a couple of good and badly formed
 	 * jdbc urls
 	 */
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/BatchExecuteTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/BatchExecuteTest.java
index 50684926cd7..26229b88560 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/BatchExecuteTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/BatchExecuteTest.java
@@ -5,11 +5,11 @@ import junit.framework.TestCase;
 import java.sql.*;
 
 /* TODO tests that can be added to this test case
-   - SQLExceptions chained to a BatchUpdateException
-   - test PreparedStatement as thoroughly as Statement
+ * - SQLExceptions chained to a BatchUpdateException
+ * - test PreparedStatement as thoroughly as Statement
  */
 
-/**
+/*
  * Test case for Statement.batchExecute()
  */
 public class BatchExecuteTest extends TestCase
@@ -166,8 +166,6 @@ public class BatchExecuteTest extends TestCase
 		pstmt.close();
 	}
 
-	/**
-	*/
 	public void testTransactionalBehaviour() throws Exception
 	{
 		Statement stmt = con.createStatement();
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/BlobTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/BlobTest.java
index 981e6c7dd5b..cd02e801ec7 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/BlobTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/BlobTest.java
@@ -7,8 +7,8 @@ import java.sql.*;
 
 import org.postgresql.largeobject.*;
 
-/**
- * $Id: BlobTest.java,v 1.3 2001/10/25 05:59:59 momjian Exp $
+/*
+ * $Id: BlobTest.java,v 1.4 2001/11/19 22:33:39 momjian Exp $
  *
  * Some simple tests based on problems reported by users. Hopefully these will
  * help prevent previous problems from re-occuring ;-)
@@ -40,7 +40,7 @@ public class BlobTest extends TestCase
 		JDBC2Tests.closeDB(con);
 	}
 
-	/**
+	/*
 	 * Tests one method of uploading a blob to the database
 	 */
 	public void testUploadBlob_LOOP()
@@ -64,7 +64,7 @@ public class BlobTest extends TestCase
 		}
 	}
 
-	/**
+	/*
 	 * Tests one method of uploading a blob to the database
 	 */
 	public void testUploadBlob_NATIVE()
@@ -88,7 +88,7 @@ public class BlobTest extends TestCase
 		}
 	}
 
-	/**
+	/*
 	 * Helper - uploads a file into a blob using old style methods. We use this
 	 * because it always works, and we can use it as a base to test the new
 	 * methods.
@@ -152,7 +152,7 @@ public class BlobTest extends TestCase
 		return oid;
 	}
 
-	/**
+	/*
 	 * Helper - compares the blobs in a table with a local file. Note this alone
 	 * tests the InputStream methods!
 	 */
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/ConnectionTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/ConnectionTest.java
index d8a9e482b16..6db4f412184 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/ConnectionTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/ConnectionTest.java
@@ -4,19 +4,19 @@ import org.postgresql.test.JDBC2Tests;
 import junit.framework.TestCase;
 import java.sql.*;
 
-/**
+/*
  * TestCase to test the internal functionality of org.postgresql.jdbc2.Connection
  * and it's superclass.
  *
  * PS: Do you know how difficult it is to type on a train? ;-)
  *
- * $Id: ConnectionTest.java,v 1.6 2001/10/25 05:59:59 momjian Exp $
+ * $Id: ConnectionTest.java,v 1.7 2001/11/19 22:33:39 momjian Exp $
  */
 
 public class ConnectionTest extends TestCase
 {
 
-	/**
+	/*
 	 * Constructor
 	 */
 	public ConnectionTest(String name)
@@ -46,7 +46,7 @@ public class ConnectionTest extends TestCase
 		JDBC2Tests.closeDB(con);
 	}
 
-	/**
+	/*
 	 * Tests the two forms of createStatement()
 	 */
 	public void testCreateStatement()
@@ -72,7 +72,7 @@ public class ConnectionTest extends TestCase
 		}
 	}
 
-	/**
+	/*
 	 * Tests the two forms of prepareStatement()
 	 */
 	public void testPrepareStatement()
@@ -100,13 +100,13 @@ public class ConnectionTest extends TestCase
 		}
 	}
 
-	/**
+	/*
 	 * Put the test for createPrepareCall here
 	 */
 	public void testPrepareCall()
 	{}
 
-	/**
+	/*
 	 * Test nativeSQL
 	 */
 	public void testNativeSQL()
@@ -114,7 +114,7 @@ public class ConnectionTest extends TestCase
 		// For now do nothing as it returns itself
 	}
 
-	/**
+	/*
 	 * Test autoCommit (both get & set)
 	 */
 	public void testTransactions()
@@ -163,7 +163,7 @@ public class ConnectionTest extends TestCase
 		}
 	}
 
-	/**
+	/*
 	 * Simple test to see if isClosed works.
 	 */
 	public void testIsClosed()
@@ -187,7 +187,7 @@ public class ConnectionTest extends TestCase
 		}
 	}
 
-	/**
+	/*
 	 * Test the warnings system
 	 */
 	public void testWarnings()
@@ -224,7 +224,7 @@ public class ConnectionTest extends TestCase
 		}
 	}
 
-	/**
+	/*
 	 * Transaction Isolation Levels
 	 */
 	public void testTransactionIsolation()
@@ -309,7 +309,7 @@ public class ConnectionTest extends TestCase
 		}
 	}
 
-	/**
+	/*
 	 * JDBC2 Type mappings
 	 */
 	public void testTypeMaps()
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
index 310aad3ca89..440e8d7414b 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
@@ -4,18 +4,18 @@ import org.postgresql.test.JDBC2Tests;
 import junit.framework.TestCase;
 import java.sql.*;
 
-/**
+/*
  * TestCase to test the internal functionality of org.postgresql.jdbc2.DatabaseMetaData
  *
  * PS: Do you know how difficult it is to type on a train? ;-)
  *
- * $Id: DatabaseMetaDataTest.java,v 1.3 2001/10/25 05:59:59 momjian Exp $
+ * $Id: DatabaseMetaDataTest.java,v 1.4 2001/11/19 22:33:39 momjian Exp $
  */
 
 public class DatabaseMetaDataTest extends TestCase
 {
 
-	/**
+	/*
 	 * Constructor
 	 */
 	public DatabaseMetaDataTest(String name)
@@ -23,7 +23,7 @@ public class DatabaseMetaDataTest extends TestCase
 		super(name);
 	}
 
-	/**
+	/*
 	 * The spec says this may return null, but we always do!
 	 */
 	public void testGetMetaData()
@@ -43,7 +43,7 @@ public class DatabaseMetaDataTest extends TestCase
 		}
 	}
 
-	/**
+	/*
 	 * Test default capabilities
 	 */
 	public void testCapabilities()
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/DateTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/DateTest.java
index 3c42c7173e6..300d1549bbd 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/DateTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/DateTest.java
@@ -4,8 +4,8 @@ import org.postgresql.test.JDBC2Tests;
 import junit.framework.TestCase;
 import java.sql.*;
 
-/**
- * $Id: DateTest.java,v 1.3 2001/10/25 05:59:59 momjian Exp $
+/*
+ * $Id: DateTest.java,v 1.4 2001/11/19 22:33:39 momjian Exp $
  *
  * Some simple tests based on problems reported by users. Hopefully these will
  * help prevent previous problems from re-occuring ;-)
@@ -33,7 +33,7 @@ public class DateTest extends TestCase
 		JDBC2Tests.closeDB(con);
 	}
 
-	/**
+	/*
 	 * Tests the time methods in ResultSet
 	 */
 	public void testGetDate()
@@ -59,7 +59,7 @@ public class DateTest extends TestCase
 		}
 	}
 
-	/**
+	/*
 	 * Tests the time methods in PreparedStatement
 	 */
 	public void testSetDate()
@@ -95,7 +95,7 @@ public class DateTest extends TestCase
 		}
 	}
 
-	/**
+	/*
 	 * Helper for the date tests. It tests what should be in the db
 	 */
 	private void dateTest() throws SQLException
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/DriverTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/DriverTest.java
index 5b2b408cc26..f2ec356c5ae 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/DriverTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/DriverTest.java
@@ -4,8 +4,8 @@ import org.postgresql.test.JDBC2Tests;
 import junit.framework.TestCase;
 import java.sql.*;
 
-/**
- * $Id: DriverTest.java,v 1.3 2001/10/25 05:59:59 momjian Exp $
+/*
+ * $Id: DriverTest.java,v 1.4 2001/11/19 22:33:39 momjian Exp $
  *
  * Tests the dynamically created class org.postgresql.Driver
  *
@@ -18,7 +18,7 @@ public class DriverTest extends TestCase
 		super(name);
 	}
 
-	/**
+	/*
 	 * This tests the acceptsURL() method with a couple of good and badly formed
 	 * jdbc urls
 	 */
@@ -49,10 +49,10 @@ public class DriverTest extends TestCase
 		}
 	}
 
-	/**
+	/*
 	 * Tests parseURL (internal)
 	 */
-	/**
+	/*
 	 * Tests the connect method by connecting to the test database
 	 */
 	public void testConnect()
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/EncodingTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/EncodingTest.java
index dbf2aefbe6f..f40bb5eae17 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/EncodingTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/EncodingTest.java
@@ -5,10 +5,10 @@ import junit.framework.*;
 import org.postgresql.core.Encoding;
 import java.io.*;
 
-/**
+/*
  * Tests for the Encoding class.
  *
- * $Id: EncodingTest.java,v 1.3 2001/10/25 05:59:59 momjian Exp $
+ * $Id: EncodingTest.java,v 1.4 2001/11/19 22:33:39 momjian Exp $
  */
 
 
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/JBuilderTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/JBuilderTest.java
index 8cd7af8951a..456a514613e 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/JBuilderTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/JBuilderTest.java
@@ -5,8 +5,8 @@ import junit.framework.TestCase;
 import java.sql.*;
 import java.math.BigDecimal;
 
-/**
- * $Id: JBuilderTest.java,v 1.4 2001/10/25 05:59:59 momjian Exp $
+/*
+ * $Id: JBuilderTest.java,v 1.5 2001/11/19 22:33:39 momjian Exp $
  *
  * Some simple tests to check that the required components needed for JBuilder
  * stay working
@@ -39,7 +39,7 @@ public class JBuilderTest extends TestCase
 		JDBC2Tests.closeDB(con);
 	}
 
-	/**
+	/*
 	 * This tests that Money types work. JDBCExplorer barfs if this fails.
 	 */
 	public void testMoney()
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/MiscTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/MiscTest.java
index 2e4a7e68481..f62a0738b39 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/MiscTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/MiscTest.java
@@ -4,8 +4,8 @@ import org.postgresql.test.JDBC2Tests;
 import junit.framework.TestCase;
 import java.sql.*;
 
-/**
- * $Id: MiscTest.java,v 1.3 2001/10/25 05:59:59 momjian Exp $
+/*
+ * $Id: MiscTest.java,v 1.4 2001/11/19 22:33:39 momjian Exp $
  *
  * Some simple tests based on problems reported by users. Hopefully these will
  * help prevent previous problems from re-occuring ;-)
@@ -19,7 +19,7 @@ public class MiscTest extends TestCase
 		super(name);
 	}
 
-	/**
+	/*
 	 * Some versions of the driver would return rs as a null?
 	 *
 	 * Sasha <ber0806@iperbole.bologna.it> was having this problem.
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/ResultSetTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/ResultSetTest.java
index e4ec7928c95..64a5560eac7 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/ResultSetTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/ResultSetTest.java
@@ -5,7 +5,7 @@ import junit.framework.TestCase;
 import java.io.*;
 import java.sql.*;
 
-/**
+/*
  * ResultSet tests.
  */
 public class ResultSetTest extends TestCase
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/TimeTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/TimeTest.java
index 03f484dad82..88ba63f76aa 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/TimeTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/TimeTest.java
@@ -4,8 +4,8 @@ import org.postgresql.test.JDBC2Tests;
 import junit.framework.TestCase;
 import java.sql.*;
 
-/**
- * $Id: TimeTest.java,v 1.3 2001/10/25 05:59:59 momjian Exp $
+/*
+ * $Id: TimeTest.java,v 1.4 2001/11/19 22:33:39 momjian Exp $
  *
  * Some simple tests based on problems reported by users. Hopefully these will
  * help prevent previous problems from re-occuring ;-)
@@ -33,7 +33,7 @@ public class TimeTest extends TestCase
 		JDBC2Tests.closeDB(con);
 	}
 
-	/**
+	/*
 	 * Tests the time methods in ResultSet
 	 */
 	public void testGetTime()
@@ -57,7 +57,7 @@ public class TimeTest extends TestCase
 		}
 	}
 
-	/**
+	/*
 	 * Tests the time methods in PreparedStatement
 	 */
 	public void testSetTime()
@@ -86,7 +86,7 @@ public class TimeTest extends TestCase
 		}
 	}
 
-	/**
+	/*
 	 * Helper for the TimeTests. It tests what should be in the db
 	 */
 	private void timeTest() throws SQLException
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/TimestampTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/TimestampTest.java
index 4b98ee5c215..f7bf62e6d60 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/TimestampTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/TimestampTest.java
@@ -4,8 +4,8 @@ import org.postgresql.test.JDBC2Tests;
 import junit.framework.TestCase;
 import java.sql.*;
 
-/**
- * $Id: TimestampTest.java,v 1.5 2001/10/25 05:59:59 momjian Exp $
+/*
+ * $Id: TimestampTest.java,v 1.6 2001/11/19 22:33:39 momjian Exp $
  *
  * This has been the most controversial pair of methods since 6.5 was released!
  *
@@ -37,7 +37,7 @@ public class TimestampTest extends TestCase
 		JDBC2Tests.closeDB(con);
 	}
 
-	/**
+	/*
 	 * Tests the time methods in ResultSet
 	 */
 	public void testGetTimestamp()
@@ -69,7 +69,7 @@ public class TimestampTest extends TestCase
 		}
 	}
 
-	/**
+	/*
 	 * Tests the time methods in PreparedStatement
 	 */
 	public void testSetTimestamp()
@@ -102,7 +102,7 @@ public class TimestampTest extends TestCase
 		}
 	}
 
-	/**
+	/*
 	 * Helper for the TimeTests. It tests what should be in the db
 	 */
 	private void timestampTest() throws SQLException