Changeset 6152

Timestamp:

2003-12-08T14:29:18+13:00 (20 years ago)

Author:

jmt12

Message:

Not only is a title clash now detected (albeit when you shift focus off the general settings screen) but the frame title now updates properly, and the shorter collection filename is shown - in a noneditable fashion of course

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java (modified) (10 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java

@@ -42 +42 @@
 import org.greenstone.gatherer.cdm.Control;
 import org.greenstone.gatherer.gui.EmailField;
+import org.greenstone.gatherer.gui.NewCollectionDetailsPrompt;
 import org.greenstone.gatherer.gui.OpenCollectionDialog;
+import org.greenstone.gatherer.gui.WarningDialog;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
@@ -220 +222 @@
         name_textfield = new JTextField("CDM.General.Collection_Name");
         Dictionary.registerTooltip(name_textfield, "CDM.General.Collection_Name_Tooltip");
+        JPanel short_name_panel = new JPanel();
+        JLabel short_name_label = new JLabel();
+        short_name_label.setPreferredSize(LABEL_SIZE);
+        Dictionary.registerText(short_name_label, "NewCollectionPrompt.Collection_Name");
+        JTextField short_name_textfield = new JTextField(Gatherer.c_man.getCollection().getName());
+        short_name_textfield.setEditable(false);
+        short_name_textfield.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
         JPanel icon_panel = new JPanel();
         icon_label = new JLabel();
@@ -245 +254 @@
         // Connection
         beta_checkbox.addActionListener(CollectionDesignManager.change_listener);
-        browse_about_icon_button.addActionListener(new BrowseListener(StaticStrings.IMAGES_PATH_RELATIVE_TO_COLLECTION_PREFIX));
-        browse_home_icon_button.addActionListener(new BrowseListener(StaticStrings.IMAGES_PATH_RELATIVE_TO_GSDL_PREFIX));
+        BrowseListener browse_listener = new BrowseListener(StaticStrings.IMAGES_PATH_RELATIVE_TO_GSDL_PREFIX);
+        browse_about_icon_button.addActionListener(browse_listener);
+        browse_home_icon_button.addActionListener(browse_listener);
+        browse_listener = null;
         public_checkbox.addActionListener(CollectionDesignManager.change_listener);
         creator_emailfield.getDocument().addDocumentListener(CollectionDesignManager.change_listener);
@@ -253 +264 @@
         maintainer_emailfield.getDocument().addDocumentListener(CollectionDesignManager.change_listener);
         name_textfield.getDocument().addDocumentListener(CollectionDesignManager.change_listener);
+        name_textfield.getDocument().addDocumentListener(new CollectionTitleUpdater());
         small_icon_textfield.getDocument().addDocumentListener(CollectionDesignManager.change_listener);
 
@@ -273 +285 @@
         name_panel.add(name_textfield, BorderLayout.CENTER);
 
+        short_name_panel.setLayout(new BorderLayout());
+        short_name_panel.add(short_name_label, BorderLayout.WEST);
+        short_name_panel.add(short_name_textfield, BorderLayout.CENTER);
+
         icon_panel.setLayout(new BorderLayout());
         icon_panel.add(icon_label, BorderLayout.WEST);
@@ -283 +299 @@
         small_icon_panel.add(browse_home_icon_button, BorderLayout.EAST);
 
-        details_panel.setLayout(new GridLayout(7,1,5,0));
+        details_panel.setLayout(new GridLayout(8,1,5,2));
         details_panel.add(creator_panel);
         details_panel.add(maintainer_panel);
@@ -289 +305 @@
         details_panel.add(beta_checkbox);
         details_panel.add(name_panel);
+        details_panel.add(short_name_panel);
         details_panel.add(icon_panel);
         details_panel.add(small_icon_panel);
@@ -350 +367 @@
         icon_collection_collectionmeta.setValue(icon_textfield.getText());
         maintainer_collectionmeta.setValue(maintainer_emailfield.getText());
-        collection_name_collectionmeta.setValue(name_textfield.getText());
         icon_collection_small_collectionmeta.setValue(small_icon_textfield.getText());
+
+        // Oh, and if the collection title is already in use warn them about it
+        String title = name_textfield.getText();
+        // I just happen to have a handy method in the new details prompt to detect this very thing
+        if(NewCollectionDetailsPrompt.titleClashes(title)) {
+            // Determine if the user wants to be warned about this
+            WarningDialog dialog = new WarningDialog("warning.TitleClashes", true);
+            if(dialog.display() == JOptionPane.OK_OPTION) {
+            // If they have said yes, then carry on with the assignement
+            collection_name_collectionmeta.setValue(title);
+            }
+            // Otherwise we don't assign anything. In fact we have to restore the frame title back to its original value
+            else {
+            String collection_title = collection_name_collectionmeta.getValue(CollectionMeta.TEXT);
+            String collection_name = Gatherer.c_man.getCollection().getName();
+            Gatherer.g_man.setTitle(collection_title, collection_name);
+            collection_name = null;
+            collection_title = null;
+            }
+            dialog.dispose();
+            dialog = null;
+        }
+        // No clash, no worries.
+        else {
+            collection_name_collectionmeta.setValue(title);
+        }
+        title = null;
+
         ready = false;
-        }
+        }  
     }
 
@@ -362 +406 @@
         private String prefix;
 
-        public BrowseListener(String prefix) {
-        this.prefix = prefix;
+        public BrowseListener(String prefix_raw) {
+        this.prefix = prefix_raw.replaceAll(StaticStrings.COLNAME_PATTERN, Gatherer.c_man.getCollection().getName());
         }
 
@@ -438 +482 @@
         }
     }
+
+    private class CollectionTitleUpdater
+        implements DocumentListener {
+        /** Gives notification that an attribute or set of attributes changed. */
+        public void changedUpdate(DocumentEvent e) {
+        setTitle();
+        }
+        /** Gives notification that there was an insert into the document. */
+        public void insertUpdate(DocumentEvent e) {
+        setTitle();
+        }
+        /** Gives notification that a portion of the document has been removed. */
+        public void removeUpdate(DocumentEvent e) {
+        setTitle();
+        }
+        
+        private void setTitle() {
+        // Set the title
+        String collection_title = name_textfield.getText();
+        String collection_name = Gatherer.c_man.getCollection().getName();
+        Gatherer.g_man.setTitle(collection_title, collection_name);
+        collection_title = null;
+        collection_name = null;
+        }
+    }
     }