Changeset 12498 for trunk/gli/src/org/greenstone/gatherer/gui

Timestamp:

2006-08-22T15:18:13+12:00 (18 years ago)

Author:

kjdon

Message:

tidied up a bit: style, command list generation, indentation

File:

• trunk/gli/src/org/greenstone/gatherer/gui/DownloadPane.java (modified) (6 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/DownloadPane.java

@@ -49 +49 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.LocalGreenstone;
 import org.greenstone.gatherer.file.WorkspaceTree;
 import org.greenstone.gatherer.util.StaticStrings;
@@ -227 +228 @@
     try {
         if (Gatherer.isGsdlRemote) {
-        String launch  = Gatherer.cgiBase + "launch";
-        launch += "?cmd=downloadinfo.pl";
-        launch += "&xml=&language="+lang;
-        launch += "&plug=" + download_name;
-        
+        StringBuffer launch_str = new StringBuffer();
+        launch_str.append(Gatherer.cgiBase);
+        launch_str.append("launch");
+        launch_str.append("?cmd=downloadinfo.pl&xml=&language=");
+        launch_str.append(lang);
+        launch_str.append("&plug=");
+        launch_str.append(download_name);
+
+        String launch = launch_str.toString();      
         System.err.println("*** launch = " + launch);
         
@@ -239 +244 @@
         }
         else {
+        ArrayList args_list = new ArrayList();
         String args[] = null;
         if(Utility.isWindows()) {
-            args = new String[6];
             if(Configuration.perl_path != null) {
-            args[0] = Configuration.perl_path;
+            args_list.add(Configuration.perl_path);
             }
             else {
-            args[0] = "Perl.exe";
+            args_list.add("Perl.exe");
             }
-            args[1] = Configuration.gsdl_path + "bin" + File.separator + "script" + File.separator + "downloadinfo.pl";
-            args[2] = "-xml";
-            args[3] = "-language";
-            args[4] = lang;
-            args[5] = download_name;
         }
-        else {
-            args = new String[5];
-            args[0] = "downloadinfo.pl";
-            args[1] = "-xml";
-            args[2] = "-language";
-            args[3] = lang;
-            args[4] = download_name;
-        }
-
+        args_list.add(LocalGreenstone.getBinScriptDirectoryPath()+"downloadinfo.pl");
+        args_list.add("-xml");
+        args_list.add("-language");
+        args_list.add(lang);
+        args_list.add(download_name);
+        
         // Create the process.
-
+        args = (String []) args_list.toArray(new String[0]);
         Runtime runtime = Runtime.getRuntime();
+        DebugStream.println("Getting Download Info: "+args_list);
         Process process = runtime.exec(args);
         
@@ -525 +523 @@
     public void actionPerformed(ActionEvent event) {
         
-        if(checkURL(true) && checkProxy() == true)
-        {
-             getter.newDownloadJob((Download)download_map.get(mode) ,mode,proxy_url);
-        }
+        if(checkURL(true) && checkProxy() == true) {
+        
+        getter.newDownloadJob((Download)download_map.get(mode) ,mode,proxy_url);
+        }
     }
     }
@@ -646 +644 @@
 
 
-        if(server_info != null)
-        {
-            server_info.dispose();
-        }
+        if(server_info != null) {
+        server_info.dispose();
+        }
 
        
@@ -655 +652 @@
         String str_url = "";
 
-        if( arg_url!= null && arg_url.isAssigned())
-        {       
-            str_url = arg_url.getValue();
-        }
+        if( arg_url!= null && arg_url.isAssigned()) {
+        str_url = arg_url.getValue();
+        }
 
             
         server_info = new ServerInfoDialog(str_url ,proxy_url, mode,(Download)download_map.get(mode));
-        server_info.setVisible(true);                      
+        
     }
     }