1 files changed, 247 insertions, 17 deletions

diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxUI.java
index 28c279d8ed6..a43ee3cb04f 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxUI.java
@@ -38,20 +38,134 @@ exception statement from your version. */
 
 package javax.swing.plaf.metal;
 
-import java.util.HashMap;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.LayoutManager;
+import java.awt.Rectangle;
+import java.awt.event.MouseEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 
+import javax.swing.CellRendererPane;
+import javax.swing.ComboBoxEditor;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicComboBoxUI;
+import javax.swing.plaf.basic.BasicComboPopup;
+import javax.swing.plaf.basic.ComboPopup;
 
-public class MetalComboBoxUI
-  extends BasicComboBoxUI
-{
 
-  /** The UI instances for JComboBoxes. */
-  private static HashMap instances = null;
+/**
+ * A UI delegate for the {@link JComboBox} component.
+ */
+public class MetalComboBoxUI extends BasicComboBoxUI
+{
+  /**
+   * A layout manager that arranges the editor component (if active) and the
+   * button that make up the combo box.
+   */
+  public class MetalComboBoxLayoutManager
+    extends BasicComboBoxUI.ComboBoxLayoutManager
+  {
+    /**
+     * Creates a new instance of the layout manager.
+     */
+    public MetalComboBoxLayoutManager()
+    {
+      // Nothing to do here.
+    }
+    
+    /**
+     * Arranges the editor (if visible) and button that comprise the combo
+     * box.
+     * 
+     * @param parent  the parent.
+     */
+    public void layoutContainer(Container parent)
+    {
+      JComboBox cb = (JComboBox) parent;
+      if (!cb.isEditable())
+        {
+          Rectangle bounds = parent.getBounds();
+          arrowButton.setBounds(0, 0, bounds.width, bounds.height);
+        }
+      else 
+        superLayout(parent);
+    }
+    
+    /**
+     * Calls the <code>layoutContainer(Container)</code> method in the super 
+     * class.
+     * 
+     * @param parent  the container.
+     */
+    public void superLayout(Container parent)
+    {
+      super.layoutContainer(parent);
+    }
+  }
+  
+  /**
+   * A listener used to handle property changes in the {@link JComboBox} 
+   * component, to ensure that the UI delegate accurately reflects the current
+   * state in the rendering onscreen.
+   */
+  public class MetalPropertyChangeListener
+    extends BasicComboBoxUI.PropertyChangeHandler
+  {
+    /**
+     * Creates a new listener.
+     */
+    public MetalPropertyChangeListener()
+    {
+      // Nothing to do here.
+    }
+    
+    /**
+     * Handles a property change event, updating the UI components as
+     * appropriate.
+     * 
+     * @param e  the event.
+     */
+    public void propertyChange(PropertyChangeEvent e)
+    {
+      if (e.getPropertyName().equals("editable"))
+        editablePropertyChanged(e);
+      super.propertyChange(e);
+    }
+  }
 
   /**
+   * A popup menu for the combo-box.
+   * 
+   * @see #createPopup()
+   *
+   * @deprecated 1.4
+   */
+  public class MetalComboPopup extends BasicComboPopup
+  {
+    /**
+     * Creates a new popup.
+     * 
+     * @param cBox  the combo box.
+     */
+    public MetalComboPopup(JComboBox cBox)
+    {
+      super(cBox); 
+    }
+    
+    public void delegateFocus(MouseEvent e)
+    {
+      super.delegateFocus(e);
+    }
+  }
+  
+  /**
    * Constructs a new instance of MetalComboBoxUI.
    */
   public MetalComboBoxUI()
@@ -68,19 +182,135 @@ public class MetalComboBoxUI
    */
   public static ComponentUI createUI(JComponent component)
   {
-    if (instances == null)
-      instances = new HashMap();
-
-    Object o = instances.get(component);
-    MetalComboBoxUI instance;
-    if (o == null)
+    return new MetalComboBoxUI();
+  }
+  
+  /**
+   * Creates an editor for the combo box.
+   * 
+   * @return An editor.
+   */
+  protected ComboBoxEditor createEditor()
+  {
+    return new MetalComboBoxEditor.UIResource();   
+  }
+  
+  /**
+   * Creates a popup for the combo box.
+   * 
+   * @return A popup.
+   */
+  protected ComboPopup createPopup()
+  {
+    return new MetalComboPopup(comboBox);
+  }
+  
+  /**
+   * Creates a new button for use in rendering the JComboBox.
+   * 
+   * @return A button.
+   */
+  protected JButton createArrowButton()
+  {
+    JButton button = new MetalComboBoxButton(comboBox, new MetalComboBoxIcon(), 
+            new CellRendererPane(), listBox);  
+    button.setMargin(new Insets(0, 1, 1, 3));
+    return button;
+  }
+  
+  /**
+   * Creates a new property change listener.
+   * 
+   * @return A new property change listener.
+   */
+  public PropertyChangeListener createPropertyChangeListener()
+  {
+    return new MetalPropertyChangeListener();
+  }
+  
+  public void paint(Graphics g, JComponent c)
+  {
+    // do nothing, the button and text field are painted elsewhere
+  }
+  
+  /**
+   * Updates the button and text field to reflect a change in the 'editable'
+   * property.
+   * 
+   * @param e  the event.
+   * 
+   * @deprecated 1.4
+   */
+  protected void editablePropertyChanged(PropertyChangeEvent e)
+  {
+    if (arrowButton instanceof MetalComboBoxButton)
+      {
+        MetalComboBoxButton b = (MetalComboBoxButton) arrowButton;
+        b.setIconOnly(comboBox.isEditable());
+      }
+    if (comboBox.isEditable())
       {
-	instance = new MetalComboBoxUI();
-	instances.put(component, instance);
+        arrowButton.setText(null);
+        if (editor != null)
+          editor.setVisible(true);
       }
     else
-      instance = (MetalComboBoxUI) o;
-
-    return instance;
+      {
+        String text = "";
+        Object selected = comboBox.getSelectedItem();
+        if (selected != null)
+          text = selected.toString();
+        arrowButton.setText(text);
+        if (editor != null)
+          editor.setVisible(true);
+      }
+  }
+  
+  /**
+   * Creates a new layout manager for the UI delegate.
+   * 
+   * @return A new layout manager.
+   */
+  protected LayoutManager createLayoutManager()
+  {
+    return new MetalComboBoxLayoutManager();
+  }
+  
+  /**
+   * Not used in Classpath.
+   * 
+   * @deprecated 1.4
+   */
+  protected void removeListeners()
+  {
+    // no longer used in JDK 1.4 
+  }
+  
+  /**
+   * Returns the minimum size for the combo.
+   * 
+   * @param c  the component
+   * 
+   * @return The minimum size for the combo box.
+   */
+  public Dimension getMinimumSize(JComponent c)
+  {
+    Dimension d = getDisplaySize();
+    MetalComboBoxButton b = (MetalComboBoxButton) arrowButton;
+    Insets insets = b.getInsets();
+    int insetsH = insets.top + insets.bottom;
+    int insetsW = insets.left + insets.right;
+    if (!comboBox.isEditable())
+      {
+        Icon icon = b.getComboIcon();
+        int iconWidth = icon.getIconWidth() + 6;
+        return new Dimension(d.width + insetsW + iconWidth, d.height + insetsH);
+      }
+    else
+      // FIXME: the following dimensions pass most of the Mauve tests, but
+      // I don't yet understand the logic behind this...it is probably wrong
+      return new Dimension(d.width + insetsW + (d.height + insetsH) - 4, 
+          d.height + insetsH + 1);
   }
+  
 }