2005-01-14 Andrew John Hughes <gnu_andrew@member.fsf.org>

        * Merge of September 2004 HEAD patches to generics branch.

1 files changed, 25 insertions, 21 deletions

diff --git a/javax/swing/ComboBoxModel.java b/javax/swing/ComboBoxModel.java
index b3b2112b5..c3b59bda6 100644
--- a/javax/swing/ComboBoxModel.java
+++ b/javax/swing/ComboBoxModel.java
@@ -37,28 +37,32 @@ exception statement from your version. */
 
 package javax.swing;
 
+
 /**
- * ComboBoxModel
- * @author	Andrew Selkirk
- * @version	1.0
+ * ComboBoxModel is a data model for JComboBox. This model keeps
+ * track of elements contained in the JComboBox as well as the current
+ * combo box selection. Whenever selection in the JComboBox changes, the
+ * ComboBoxModel should fire ListDataEvents to ComboBox's ListDataListeners.
+ *
+ * @author        Andrew Selkirk
+ * @version        1.0
  */
-public interface ComboBoxModel extends ListModel {
-
-	//-------------------------------------------------------------
-	// Methods ----------------------------------------------------
-	//-------------------------------------------------------------
-
-	/**
-	 * setSelectedItem
-	 * @param item TODO
-	 */
-	void setSelectedItem(Object item);
-
-	/**
-	 * getSelectedItem
-	 * @returns Object
-	 */
-	Object getSelectedItem();
-
+public interface ComboBoxModel extends ListModel
+{
+  /**
+   * This method sets the selected item in the combo box. Class
+   * implementing this interface should fire ListDataEvents to
+   * all registered ListDataListeners to indicated that the
+   * selection has changed.
+   *
+   * @param item item in the combo box that should be selected
+   */
+  void setSelectedItem(Object item);
 
+  /**
+   * The method returns currently selected item in the combo box
+   *
+   * @returns item that is currently selected in the combo box.
+   */
+  Object getSelectedItem();
 } // ComboBoxModel