Changeset 13393

Timestamp:

2006-12-01T12:21:13+13:00 (17 years ago)

Author:

mdewsnip

Message:

Removed the "Browse" button from the Open collection dialog (as opening collections outside the Greenstone collect directory doesn't work at all), and renamed the SimpleOpenCollectionDialog to OpenCollectionDialog.

Location:

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

Files:

• GUIManager.java (modified) (1 diff)
• OpenCollectionDialog.java (modified) (4 diffs)
• SimpleOpenCollectionDialog.java (deleted)

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

@@ -709 +709 @@
     private String showOpenCollectionDialog()
     {
-    // We first try the simple open collection dialog
-    SimpleOpenCollectionDialog dialog = new SimpleOpenCollectionDialog();
-    int user_choice = dialog.display();
-
-    // Used simple collection list
-    if (user_choice == SimpleOpenCollectionDialog.OK_OPTION) {
+    OpenCollectionDialog dialog = new OpenCollectionDialog();
+    if (dialog.display() == OpenCollectionDialog.OK_OPTION) {
         return dialog.getFileName();
-    }
-
-    // Chosen to use the advanced 'browse' dialog
-    File collect_directory = null;
-    if (user_choice == SimpleOpenCollectionDialog.BROWSE_OPTION) {
-        if (Gatherer.GS3) {
-        collect_directory = new File(Utility.getSitesDir(Configuration.gsdl3_path));
-        }
-        else {
-        collect_directory = new File(Gatherer.getCollectDirectoryPath());
-        }
-        OpenCollectionDialog chooser = new OpenCollectionDialog(collect_directory);
-        return chooser.getFileName();
     }
 

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

@@ -6 +6 @@
  * University of Waikato, New Zealand.
  *
- * <BR><BR>
- *
  * Author: John Thompson, Greenstone Digital Library, University of Waikato
  *
- * <BR><BR>
- *
  * Copyright (C) 1999 New Zealand Digital Library Project
- *
- * <BR><BR>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21 +15 @@
  * (at your option) any later version.
  *
- * <BR><BR>
- *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * <BR><BR>
  *
  * You should have received a copy of the GNU General Public License
@@ -39 +29 @@
 import java.awt.*;
 import java.awt.event.*;
-import java.beans.*;
-import java.io.File;
-import java.io.IOException;
-import java.text.*;
+import java.io.*;
 import java.util.*;
 import javax.swing.*;
-import javax.swing.filechooser.*;
+import javax.swing.event.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
+import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.BasicCollectionConfiguration;
-import org.greenstone.gatherer.collection.CollectionManager;
-import org.greenstone.gatherer.util.JarTools;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
 
+/** A dialog which provides a straight-forward access to the currently installed collections. It also will contain the ability to continue through to the original OpenCollectionDialog if your source collection is located somewhere other than the gsdl collect folder. */
 public class OpenCollectionDialog
-    extends JFileChooser {
-    static final private ImageIcon LOCKED_COLLECTION_ICON = JarTools.getImage("lcolicn.gif");
-    static final private ImageIcon NORMAL_COLLECTION_ICON = JarTools.getImage("ncolicn.gif");
-
-    /** Constructor */
-    public OpenCollectionDialog(File file) {
-    super(file);
-    ///ystem.err.println("Size = " + getSize());
-    // Other initialization
-    setAcceptAllFileFilterUsed(false);
-    setDialogTitle(Dictionary.get("OpenCollectionDialog.Title"));
-    setFileFilter(new GathererFilter());
-    setFileSystemView(new GathererFileSystemView());
-    setFileView(new GathererFileView());
-    setSize(400,300);
-    // Stop the annoying renaming
-    GUIUtils.disableRename(this);
-    // Description accessory
-    DescriptionPreview accessory = new DescriptionPreview(this);
-    setAccessory(accessory);
-    // Move accessory
-    JPanel accessory_pane = (JPanel) accessory.getParent();
-    JPanel center_pane = (JPanel) accessory_pane.getParent();
-    center_pane.add(accessory_pane, BorderLayout.SOUTH);
+    extends ModalDialog {
+
+    static final public int OK_OPTION = 0;
+    static final public int CANCEL_OPTION = 1;
+
+    static final private Dimension SIZE = new Dimension(640,480);
+    static final private String BLANK = "b";
+    static final private String DESCRIPTION = "d";
+
+    private CardLayout card_layout;
+    private int result;
+    private JButton cancel_button;
+    private JButton open_button;
+    private JList collection_list;
+    private JTextArea description_textarea;
+    private JPanel description_pane;
+    private String filename;
+
+    public OpenCollectionDialog() {
+    super(Gatherer.g_man, "", true);
+    setJMenuBar(new SimpleMenuBar("openingacollection"));
+    setSize(SIZE);
+    setTitle(Dictionary.get("OpenCollectionDialog.Title"));
+    
+    // Creation
+    JPanel content_pane = (JPanel) getContentPane();
+
+    JPanel center_pane = new JPanel();
+
+    JPanel collection_list_pane = new JPanel();
+    JLabel collection_list_label = new JLabel(Dictionary.get("OpenCollectionDialog.Available_Collections"));
+    collection_list = new JList(new CollectionListModel());
+    description_pane = new JPanel();
+    card_layout = new CardLayout();
+
+    JPanel blank_pane = new JPanel();
+
+    JPanel description_textarea_pane = new JPanel();
+    JLabel description_textarea_label = new JLabel(Dictionary.get("OpenCollectionDialog.Description"));
+    description_textarea = new JTextArea();
+
+    JPanel button_pane = new JPanel();
+    open_button = new GLIButton(Dictionary.get("OpenCollectionDialog.Open"), Dictionary.get("OpenCollectionDialog.Open_Tooltip"));
+    open_button.setEnabled(false);
+    
+    cancel_button = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("General.Pure_Cancel_Tooltip"));
+    
+    // Connection
+    cancel_button.addActionListener(new CancelListener());
+    open_button.addActionListener(new OpenListener());
+    CollectionListSelectionListener clsl = new CollectionListSelectionListener();
+    collection_list.addListSelectionListener(clsl);
+    collection_list.addMouseListener(clsl);
+    clsl = null;
+
+    // Layout
+    collection_list_pane.setLayout(new BorderLayout());
+    collection_list_pane.add(collection_list_label, BorderLayout.NORTH);
+    collection_list_pane.add(new JScrollPane(collection_list), BorderLayout.CENTER);
+
+    description_textarea_pane.setLayout(new BorderLayout());
+    description_textarea_pane.add(description_textarea_label, BorderLayout.NORTH);
+    description_textarea_pane.add(new JScrollPane(description_textarea), BorderLayout.CENTER);
+
+    description_pane.setLayout(card_layout);
+    description_pane.add(description_textarea_pane, DESCRIPTION);
+    description_pane.add(blank_pane, BLANK);
+
+    center_pane.setLayout(new GridLayout(2,1,0,5));
+    center_pane.add(collection_list_pane);
+    center_pane.add(description_pane);
+
+    button_pane.setLayout(new GridLayout(1,4));
+    button_pane.add(new JPanel());
+    button_pane.add(open_button);
+    button_pane.add(cancel_button);
+
+    content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+    content_pane.setLayout(new BorderLayout());
+    content_pane.add(center_pane, BorderLayout.CENTER);
+    content_pane.add(button_pane, BorderLayout.SOUTH);
+
+    Dimension screen_size = Configuration.screen_size;
+    setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
+    screen_size = null;
     }
 
@@ -83 +132 @@
     }
 
+    public int display() {
+    setVisible(true);
+    return result;
+    }
+
     public String getFileName() {
-    // Continually loop until the use chooses an appropriate file or cancels.
-    while(true) {
-        int return_val = showOpenDialog(null);
-        if(return_val == JFileChooser.APPROVE_OPTION) {
-        File file = getSelectedFile();
-        if(file != null && file.getName().endsWith(".col")) {
-            return file.getAbsolutePath();
+    return this.filename;
+    }
+
+    private class CancelListener
+    implements ActionListener {
+
+    public void actionPerformed(ActionEvent event) {
+        result = CANCEL_OPTION;
+        OpenCollectionDialog.this.dispose();
+    }
+    }
+
+    private class CollectionListSelectionListener
+    extends MouseAdapter
+    implements ListSelectionListener {
+
+    public void mouseClicked(MouseEvent event) {
+        ///ystem.err.println("Mouse clicked");
+        if(event.getClickCount() >= 2) {
+        Point location = event.getPoint();
+        int index = collection_list.locationToIndex(location);
+        collection_list.setSelectedIndex(index);
+        location = null;
+        open_button.doClick();
+        }
+    }
+
+    public void valueChanged(ListSelectionEvent event) {
+        if(collection_list.isSelectionEmpty()) {
+        card_layout.show(description_pane, BLANK);
+        open_button.setEnabled(false);
+        }
+        else {
+        BasicCollectionConfiguration collection_configuration = (BasicCollectionConfiguration) collection_list.getSelectedValue();
+        description_textarea.setText(collection_configuration.getDescription());
+        description_textarea.setCaretPosition(0);
+        card_layout.show(description_pane, DESCRIPTION);
+        open_button.setEnabled(true);
+        }
+    }
+    }
+
+    // use this if we ever go back to viewing all colls at once
+    /*    private class GS3CollectionListModel
+    extends AbstractListModel {
+
+    private TreeSet data;
+
+    public GS3CollectionListModel() {
+        data = new TreeSet();
+        File sites_folder = new File(Utility.getSitesDir(Configuration.gsdl3_path));
+        File sites[] = sites_folder.listFiles();
+        for (int s=0; s<sites.length; s++) {
+        String site_name = sites[s].getName();
+        System.err.println("found site "+site_name);
+        File collect_folder = new File(Utility.getCollectDir(Configuration.gsdl3_path, site_name) );
+        if (!collect_folder.exists()) {
+            continue;
         }
-        }
-        else {
-        return null;
-        }
-    }
-    }
-
-
-
-    /* The DescriptionPreview accessory is adapted from the ImagePreview.java (an example used by FileChooserDemo2.java). */
-    private class DescriptionPreview
-    extends JPanel
-    implements PropertyChangeListener {
-    private File file = null;
-    private JTextArea text;
-
-    public DescriptionPreview(JFileChooser fc) {
-        setName("Description Preview");
-        setPreferredSize(new Dimension(100, 75)); // About three rows.
-
-        text = new JTextArea(Dictionary.get("OpenCollectionDialog.No_Description"));
-        
-        setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
-        setLayout(new BorderLayout());
-        add(new JScrollPane(text), BorderLayout.CENTER);
-
-        fc.addPropertyChangeListener(this);
-    }
-
-    /** Whenever a new file or folder is selected we determine what description should be displayed. */
-    public void propertyChange(PropertyChangeEvent e) {
-        boolean update = false;
-        String prop = e.getPropertyName();
-        // If the directory changed, don't show an image.
-        if (JFileChooser.DIRECTORY_CHANGED_PROPERTY.equals(prop)) {
-        file = null;
-        update = true;
-        }
-        // If a file became selected, find out which one.
-        else if (JFileChooser.SELECTED_FILE_CHANGED_PROPERTY.equals(prop)) {
-        file = (File) e.getNewValue();
-        update = true;
-        }
-
-        // Update the description accordingly.
-        if (update) {
-        if(file == null) {
-            text.setText(Dictionary.get("OpenCollectionDialog.No_Description"));
+        File[] collection_folders = collect_folder.listFiles();
+        for(int i = 0; i < collection_folders.length; i++) {
+            File collection_folder = collection_folders[i];
+            String collection_foldername = collection_folder.getName();
+            if(!collection_folder.isFile() && !collection_foldername.equals(StaticStrings.MODEL_COLLECTION_NAME)) {
+            BasicCollectionConfiguration collection_configuration = new BasicCollectionConfiguration(new File(collection_folder, Utility.CONFIG_FILE), site_name);
+            if(!collection_configuration.getName().equals(StaticStrings.ERROR_STR)) {
+                data.add(collection_configuration);
+            }
+            }
+            collection_foldername = null;
+            collection_folder = null;
+        } // for each collection
+        collection_folders = null;
+        collect_folder = null;
+        } // for each site
+        sites_folder = null;
+        sites = null;
+    }
+
+    public Object getElementAt(int index) {
+        Iterator iterator = data.iterator();
+        for(int i = 0; iterator.hasNext(); i++) {
+        Object object = iterator.next();
+        if(i == index) {
+            iterator = null;
+            return object;
         }
-        else {
-            // Build a wrapper around the collection configuration file.
-            File config_file = new File(file.getParentFile(), Utility.CONFIG_FILE);
-            if(config_file.exists()) {
-            BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(config_file);
-            text.setText(StaticStrings.SPEECH_CHARACTER + collect_cfg.getName() + StaticStrings.SPEECH_CHARACTER + StaticStrings.NEW_LINE_CHAR);
-            text.setText(collect_cfg.getDescription());
-            text.setCaretPosition(0);
+        object = null;
+        }
+        iterator = null;
+        return null;
+    }
+
+    public int getSize() {
+        return data.size();
+    }
+    }
+    */  
+    private class CollectionListModel
+    extends AbstractListModel {
+
+    private TreeSet data;
+
+    public CollectionListModel() {
+        data = new TreeSet();
+        File collect_directory = new File(Gatherer.getCollectDirectoryPath());
+        if (!collect_directory.exists()) {
+        collect_directory = null;
+        return;
+        }
+        File[] collection_folders = collect_directory.listFiles();
+        for(int i = 0; i < collection_folders.length; i++) {
+        File collection_folder = collection_folders[i];
+        String collection_foldername = collection_folder.getName();
+        if(collection_folder.isDirectory() && !collection_foldername.equals(StaticStrings.MODEL_COLLECTION_NAME)) {
+            File config_file = new File(collection_folder, Utility.CONFIG_FILE);
+            if (config_file.exists()) {
+            BasicCollectionConfiguration collection_configuration = new BasicCollectionConfiguration(config_file);
+            data.add(collection_configuration);
             }
+            config_file = null;
         }
-        }
-    }
-    }
-
-    /** ImageFilter.java is a 1.4 example used by FileChooserDemo2.java. */
-    private class GathererFilter
-    extends FileFilter {
-
-    // Accept all directories and all .col files
-    public boolean accept(File f) {
-        return (f.isDirectory() || f.getName().toLowerCase().endsWith(".col"));
-    }
-
-    // The description of this filter
-    public String getDescription() {
-        return Dictionary.get("OpenCollectionDialog.Collection");
-    }
-    }
-
-    private class GathererFileSystemView
-    extends FileSystemView {
-
-    private FileSystemView default_system_view = FileSystemView.getFileSystemView();
-
-    /** Creates a new folder with a default folder name. */
-    public File createNewFolder(File containingDir)
-        throws IOException {
-        return default_system_view.createNewFolder(containingDir);
-    }
-
-    /** Gets the list of shown (i.e. */
-    public File[] getFiles(File dir, boolean useFileHiding) {
-        // Retrieve the files usually returned by the platform specific file system view.
-        File[] files = default_system_view.getFiles(dir, useFileHiding);
-        // Determine if the current dir actually contains a valid greenstone collection. To do this we check for the presence of the file <dir>/etc/collect.cfg and a directory named import.
-        File collect_cfg_file = new File(dir, Utility.CONFIG_FILE);
-        File import_dir_file = new File(dir, "import");
-        if(collect_cfg_file.exists() && import_dir_file.exists()) {
-        // Create a new dummy collection file.
-        String name = dir.getName();
-        File collection_file = new File(dir, name + ".col");
-        // If this file doesn't already exist.
-        if(!collection_file.exists()) {
-            File[] temp = new File[files.length + 1];
-            System.arraycopy(files, 0, temp, 0, files.length);
-            temp[files.length] = collection_file;
-            files = temp;
-            temp = null;
+        collection_foldername = null;
+        collection_folder = null;
+        }
+        collection_folders = null;
+        collect_directory = null;
+    }
+
+    public Object getElementAt(int index) {
+        Iterator iterator = data.iterator();
+        for(int i = 0; iterator.hasNext(); i++) {
+        Object object = iterator.next();
+        if(i == index) {
+            iterator = null;
+            return object;
         }
-        collection_file = null;
-        name = null;
-        }
-        import_dir_file = null;
-        collect_cfg_file = null;
-        return files;
-    }
-    }
-
-    /** A FileView which returns differing icons depending on whether a lock file is present within the collection folder. */
-    private class GathererFileView
-    extends FileView {
-
-    public String getDescription(File file) {
-        String description = null;
-        if (file.getName().endsWith(".col")) {
-        if (!lockExists(file)) {
-            description = Dictionary.get("OpenCollectionDialog.Normal_Collection");
-        }
-        else {
-            description = Dictionary.get("OpenCollectionDialog.Locked_Collection");
-        }
-        }
-        return description;
-    }
-
-    public Icon getIcon(File file) {
-        Icon icon = null;
-        if (file.getName().endsWith(".col")) {
-        if (!lockExists(file)) {
-            icon = NORMAL_COLLECTION_ICON;
-        }
-        else {
-            icon = LOCKED_COLLECTION_ICON;
-        }
-        }
-        return icon;
-    }
-
-    /** Determine if a lock file exists. */
-    private boolean lockExists(File file) {
-        File lock_file = new File(file.getParentFile(), CollectionManager.LOCK_FILE);
-        return lock_file.exists();
+        object = null;
+        }
+        iterator = null;
+        return null;
+    }
+
+    public int getSize() {
+        return data.size();
+    }
+    }
+
+    private class OpenListener
+    implements ActionListener {
+
+    public void actionPerformed(ActionEvent event) {
+        result = OK_OPTION;
+        Object selected_object = collection_list.getSelectedValue();
+        if (selected_object instanceof BasicCollectionConfiguration) {
+        BasicCollectionConfiguration collection_configuration = (BasicCollectionConfiguration)selected_object; //(BasicCollectionConfiguration) collection_list.getSelectedValue();
+        //*************888
+        File collect_cfg_file = collection_configuration.getFile(); // returns the collect.cfg file
+        File etc_folder = collect_cfg_file.getParentFile();
+        File collection_folder = etc_folder.getParentFile();
+        filename = collection_folder.getAbsolutePath() + File.separator + collection_folder.getName() + ".col";
+        collection_folder = null;
+        etc_folder = null;
+        collect_cfg_file = null;
+        collection_configuration = null;
+        OpenCollectionDialog.this.dispose();
+        }
     }
     }