Changeset 10364

Timestamp:

2005-08-01T11:50:28+12:00 (19 years ago)

Author:

mdewsnip

Message:

Removed the Utility::getWGetPath() function.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (1 diff)
• util/Utility.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -308 +308 @@
         // If the WGet path hasn't been specified by the user, try the Greenstone one
         if (wget_path == null) {
-            File wget_file = new File(Utility.getWGetPath(gsdl_path));
-            if (wget_file.exists()) {
-            wget_path = Utility.getWGetPath(gsdl_path);
+            String wget_file_path = gsdl_path + "bin" + File.separator;
+            if (Utility.isWindows()) {
+            wget_file_path += "windows" + File.separator + "wget.exe";
+            }
+            else if (Utility.isMac()) {
+            wget_file_path += "darwin" + File.separator + "wget";
+            }
+            else {
+            wget_file_path += "linux" + File.separator + "wget";
+            }
+            if (new File(wget_file_path).exists()) {
+            wget_path = wget_file_path;
             }
         }

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -358 +358 @@
 
 
-    /** returns the path to the greenstone version of wget */
-    static public String getWGetPath(String gsdl_path)
-    {
-    if (isWindows()) {
-        return gsdl_path + "bin" + File.separator + "windows" + File.separator + "wget.exe";
-    }
-    else if (isMac()) {
-        return gsdl_path + "bin" + File.separator + "darwin" + File.separator + "wget";
-    }
-    else {
-        return gsdl_path + "bin" + File.separator + "linux" + File.separator + "wget";
-    }
-    }
-
-
     /** Method to determine if the host system is MacOS based.
      * @return a boolean which is true if the platform is MacOS, false otherwise