[eclipse-ccase-cvs] net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui ElementSelectionTree.java, 1.1.2.3, 1.1.2.4

[Mikael P. <er...@us...>]

Update of /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui
In directory vz-cvs-4.sog:/tmp/cvs-serv13346/src/net/sourceforge/eclipseccase/ui

Modified Files:
      Tag: mike_diff_checkin
	ElementSelectionTree.java 
Log Message:
Updated

Index: ElementSelectionTree.java
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui/Attic/ElementSelectionTree.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** ElementSelectionTree.java	1 Feb 2012 17:59:42 -0000	1.1.2.3
--- ElementSelectionTree.java	2 Feb 2012 15:56:49 -0000	1.1.2.4
***************
*** 1,56 ****
  package net.sourceforge.eclipseccase.ui;
  
! import org.eclipse.core.resources.IWorkspaceRoot;
! 
! import org.eclipse.compare.structuremergeviewer.Differencer;
! 
! import org.eclipse.team.core.diff.IDiff;
! 
! import org.eclipse.team.ui.synchronize.AbstractSynchronizeLabelProvider;
! 
! import org.eclipse.compare.CompareConfiguration;
! 
! import org.eclipse.ui.model.WorkbenchLabelProvider;
! 
! import org.eclipse.jface.viewers.LabelProvider;
! 
! import org.eclipse.ui.model.WorkbenchContentProvider;
  
! import org.eclipse.jface.viewers.ILabelProviderListener;
  import org.eclipse.swt.graphics.Image;
- 
- import org.eclipse.jface.viewers.ILabelProvider;
- 
- import org.eclipse.jface.viewers.Viewer;
- 
- import java.io.File;
- 
- import org.eclipse.jface.viewers.ITreeContentProvider;
- 
- import org.eclipse.core.resources.IContainer;
- 
- import org.eclipse.jface.viewers.CheckStateChangedEvent;
- 
- import java.util.Comparator;
- 
- import java.util.ArrayList;
- 
- import java.util.Arrays;
- 
- import org.eclipse.core.resources.IResource;
- 
- import org.eclipse.jface.viewers.ICheckStateListener;
- 
  import org.eclipse.swt.layout.GridData;
- 
- import org.eclipse.jface.viewers.CheckboxTreeViewer;
- 
  import org.eclipse.swt.layout.GridLayout;
