Changeset 7280

Timestamp:

2004-05-05T13:44:48+12:00 (20 years ago)

Author:

kjdon

Message:

removed a heap of unnecessary crap - filename, email etc fields that are not used, BrowseListener for the old browse button (for base this coll on)

File:

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

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

@@ -47 +47 @@
 
     static public boolean titleClashes(String title, File current_config_file) {
-    // An empty collection title never clashes with anything. I may look ugly in the final collection but there is nothing wrong with having no title for a particular language.
+    // An empty collection title never clashes with anything. It may look ugly in the final collection but there is nothing wrong with having no title for a particular language.
     if(title == null || title.length() == 0) {
         return false;
@@ -75 +75 @@
     private JDialog self;
     private JTextArea description;
-    /* Suppress email
-    private JTextField address;
-    private JTextField host;
-    */
     private JTextField title;
-    //private RestrictedTextField file;
     private String description_final;
-    // private String email_final; no more email
-    // private String name_final;
     private String title_final;
     static private Dimension COMPONENT_SIZE = new Dimension(230, 25);
@@ -142 +135 @@
     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");
-        /* Suppress Email
-    JPanel email_pane = new JPanel();
-    JLabel email_label = new JLabel();
-        Dictionary.setText(email_label, "NewCollectionPrompt.Collection_Email");
-    JPanel host_pane = new JPanel();
-    JPanel address_pane = new JPanel();
-    address = new JTextField();
-    Dictionary.setTooltip(address, "CDM.General.Email.Creator_Tooltip");
-    JLabel at_label = new JLabel("@");
-    host = new JTextField();
-    Dictionary.setTooltip(host, "CDM.General.Email.Creator_Tooltip");
-    */
 
     JPanel center_pane = new JPanel();
@@ -184 +161 @@
     cancel_button.setMnemonic(KeyEvent.VK_C);
     Dictionary.setBoth(cancel_button, "General.Cancel", "General.Cancel_Tooltip");
-
-    //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); suppress email
     description.addKeyListener(new ColorListener(description));
     description.addKeyListener(new DescriptionListener());
-    //file.addKeyListener(new ColorListener(file));
-    //host.addKeyListener(email_color_listener); suppress email
     title.addKeyListener(new ColorListener(title));
-    //title.getDocument().addDocumentListener(new TitleListener());
+
     // Layout
-
     title_pane.setLayout(new BorderLayout(5,0));
     title_pane.add(title_label, BorderLayout.WEST);
     title_pane.add(title, BorderLayout.CENTER);
 
-    /* suppress filename
-    file_pane.setLayout(new BorderLayout());
-    file_pane.add(file, BorderLayout.WEST);
-    file_pane.add(file_label, BorderLayout.CENTER);
-
-    name_pane.setLayout(new BorderLayout());
-    name_pane.add(name_label, BorderLayout.WEST);
-    name_pane.add(file_pane, BorderLayout.CENTER);
-    */
-
-    /* suppress email
-
-    address_pane.setLayout(new BorderLayout());
-    address_pane.add(address, BorderLayout.CENTER);
-    address_pane.add(at_label, BorderLayout.EAST);
-
-    host_pane.setLayout(new GridLayout(1,2));
-    host_pane.add(address_pane);
-    host_pane.add(host);
-
-    email_pane.setLayout(new BorderLayout());
-    email_pane.add(email_label, BorderLayout.WEST);
-    email_pane.add(host_pane, BorderLayout.CENTER);
-    */
-
     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); no email anymore
 
     description_pane.setLayout(new BorderLayout());
@@ -241 +184 @@
     base_collection_pane.add(base_collection_label, BorderLayout.WEST);
     base_collection_pane.add(base_collection, BorderLayout.CENTER);
-    // base_collection_pane.add(base_collection_browse, BorderLayout.EAST);
 
     center_pane.setBorder(BorderFactory.createEmptyBorder(5,0,5,0));
@@ -278 +220 @@
     return description_final;
     }
