Attachment #223621 for bug #393953

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 393953
Collapse All | Expand All

Lines 34-40 Link Here

(-)src/org/eclipse/emf/ecp/ui/views/ECPProvidersView.java (-1 / +1 lines)
34	protected TreeViewer createViewer(Composite parent)	34	protected TreeViewer createViewer(Composite parent)
35	{	35	{
36	TreeViewer viewer = TreeViewerFactory.createTreeViewer(parent, new ProvidersLabelProvider(),	36	TreeViewer viewer = TreeViewerFactory.createTreeViewer(parent, new ProvidersLabelProvider(),
37	new ProvidersContentProvider(), ECPProviderRegistry.INSTANCE, createLabelDecorator());	37	new ProvidersContentProvider(), ECPProviderRegistry.INSTANCE, createLabelDecorator(),true);
38	return viewer;	38	return viewer;
39	}	39	}
40	}	40	}





	@Override
	protected TreeViewer createViewer(final Composite parent) {
		viewer = TreeViewerFactory.createModelExplorerViewer(parent, true, createLabelDecorator(),false);
		contentProvider=(ModelContentProvider)viewer.getContentProvider();
		viewer.addDoubleClickListener(new DoubleClickListener());
		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
		
			public void selectionChanged(SelectionChangedEvent event) {
				if(linkingActive){
					Object selected=((IStructuredSelection)event.getSelection()).getFirstElement();

					}
				}
			}
		});		
		return viewer;
	}


Lines 67-73 Link Here

