Changeset 13320

Timestamp:

2006-11-24T10:03:34+13:00 (17 years ago)

Author:

shaoqun

Message:

added a browse button for the export directory

File:

• trunk/gli/src/org/greenstone/gatherer/gui/ExportAsPrompt.java (modified) (10 diffs)

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

@@ -114 +114 @@
     private StringBuffer error_message = null;
     /** The size of the export prompt screen. */
-    public static final Dimension SIZE = new Dimension(500, 520);  
+    public static final Dimension SIZE = new Dimension(500, 540);  
     private GDefaultProgressMonitor progress_monitor;    
 
@@ -120 +120 @@
     private JButton convert_xml_button2 = null;
     private JButton convert_xml_button3 = null;
+    private JButton folder_button = null;
 
     private JPanel instructions_pane = null;
@@ -238 +239 @@
     title_field.setToolTipText(Dictionary.get("ExportAsPrompt.Export_Name_Tooltip"));
     title_label = new JLabel(Dictionary.get("ExportAsPrompt.Export_Name"));
+
+        folder_button = new GLIButton(Dictionary.get("ExportAsPrompt.Browse"),Dictionary.get("ExportAsPrompt.Browse_Tooltip"));
+    folder_button.addActionListener(new FolderButtonListener());
+   
     
     scanForCollections();
@@ -301 +306 @@
     title_pane.add(title_label, BorderLayout.WEST);
     title_pane.add(title_field, BorderLayout.CENTER);
+        title_pane.add(folder_button, BorderLayout.EAST);
         //apply xsl pane
           
@@ -342 +348 @@
 
         JPanel tmp_pane = new JPanel(new BorderLayout());
-        tmp_pane.add(saveas_pane, BorderLayout.WEST);
+        tmp_pane.add(saveas_pane, BorderLayout.NORTH);
     tmp_pane.add(title_pane, BorderLayout.CENTER);
 
@@ -407 +413 @@
     if (num_collections == 0) return;
     cd_title = title_field.getText();
-    cd_title = cd_title.trim();
-    cd_title = cd_title.replaceAll("\"", "");
 
     String export_type = (String) saveas_combobox.getSelectedItem();
@@ -427 +431 @@
     command_parts_list.add("-exportdir");
     String export_dir = LocalGreenstone.getTmpDirectoryPath();
-        if (cd_title.equals("")) {
-        export_dir += "exported_" + export_type;
+        if (cd_title.equals("")) {
+            export_dir += "exported_" + export_type;
     }
     else {
-        export_dir += cd_title.replaceAll("\\s", "");
-    }
-    command_parts_list.add(export_dir);
+        File cd_file = new File(cd_title);
+            if (cd_file.isAbsolute())
+        export_dir = cd_title + File.separator + "exported_" + export_type;
+        else{
+                cd_title = cd_title.replaceAll("\\s+","");
+                cd_title = cd_title.replaceAll("\\\\+","/");
+                cd_title = cd_title.replaceAll("/+","/");
+                export_dir +=cd_title;
+        }
+    }
+
+        command_parts_list.add(export_dir);
 
         if (!export_type.equals("METS") && xsl_file1 !=null){
@@ -520 +533 @@
     
     args[0] = coll_names.toString();
-
-    args[1] = LocalGreenstone.getTmpDirectoryPath();
-    if(cd_title.equals("")) {
-        String export_type = (String)saveas_combobox.getSelectedItem();
-        args[1] += "exported_" + export_type;
-    } else {
-        args[1] += "exported_"+cd_title.replaceAll("\\s","");
-    }
+    
+    String export_type = (String) saveas_combobox.getSelectedItem();       
+        args[1] = LocalGreenstone.getTmpDirectoryPath();
+        if (cd_title.equals("")) {
+           args[1] += "exported_" + export_type;
+    }
+    else {
+        File cd_file = new File(cd_title);
+            if (cd_file.isAbsolute())
+        args[1] = cd_title + File.separator + "exported_" + export_type;
+        else{
+                cd_title = cd_title.replaceAll("\\s+","");
+                cd_title = cd_title.replaceAll("\\\\+","/");
+                cd_title = cd_title.replaceAll("/+","/");
+                args[1] +=cd_title;
+        }
+    }
+        
 
     String title;
@@ -877 +900 @@
      }
 
+ private class FolderButtonListener implements ActionListener {
+    public void actionPerformed(ActionEvent event) {
+        JFileChooser chooser = new JFileChooser();
+        chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+       
+        int returnVal = chooser.showOpenDialog(prompt);        
+        
+        if(returnVal == JFileChooser.APPROVE_OPTION) {
+        File folder_name = chooser.getSelectedFile();
+        title_field.setText(folder_name.getPath());
+        }
+        
+    }
+ }
 }
 
@@ -882 +919 @@
 
 
+