-
-    /* 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() {
-        // 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);
-            // Arg. We need a few more tests than just whitespace
-            if(Character.isLetterOrDigit(c)) {
-                name_buffer.append(Character.toLowerCase(c));
-            }
-            i++;
-        }
-        // We need to ensure the filename is unique
-        int counter = 0;
-        StringBuffer new_name_buffer = new StringBuffer(name_buffer.toString());
-        while(filenameClashes(new_name_buffer.toString())) {
-            new_name_buffer = new StringBuffer(name_buffer.toString());
-            counter++;
-            String suffix = String.valueOf(counter);
-            // If we have to truncate the namestring so as to fit the suffix
-            if(suffix.length() + new_name_buffer.length() > 8) {
-                new_name_buffer.replace(new_name_buffer.length() - suffix.length(), new_name_buffer.length(), suffix);
-            }
-            // Or just append it if that isn't necessary
-            else {
-                new_name_buffer.append(suffix);
-            }
-
-        }
-        // All done
-        return new_name_buffer.toString();
-    }
-
+    public String getName() {
+    // 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);
+        // Arg. We need a few more tests than just whitespace
+        if(Character.isLetterOrDigit(c)) {
+        name_buffer.append(Character.toLowerCase(c));
+        }
+        i++;
+    }
+    // We need to ensure the filename is unique
+    int counter = 0;
+    StringBuffer new_name_buffer = new StringBuffer(name_buffer.toString());
+    while(filenameClashes(new_name_buffer.toString())) {
+        new_name_buffer = new StringBuffer(name_buffer.toString());
+        counter++;
+        String suffix = String.valueOf(counter);
+        // If we have to truncate the namestring so as to fit the suffix
+        if(suffix.length() + new_name_buffer.length() > 8) {
+        new_name_buffer.replace(new_name_buffer.length() - suffix.length(), new_name_buffer.length(), suffix);
+        }
+        // Or just append it if that isn't necessary
+        else {
+        new_name_buffer.append(suffix);
+        }
+        
+    }
+    // All done
+    return new_name_buffer.toString();
+    }
+    
     private boolean filenameClashes(String filename) {
     File collection_directory = new File(Utility.getCollectDir(Gatherer.config.gsdl_path));
@@ -335 +271 @@
     return title_final;
     }
-
-
-    private class BrowseListener
-    implements ActionListener {
-    public void actionPerformed(ActionEvent event) {
-        File file;
-        if(Gatherer.config.gsdl_path != null) {
-        file = new File(Utility.getCollectDir(Gatherer.config.gsdl_path));
-        }
-        else {
-        file = new File(Utility.BASE_DIR);
-        }
-        // Show OpenCollectionPrompt.
-        OpenCollectionDialog chooser = new OpenCollectionDialog(file);
-        file = chooser.getSelectedFile();
-        if(file != null) {
-        file = file.getParentFile();
-        BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(new File(file, Utility.META_DIR));
-        Item item = new Item(file, collect_cfg);
-        base_collection.addItem(item);
-        base_collection.setSelectedItem(item);
-        collect_cfg = null;
-        }
-    }
-    }
-
+ 
     private class CancelListener
     implements ActionListener {
@@ -390 +301 @@
     }
     }
-
+    
     private class CreateListener
     implements ActionListener {
@@ -413 +324 @@
         }
         }
-        /* Suppress filename
-           name_final = file.getText();
-           if(name_final.length() > 0) {
-           // Determine if this filename is already in use.
-           File collection_directory = new File(Utility.getCollectDir(Gatherer.config.gsdl_path));
-           File children[] = collection_directory.listFiles();
-           for(int i = 0; children != null && i < children.length; i++) {
-           if(children[i].getName().equals(name_final)) {
-           JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("NewCollectionPrompt.Name_Error"), Dictionary.get("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
-           file.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));
-           file.setBackground(Gatherer.config.getColor("coloring.error_background", false));
-           return;
-           }
-           }
-           }
-           else {
-           JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("NewCollectionPrompt.Name_Error"), Dictionary.get("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
-           file.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));
-           file.setBackground(Gatherer.config.getColor("coloring.error_background", false));
-           return;
-           }
-        */
-        /* Suppress email
-           email_final = address.getText() + "@" + host.getText();
-           if(email_final.length() == 0 || email_final.startsWith("@") || email_final.endsWith("@")) {
-           JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("NewCollectionPrompt.Email_Error"), Dictionary.get("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
-           address.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));
-           address.setBackground(Gatherer.config.getColor("coloring.error_background", false));
-           host.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));
-           host.setBackground(Gatherer.config.getColor("coloring.error_background", false));
-           return;
-           }
-        */
+        
         description_final = description.getText();
         if(description_final.length() == 0) {
@@ -499 +378 @@
     public String toString() {
         if(name == null && config != null) {
-        StringBuffer title_buffer = new StringBuffer(config.getName());
-        title_buffer.append(StaticStrings.SPACE_CHARACTER);
-        title_buffer.append(StaticStrings.OPEN_PARENTHESIS_CHARACTER);
-        title_buffer.append(config.getShortName());
-        title_buffer.append(StaticStrings.CLOSE_PARENTHESIS_CHARACTER);
-        name = title_buffer.toString();
-        title_buffer = null;
+        name = config.toString();
         }
         return name;
     }
     }
