Changeset 4489

Timestamp:

2003-06-05T13:32:17+12:00 (21 years ago)

Author:

kjdon

Message:

changed a lot of stuff to do with importing metadata sets and merging elements with the same name. now there is no separate progress bar cos that was screwy, and we dont really need it anyway. this stuff still isn't working properly, but I'll keep working on it...

Location:

trunk/gli/src/org/greenstone/gatherer/msm

Files:

• MSMPrompt.java (modified) (23 diffs)
• MetadataSetManager.java (modified) (5 diffs)

trunk/gli/src/org/greenstone/gatherer/msm/MSMPrompt.java

@@ -67 +67 @@
     private JButton replace = null;
     private JButton skip = null;
-    private JDialog off_screen = null;
     private JDialog on_screen = null;
     private JDialog dialog = null;
@@ -79 +78 @@
     private Object result = null;
 
-    final static private Dimension MDE_SIZE = new Dimension(500,225);
+    final static private Dimension MDE_SIZE = new Dimension(500,250);
     final static private Dimension MDS_SIZE = new Dimension(800,425);
     final static private Dimension PROGRESS_SIZE = new Dimension(500,105);
@@ -149 +148 @@
     args[0] = mde_new.getAttribute("name");
     args[1] = get(reason, null);
-    JOptionPane.showMessageDialog(off_screen, get("Add_Failed", args), get("Add_Failed_Title", null), JOptionPane.ERROR_MESSAGE);
+    JOptionPane.showMessageDialog(Gatherer.g_man, get("Add_Failed", args), get("Add_Failed_Title", null), JOptionPane.ERROR_MESSAGE);
     }
 
