Changeset 6569

Timestamp:

2004-01-21T11:21:57+13:00 (20 years ago)

Author:

jmt12

Message:

JScrollPane now right aligned for right aligned languages

File:

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

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

@@ -189 +189 @@
     /** The panel containing the set list. */
     private JPanel set_pane = null;
+
+    private JScrollPane element_list_scroll_pane;
     /** The text area of inline instructions. */
     private JTextArea instructions = null;
 
     private ListListener list_listener;
+
+    private MultilingualListCellRenderer element_list_cell_renderer;
+
     /** The element model for the currently selected set. */
     private Vector element_model = null;
@@ -209 +214 @@
         element_label.setOpaque(true);
         Dictionary.registerText(element_label, "CDM.MetadataSetManager.Elements");
+        element_list_scroll_pane = new JScrollPane();
+        element_list_cell_renderer = new MultilingualListCellRenderer(element_list_scroll_pane);
         element_list = new JList();
+        element_list_scroll_pane.setViewportView(element_list);
+        element_list.setCellRenderer(element_list_cell_renderer);
         element_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         element_pane = new JPanel();
@@ -271 +280 @@
         element_pane.setLayout(new BorderLayout());
         element_pane.add(element_label, BorderLayout.NORTH);
-        element_pane.add(new JScrollPane(element_list), BorderLayout.CENTER);
+        element_pane.add(element_list_scroll_pane, BorderLayout.CENTER);
 
         central_pane.setLayout(new GridLayout(2,1));
@@ -336 +345 @@
         if(set_list.isSelectionEmpty() && set_list.getModel().getSize() > 0) {
         set_list.setSelectedIndex(0);
-        MetadataSet set = ((SetWrapper)set_list.getSelectedValue()).getSet();
-        NodeList elements = set.getElements();
-        element_model = new Vector();
-        for(int i = 0; i < elements.getLength(); i++) {
-            element_model.add(new ElementWrapper(elements.item(i)));
-        }
-        element_list.setListData(element_model);
-        configure_button.setEnabled(true);
-        remove_button.setEnabled(true);
-        elements = null;
-        set = null;
+        list_listener.valueChanged(new ListSelectionEvent(set_list, 0, 0, true));
         }
     }
@@ -411 +410 @@
         implements ListSelectionListener {
         public void valueChanged(ListSelectionEvent event) {
+        // Wait until we get a stable event
+        if(event.getValueIsAdjusting()) {
+            return;
+        }
+        // Now we can process it
         if(!set_list.isSelectionEmpty()) {
             MetadataSet set = ((SetWrapper)set_list.getSelectedValue()).getSet();
@@ -422 +426 @@
             configure_button.setEnabled(true);
             remove_button.setEnabled(true);
+
+            // Finally check the directionality and scroll as necessary
+            JScrollBar scroll_bar = element_list_scroll_pane.getHorizontalScrollBar();
+            if(element_list_cell_renderer.getDirectionality() == Character.DIRECTIONALITY_RIGHT_TO_LEFT) {
+            scroll_bar.setValue(scroll_bar.getMaximum());
+            }
+            else {
+            scroll_bar.setValue(scroll_bar.getMinimum());
+            }
+
         }
         else {
@@ -452 +466 @@
         }
         }
-    }   
+    }
+
+    private class MultilingualListCellRenderer
+        extends DefaultListCellRenderer {
+        private byte previous_directionality = Character.DIRECTIONALITY_UNDEFINED;
+        private JScrollPane scroll_pane;
+        public MultilingualListCellRenderer(JScrollPane scroll_pane) {
+        super();
+        this.scroll_pane = scroll_pane;
+        }
+
+        public byte getDirectionality() {
+        if(previous_directionality == Character.DIRECTIONALITY_RIGHT_TO_LEFT || previous_directionality == Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC || previous_directionality == Character.DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING || previous_directionality == Character.DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE) {
+            return Character.DIRECTIONALITY_RIGHT_TO_LEFT;
+        }
+        else {
+            return Character.DIRECTIONALITY_LEFT_TO_RIGHT;
+        }
+        }
+        
+        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+        JLabel component = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+        // Determine if the text should be left aligned or right aligned
+        String text = value.toString();
+        int text_index = 0;
+        byte directionality = Character.DIRECTIONALITY_UNDEFINED;
+        while(directionality == Character.DIRECTIONALITY_UNDEFINED && text_index < text.length()) {
+            directionality = Character.getDirectionality(text.charAt(text_index));
+            text_index++;
+        }
+        if(directionality != previous_directionality) {
+            previous_directionality = directionality;
+            if(directionality == Character.DIRECTIONALITY_RIGHT_TO_LEFT || directionality == Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC || directionality == Character.DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING || directionality == Character.DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE) {
+            ///ystem.err.println("R2L for: " + text);
+            component.setHorizontalAlignment(JLabel.TRAILING);
+            component.setHorizontalTextPosition(JLabel.TRAILING);
+            component.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
+            //scroll_pane.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
+            }
+            else {
+            component.setHorizontalAlignment(JLabel.LEADING);
+            component.setHorizontalTextPosition(JLabel.LEADING);
+            ///ystem.err.println("L2R for: " + text);
+            component.setComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT);
+            //scroll_pane.setComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT);
+            }
+        }
+
+        text = null;
+        return component;
+        }
+
+    }
+    
     }