-
-    /*
-    private class RestrictedTextField
-    extends JTextField {
-    public RestrictedTextField(RestrictedTextDocument document, String value, int cols) {
-        super(document, "", cols);
-    }
-    protected Document createDefaultModel() {
-        return new RestrictedTextDocument(11);
-    }
-    }
-
-    private class RestrictedTextDocument
-    extends PlainDocument {
-    private char block[];
-    private int cols;
-    private int current;
-    public RestrictedTextDocument(int cols) {
-        super();
-        this.cols = cols;
-        this.current = 0;
-    }
-    public void blockChar(char c) {
-        if(block == null) {
-        block = new char[1];
-        block[0] = c;
-        }
-        else {
-        char temp[] = block;
-        block = new char[temp.length + 1];
-        System.arraycopy(temp, 0, block, 0, temp.length);
-        block[temp.length] = c;
-        temp = null;
-        }
-    }
-    public void insertString(int offs, String str, AttributeSet a)
-        throws BadLocationException {
-        // Remove any blocked characters.
-        StringBuffer temp = new StringBuffer(str);
-        for(int i = 0; block != null && i < block.length; i++) {
-        for(int j = temp.length() - 1; j >= 0; j--) {
-            if(temp.charAt(j) == block[i]) {
-            temp.deleteCharAt(j);
-            }
-        }
-        }
-        str = temp.toString();
-        if(cols == -1 || str.length() + current <= cols) {
-        super.insertString(offs, str, a);
-        current = current + str.length();
-        }
-    }
-    public void remove(int offs, int len)
-        throws BadLocationException {
-        super.remove(offs, len);
-        current = current - len;
-    }
-    }
-    */
-
-    /* Suppress filename
-    private class TitleListener
-    implements DocumentListener {
-    ** 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. *
-    public void insertUpdate(DocumentEvent e) {
-        updateFilename();
-    }
-
-    ** Gives notification that a portion of the document has been removed. *
-    public void removeUpdate(DocumentEvent e) {
-        updateFilename();
-    }
-
-    private void updateFilename() {
-        String current_name = file.getText();
-        String current_title = title.getText();
-        StringBuffer temp = new StringBuffer("");
-        int i = 0;
-        while(i < current_title.length() && temp.length() < 8) {
-        if(current_title.charAt(i) != ' ') {
-            temp.append(Character.toLowerCase(current_title.charAt(i)));
-        }
-        i++;
-        }
-        String result = temp.toString();
-        if(current_name.startsWith(result) || result.startsWith(current_name)) {
-        file.setText(result);
-        }
-    }
-    }
-    */
 }