Changeset 9150

Timestamp:

2005-02-23T14:06:11+13:00 (19 years ago)

Author:

kjdon

Message:

moved internal class ResultDialog out form ExportCOllectionPrompt into its own class, SimpleREsultDialog, so can use it for other things.

Location:

trunk/gli/src/org/greenstone/gatherer/gui

Files:

• ExportCollectionPrompt.java (modified) (3 diffs)
• SimpleResultDialog.java (added)

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

@@ -288 +288 @@
     //process.run();
     DebugStream.println("ExportCollectionPrompt.exportCollection().return");
+    
     }
 
@@ -313 +314 @@
         args[1] += "exported_"+cd_title.replaceAll("\\s","");
     }
-    ResultDialog result_dialog = new ResultDialog(success, extra, args);
+    String title;
+    String label;
+    if (success) {
+        title = Dictionary.get("ExportCollectionPrompt.Successful_Title");
+        label = Dictionary.get("ExportCollectionPrompt.Successful_Export", args);
+    } else {
+        title = Dictionary.get("ExportCollectionPrompt.Failed_Title");
+        label = Dictionary.get("ExportCollectionPrompt.Failed_Export", args);
+    }
+    SimpleResultDialog result_dialog = new SimpleResultDialog(title, label, extra);
     result_dialog.setVisible(true); // Blocks
     result_dialog.dispose();
     result_dialog = null;
-    /*
-    if (success) {
-        JOptionPane.showMessageDialog(prompt,Dictionary.get("ExportCollectionPrompt.Successful_Export", args)+"\n\n"+Dictionary.get("ExportCollectionPrompt.Output")+"\n"+extra, Dictionary.get("ExportCollectionPrompt.Successful_Title"),JOptionPane.INFORMATION_MESSAGE);
-    }
-    else {
-        JOptionPane.showMessageDialog(prompt,Dictionary.get("ExportCollectionPrompt.Failed_Export", args)+"\n\n"+Dictionary.get("ExportCollectionPrompt.Output")+"\n"+extra, Dictionary.get("ExportCollectionPrompt.Failed_Title"),JOptionPane.WARNING_MESSAGE);
-    }
-    */
     }
 
@@ -509 +511 @@
     }
 
-    private class ResultDialog
-    extends ModalDialog {
-    
-    private Dimension size = new Dimension(600,300);
-    private ResultDialog self;
-
-    public ResultDialog(boolean success, String extra, String [] args) {
-        super(Gatherer.g_man, Dictionary.get("ExportCollectionPrompt.Successful_Title"), true);
-
-        this.self = this;
-
-        setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
-        setSize(size);
-        
-        JPanel content_pane = (JPanel) getContentPane();
-        JLabel result_label = new JLabel();
-        if(success) {
-        Dictionary.registerText(result_label, "ExportCollectionPrompt.Successful_Export", args);
-        }
-        else {
-        Dictionary.registerText(result_label, "ExportCollectionPrompt.Failed_Export", args);
-        }
-
-        JPanel button_pane = new JPanel();
-        JButton close_button = new GLIButton("Close");
-        close_button.setMnemonic(KeyEvent.VK_C);
-        close_button.addActionListener(new CloseButtonListener());
-
-        JPanel output_pane = new JPanel();
-        JLabel output_label = new JLabel();
-        Dictionary.registerText(output_label, "ExportCollectionPrompt.Output");
-
-        JTextArea output_textarea = new JTextArea(extra);
-        output_textarea.setCaretPosition(0);
-        output_textarea.setEditable(false);
-        output_textarea.setLineWrap(true);
-        output_textarea.setWrapStyleWord(true);
-        
-        button_pane.setLayout(new BorderLayout());
-        button_pane.add(close_button, BorderLayout.EAST);
-
-        output_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
-        output_pane.setLayout(new BorderLayout());
-        output_pane.add(output_label, BorderLayout.NORTH);
-        output_pane.add(new JScrollPane(output_textarea), BorderLayout.CENTER);
-
-        content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-        content_pane.setLayout(new BorderLayout());
-        content_pane.add(result_label, BorderLayout.NORTH);
-        content_pane.add(output_pane, BorderLayout.CENTER);
-        content_pane.add(button_pane, BorderLayout.SOUTH);
-
-        // Position
-        Rectangle frame_bounds = Gatherer.g_man.getBounds();
-        setLocation(frame_bounds.x + (frame_bounds.width - size.width) / 2, frame_bounds.y + (frame_bounds.height - size.height) / 2);
-    }
-
-    private class CloseButtonListener
-        implements ActionListener {
-        public void actionPerformed(ActionEvent event) {
-        self.setVisible(false);
-        }
-    }
-    }
+
 }