Changeset 4671

Timestamp:

2003-06-16T10:01:27+12:00 (21 years ago)

Author:

jmt12

Message:

Reimplemented dialog with more useful messages.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/FileAssociationDialog.java (modified) (13 diffs)

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

@@ -41 +41 @@
 import java.util.*;
 import javax.swing.*;
+import javax.swing.event.*;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.file.FileAssociationManager;
 import org.greenstone.gatherer.gui.GComboBox;
+import org.greenstone.gatherer.gui.ModalDialog;
+import org.greenstone.gatherer.gui.SimpleMenuBar;
 import org.greenstone.gatherer.util.Utility;
 import org.outerj.pollo.util.*;
-import org.greenstone.gatherer.gui.SimpleMenuBar;
-import org.greenstone.gatherer.gui.ModalDialog;
 
 /** The file association allows the entry of new file associations and the modification of existing ones. This is done via a list of known extensions, and two fields to fill out relevant details. 
@@ -80 +81 @@
     static final private Dimension LABEL_SIZE = new Dimension(150, 25);
     /** The default size for the dialog. */
-    static final private Dimension SIZE = new Dimension(600, 175);
+    static final private Dimension SIZE = new Dimension(600, 270);
     /** Create a new file association dialog.
      * @param manager A reference to the <strong>FileAssociationManager</strong> so we can determine what extensions are already associated.
@@ -98 +99 @@
     JPanel content_pane = (JPanel) getContentPane();
     content_pane.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
+    JPanel control_pane = new JPanel();
+    JTextArea instructions_area = new JTextArea(get("Instructions"));
+    instructions_area.setEditable(false);
+    instructions_area.setLineWrap(true);
+    instructions_area.setRows(5);
+    instructions_area.setWrapStyleWord(true);
     JPanel extension_pane = new JPanel();
     extension_pane.setOpaque(false);
@@ -105 +112 @@
     extension.setEditable(true);
     extension.setPreferredSize(LABEL_SIZE);
-    for(Iterator extensions = manager.keySet().iterator(); extensions.hasNext(); ) {
-        extension.add((String)extensions.next());
+    for(int i = 0; i < manager.size(); i++) {
+        extension.add(manager.getExtension(i));
     }
     JPanel command_pane = new JPanel();
@@ -119 +126 @@
     command.setSelectedTextColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
     if(extension.count() > 0) {
-        command.setText(manager.getCommandImmediately((String)extension.get(0)));
+        command.setText(manager.getCommandString((String)extension.get(0)));
     }
     browse = new JButton(get("Browse"));
@@ -134 +141 @@
     cancel.addActionListener(new CancelListener());
     ok.addActionListener(new OKListener());
-    extension.addItemListener(new ExtensionListener());
-    command.addKeyListener(new CommandListener());
+    extension.addActionListener(new ExtensionListener());
+    command.getDocument().addDocumentListener(new CommandListener());
     // Layout
+    extension_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
     extension_pane.setLayout(new BorderLayout());
     extension_pane.add(extension_label, BorderLayout.WEST);
@@ -149 +157 @@
     command_pane.add(command_label);
     command_pane.add(inner_pane);
+
+    control_pane.setLayout(new BorderLayout());
+    control_pane.add(extension_pane, BorderLayout.NORTH);
+    control_pane.add(command_pane, BorderLayout.CENTER);
 
     button_pane.setLayout(new GridLayout(1,2,2,2));
@@ -156 +168 @@
     content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
     content_pane.setLayout(new BorderLayout());
-    content_pane.add(extension_pane, BorderLayout.NORTH);
-    content_pane.add(command_pane, BorderLayout.CENTER);
+    content_pane.add(new JScrollPane(instructions_area), BorderLayout.NORTH);
+    content_pane.add(control_pane, BorderLayout.CENTER);
     content_pane.add(button_pane, BorderLayout.SOUTH);
 
@@ -174 +186 @@
     previous_extension = null;
     }
-    /** Redisplay the dialog, ensuring that the details (or lack thereof) for a certain extension is apparent.
-      * @param new_extension The extension code as a <strong>String</strong>.
-      */
+    /** Redisplay the dialog, ensuring that the details (or lack thereof) for a certain extension is apparent. In fact if an extension is provided force the user to add it or cancel.
+     * @param new_extension The extension code as a <strong>String</strong>.
+     */
     public String display(String new_extension) {
     if(new_extension != null) {
+        ok.setText(get("Add"));
         int index = extension.add(new_extension);
         extension.setSelectedIndex(index);
+        extension.setEnabled(false);
     }
     else {
-
+        ok.setText(get("General.OK"));
+        extension.setEnabled(true);
     }
     setVisible(true);
     if(save_required) {
-        manager.setCommand((String)extension.getSelectedItem(), (String)command.getText());
+        setCommand((String)extension.getSelectedItem(), (String)command.getText(), true);
         save_required = false;
     }
-    if(cancelled) {
+    if(!cancelled) {
+        return setCommand((String)extension.getSelectedItem(), (String)command.getText(), false);
+    }
+    else {
         return null;
     }
-    return command.getText();
     }
 
@@ -206 +223 @@
     return Gatherer.dictionary.get(key, args);
     }    