(-)src/org/eclipse/emf/ecp/ui/views/ModelRepositoriesView.java (-1 / +1 lines)
67	@Override	67	@Override
68	protected TreeViewer createViewer(Composite parent)	68	protected TreeViewer createViewer(Composite parent)
69	{	69	{
70	TreeViewer viewer = TreeViewerFactory.createRepositoryExplorerViewer(parent, createLabelDecorator());	70	TreeViewer viewer = TreeViewerFactory.createRepositoryExplorerViewer(parent, createLabelDecorator(),true);
71		71
72	addRepositoryAction = new AddRepositoryAction(getSite().getShell());	72	addRepositoryAction = new AddRepositoryAction(getSite().getShell());
73	setEnablements();	73	setEnablements();




import org.eclipse.emf.ecp.ui.model.ModelLabelProvider;
import org.eclipse.emf.ecp.ui.model.RepositoriesContentProvider;
import org.eclipse.emf.ecp.ui.model.RepositoriesLabelProvider;
import org.eclipse.emf.ecp.ui.util.ModelContentProviderHelper;
import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;


 * @author Eugen Neufeld
 */
public class TreeViewerFactory {
	public static TreeViewer createModelExplorerViewer(Composite parent, boolean hasDnD,
		ILabelDecorator labelDecorator, boolean sort) {
		final ModelContentProvider contentProvider = new ModelContentProvider();
		ModelContentProviderHelper.INSTANCE.setModelContentProvider(contentProvider);
		final TreeViewer viewer = createTreeViewer(parent, new ModelLabelProvider(contentProvider), contentProvider,
			ECPProjectManager.INSTANCE, labelDecorator, sort);
		if (hasDnD) {
			final ModelExplorerDropAdapter dropAdapter = new ModelExplorerDropAdapter(contentProvider, viewer);


		return viewer;
	}

	public static TreeViewer createRepositoryExplorerViewer(Composite parent, ILabelDecorator labelDecorator,
		boolean sort) {
		RepositoriesContentProvider contentProvider = new RepositoriesContentProvider();
		TreeViewer viewer = createTreeViewer(parent, new RepositoriesLabelProvider(contentProvider), contentProvider,
			ECPRepositoryManager.INSTANCE, labelDecorator, sort);
		return viewer;
	}

	public static TreeViewer createTreeViewer(Composite parent, ILabelProvider labelProvider,
		ITreeContentProvider contentProvider, Object input, ILabelDecorator labelDecorator, boolean sort) {
		TreeViewer viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
		createTreeViewer(labelProvider, contentProvider, input, labelDecorator, viewer, sort);
		return viewer;
	}

	public static TreeViewer createCheckedTreeViewer(Composite parent, ILabelProvider labelProvider,
		ITreeContentProvider contentProvider, Object input, ILabelDecorator labelDecorator, boolean sort) {
		final ContainerCheckedTreeViewer viewer = new ContainerCheckedTreeViewer(parent, SWT.MULTI | SWT.H_SCROLL
			| SWT.V_SCROLL);
		createTreeViewer(labelProvider, contentProvider, input, labelDecorator, viewer, sort);
		return viewer;
	}


	 * @param viewer
	 */
	private static void createTreeViewer(ILabelProvider labelProvider, ITreeContentProvider contentProvider,
		Object input, ILabelDecorator labelDecorator, TreeViewer viewer, boolean sort) {
		viewer.setContentProvider(contentProvider);
		viewer.setLabelProvider(labelProvider);
		if (sort) {
			viewer.setSorter(new ViewerSorter());
		}
		viewer.setInput(input);

		if (labelDecorator != null) {




	}

	private TreeViewer createTreeViewer(Composite composite) {
		return TreeViewerFactory.createTreeViewer(composite, getLabelProvider(), getContentProvider(), getInput(),
			null, true);
	}

	private TreeViewer createCheckedTreeViewer(Composite composite) {
		return TreeViewerFactory.createCheckedTreeViewer(composite, getLabelProvider(), getContentProvider(),
			getInput(), null, true);
	}

	@Override

Return to bug 393953

Lines 84-94 Link Here

(-)src/org/eclipse/emf/ecp/ui/views/ModelExplorerView.java (-3 / +3 lines)
84		84
85	@Override	85	@Override
86	protected TreeViewer createViewer(final Composite parent) {	86	protected TreeViewer createViewer(final Composite parent) {
87	viewer = TreeViewerFactory.createModelExplorerViewer(parent, true, createLabelDecorator());	87	viewer = TreeViewerFactory.createModelExplorerViewer(parent, true, createLabelDecorator(),false);
88	contentProvider=(ModelContentProvider)viewer.getContentProvider();	88	contentProvider=(ModelContentProvider)viewer.getContentProvider();
89	viewer.addDoubleClickListener(new DoubleClickListener());	89	viewer.addDoubleClickListener(new DoubleClickListener());
90	viewer.addSelectionChangedListener(new ISelectionChangedListener() {	90	viewer.addSelectionChangedListener(new ISelectionChangedListener() {
91		91
92	public void selectionChanged(SelectionChangedEvent event) {	92	public void selectionChanged(SelectionChangedEvent event) {
93	if(linkingActive){	93	if(linkingActive){
94	Object selected=((IStructuredSelection)event.getSelection()).getFirstElement();	94	Object selected=((IStructuredSelection)event.getSelection()).getFirstElement();
Lines 109-115 Link Here
109	}	109	}
110	}	110	}
111	}	111	}
112	});	112	});
113	return viewer;	113	return viewer;
114	}	114	}
115		115

Lines 24-29 Link Here

(-)src/org/eclipse/emf/ecp/ui/common/TreeViewerFactory.java (-10 / +16 lines)
24	import org.eclipse.emf.ecp.ui.model.ModelLabelProvider;	24	import org.eclipse.emf.ecp.ui.model.ModelLabelProvider;
25	import org.eclipse.emf.ecp.ui.model.RepositoriesContentProvider;	25	import org.eclipse.emf.ecp.ui.model.RepositoriesContentProvider;
26	import org.eclipse.emf.ecp.ui.model.RepositoriesLabelProvider;	26	import org.eclipse.emf.ecp.ui.model.RepositoriesLabelProvider;
		27	import org.eclipse.emf.ecp.ui.util.ModelContentProviderHelper;
27	import org.eclipse.emf.edit.ui.dnd.LocalTransfer;	28	import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
28	import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;	29	import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
29		30
Lines 46-55 Link Here
46	* @author Eugen Neufeld	47	* @author Eugen Neufeld
47	*/	48	*/
48	public class TreeViewerFactory {	49	public class TreeViewerFactory {
49	public static TreeViewer createModelExplorerViewer(Composite parent, boolean hasDnD, ILabelDecorator labelDecorator) {	50	public static TreeViewer createModelExplorerViewer(Composite parent, boolean hasDnD,
		51	ILabelDecorator labelDecorator, boolean sort) {
50	final ModelContentProvider contentProvider = new ModelContentProvider();	52	final ModelContentProvider contentProvider = new ModelContentProvider();
		53	ModelContentProviderHelper.INSTANCE.setModelContentProvider(contentProvider);
51	final TreeViewer viewer = createTreeViewer(parent, new ModelLabelProvider(contentProvider), contentProvider,	54	final TreeViewer viewer = createTreeViewer(parent, new ModelLabelProvider(contentProvider), contentProvider,
52	ECPProjectManager.INSTANCE, labelDecorator);	55	ECPProjectManager.INSTANCE, labelDecorator, sort);
53	if (hasDnD) {	56	if (hasDnD) {
54	final ModelExplorerDropAdapter dropAdapter = new ModelExplorerDropAdapter(contentProvider, viewer);	57	final ModelExplorerDropAdapter dropAdapter = new ModelExplorerDropAdapter(contentProvider, viewer);
55		58
Lines 83-107 Link Here
83	return viewer;	86	return viewer;
84	}	87	}
85		88
86	public static TreeViewer createRepositoryExplorerViewer(Composite parent, ILabelDecorator labelDecorator) {	89	public static TreeViewer createRepositoryExplorerViewer(Composite parent, ILabelDecorator labelDecorator,
		90	boolean sort) {
87	RepositoriesContentProvider contentProvider = new RepositoriesContentProvider();	91	RepositoriesContentProvider contentProvider = new RepositoriesContentProvider();
88	TreeViewer viewer = createTreeViewer(parent, new RepositoriesLabelProvider(contentProvider), contentProvider,	92	TreeViewer viewer = createTreeViewer(parent, new RepositoriesLabelProvider(contentProvider), contentProvider,
89	ECPRepositoryManager.INSTANCE, labelDecorator);	93	ECPRepositoryManager.INSTANCE, labelDecorator, sort);
90	return viewer;	94	return viewer;
91	}	95	}
92		96
93	public static TreeViewer createTreeViewer(Composite parent, ILabelProvider labelProvider,	97	public static TreeViewer createTreeViewer(Composite parent, ILabelProvider labelProvider,
94	ITreeContentProvider contentProvider, Object input, ILabelDecorator labelDecorator) {	98	ITreeContentProvider contentProvider, Object input, ILabelDecorator labelDecorator, boolean sort) {
95	TreeViewer viewer = new TreeViewer(parent, SWT.MULTI \| SWT.H_SCROLL \| SWT.V_SCROLL);	99	TreeViewer viewer = new TreeViewer(parent, SWT.MULTI \| SWT.H_SCROLL \| SWT.V_SCROLL);
96	createTreeViewer(labelProvider, contentProvider, input, labelDecorator, viewer);	100	createTreeViewer(labelProvider, contentProvider, input, labelDecorator, viewer, sort);
97	return viewer;	101	return viewer;
98	}	102	}
99		103
100	public static TreeViewer createCheckedTreeViewer(Composite parent, ILabelProvider labelProvider,	104	public static TreeViewer createCheckedTreeViewer(Composite parent, ILabelProvider labelProvider,
101	ITreeContentProvider contentProvider, Object input, ILabelDecorator labelDecorator) {	105	ITreeContentProvider contentProvider, Object input, ILabelDecorator labelDecorator, boolean sort) {
102	final ContainerCheckedTreeViewer viewer = new ContainerCheckedTreeViewer(parent, SWT.MULTI \| SWT.H_SCROLL	106	final ContainerCheckedTreeViewer viewer = new ContainerCheckedTreeViewer(parent, SWT.MULTI \| SWT.H_SCROLL
103	\| SWT.V_SCROLL);	107	\| SWT.V_SCROLL);
104	createTreeViewer(labelProvider, contentProvider, input, labelDecorator, viewer);	108	createTreeViewer(labelProvider, contentProvider, input, labelDecorator, viewer, sort);
105	return viewer;	109	return viewer;
106	}	110	}
107		111
Lines 113-122 Link Here
113	* @param viewer	117	* @param viewer
114	*/	118	*/
115	private static void createTreeViewer(ILabelProvider labelProvider, ITreeContentProvider contentProvider,	119	private static void createTreeViewer(ILabelProvider labelProvider, ITreeContentProvider contentProvider,
116	Object input, ILabelDecorator labelDecorator, TreeViewer viewer) {	120	Object input, ILabelDecorator labelDecorator, TreeViewer viewer, boolean sort) {
117	viewer.setContentProvider(contentProvider);	121	viewer.setContentProvider(contentProvider);
118	viewer.setLabelProvider(labelProvider);	122	viewer.setLabelProvider(labelProvider);
119	viewer.setSorter(new ViewerSorter());	123	if (sort) {
		124	viewer.setSorter(new ViewerSorter());
		125	}
120	viewer.setInput(input);	126	viewer.setInput(input);
121		127
122	if (labelDecorator != null) {	128	if (labelDecorator != null) {

Lines 91-103 Link Here

(-)src/org/eclipse/emf/ecp/ui/common/AbstractEClassTreeSelectionComposite.java (-3 / +3 lines)
91	}	91	}
92		92
93	private TreeViewer createTreeViewer(Composite composite) {	93	private TreeViewer createTreeViewer(Composite composite) {
94	return TreeViewerFactory	94	return TreeViewerFactory.createTreeViewer(composite, getLabelProvider(), getContentProvider(), getInput(),
95	.createTreeViewer(composite, getLabelProvider(), getContentProvider(), getInput(), null);	95	null, true);
96	}	96	}
97		97
98	private TreeViewer createCheckedTreeViewer(Composite composite) {	98	private TreeViewer createCheckedTreeViewer(Composite composite) {
99	return TreeViewerFactory.createCheckedTreeViewer(composite, getLabelProvider(), getContentProvider(),	99	return TreeViewerFactory.createCheckedTreeViewer(composite, getLabelProvider(), getContentProvider(),
100	getInput(), null);	100	getInput(), null, true);
101	}	101	}
102		102
103	@Override	103	@Override