Changeset 25635 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/derby/DerbyDBWrapper.java

Timestamp:

2012-05-22T13:01:04+12:00 (12 years ago)

Author:

sjm84

Message:

Fixing Greenstone 3's use (or lack thereof) of generics, this was done automatically so we may want to change it over time. This change will also auto-format any files that have not already been formatted.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/derby/DerbyDBWrapper.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/derby/DerbyDBWrapper.java

@@ -30 +30 @@
     if(sqlState == null) return null;
         String dbInfoState = sqlState.getDBInfoStatement(id);
-        ArrayList result = executeQuery(dbInfoState);
+        ArrayList<HashMap<String, Object>> result = executeQuery(dbInfoState);
     if (result.size() == 0) return null;
     DBInfo info = new DBInfo();
     for(int i=0;  i<result.size();i++){
-        HashMap arow = (HashMap)result.get(i);
+        HashMap arow = result.get(i);
         Iterator ite = arow.keySet().iterator();
         while(ite.hasNext()){
@@ -90 +90 @@
     }
 
-    public synchronized ArrayList executeQuery(String query_statement){
+    public synchronized ArrayList<HashMap<String, Object>> executeQuery(String query_statement){
     //the database hasn't been correct yet
-        ArrayList results = new ArrayList();
+        ArrayList<HashMap<String, Object>> results = new ArrayList<HashMap<String, Object>>();
     ResultSet rs = null;
     try{    
@@ -101 +101 @@
         int numOfColumns = rsmd.getColumnCount();
         while(rs.next()){
-        HashMap arow = new HashMap();
+        HashMap<String, Object> arow = new HashMap<String, Object>();
         for(int i = 1; i <= numOfColumns ; i++){
             arow.put(rsmd.getColumnName(i).toLowerCase(), rs.getObject(i));