Attachment #7764 for bug #21708

Lines 12-17 Link Here

(-)TestModelContentProvider.java (+5 lines)
12		12
13	import org.eclipse.jface.util.Assert;	13	import org.eclipse.jface.util.Assert;
14	import org.eclipse.jface.viewers.AbstractTreeViewer;	14	import org.eclipse.jface.viewers.AbstractTreeViewer;
		15	import org.eclipse.jface.viewers.ComboViewer;
15	import org.eclipse.jface.viewers.IBasicPropertyConstants;	16	import org.eclipse.jface.viewers.IBasicPropertyConstants;
16	import org.eclipse.jface.viewers.IStructuredContentProvider;	17	import org.eclipse.jface.viewers.IStructuredContentProvider;
17	import org.eclipse.jface.viewers.ITreeContentProvider;	18	import org.eclipse.jface.viewers.ITreeContentProvider;
Lines 38-43 Link Here
38	}	39	}
39	else if (fViewer instanceof AbstractTreeViewer) {	40	else if (fViewer instanceof AbstractTreeViewer) {
40	((AbstractTreeViewer) fViewer).add(change.getParent(), change.getChildren());	41	((AbstractTreeViewer) fViewer).add(change.getParent(), change.getChildren());
		42	} else if (fViewer instanceof ComboViewer) {
		43	((ComboViewer)fViewer).add(change.getChildren());
41	}	44	}
42	else {	45	else {
43	Assert.isTrue(false, "Unknown kind of viewer");	46	Assert.isTrue(false, "Unknown kind of viewer");
Lines 60-65 Link Here
60	}	63	}
61	else if (fViewer instanceof AbstractTreeViewer) {	64	else if (fViewer instanceof AbstractTreeViewer) {
62	((AbstractTreeViewer) fViewer).remove(change.getChildren());	65	((AbstractTreeViewer) fViewer).remove(change.getChildren());
		66	} else if (fViewer instanceof ComboViewer) {
		67	((ComboViewer) fViewer).remove(change.getChildren());
63	}	68	}
64	else {	69	else {
65	Assert.isTrue(false, "Unknown kind of viewer");	70	Assert.isTrue(false, "Unknown kind of viewer");




/*******************************************************************************
 * 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);
	}
}

Return to bug 21708

Added Link Here

(-)Eclipse (+42 lines)
1	/*******************************************************************************
2	* Copyright (c) 2004 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Common Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/cpl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.jface.tests.viewers;
12
13	import org.eclipse.jface.viewers.ComboViewer;
14	import org.eclipse.jface.viewers.StructuredViewer;
15	import org.eclipse.swt.widgets.Combo;
16	import org.eclipse.swt.widgets.Composite;
17
18	/**
19	* @since 3.0
20	*/
21	public class ComboViewerTest extends StructuredViewerTest {
22	public ComboViewerTest(String name) {
23	super(name);
24	}
25	protected StructuredViewer createViewer(Composite parent) {
26	ComboViewer viewer= new ComboViewer(parent);
27	viewer.setContentProvider(new TestModelContentProvider());
28	return viewer;
29	}
30	protected int getItemCount() {
31	TestElement first= fRootElement.getFirstChild();
32	Combo list= (Combo)fViewer.testFindItem(first);
33	return list.getItemCount();
34	}
35	protected String getItemText(int at) {
36	Combo list= (Combo) fViewer.getControl();
37	return list.getItem(at);
38	}
39	public static void main(String args[]) {
40	junit.textui.TestRunner.run(ListViewerTest.class);
41	}
42	}