@@ -181 +180 @@
      */
     public void endMerge() {
-    off_screen.dispose();
-    off_screen = null;
     }
     /** Method to indicate that yet another element has been succesfully merged, so that progress bar should reflect this.
@@ -193 +190 @@
     /** Method to display the metadata element merging prompt, wherein the user determines how the attributes within an element should be merged.
      * @param mde_cur The current <strong>Element</strong> we are merging against.
-     * @param att_cur The attribute <strong>Element</strong> of the current element in question.
+     * @param atts_cur The list of matching attribute <strong>Elements</strong> of the current element in question.
      * @param mde_new The <strong>Element</strong> which we have choosen to merge in, and whose attributes are being examined.
      * @param att_new And the new elements attribute <strong>Element</strong>.
-     * @return An <i>int</i> specifying what further action should be undertaken, if any.
-     */
-    public int mDEPrompt(Element mde_cur, Element att_cur, Element mde_new, Element att_new) {
+     * @return An object, which is either an Integer specifying what further action should be undertaken, if any, or if the action was replace, returns an Element, which is the attribute Element to replace with the new one
+     */
+    public Object mDEPrompt(Element mde_cur, Element []atts_cur, Element mde_new, Element att_new) {
     action = Declarations.NO_ACTION;
     // Construction and configuration
@@ -208 +205 @@
     JPanel content_pane = (JPanel)dialog.getContentPane();
 
-    JLabel cur_name_label = new JLabel(get("Element_Name"));
-
-    JLabel cur_name = new JLabel(MSMUtils.getFullName(mde_cur));
-    cur_name.setBackground(Color.white);
-    cur_name.setOpaque(true);
-
-    JLabel cur_att_label = new JLabel(get("Attribute"));
-
-    JLabel cur_att = new JLabel(att_cur.getAttribute("name") +" = " + MSMUtils.getValue(att_cur));
-    cur_att.setBackground(Color.white);
-    cur_att.setOpaque(true);
-
-    JLabel new_name_label = new JLabel(cur_name_label.getText());
-
-    JLabel new_name = new JLabel(MSMUtils.getFullName(mde_new));
-    new_name.setBackground(Color.white);
-    new_name.setOpaque(true);
-
-    JLabel new_att_label = new JLabel(cur_att_label.getText());
-
-    JLabel new_att = new JLabel(att_new.getAttribute("name") +" = " + MSMUtils.getValue(att_new));
-    new_att.setBackground(Color.white);
-    new_att.setOpaque(true);
-
-    replace.setEnabled(true);
+    JLabel element_name_label = new JLabel(get("Element_Name"));
+    JLabel element_name = new JLabel(MSMUtils.getFullName(mde_cur));
+    
+    JLabel attribute_name_label = new JLabel(get("Attribute"));
+    JLabel attribute_name = new JLabel(att_new.getAttribute("name"));
+
+    add.setEnabled(true);
+    replace.setEnabled(false);
     skip.setEnabled(true);
 
-    // Layout
+    JList cur_values = new JList(atts_cur);
+    cur_values.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+    cur_values.setLayoutOrientation(JList.VERTICAL);
+    cur_values.setVisibleRowCount(3);
+    cur_values.setCellRenderer(new AttributeListCellRenderer());
+    cur_values.addListSelectionListener(new ElementListListener(cur_values, replace));
+    //Layout
+    JPanel title_pane = new JPanel();
+    title_pane.setLayout(new GridLayout(2,2));
+    title_pane.add(element_name_label);
+    title_pane.add(element_name);
+    title_pane.add(attribute_name_label);
+    title_pane.add(attribute_name);
+
     JPanel current_pane = new JPanel();
-    current_pane.setBorder(BorderFactory.createTitledBorder(get("Current_Element")));
-    current_pane.setLayout(new GridLayout(2,2));
-    current_pane.add(cur_name_label);
-    current_pane.add(cur_name);
-    current_pane.add(cur_att_label);
-    current_pane.add(cur_att);
+    current_pane.setLayout(new BorderLayout());
+    current_pane.setBorder(BorderFactory.createTitledBorder(get("Current_Values")));
+    JScrollPane scroll = new JScrollPane(cur_values);
+    current_pane.add(scroll, BorderLayout.CENTER);
 
     JPanel new_pane = new JPanel();
-    new_pane.setBorder(BorderFactory.createTitledBorder(get("New_Element")));
-    new_pane.setLayout(new GridLayout(2,2));
-    new_pane.add(new_name_label);
-    new_pane.add(new_name);
-    new_pane.add(new_att_label);
-    new_pane.add(new_att);
-
+    new_pane.setBorder(BorderFactory.createTitledBorder(get("New_Value")));
+    new_pane.setLayout(new BorderLayout());
+    JLabel new_att = new JLabel(MSMUtils.getValue(att_new));
+    new_pane.add(new_att, BorderLayout.WEST);
     JPanel central_pane = new JPanel();
     central_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-    central_pane.setLayout(new GridLayout(2,1));
+    central_pane.setLayout(new BoxLayout(central_pane, BoxLayout.Y_AXIS));
+    central_pane.add(title_pane);
     central_pane.add(current_pane);
     central_pane.add(new_pane);
@@ -260 +249 @@
     JPanel button_pane = new JPanel();
     button_pane.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
-    button_pane.setLayout(new GridLayout(1,3));
+    button_pane.setLayout(new GridLayout(1,4));
+    button_pane.add(add);
     button_pane.add(replace);
     button_pane.add(skip);
@@ -270 +260 @@
 
     // Display
+    
     dialog.setLocation((screen_size.width - MDE_SIZE.width) / 2, (screen_size.height - MDE_SIZE.height) / 2);
     on_screen = dialog;
-    off_screen.setVisible(false);
-    on_screen.setVisible(true);
-    off_screen.setVisible(true);
+    on_screen.setVisible(true); // blocks until hidden
     on_screen.dispose();
 
+    // the return value - will either be an Integer containing the action, 
+    // of the selected Element for a replace
+    Object result = new Integer(action);
+    // need to get the value of the list selection if replace was clicked
+    if (action == Declarations.REPLACE) {
+        result = cur_values.getSelectedValue();
+    }
     content_pane = null;
-    cur_name_label = null;
-    cur_name = null;
-    cur_att_label = null;
-    cur_att = null;
-    new_name_label = null;
-    new_name = null;
-    new_att_label = null;
+    element_name_label = null;
+    element_name = null;
+    attribute_name_label = null;
+    attribute_name=null;
+    cur_values = null;
+    title_pane=null;
+    current_pane = null;
+    scroll = null;
+    new_pane = null;
     new_att = null;
-    current_pane = null;
-    new_pane = null;
     central_pane = null;
     button_pane = null;
-    screen_size = null;
     on_screen = null;
     dialog = null;
-
-    return action;
+    
+    return result;
     }
     /** This method displays the metadata data set merging prompt, wherein the user determines how the elements within a set should be merged.
@@ -320 +315 @@
         skip.setEnabled(true);
                 // Current details.
-        String str_cur[] = MSMUtils.getStructuralDetails(mde_cur);
+        String str_cur[] = MSMUtils.getStructuralDetails(mds_cur, mde_cur);
         String opt_cur[] = MSMUtils.getOptionListDetails(mde_cur);
         String ass_cur[] = MSMUtils.getAssignedValuesDetails(mds_cur, mde_cur);
-        String details_cur = get("Structural");
+        String details_cur = get("Structural", str_cur);
         if(opt_cur != null) {
         details_cur = details_cur + "\n" + get("OptionList", opt_cur);
@@ -346 +341 @@
     }
     // New details.
-    String str_new[] = MSMUtils.getStructuralDetails(mde_new);
+    String str_new[] = MSMUtils.getStructuralDetails(mds_new, mde_new);
     String opt_new[] = MSMUtils.getOptionListDetails(mde_new);
     String ass_new[] = MSMUtils.getAssignedValuesDetails(mds_new, mde_new);
@@ -402 +397 @@
     dialog.setLocation((screen_size.width - MDS_SIZE.width) / 2, (screen_size.height - MDS_SIZE.height) / 2);
     on_screen = dialog;
-    off_screen.setVisible(false);
     on_screen.setVisible(true); // Blocks until hidden.
-    off_screen.setVisible(true);
     on_screen.dispose();
     on_screen = null;
@@ -426 +419 @@
     return action;
     }
-    /** This method creates an initial JDialog which simply shows the MSMs progress towards merging the metadata sets.
+    /** This method initialises the  progress bar.
      * @param element_count An <i>int</i> specifying the total number of elements to be merged.
      */
     public void startMerge(int element_count) {
-    action = Declarations.NO_ACTION;
-    JDialog dialog = new ModalDialog(Gatherer.g_man);
-    dialog.setModal(false);
-    dialog.setSize(PROGRESS_SIZE);
-    dialog.setTitle(get("Merge_Progress"));
-    //dialog.setJMenuBar(new SimpleMenuBar("0")); ?? do we want help here??
-
-    JPanel content_pane = (JPanel)dialog.getContentPane();
     progress.setMaximum(element_count);
     progress.setMinimum(0);
     progress.setString("0%");
     progress.setValue(0);
-    // Layout.
-    content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-    content_pane.setLayout(new BorderLayout());
-    content_pane.add(progress_label, BorderLayout.NORTH);
-    content_pane.add(progress, BorderLayout.CENTER);
-    // Display.
-    dialog.setLocation((screen_size.width - PROGRESS_SIZE.width) / 2, (screen_size.height - PROGRESS_SIZE.height) / 2);
-    off_screen = dialog;
-    dialog.setVisible(true);
-    content_pane = null;
-    dialog = null;
-    }
+    }
+    
     /** This method creates a prompt for renaming an Element.
      * @param mde_new The <strong>Element</strong> we wish to rename.
@@ -515 +490 @@
     dialog.setLocation((screen_size.width - RENAME_SIZE.width) / 2, (screen_size.height - RENAME_SIZE.height) / 2);
     on_screen = dialog;
-    off_screen.setVisible(false);
     on_screen.setVisible(true);
-    off_screen.setVisible(true);
     on_screen.dispose();
     on_screen = null;         
@@ -550 +523 @@
     args[0] = mde_cur.getAttribute("name");
     args[1] = get(reason, null);
-    JOptionPane.showMessageDialog(off_screen, get("Remove_Failed", args), get("Remove_Failed_Title", null), JOptionPane.ERROR_MESSAGE);
+    JOptionPane.showMessageDialog(Gatherer.g_man, get("Remove_Failed", args), get("Remove_Failed_Title", null), JOptionPane.ERROR_MESSAGE);
     }
 
@@ -563 +536 @@
     args[1] = new_name;
     args[2] = get(reason, null);
-    JOptionPane.showMessageDialog(off_screen, get("Rename_Failed", args), get("Rename_Failed_Title", null), JOptionPane.ERROR_MESSAGE);
+    JOptionPane.showMessageDialog(Gatherer.g_man, get("Rename_Failed", args), get("Rename_Failed_Title", null), JOptionPane.ERROR_MESSAGE);
     }
 
@@ -611 +584 @@
     dialog.setLocation((screen_size.width - SELECT_SIZE.width) / 2, (screen_size.height - SELECT_SIZE.height) / 2);
     on_screen = dialog;
-    off_screen.setVisible(false);
     on_screen.setVisible(true);
-    off_screen.setVisible(true);
     on_screen.dispose();
     on_screen = null;   
@@ -763 +734 @@
     // Display
     dialog.setLocation((screen_size.width - SELECT_ELEMENT_SIZE.width) / 2, (screen_size.height - SELECT_ELEMENT_SIZE.height) / 2);
-    System.err.println("Showing selection dialog. Block...");
     dialog.setVisible(true);
-    System.err.println("and release. Returning value.");
     // Deallocate everything because JDK1.4 won't.
     // Why, oh why did I do this?
@@ -874 +843 @@
     // Display
     dialog.setLocation((screen_size.width - SELECT_SET_SIZE.width) / 2, (screen_size.height - SELECT_SET_SIZE.height) / 2);
-    System.err.println("Showing selection dialog. Block...");
     dialog.setVisible(true);
-    System.err.println("and release. Returning value.");
     Object value = set.getSelectedItem();
     if(value instanceof MetadataSet) {
@@ -905 +872 @@
     }
     public void actionPerformed(ActionEvent event) {
-                // Get the currently selected metadata set.
+        // Get the currently selected metadata set.
         MetadataSet mds = (MetadataSet) set.getSelectedItem();
         String n = name;
-                // If we've been forced to go this far then any given namespace is complete bollocks.
+        // If we've been forced to go this far then any given namespace is complete bollocks.
         while(n.indexOf(".") != -1 && !n.equals(".")) {
         n = n.substring(n.indexOf(".") + 1);
         }
-                // However, before we attempt to add a new element to the set, we should check that none already exists.
+        // However, before we attempt to add a new element to the set, we should check that none already exists.
         Element element = mds.getElement(name);
         if(element == null) {
@@ -926 +893 @@
     }
     }
+
+    /** a ListCellRenderer for a list of Elements - the displayed value of the element is not Element.toString() */
+    private class AttributeListCellRenderer extends DefaultListCellRenderer {
+    
+    public AttributeListCellRenderer() {
+        super();
+    }
+    public Component getListCellRendererComponent(JList list,
+                              Object value,
+                              int index,
+                              boolean isSelected,
+                              boolean cellHasFocus) {
+                
+        setText(MSMUtils.getValue((Element)value));
+        if (isSelected) {
+        setBackground(list.getSelectionBackground());
+        setForeground(list.getSelectionForeground());
+        }
+        else {
+        setBackground(list.getBackground());
+        setForeground(list.getForeground());
+        }
+        setEnabled(list.isEnabled());
+        setFont(list.getFont());
+        setOpaque(true);
+        return this;
+    }
+    
+    
+    }
+
     /** This listener listens for selections within the select element to merge prompt, and once one has been made enables the ok button.*/
     private class ElementListListener 
