Changeset 12497

Timestamp:

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

Author:

kjdon

Message:

tidied up a bit: style, command list generation

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/download/ServerInfoDialog.java (modified) (5 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/download/ServerInfoDialog.java

@@ -10 +10 @@
 import org.greenstone.gatherer.cdm.Argument;
 import org.greenstone.gatherer.Configuration;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
+import org.greenstone.gatherer.LocalGreenstone;
 import org.greenstone.gatherer.gui.*;
 import org.greenstone.gatherer.cdm.download.Download;
@@ -17 +19 @@
 public class ServerInfoDialog extends JDialog
 {    
+    static private Dimension SIZE = new Dimension(500, 300);
     private String url;
     private String mode;
     private JPanel info_list_pane;
     private JScrollPane info_scroll_pane;
-    private JDialog me;
+    private JDialog info_dialog;
     private Download download;
     private String proxy_url;
-
+    
     public ServerInfoDialog(String url, String proxy_url, String mode, Download download) {
     super();
@@ -31 +34 @@
         this.download = download;
         this.proxy_url = proxy_url;
+    this.info_dialog = this;
+    
+    this.setSize(SIZE);
 
-    this.setSize(300,400);
-
-    JButton close_button = new GLIButton(Dictionary.get("Download.ServerInformation.close"),Dictionary.get("Download.ServerInformation.close_Tooltip"));
-    close_button.setEnabled(true);
-    close_button.setMnemonic(KeyEvent.VK_C);
- 
-    close_button.addActionListener(new CloseBtnListener());
-
+    JButton close_button = new GLIButton(Dictionary.get("General.Close"),Dictionary.get("General.Close_Tooltip"));
+    close_button.setEnabled(true); 
+    close_button.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent event) {
+            info_dialog.dispose();
+        }
+        });
+    
     JPanel button_pane = new JPanel();
     button_pane.setLayout(new FlowLayout());
@@ -65 +71 @@
     Container main_container = this.getContentPane();
     main_container.add(main_pane);
-    me = this;
+    
+    // Show
+    Dimension screen_size = Configuration.screen_size;
+    setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
+    setVisible(true);
+
     }
 
     private void getServerInfo()
     {
-        String command ="";  
-        if (Utility.isWindows()) {
-              command = "perl -S \"" + Configuration.gsdl_path + "bin" + File.separator + "script" + File.separator + "downloadfrom.pl "+"\"" + " -info -download_mode " + mode + " "; 
-    } 
-    else{
-        command =Configuration.gsdl_path + "bin" + File.separator + "script" + File.separator + "downloadfrom.pl  -info -download_mode " + mode + " "; 
+    ArrayList commands = new ArrayList();
+    if (Utility.isWindows()) {
+        commands.add(Configuration.perl_path);
+        commands.add("-S");
     }
-
+    commands.add(LocalGreenstone.getBinScriptDirectoryPath()+"downloadfrom.pl");
+    commands.add("-info");
+    commands.add("-download_mode");
+    commands.add(mode);
+    
         ArrayList all_arg = download.getArguments(true,false);
-    for(int i = 0; i < all_arg.size(); i++) {
+    for (int i = 0; i < all_arg.size(); i++) {
         Argument argument = (Argument) all_arg.get(i);
         
-        if(argument.isAssigned())
-        {
-                command +="-" + argument.getName()+" ";
-            if(argument.getType() != Argument.FLAG)
-            {
-                command +=argument.getValue()+" ";
-            }
+        if(argument.isAssigned()) {
+        commands.add("-" + argument.getName());
+        if(argument.getType() != Argument.FLAG) {
+            commands.add(argument.getValue());
         }
-     
+        }   
     }
-
-     try {
-          String [] env = null;
-          Process prcs = null; 
-      Runtime rt = Runtime.getRuntime();
+    
+    String[] command = (String[]) commands.toArray(new String[0]);
+    DebugStream.println("Getting server info: "+commands);
+    try {
+        String [] env = null;
+        Process prcs = null; 
+        Runtime rt = Runtime.getRuntime();
       
-         if (Utility.isWindows()) {
+        if (Utility.isWindows()) {
                 prcs = rt.exec(command);   
         }
-        else{
-        //for lunix
+        else {
+        ArrayList env_list = new ArrayList();
         if (proxy_url != null && !proxy_url.equals("")) {           
-            env = new String[4];
                     proxy_url = proxy_url.replaceAll("http://","");
-            env[0] = "http_proxy=http://"+proxy_url;
-            env[1] = "ftp_proxy=ftp://"+proxy_url;
-            env[2] = "GSDLHOME="+Configuration.gsdl_path;
-            env[3] = "GSDLOS="+System.getProperty("os.name");
-            prcs = rt.exec(command,env); 
-        } 
-        else{        
-            env = new String[2];
-         
-            env[0] = "GSDLHOME="+Configuration.gsdl_path;
-            env[1] = "GSDLOS="+System.getProperty("os.name");
-            prcs = rt.exec(command,env); 
-        } 
+            env_list.add("http_proxy=http://"+proxy_url);
+            env_list.add("ftp_proxy=ftp://"+proxy_url);
+        }
+        env_list.add("GSDLHOME="+Configuration.gsdl_path);
+        env_list.add("GSDLOS="+System.getProperty("os.name"));
+        env = (String []) env_list.toArray(new String[0]);
+        prcs = rt.exec(command,env); 
+        
         }
 
-     // System.out.println(command);
-     
-      InputStreamReader isr = new InputStreamReader(prcs.getErrorStream());
+        InputStreamReader isr = new InputStreamReader(prcs.getErrorStream());
         BufferedReader br = new BufferedReader(isr);
         String line;
@@ -133 +137 @@
         info_list_pane.add(a_label);
         }
-    }catch (Exception ioe) {
+        
+    } catch (Exception ioe) {
       
-        }
+    }
     
     }
 
-    private class CloseBtnListener implements ActionListener 
-    {
-    public void actionPerformed(ActionEvent event) 
-    {
-       me.dispose();
-    }
-    }
-
 }