Changeset 8132

Timestamp:

2004-09-22T12:32:56+12:00 (20 years ago)

Author:

mdewsnip

Message:

More improvements to new metadata code, including language-specific metadata element display.

Location:

trunk/gli/src/org/greenstone/gatherer/gui

Files:

• MetadataElementListCellRenderer.java (added)
• MetadataImportMappingPrompt.java (modified) (5 diffs)
• MetadataValueTableCellRenderer.java (modified) (1 diff)

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

@@ -18 +18 @@
 {
     final static public int ADD_BUTTON_PRESSED = 0;
-    final static public int MAP_BUTTON_PRESSED = 1;
+    final static public int REPLACE_BUTTON_PRESSED = 1;
     final static public int IGNORE_BUTTON_PRESSED = 2;
     final static private Dimension DIALOG_SIZE = new Dimension(640, 180);
@@ -27 +27 @@
     private GComboBox metadata_elements_combobox = null;
     private JButton add_button = null;
-    private JButton map_button = null;
+    private JButton replace_button = null;
     private JButton ignore_button = null;
     private JDialog on_screen = null;
@@ -57 +57 @@
     // Dictionary.registerBoth(add_button, "MSMPrompt.Add", "MSMPrompt.Add_Tooltip");
 
-    map_button = new GLIButton();
-    map_button.addActionListener(this);
-    map_button.setEnabled(true);
-    map_button.setMnemonic(KeyEvent.VK_M);
-    map_button.setText("Map");
+    replace_button = new GLIButton();
+    replace_button.addActionListener(this);
+    replace_button.setEnabled(true);
+    replace_button.setMnemonic(KeyEvent.VK_M);
+    replace_button.setText("Replace");
     // Dictionary.registerBoth(merge, "MSMPrompt.Merge", "MSMPrompt.Merge_Tooltip");
 
@@ -95 +95 @@
     button_pane.setLayout(new GridLayout(1,3));
     button_pane.add(add_button);
-    button_pane.add(map_button);
+    button_pane.add(replace_button);
     button_pane.add(ignore_button);
 
@@ -125 +125 @@
         result = ADD_BUTTON_PRESSED;
     }
-    if (esrc == map_button) {
-        result = MAP_BUTTON_PRESSED;
+    if (esrc == replace_button) {
+        result = REPLACE_BUTTON_PRESSED;
     }
     if (esrc == ignore_button) {

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

@@ -14 +14 @@
 
 public class MetadataValueTableCellRenderer
-   extends DefaultTableCellRenderer
+    extends DefaultTableCellRenderer
 {
-   private MetadataValueTableModel metadata_value_table_model = null;
+    private MetadataValueTableModel metadata_value_table_model = null;
 
 
-   public MetadataValueTableCellRenderer(MetadataValueTableModel metadata_value_table_model)
-   {
-      super();
-      this.metadata_value_table_model = metadata_value_table_model;
-   }
+    public MetadataValueTableCellRenderer(MetadataValueTableModel metadata_value_table_model)
+    {
+    super();
+    this.metadata_value_table_model = metadata_value_table_model;
+    }
 
 
-   /** Returns the default table cell renderer.
-    * @param table The <strong>JTable</strong>.
-    * @param value The value to assign to the cell at [row, column] as an <strong>Object</strong>.
-    * @param isSelected <i>true</i> if cell is selected.
-    * @param hasFocus <i>true</i> if cell has focus.
-    * @param row The row of the cell to render as an <i>int</i>.
-    * @param column The column of the cell to render as an <i>int</i>.
-    * @return The default table cell renderer <strong>Component</strong>.
-    */
-   public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column)
-   {
-      JLabel renderer = null;
+    /** Returns the default table cell renderer.
+     * @param table The <strong>JTable</strong>.
+     * @param value The value to assign to the cell at [row, column] as an <strong>Object</strong>.
+     * @param isSelected <i>true</i> if cell is selected.
+     * @param hasFocus <i>true</i> if cell has focus.
+     * @param row The row of the cell to render as an <i>int</i>.
+     * @param column The column of the cell to render as an <i>int</i>.
+     * @return The default table cell renderer <strong>Component</strong>.
+     */
+    public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column)
+    {
+    JLabel renderer = null;
 
-      // First column: inherited metadata icon
-      if (column == 0 && value != null) {
-     renderer = new JLabel(Utility.getImage("upfolder.gif"));
-      }
-      else {
-     renderer = (JLabel) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-      }
+    // First column: inherited metadata icon
+    if (column == 0 && value != null) {
+        renderer = new JLabel(Utility.getImage("upfolder.gif"));
+    }
+    else {
+        renderer = (JLabel) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+    }
 
-      // Set up the component
-      renderer.setOpaque(true);
+    // Set up the component
+    renderer.setOpaque(true);
 
-      // Foreground
-      if (metadata_value_table_model.isCommon(row)) {
-     renderer.setForeground(Color.black);
-      }
-      else {
-     renderer.setForeground(Color.gray);
-      }
+    // Foreground
+    if (metadata_value_table_model.isCommon(row)) {
+        renderer.setForeground(Color.black);
+    }
+    else {
+        renderer.setForeground(Color.gray);
+    }
 
-      // Background
-      if (isSelected) {
-     renderer.setBackground(Gatherer.config.getColor("coloring.workspace_heading_background", true));
-      }
-      else {
-     if (column <= 1) {
-        renderer.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", true));
-     }
-     else {
-        renderer.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", true));
-     }
-      }
+    // Background
+    if (isSelected) {
+        renderer.setBackground(Gatherer.config.getColor("coloring.workspace_heading_background", true));
+    }
+    else {
+        if (column <= 1) {
+        renderer.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", true));
+        }
+        else {
+        renderer.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", true));
+        }
+    }
 
-      // Finally the 3rd column of cells never paint focus.
-      if (column == 2) {
-     renderer.setBorder(BorderFactory.createEmptyBorder(0,0,0,0));
-      }
+    // Finally the 3rd column of cells never paint focus.
+    if (column == 2) {
+        renderer.setBorder(BorderFactory.createEmptyBorder(0,0,0,0));
+    }
 
-      // We set a tooltip over the element column containing the definition of the element
-      if (value instanceof MetadataElement) {
-      String interface_language_code = Gatherer.config.getLanguage();
-      String metadata_element_definition = MetadataTools.getMetadataElementAttribute((MetadataElement) value, "definition", interface_language_code, "en");
-      if (metadata_element_definition != null) {
-          renderer.setToolTipText(Utility.formatHTMLWidth(metadata_element_definition, 60));
-      }
-      }
+    // We set a tooltip over the element column containing the definition of the element
+    if (value instanceof MetadataElement) {
+        String interface_language_code = Gatherer.config.getLanguage();
+        String metadata_element_definition = MetadataTools.getMetadataElementAttribute((MetadataElement) value, "definition", interface_language_code, "en");
+        if (metadata_element_definition != null) {
+        renderer.setToolTipText(Utility.formatHTMLWidth(metadata_element_definition, 60));
+        }
+    }
 
-      return renderer;
-   }
+    return renderer;
+    }
 }