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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSFile.java

@@ -243 +243 @@
      * this is not so good because sites may be on a different computer
      */
-    static public String stylesheetFile(String gsdl3_home, String site_name, String collection, String interface_name, ArrayList base_interfaces, String filename)
+    static public String stylesheetFile(String gsdl3_home, String site_name, String collection, String interface_name, ArrayList<String> base_interfaces, String filename)
     {
 
@@ -281 +281 @@
         for (int i = 0; i < base_interfaces.size(); i++)
         {
-            interface_home = interfaceHome(gsdl3_home, (String) base_interfaces.get(i));
+            interface_home = interfaceHome(gsdl3_home, base_interfaces.get(i));
             stylesheet = new File(interface_home + File.separatorChar + "transform" + File.separatorChar + filename);
             if (stylesheet.exists())
@@ -293 +293 @@
     }
 
-    static public ArrayList<File> getStylesheetFiles(String gsdl3_home, String site_name, String collection, String interface_name, ArrayList base_interfaces, String filename)
+    static public ArrayList<File> getStylesheetFiles(String gsdl3_home, String site_name, String collection, String interface_name, ArrayList<String> base_interfaces, String filename)
     {
         ArrayList<File> stylesheets = new ArrayList<File>();
@@ -328 +328 @@
             for (int i = 0; i < base_interfaces.size(); i++)
             {
-                interface_home = interfaceHome(gsdl3_home, (String) base_interfaces.get(i));
+                interface_home = interfaceHome(gsdl3_home, base_interfaces.get(i));
                 stylesheet = new File(interface_home + File.separatorChar + "transform" + File.separatorChar + filename);
                 if (stylesheet.exists())