Changeset 25635 for main/trunk/greenstone3/src/java/org/greenstone/util

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.

Location:

main/trunk/greenstone3/src/java/org/greenstone/util

Files:

• Configuration.java (modified) (6 diffs)
• ScriptReadWrite.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/util/Configuration.java

@@ -42 +42 @@
 public class Configuration {
     
-    static private Hashtable hash = null;
+    static private Hashtable<String, String> hash = null;
 
     /** The first of three patterns used during tokenization, this pattern handles a comma separated list. */
@@ -53 +53 @@
     public Configuration() {
     
-    hash = new Hashtable();
+    hash = new Hashtable<String, String>();
     
     
@@ -76 +76 @@
     /** Retrieve whether the named property is set or not */
     static public boolean get(String property) {
-    String value = (String)hash.get(property);
+    String value = hash.get(property);
     return (value != null && value.equalsIgnoreCase("true"));
     }
@@ -82 +82 @@
     /** Retrieve the value of the named property as a String */
     static public String getString(String property) {
-    return (String)hash.get(property);
+    return hash.get(property);
     }
 
@@ -89 +89 @@
     Locale result = Locale.getDefault();
     try {
-        String raw = (String) hash.get(property);
+        String raw = hash.get(property);
         if (raw==null) {
         return result;
@@ -113 +113 @@
     static public Color getColor(String property) {
     Color result = Color.white; // Default
-    String raw = (String)hash.get(property);
+    String raw = hash.get(property);
     if (raw == null || raw.equals("")) {
         return result;

main/trunk/greenstone3/src/java/org/greenstone/util/ScriptReadWrite.java

@@ -15 +15 @@
     }
 
-    public ArrayList readInFile(File file) {
+    public ArrayList<String> readInFile(File file) {
     try {
-        ArrayList fileLines = new ArrayList();
+        ArrayList<String> fileLines = new ArrayList<String>();
         String oneLine = null;
         BufferedReader bufferedReader = new BufferedReader(new FileReader(file));
@@ -31 +31 @@
     }
 
-    public void writeOutFile(File file, ArrayList fileLines_in) {
+    public void writeOutFile(File file, ArrayList<String> fileLines_in) {
     try {
         PrintWriter printWriter = new PrintWriter(new BufferedWriter(new FileWriter(file)));
@@ -44 +44 @@
     }
 
-    public ArrayList queryReplace(ArrayList fileLines_ex, String param,
+    public ArrayList<String> queryReplace(ArrayList<String> fileLines_ex, String param,
                   String newValue) {
     // only replace existing, don't append if param does not exist
@@ -52 +52 @@
     // if the parameter exists, then a replace is performed, else the parameter-value
     // is appended
-    public ArrayList replaceOrAddLine(ArrayList fileLines_ex, String param, String newValue, 
+    public ArrayList<String> replaceOrAddLine(ArrayList<String> fileLines_ex, String param, String newValue, 
                       boolean replaceElseAdd) 
     {   
@@ -63 +63 @@
 
     for (int i = 0; i < fileLines_ex.size(); i++) {
-        oneLine = ((String) fileLines_ex.get(i)).trim();
+        oneLine = fileLines_ex.get(i).trim();
         // oneLine_length = oneLine.length();
         StringTokenizer st = new StringTokenizer(oneLine, "=");