Changeset 25635 for main/trunk/greenstone3/src/java/org/greenstone/server/Server2.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/server/Server2.java (modified) (6 diffs)

main/trunk/greenstone3/src/java/org/greenstone/server/Server2.java

@@ -83 +83 @@
                     config_properties.setProperty(url, URL_PENDING);
                     ScriptReadWrite scriptReadWrite = new ScriptReadWrite();
-                    ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
+                    ArrayList<String> fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
                     scriptReadWrite.replaceOrAddLine(fileLines, url, URL_PENDING, true);
                     scriptReadWrite.writeOutFile(config_properties_file, fileLines);
@@ -160 +160 @@
         String hosts = inetAddress.getHostName();
         ScriptReadWrite scriptReadWrite = new ScriptReadWrite();
-        ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
+        ArrayList<String> fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
         scriptReadWrite.replaceOrAddLine(fileLines, "hosts", hosts, true);
         scriptReadWrite.writeOutFile(config_properties_file, fileLines);
@@ -175 +175 @@
         config_properties.setProperty(url, URL_PENDING);
         ScriptReadWrite scriptReadWrite = new ScriptReadWrite();
-        ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
+        ArrayList<String> fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
         scriptReadWrite.replaceOrAddLine(fileLines, url, URL_PENDING, true);
         scriptReadWrite.writeOutFile(config_properties_file, fileLines);
@@ -355 +355 @@
             // write this updated port to the config file, since the configure target uses the file to run
             ScriptReadWrite scriptReadWrite = new ScriptReadWrite();
-            ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
+            ArrayList<String> fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
             scriptReadWrite.replaceOrAddLine(fileLines, "portnumber", port, false); // write the correct port
             scriptReadWrite.writeOutFile(config_properties_file, fileLines);
@@ -377 +377 @@
     protected void preStop() {
     ScriptReadWrite scriptReadWrite = new ScriptReadWrite();
-    ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
+    ArrayList<String> fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
 
     // Remove the url=... line, start searching from the end
     boolean done = false;
     for (int i = fileLines.size()-1; i >= 0 && !done; i--) {
-        String line = ((String) fileLines.get(i)).trim();
+        String line = fileLines.get(i).trim();
         if(line.startsWith(property_prefix+"url=")) {
         fileLines.remove(i);
@@ -437 +437 @@
 
     ScriptReadWrite scriptReadWrite = new ScriptReadWrite();
-    ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
+    ArrayList<String> fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
     scriptReadWrite.replaceOrAddLine(fileLines, property_prefix+"url", libraryURL, true);
     scriptReadWrite.replaceOrAddLine(fileLines, "portnumber", port, false); // write the correct port