@@ -986 +984 @@
     }
     public void actionPerformed(ActionEvent event) {
-                // Return the currently selected element
+        // Return the currently selected element
         result = (ElementWrapper)element.getSelectedItem();
         dialog.setVisible(false);
@@ -1020 +1018 @@
         element.removeAllItems();
         MetadataSet mds = (MetadataSet) set.getSelectedItem();
-        System.err.println("Set selected: " + mds);
+        ///ystem.err.println("Set selected: " + mds);
         if(mds != null) {
         NodeList elements = mds.getElements();
@@ -1067 +1065 @@
     }  
     }
+
 }

trunk/gli/src/org/greenstone/gatherer/msm/MetadataSetManager.java

@@ -566 +566 @@
             matched = true;
             MetadataSet mds_cur = (MetadataSet)mds_hashtable.get(key);
-            //ystem.err.println("Merging " + mds_new + " into " + mds_cur);
-            MergeTask task = new MergeTask(mds_cur, mds_new);
-            task.start();
+            ///ystem.err.println("Merging " + mds_new + " into " + mds_cur);
+            mergeMDS(mds_cur, mds_new);
         }
         }
@@ -576 +575 @@
         }
         // Fire setChanged() message.
-        //fireSetChanged(mds_new);
+        fireSetChanged(mds_new);
         return true;
     }
     // else we cancelled for some reason.
     return false;