- 
- import org.eclipse.swt.SWT;
- 
- import org.eclipse.swt.widgets.Control;
- 
  import org.eclipse.swt.widgets.Composite;
  
  /**
--- 1,16 ----
  package net.sourceforge.eclipseccase.ui;
  
! import org.eclipse.swt.custom.ViewForm;
  
! import java.util.*;
! import org.eclipse.core.resources.*;
! import org.eclipse.jface.viewers.*;
! import org.eclipse.swt.SWT;
  import org.eclipse.swt.graphics.Image;
  import org.eclipse.swt.layout.GridData;
  import org.eclipse.swt.layout.GridLayout;
  import org.eclipse.swt.widgets.Composite;
+ import org.eclipse.ui.model.WorkbenchContentProvider;
+ import org.eclipse.ui.model.WorkbenchLabelProvider;
  
  /**
***************
*** 86,95 ****
  	}
  
! 	protected Control createContents(Composite parent) {
! 		Composite composite = new Composite(parent, SWT.NONE);
! 		composite.setLayout(new GridLayout(1, false));
! 
  		// Create the tree viewer to display the file tree
! 		final CheckboxTreeViewer checkTreeViewer = new CheckboxTreeViewer(composite);
  		checkTreeViewer.getTree().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
  		checkTreeViewer.setContentProvider(new ElementSelectionContentProvider());
--- 46,58 ----
  	}
  
! 	private void createContents(Composite parent) {
! //		Composite composite = new Composite(parent, SWT.NONE);
! //		composite.setLayout(new GridLayout(1, false));
! 		ViewForm viewerPane = new ViewForm(this, SWT.BORDER | SWT.FLAT);
! 		viewerPane.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
! 		
! 		
  		// Create the tree viewer to display the file tree
! 		final CheckboxTreeViewer checkTreeViewer = new CheckboxTreeViewer(viewerPane,SWT.MULTI);
  		checkTreeViewer.getTree().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
  		checkTreeViewer.setContentProvider(new ElementSelectionContentProvider());
***************
*** 106,118 ****
  			}
  		});
! 		return composite;
  	}
  
  	public IResource[] getSelectedResources() {
  		ArrayList<IResource> selected = new ArrayList<IResource>();
! 		Object[] checkedResources = ((CheckboxTreeViewer) checkTreeViewer).getCheckedElements();
  		for (int i = 0; i < checkedResources.length; i++) {
! 			if (resourceList.contains(checkedResources[i]))
  				selected.add((IResource) checkedResources[i]);
  		}
  		IResource[] selectedResources = new IResource[selected.size()];
--- 69,82 ----
  			}
  		});
! 
  	}
  
  	public IResource[] getSelectedResources() {
  		ArrayList<IResource> selected = new ArrayList<IResource>();
! 		Object[] checkedResources = checkTreeViewer.getCheckedElements();
  		for (int i = 0; i < checkedResources.length; i++) {
! 			if (resourceList.contains(checkedResources[i])) {
  				selected.add((IResource) checkedResources[i]);
+ 			}
  		}
  		IResource[] selectedResources = new IResource[selected.size()];
***************
*** 131,138 ****
--- 95,104 ----
  	// we only use compressed mode!
  	private class ElementSelectionContentProvider extends WorkbenchContentProvider {
+ 		@Override
  		public Object getParent(Object element) {
  			return ((IResource) element).getParent();
  		}
  
+ 		@Override
  		public boolean hasChildren(Object element) {
  			if (element instanceof IContainer)
***************
*** 142,156 ****
  		}
  
  		public Object[] getElements(Object inputElement) {
  			return getChildren(inputElement);
  		}
  
  		public Object[] getChildren(Object parentElement) {
! 			if (parentElement instanceof ElementSelectionTree) {
  				return getCompressedFolders();
! 			}
! 			if (parentElement instanceof IContainer) {
  				return getChildResources((IContainer) parentElement);
- 			}
  			return new Object[0];
  		}
--- 108,122 ----
  		}
  
+ 		@Override
  		public Object[] getElements(Object inputElement) {
  			return getChildren(inputElement);
  		}
  
+ 		@Override
  		public Object[] getChildren(Object parentElement) {
! 			if (parentElement instanceof ElementSelectionTree)
  				return getCompressedFolders();
! 			if (parentElement instanceof IContainer)
  				return getChildResources((IContainer) parentElement);
  			return new Object[0];
  		}
***************
*** 160,163 ****
--- 126,130 ----
  		WorkbenchLabelProvider wlp = new WorkbenchLabelProvider();
  
+ 		@Override
  		public Image getImage(Object element) {
  			Image image = null;
***************
*** 176,179 ****
--- 143,147 ----
  		}
  
+ 		@Override
  		public String getText(Object element) {
  			String text = null;
***************
*** 182,187 ****
  				IContainer container = (IContainer) element;
  				text = container.getFullPath().makeRelative().toString();
! 			} else
  				text = resource.getName();
  
  			return text;
--- 150,156 ----
  				IContainer container = (IContainer) element;
  				text = container.getFullPath().makeRelative().toString();
! 			} else {
  				text = resource.getName();
+ 			}
  
  			return text;
***************
*** 194,199 ****
  			compressedFolderList = new ArrayList<IResource>();
  			for (int i = 0; i < resources.length; i++) {
! 				if (resources[i] instanceof IContainer && !compressedFolderList.contains(resources[i]))
  					compressedFolderList.add(resources[i]);
  				if (!(resources[i] instanceof IContainer)) {
  					IContainer parent = resources[i].getParent();
--- 163,169 ----
  			compressedFolderList = new ArrayList<IResource>();
  			for (int i = 0; i < resources.length; i++) {
! 				if (resources[i] instanceof IContainer && !compressedFolderList.contains(resources[i])) {
  					compressedFolderList.add(resources[i]);
+ 				}
  				if (!(resources[i] instanceof IContainer)) {
  					IContainer parent = resources[i].getParent();
***************
*** 215,220 ****
  			if (!(resources[i] instanceof IContainer)) {
  				IContainer parentFolder = resources[i].getParent();
! 				if (parentFolder != null && parentFolder.equals(parent) && !children.contains(parentFolder))
  					children.add(resources[i]);
  			}
  		}
--- 185,191 ----
  			if (!(resources[i] instanceof IContainer)) {
  				IContainer parentFolder = resources[i].getParent();
! 				if (parentFolder != null && parentFolder.equals(parent) && !children.contains(parentFolder)) {
  					children.add(resources[i]);
+ 				}
  			}
  		}