Changeset 25635 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/DatabaseFactory.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/DatabaseFactory.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/DatabaseFactory.java

@@ -11 +11 @@
 
 public class DatabaseFactory{
-    private static HashMap serverMap = new HashMap();
+    private static HashMap<String, SQLServer> serverMap = new HashMap<String, SQLServer>();
     private static Logger logger = Logger.getLogger(org.greenstone.gsdl3.sql.DatabaseFactory.class.getName());
 
@@ -29 +29 @@
     public static final SQLServer getDatabaseServer(String dbname){
     dbname = properDBName(dbname);
-    if (serverMap.containsKey(dbname)) return (SQLServer) serverMap.get(dbname);
+    if (serverMap.containsKey(dbname)) return serverMap.get(dbname);
     String fullName = "org.greenstone.gsdl3.sql." + dbname.toLowerCase()+ "." + dbname +"SQLServer";
     try {