-    }
-
-    private class MergeTask
-    extends Thread {
-    private MetadataSet mds_cur;
-    private MetadataSet mds_new;
-    MergeTask(MetadataSet mds_cur, MetadataSet mds_new) {
-        this.mds_cur = mds_cur;
-        this.mds_new = mds_new;
-    }
-    public void run() {
-        mergeMDS(mds_cur, mds_new);
-        fireSetChanged(mds_new);
-    }
     }
 
@@ -652 +637 @@
         boolean cont = false;
         Element mde_new = mds_new.getElement(i);
-                // See if the element already exists in the current set
+        // See if the element already exists in the current set
         Element mde_cur = mds_cur.getElement(mde_new.getAttribute("name"));
         int option = Declarations.NO_ACTION;
@@ -765 +750 @@
      */
     public boolean mergeMDE(MetadataSet mds_cur, Element mde_cur, MetadataSet mds_new, Element mde_new) {
-    while(true) {
-        for(Node mdn_new = mde_new.getFirstChild(); mdn_new != null; mdn_new = mdn_new.getNextSibling()) {
-        // Only merge the nodes whose name is 'Attribute'
-        if(mdn_new.getNodeName().equals("Attribute")) {
-            Element att_new = (Element) mdn_new;
-            // Unfortunately some attributes, such as author, can have several occurances, so match each in turn.
-            Element temp[] = MSMUtils.getAttributeNodesNamed(mde_cur, att_new.getAttribute("name"));
+    for(Node mdn_new = mde_new.getFirstChild(); mdn_new != null; mdn_new = mdn_new.getNextSibling()) {
+        // Only merge the nodes whose name is 'Attribute'
+        if(mdn_new.getNodeName().equals("Attribute")) {
+        Element att_new = (Element) mdn_new;
+        int action = Declarations.NO_ACTION;    
+        Element replace_att = null; // replace this att with the new one
+        // Unfortunately some attributes, such as author, can have several occurances, so match each in turn.
+        Element temp[] = MSMUtils.getAttributeNodesNamed(mde_cur, att_new.getAttribute("name"));
+        if (temp==null) {           
+            action = Declarations.ADD;
+        } else {
+            
+            // look for an exact match
             for(int i = 0; temp != null && i < temp.length; i++) {
             Element att_cur = temp[i];
-            boolean cont = false;
-            int action = Declarations.NO_ACTION;                     
-            while(!cont) {
-                if(att_cur != null) {
-                if(!MSMUtils.attributesEqual(att_cur, att_new)) {
-                    action = prompt.mDEPrompt(mde_cur, att_cur, mde_new, att_new);
-                }
-                else {
-                    action = Declarations.SKIP;
-                }
-                }
-                else {
-                action = Declarations.ADD;
-                }
-                switch (action) {
-                case Declarations.REPLACE:
-                // Out with the old.
-                mde_cur.removeChild(att_cur);
-                case Declarations.ADD:
-                // Simply add the new attribute. No clash is possible as we have already tested for it.
-                MSMUtils.add(mde_cur, att_new);
-                cont = true;
-                break;
-                case Declarations.SKIP:
-                // Do nothing. Move on to next attribute.
-                cont = true;
-                break;
-                case Declarations.CANCEL:
-                return false;
-                default:
-                cont = false;
-                }
+            if(MSMUtils.attributesEqual(att_cur, att_new)) {
+                action = Declarations.SKIP;
+                break;
             }
             att_cur = null;
             }
-            temp = null;
-            att_new = null;
-        }
-        }
-        return mergeMDV(mds_cur, mde_cur, mds_new, mde_new);
-    }
-    }
+            if (action == Declarations.NO_ACTION) {
+            // we didn't find a match, so we have to prompt teh user for what to do
+            Object result = prompt.mDEPrompt(mde_cur, temp, mde_new, att_new);
+            if (result instanceof Integer) {
+                action = ((Integer)result).intValue();
+            } else {
+                // we have a replace action, and the returned object is the Attribute to replace
+                action = Declarations.REPLACE;
+                replace_att = (Element)result;
+            }
+            }
+        }
+
+        // now do the required action
+        switch (action) {
+        case Declarations.REPLACE:
+            // Out with the old.
+            mde_cur.removeChild(replace_att);
+        case Declarations.ADD:
+            // Simply add the new attribute. No clash is possible as we have already tested for it.
+            MSMUtils.add(mde_cur, att_new);
+            break;
+        case Declarations.SKIP:
+            // Do nothing. Move on to next attribute.
+            break;
+        case Declarations.CANCEL:
+            return false;
+        default:
+        }
+        
+        att_new = null;
+        temp = null;
+        replace_att = null;
+        } // if node nmae = attribute    
+    } //for each child node
+    return mergeMDV(mds_cur, mde_cur, mds_new, mde_new);
+    }
+    
     /** Merge two metadata value trees.
      * @param mds_cur The current MetadataSet. 
@@ -833 +826 @@
     MetadataSet set = (MetadataSet) mds_hashtable.get(namespace);
     if(set != null) {
-                // Bugger. Get the old name -before- we remove the element from the set.
+        // Bugger. Get the old name -before- we remove the element from the set.
         String old_name = element.toString();
-                // Remove the element.
+        // Remove the element.
         set.removeElement(element.getElement());
-                // Fire event.
+        // Fire event.
         fireElementChanged(new MSMEvent(this, null, old_name));
     }
     else {
-                ///ystem.err.println("no such set " + namespace);
+        ///ystem.err.println("no such set " + namespace);
     }
     // No such set. No such element.