Index: TestModelContentProvider.java
===================================================================
retrieving revision 1.4
diff -u -r1.4 TestModelContentProvider.java
--- TestModelContentProvider.java	11 Mar 2003 21:23:53 -0000	1.4
+++ TestModelContentProvider.java	11 Feb 2004 03:13:59 -0000
@@ -12,6 +12,7 @@
 
 import org.eclipse.jface.util.Assert;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
+import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IBasicPropertyConstants;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -38,6 +39,8 @@
 	}
 	else if (fViewer instanceof AbstractTreeViewer) {
 		((AbstractTreeViewer) fViewer).add(change.getParent(), change.getChildren());
+	} else if (fViewer instanceof ComboViewer) {
+		((ComboViewer)fViewer).add(change.getChildren());
 	}
 	else {
 		Assert.isTrue(false, "Unknown kind of viewer");
@@ -60,6 +63,8 @@
 	}
 	else if (fViewer instanceof AbstractTreeViewer) {
 		((AbstractTreeViewer) fViewer).remove(change.getChildren());
+	} else if (fViewer instanceof ComboViewer) {
+		((ComboViewer) fViewer).remove(change.getChildren());
 	}
 	else {
 		Assert.isTrue(false, "Unknown kind of viewer");
Index: Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ComboViewerTest.java
===================================================================
RCS file: Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ComboViewerTest.java
diff -N Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ComboViewerTest.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Eclipse JFace Tests/org/eclipse/jface/tests/viewers/ComboViewerTest.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jface.tests.viewers;
+
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * @since 3.0
+ */
+public class ComboViewerTest extends StructuredViewerTest {
+	public ComboViewerTest(String name) {
+		super(name);
+	}
+	protected StructuredViewer createViewer(Composite parent) {
+		ComboViewer viewer= new ComboViewer(parent);
+		viewer.setContentProvider(new TestModelContentProvider());
+		return viewer;
+	}
+	protected int getItemCount() {
+		TestElement first= fRootElement.getFirstChild();
+		Combo list= (Combo)fViewer.testFindItem(first);
+		return list.getItemCount();
+	}
+	protected String getItemText(int at) {
+		Combo list= (Combo) fViewer.getControl();
+		return list.getItem(at);
+	}
+	public static void main(String args[]) {
+		junit.textui.TestRunner.run(ListViewerTest.class);
+	}
+}