Changeset 6041

Timestamp:

2003-11-28T17:48:22+13:00 (20 years ago)

Author:

jmt12

Message:

Email field is gone, as is short filename. Sais filename is now automatically created

File:

• trunk/gli/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java (modified) (14 diffs)

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

@@ -23 +23 @@
     private JDialog self;
     private JTextArea description;
+    /* Suppress email
     private JTextField address;
     private JTextField host;
+    */
     private JTextField title;
-    private RestrictedTextField file;
+    //private RestrictedTextField file;
     private String description_final;
-    private String email_final;
-    private String name_final;
+    // private String email_final; no more email
+    // private String name_final;
     private String title_final;
     static private Dimension label_size = new Dimension(230, 25);
     /** The size of this new collection dialog box. */
-    static private Dimension size = new Dimension(700, 375);
+    static private Dimension size = new Dimension(600, 280);
     static private int FILENAME_SIZE = 8;
 
@@ -91 +93 @@
     JLabel name_label = new JLabel();
     Dictionary.setText(name_label, "NewCollectionPrompt.Collection_Name");
-    JPanel file_pane = new JPanel();
-    file = new RestrictedTextField(new RestrictedTextDocument(FILENAME_SIZE), "", FILENAME_SIZE);
-    Dictionary.setTooltip(file, "NewCollectionPrompt.Collection_Name_Tooltip");
-    JLabel file_label = new JLabel(".col");
+    //JPanel file_pane = new JPanel();
+    //file = new RestrictedTextField(new RestrictedTextDocument(FILENAME_SIZE), "", FILENAME_SIZE);
+    //Dictionary.setTooltip(file, "NewCollectionPrompt.Collection_Name_Tooltip");
+    //JLabel file_label = new JLabel(".col");
+        /* Suppress Email
     JPanel email_pane = new JPanel();
     JLabel email_label = new JLabel();
-    Dictionary.setText(email_label, "NewCollectionPrompt.Collection_Email");
+        Dictionary.setText(email_label, "NewCollectionPrompt.Collection_Email");
     JPanel host_pane = new JPanel();
     JPanel address_pane = new JPanel();
@@ -105 +108 @@
     host = new JTextField();
     Dictionary.setTooltip(host, "CDM.General.Email.Creator_Tooltip");
+    */
 
     JPanel center_pane = new JPanel();
@@ -131 +135 @@
     cancel_button.setMnemonic(KeyEvent.VK_C);
     Dictionary.setBoth(cancel_button, "General.Cancel", "General.Cancel_Tooltip");
-    ColorListener email_color_listener = new ColorListener(address, host);
+    
+    //ColorListener email_color_listener = new ColorListener(address, host); No more email
 
     // Connection
     cancel_button.addActionListener(new CancelListener());
     create_button.addActionListener(new CreateListener());
-    address.addKeyListener(email_color_listener);
+    //address.addKeyListener(email_color_listener); suppress email
     description.addKeyListener(new ColorListener(description));
     description.addKeyListener(new DescriptionListener());
-    file.addKeyListener(new ColorListener(file));
-    host.addKeyListener(email_color_listener);
+    //file.addKeyListener(new ColorListener(file));
+    //host.addKeyListener(email_color_listener); suppress email
     title.addKeyListener(new ColorListener(title));
-    title.getDocument().addDocumentListener(new TitleListener());
+    //title.getDocument().addDocumentListener(new TitleListener());
     // Layout
     title_label.setPreferredSize(label_size);
@@ -150 +155 @@
     title_pane.add(title, BorderLayout.CENTER);
 
+    /* suppress filename
     file_pane.setLayout(new BorderLayout());
     file_pane.add(file, BorderLayout.WEST);
@@ -159 +165 @@
     name_pane.add(name_label, BorderLayout.WEST);
     name_pane.add(file_pane, BorderLayout.CENTER);
-
+    */
+
+    /* suppress email
     email_label.setPreferredSize(label_size);
 
@@ -173 +181 @@
     email_pane.add(email_label, BorderLayout.WEST);
     email_pane.add(host_pane, BorderLayout.CENTER);
-
-    upper_pane.setLayout(new GridLayout(4,1));
+    */
+
+    upper_pane.setLayout(new GridLayout(2,1));
     upper_pane.add(instructions_label);
     upper_pane.add(title_pane);
-    upper_pane.add(name_pane);
-    upper_pane.add(email_pane);
+    //upper_pane.add(name_pane);
+    //upper_pane.add(email_pane); no email anymore
 
     description_pane.setLayout(new BorderLayout());
@@ -227 +236 @@
     }
 
+    /* No more email
     public String getEmail() {
     return email_final;
     }
-
+    */
+
+    /** Generates the collection short filename by taking the first eight characters of the title (spaces removed) and then adjusting by further truncating and then adding an unique suffix as necessary.
+     * @return the filename as a String
+     */
     public String getName() {
-    return name_final;
+    // Retrieve the first 8 non-whitespace characters of title_final.
+    StringBuffer name_buffer = new StringBuffer("");
+    int i = 0;
+    while(i < title_final.length() && name_buffer.length() < 8) {
+        char c = title_final.charAt(i);
+        if(!Character.isWhitespace(c)) {
+        name_buffer.append(Character.toLowerCase(c));
+        }
+        i++;
+    }
+    // We need to ensure the filename is unique
+    int counter = 0;
+    while(filenameClashes(name_buffer.toString())) {
+        counter++;
+        String suffix = String.valueOf(counter);
+        name_buffer.replace(name_buffer.length() - suffix.length(), name_buffer.length(), suffix);
+    }
+    // All done
+    return name_buffer.toString();
+    }
+
+    private boolean filenameClashes(String filename) {
+    File collection_directory = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path));
+    File children[] = collection_directory.listFiles();
+    for(int i = 0; children != null && i < children.length; i++) {
+        if(children[i].getName().equals(filename)) {
+        return true;
+        }
+    }
+    return false;
     }
 
@@ -304 +347 @@
         return;
         }
+        // We must ensure that the collection title is unique. This is a pain in the nether regions as we are forced to load the collect.cfg of each other collection in turn looking for a conflicting title
+        else {
+
+
+        }
+        /* Suppress filename
         name_final = file.getText();
         if(name_final.length() > 0) {
@@ -324 +373 @@
         return;
         }
+        */
+        /* Suppress email
         email_final = address.getText() + "@" + host.getText();
         if(email_final.length() == 0 || email_final.startsWith("@") || email_final.endsWith("@")) {
@@ -333 +384 @@
         return; 
         }
+        */
         description_final = description.getText();
         if(description_final.length() == 0) {
@@ -382 +434 @@
     }
 
+    /*
     private class RestrictedTextField 
     extends JTextField {
@@ -438 +491 @@
     }
     }
-
+    */
+
+    /* Suppress filename
     private class TitleListener
     implements DocumentListener {
-    /** Gives notification that an attribute or set of attributes changed. */
+    ** Gives notification that an attribute or set of attributes changed. *
     public void changedUpdate(DocumentEvent e) {
         updateFilename();
     }
 
-    /** Gives notification that there was an insert into the document. */
+    ** Gives notification that there was an insert into the document. *
     public void insertUpdate(DocumentEvent e) {
         updateFilename();
     }
           
-    /** Gives notification that a portion of the document has been removed. */
+    ** Gives notification that a portion of the document has been removed. *
     public void removeUpdate(DocumentEvent e) {
         updateFilename();
@@ -473 +528 @@
     }
     }
+    */
 }
+
+
+