some code cleanup. removed unnecessary semikolons, unused vars, etc.

[mir.git] / source / mir / storage / Database.java

diff --git a/source/mir/storage/Database.java b/source/mir/storage/Database.java
index ea6d987..0f886db 100755 (executable)
--- a/source/mir/storage/Database.java
+++ b/source/mir/storage/Database.java
@@ -29,32 +29,52 @@
  */
 package mir.storage;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+
 import mir.config.MirPropertiesConfiguration;
+import mir.entity.AbstractEntity;
 import mir.entity.Entity;
 import mir.entity.EntityList;
 import mir.entity.StorableObjectEntity;
-import mir.entity.AbstractEntity;
 import mir.log.LoggerWrapper;
 import mir.misc.StringUtil;
-import mir.storage.store.*;
+import mir.storage.store.ObjectStore;
+import mir.storage.store.StorableObject;
+import mir.storage.store.StoreContainerType;
+import mir.storage.store.StoreIdentifier;
+import mir.storage.store.StoreUtil;
 import mir.util.JDBCStringRoutines;
 import mircoders.global.MirGlobal;
 
-import java.io.*;
-import java.sql.*;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
 import org.apache.commons.dbcp.DelegatingConnection;
 import org.postgresql.PGConnection;
-import org.postgresql.largeobject.LargeObjectManager;
 import org.postgresql.largeobject.LargeObject;
+import org.postgresql.largeobject.LargeObjectManager;
 
 /**
  * Implements database access.
  *
- * @version $Id: Database.java,v 1.44.2.26 2005/01/23 15:36:03 zapata Exp $
+ * @version $Id: Database.java,v 1.44.2.27 2005/02/10 16:22:33 rhindes Exp $
  * @author rk
  *
  */
@@ -882,7 +902,8 @@ public class Database {
         con.setAutoCommit(true);
       }
       catch (Exception e) {
-        ;
+        
+       
       }
 
       freeConnection(con, pstmt);
@@ -1041,7 +1062,7 @@ public class Database {
         freeConnection(connection, statement);
       }
     }
-  };
+  }
 
   /**
    * Executes 1 sql statement and returns the first result row as a <code>Map</code>s
@@ -1053,8 +1074,7 @@ public class Database {
       try {
         if (resultList.size()>0)
           return (Map) resultList.get(0);
-        else
-          return null;
+                               return null;
       }
       finally {
       }
@@ -1062,7 +1082,7 @@ public class Database {
     catch (Throwable t) {
       throw new StorageObjectFailure(t);
     }
-  };
+  }
 
   /**
    * Executes 1 sql statement and returns the first column of the first result row as a <code>String</code>s
@@ -1077,9 +1097,8 @@ public class Database {
     Iterator i = row.values().iterator();
     if (i.hasNext())
       return (String) i.next();
-    else
-      return null;
-  };
+               return null;
+  }
 
   public int getSize(String where) throws SQLException, StorageObjectFailure {
     return getSize("", null, where);