aboutsummaryrefslogtreecommitdiff
path: root/src/uk/org/ury/database/DatabaseDriver.java
diff options
context:
space:
mode:
authorMatt Windsor <matt@deling.(none)>2011-03-18 08:28:09 +0000
committerMatt Windsor <matt@deling.(none)>2011-03-18 08:28:09 +0000
commitd547f87da5f68c12dede7c9d45618cae11ff5699 (patch)
tree613aa95d94b363c72ba9a7be639c74f76edf81f8 /src/uk/org/ury/database/DatabaseDriver.java
parentc8bb324e757587e742df0824304144e1eb881cee (diff)
Mega-commit to the rescue! Added Javadoc snapshot (admittedly old); show UI now fixed-layout; UI uses system selection colours for accents; now uses bapsserver password and can thus talk to show database relations; removed member relation dependencies until further notice; attempted to get application and applet launchers working but having issues with the latter; started working on a server communicating via a minimal implementation of HTTP 1.1 (standardisation required eventually).
Diffstat (limited to 'src/uk/org/ury/database/DatabaseDriver.java')
-rw-r--r--src/uk/org/ury/database/DatabaseDriver.java29
1 files changed, 14 insertions, 15 deletions
diff --git a/src/uk/org/ury/database/DatabaseDriver.java b/src/uk/org/ury/database/DatabaseDriver.java
index a7db32e..7c71827 100644
--- a/src/uk/org/ury/database/DatabaseDriver.java
+++ b/src/uk/org/ury/database/DatabaseDriver.java
@@ -35,7 +35,8 @@ public class DatabaseDriver
* Construct a new DatabaseDriver with the given user class.
*
* @param config The config with login details.
- * @param userclass The user class to log in to the database with.
+ *
+ * @param type The user class to log in to the database with.
*
* @throws IllegalArgumentException if the user class is
* not supported (this should not happen).
@@ -49,7 +50,8 @@ public class DatabaseDriver
*/
public
- DatabaseDriver (ConfigReader config, UserClass type) throws MissingCredentialsException, ConnectionFailureException
+ DatabaseDriver (ConfigReader config, UserClass type)
+ throws MissingCredentialsException, ConnectionFailureException
{
try
{
@@ -73,7 +75,8 @@ public class DatabaseDriver
*/
private void
- connect (ConfigReader config, UserClass type) throws SQLException
+ connect (ConfigReader config, UserClass type)
+ throws SQLException
{
if (config == null)
throw new IllegalArgumentException ("Supplied null config.");
@@ -113,23 +116,18 @@ public class DatabaseDriver
* @param fetchSize The maximum number of query rows to return.
*
* @return the JDBC results set.
+ *
+ * @throws SQLException if a SQL error occurs.
*/
public ResultSet
executeQuery (String sql, int fetchSize)
+ throws SQLException
{
- try
- {
- Statement st = conn.createStatement ();
- st.setFetchSize (fetchSize);
+ Statement st = conn.createStatement ();
+ st.setFetchSize (fetchSize);
- return st.executeQuery (sql);
- }
- catch (SQLException e)
- {
- e.printStackTrace ();
- return null;
- }
+ return st.executeQuery (sql);
}
@@ -154,7 +152,8 @@ public class DatabaseDriver
*/
public ResultSet
- executeQuery (String sql, Object[] params, int fetchSize) throws SQLException
+ executeQuery (String sql, Object[] params, int fetchSize)
+ throws SQLException
{
PreparedStatement st = conn.prepareStatement (sql);