+
+    private String setCommand(String extension, String command, boolean process) {
+    if(command.indexOf(FileAssociationManager.FILENAME_ARG) == -1) {
+        command = command + " " + FileAssociationManager.FILENAME_ARG;
+    }
+    if(process) {
+        manager.setCommand(extension, command);
+    }
+    return command;
+    }
 
     /** Whenever the user clicks the browse button, we should open up a file browser to allow them to select an executable file from somewhere in the file system. */
@@ -241 +268 @@
     /** If any changes occur to the command field, mark it as needing saving before we can change extensions, or dispose of this dialog (other than cancelling. */
     private class CommandListener
-    extends KeyAdapter {
-    /** Whenever we detect a new character has been typed, note that we need to update this association in the manager. 
-     * @param event A <strong>KeyEvent</strong> containing information about the key typed event.
-            */
-    public void keyTyped(KeyEvent event) {
-        save_required = true;
+    implements DocumentListener {
+    /** Gives notification that an attribute or set of attributes changed. */
+    public void changedUpdate(DocumentEvent e) {
+        save_required = !ignore && true;
+    }
+    /** Gives notification that there was an insert into the document. */
+    public void insertUpdate(DocumentEvent e) {
+        save_required = !ignore && true;
+    }
+          
+    /** Gives notification that a portion of the document has been removed. */
+    public void removeUpdate(DocumentEvent e) {
+        save_required = !ignore && true;
     }
     }
     /** Whenever the user selects an extension, we should fill out the command field with whatever value has been previously entered for the command (if any). */
     private class ExtensionListener
-    implements ItemListener {
+    implements ActionListener {
     /** This method is called whenever the selection in the extension list changes, so that we can save any old details, then load up the information for the new selection.
      * @param event An <strong>ItemEvent</strong> encompassing everything you ever wanted to know about the list selectio, but were afraid to ask.
      * @see org.greenstone.gatherer.file.FileAssociationManager
      */
-    public void itemStateChanged(ItemEvent event) {
+    public void actionPerformed(ActionEvent event) {
         String ext = (String) extension.getSelectedItem();
         if(!ignore && ext != null && ext.length() > 0) {
@@ -262 +296 @@
         // Save the previous extension if necessary
         if(save_required && previous_extension != null) {
-            manager.setCommand(previous_extension, command.getText());
+            setCommand(previous_extension, command.getText(), true);
             save_required = false;
         }
-        previous_extension = manager.getCommandImmediately((String)extension.getSelectedItem());
-        if(previous_extension != null) {
-            command.setText(previous_extension);
-        }
-        else {
-            command.setText("");
-        }
+        command.setText(manager.getCommandString(ext));
+        previous_extension = ext;
         ignore = false;
         }
@@ -284 +313 @@
     public void actionPerformed(ActionEvent event) {
         if(save_required) {
-        manager.setCommand(extension.getSelectedItem().toString(), command.getText());
+        setCommand(extension.getSelectedItem().toString(), command.getText(), true);
         save_required = false;
         }