Attachment 223621 Details for Bug 393953 – adds an extra var in order to choose weather sorting should be active or not.

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

[patch] adds an extra var in order to choose weather sorting should be active or not.

choose_sorting.patch (text/plain), 8.21 KB, created by Tobias Verhoeven

on 2012-11-15 12:43:00 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Verhoeven

Created: 2012-11-15 12:43:00 EST

Size: 8.21 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.emf.ecp.ui.workbench
>diff --git src/org/eclipse/emf/ecp/ui/views/ECPProvidersView.java src/org/eclipse/emf/ecp/ui/views/ECPProvidersView.java
>index f75fa0d..c08774c 100644
>--- src/org/eclipse/emf/ecp/ui/views/ECPProvidersView.java
>+++ src/org/eclipse/emf/ecp/ui/views/ECPProvidersView.java
>@@ -34,7 +34,7 @@
>   protected TreeViewer createViewer(Composite parent)
>   {
>     TreeViewer viewer = TreeViewerFactory.createTreeViewer(parent, new ProvidersLabelProvider(),
>-        new ProvidersContentProvider(), ECPProviderRegistry.INSTANCE, createLabelDecorator());
>+        new ProvidersContentProvider(), ECPProviderRegistry.INSTANCE, createLabelDecorator(),true);
>     return viewer;
>   }
> }
>diff --git src/org/eclipse/emf/ecp/ui/views/ModelExplorerView.java src/org/eclipse/emf/ecp/ui/views/ModelExplorerView.java
>index 9387640..e796986 100644
>--- src/org/eclipse/emf/ecp/ui/views/ModelExplorerView.java
>+++ src/org/eclipse/emf/ecp/ui/views/ModelExplorerView.java
>@@ -84,11 +84,11 @@
> 
> 	@Override
> 	protected TreeViewer createViewer(final Composite parent) {
>-		viewer = TreeViewerFactory.createModelExplorerViewer(parent, true, createLabelDecorator());
>+		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();
>@@ -109,7 +109,7 @@
> 					}
> 				}
> 			}
>-		});
>+		});		
> 		return viewer;
> 	}
> 
>diff --git src/org/eclipse/emf/ecp/ui/views/ModelRepositoriesView.java src/org/eclipse/emf/ecp/ui/views/ModelRepositoriesView.java
>index 28f88ea..06728bb 100644
>--- src/org/eclipse/emf/ecp/ui/views/ModelRepositoriesView.java
>+++ src/org/eclipse/emf/ecp/ui/views/ModelRepositoriesView.java
>@@ -67,7 +67,7 @@
>   @Override
>   protected TreeViewer createViewer(Composite parent)
>   {
>-	  TreeViewer viewer = TreeViewerFactory.createRepositoryExplorerViewer(parent, createLabelDecorator());
>+	  TreeViewer viewer = TreeViewerFactory.createRepositoryExplorerViewer(parent, createLabelDecorator(),true);
> 
>     addRepositoryAction = new AddRepositoryAction(getSite().getShell());
>     setEnablements();
>### Eclipse Workspace Patch 1.0
>#P org.eclipse.emf.ecp.ui
>diff --git src/org/eclipse/emf/ecp/ui/common/TreeViewerFactory.java src/org/eclipse/emf/ecp/ui/common/TreeViewerFactory.java
>index 13ced62..c8c2e94 100644
>--- src/org/eclipse/emf/ecp/ui/common/TreeViewerFactory.java
>+++ src/org/eclipse/emf/ecp/ui/common/TreeViewerFactory.java
>@@ -24,6 +24,7 @@
> 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;
> 
>@@ -46,10 +47,12 @@
>  * @author Eugen Neufeld
>  */
> public class TreeViewerFactory {
>-	public static TreeViewer createModelExplorerViewer(Composite parent, boolean hasDnD, ILabelDecorator labelDecorator) {
>+	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);
>+			ECPProjectManager.INSTANCE, labelDecorator, sort);
> 		if (hasDnD) {
> 			final ModelExplorerDropAdapter dropAdapter = new ModelExplorerDropAdapter(contentProvider, viewer);
> 
>@@ -83,25 +86,26 @@
> 		return viewer;
> 	}
> 
>-	public static TreeViewer createRepositoryExplorerViewer(Composite parent, ILabelDecorator labelDecorator) {
>+	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);
>+			ECPRepositoryManager.INSTANCE, labelDecorator, sort);
> 		return viewer;
> 	}
> 
> 	public static TreeViewer createTreeViewer(Composite parent, ILabelProvider labelProvider,
>-		ITreeContentProvider contentProvider, Object input, ILabelDecorator labelDecorator) {
>+		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);
>+		createTreeViewer(labelProvider, contentProvider, input, labelDecorator, viewer, sort);
> 		return viewer;
> 	}
> 
> 	public static TreeViewer createCheckedTreeViewer(Composite parent, ILabelProvider labelProvider,
>-		ITreeContentProvider contentProvider, Object input, ILabelDecorator labelDecorator) {
>+		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);
>+		createTreeViewer(labelProvider, contentProvider, input, labelDecorator, viewer, sort);
> 		return viewer;
> 	}
> 
>@@ -113,10 +117,12 @@
> 	 * @param viewer
> 	 */
> 	private static void createTreeViewer(ILabelProvider labelProvider, ITreeContentProvider contentProvider,
>-		Object input, ILabelDecorator labelDecorator, TreeViewer viewer) {
>+		Object input, ILabelDecorator labelDecorator, TreeViewer viewer, boolean sort) {
> 		viewer.setContentProvider(contentProvider);
> 		viewer.setLabelProvider(labelProvider);
>-		viewer.setSorter(new ViewerSorter());
>+		if (sort) {
>+			viewer.setSorter(new ViewerSorter());
>+		}
> 		viewer.setInput(input);
> 
> 		if (labelDecorator != null) {
>	### Eclipse Workspace Patch 1.0
>	#P org.eclipse.emf.ecp.ui
>	diff --git src/org/eclipse/emf/ecp/ui/common/AbstractEClassTreeSelectionComposite.java src/org/eclipse/emf/ecp/ui/common/AbstractEClassTreeSelectionComposite.java
>	index 77f0abf..9f62cbe 100644
>	--- src/org/eclipse/emf/ecp/ui/common/AbstractEClassTreeSelectionComposite.java
>	+++ src/org/eclipse/emf/ecp/ui/common/AbstractEClassTreeSelectionComposite.java
>	@@ -91,13 +91,13 @@
>	 	}
>	 
>	 	private TreeViewer createTreeViewer(Composite composite) {
>	-		return TreeViewerFactory
>	-			.createTreeViewer(composite, getLabelProvider(), getContentProvider(), getInput(), null);
>	+		return TreeViewerFactory.createTreeViewer(composite, getLabelProvider(), getContentProvider(), getInput(),
>	+			null, true);
>	 	}
>	 
>	 	private TreeViewer createCheckedTreeViewer(Composite composite) {
>	 		return TreeViewerFactory.createCheckedTreeViewer(composite, getLabelProvider(), getContentProvider(),
>	-			getInput(), null);
>	+			getInput(), null, true);
>	 	}
>	 
>	 	@Override
>### Eclipse Workspace Patch 1.0
>#P org.eclipse.emf.ecp.ui
>diff --git src/org/eclipse/emf/ecp/ui/common/AbstractEClassTreeSelectionComposite.java src/org/eclipse/emf/ecp/ui/common/AbstractEClassTreeSelectionComposite.java
>index 77f0abf..9f62cbe 100644
>--- src/org/eclipse/emf/ecp/ui/common/AbstractEClassTreeSelectionComposite.java
>+++ src/org/eclipse/emf/ecp/ui/common/AbstractEClassTreeSelectionComposite.java
>@@ -91,13 +91,13 @@
> 	}
> 
> 	private TreeViewer createTreeViewer(Composite composite) {
>-		return TreeViewerFactory
>-			.createTreeViewer(composite, getLabelProvider(), getContentProvider(), getInput(), null);
>+		return TreeViewerFactory.createTreeViewer(composite, getLabelProvider(), getContentProvider(), getInput(),
>+			null, true);
> 	}
> 
> 	private TreeViewer createCheckedTreeViewer(Composite composite) {
> 		return TreeViewerFactory.createCheckedTreeViewer(composite, getLabelProvider(), getContentProvider(),
>-			getInput(), null);
>+			getInput(), null, true);
> 	}
> 
> 	@Override

Flags:

eneufeld: iplog+

Actions: View | Diff

Attachments on bug 393953: 223621