Changeset 12091

Timestamp:

2006-07-07T13:10:08+12:00 (18 years ago)

Author:

kjdon

Message:

subcollection index names no longer appear on this panel - done using searchmetadatamanager.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/SubcollectionIndexManager.java (modified) (7 diffs)

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

@@ -284 +284 @@
         JPanel content_pane = new JPanel();
 
-        JLabel name_label = new JLabel();
-        Dictionary.registerText(name_label, "CDM.SubcollectionIndexManager.PartitionName");
-        subcollection_index_name_textfield = new JTextField();
-        subcollection_index_name_textfield.setPreferredSize(FIELD_SIZE);
-        Dictionary.registerTooltip(subcollection_index_name_textfield, "CDM.SubcollectionIndexManager.PartitionName_Tooltip");
-
         JLabel source_label = new JLabel();
         Dictionary.registerText(source_label, "CDM.SubcollectionIndexManager.Source");
@@ -325 +319 @@
         set_default_button.addActionListener(new SetDefaultListener());
         set_default_button.addActionListener(CollectionDesignManager.buildcol_change_listener);
-        subcollection_index_name_textfield.getDocument().addDocumentListener(new NameListener());
         subcollection_index_list.addListSelectionListener(new SubcollectionIndexListListener());
         source_list.addListSelectionListener(new SourceListListener());
@@ -344 +337 @@
         labels_pane.setLayout(new BorderLayout());
         labels_pane.setBorder(BorderFactory.createEmptyBorder(5, 5, 10, 5));
-        labels_pane.add(name_label, BorderLayout.NORTH);
         labels_pane.add(source_label, BorderLayout.CENTER);
         
         boxes_pane.setLayout(new BorderLayout());
-        boxes_pane.add(subcollection_index_name_textfield, BorderLayout.NORTH);
         boxes_pane.add(new JScrollPane(source_list), BorderLayout.CENTER);
         
@@ -409 +400 @@
         }
 
-        // Display the selected subcollection index's name
-        String id = selected_index.getID();
-        String name = CollectionDesignManager.collectionmeta_manager.getMetadatum("." + id).getValue(true);
-        subcollection_index_name_textfield.setText(name);
-
         // Display the selected subcollection index's sources
         source_list.clearTicked();
@@ -425 +411 @@
         boolean replace_enabled = false;
 
-        // Indexes must have a name
-        if (subcollection_index_name_textfield.getText().length() == 0) {
-        add_enabled = false;
-        }
         // Can't add a new index if no sources are selected
-        else if (source_list.isNothingTicked()) {
+        if (source_list.isNothingTicked()) {
         add_enabled = false;
         }
@@ -444 +426 @@
             // Here we need to check if we have changed the name - if so, we can enable the replace button
             if (subcollection_index_list.getSelectedIndex() != -1) {
-            String name = subcollection_index_name_textfield.getText();
             SubcollectionIndex selected_index = (SubcollectionIndex) subcollection_index_list.getSelectedValue();
-            String selected_name = CollectionDesignManager.collectionmeta_manager.getMetadatum("." + selected_index.getID()).getValue(true);
-            if (!name.equals(selected_name)) {
-                replace_enabled = true;
-            }
             }
         }
@@ -473 +450 @@
         public void actionPerformed(ActionEvent event)
         {
-        String name = subcollection_index_name_textfield.getText();
-        if (!source_list.isNothingTicked() && name.length() != 0) {
+        if (!source_list.isNothingTicked()) {// && name.length() != 0) {
             ArrayList sources = source_list.getTicked();
             SubcollectionIndex subcollection_index = new SubcollectionIndex(sources.toArray());
 
-            // Before we add the index to the model, we have to add the collection metadata for this
+            // Before we add the index to the model, we have to add a default collection metadata for this
             CollectionMeta metadatum = new CollectionMeta("." + subcollection_index.getID());
-            metadatum.setValue(name);
+            metadatum.setValue(subcollection_index.getID());
             CollectionDesignManager.collectionmeta_manager.addMetadatum(metadatum);