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

[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-serv10238/src/net/sourceforge/eclipseccase/ui

Modified Files:
      Tag: mike_diff_checkin
	ElementSelectionTree.java 
Log Message:
Additional update

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.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** ElementSelectionTree.java	1 Feb 2012 14:19:00 -0000	1.1.2.2
--- ElementSelectionTree.java	1 Feb 2012 17:59:42 -0000	1.1.2.3
***************
*** 68,74 ****
  
  	private CheckboxTreeViewer checkTreeViewer;
! 	
  	private IContainer[] compressedFolders;
! 	
  	private ArrayList<IResource> compressedFolderList;
  
--- 68,74 ----
  
  	private CheckboxTreeViewer checkTreeViewer;
! 
  	private IContainer[] compressedFolders;
! 
  	private ArrayList<IResource> compressedFolderList;
  
***************
*** 114,118 ****
  		for (int i = 0; i < checkedResources.length; i++) {
  			if (resourceList.contains(checkedResources[i]))
! 				selected.add((IResource)checkedResources[i]);
  		}
  		IResource[] selectedResources = new IResource[selected.size()];
--- 114,118 ----
  		for (int i = 0; i < checkedResources.length; i++) {
  			if (resourceList.contains(checkedResources[i]))
! 				selected.add((IResource) checkedResources[i]);
  		}
  		IResource[] selectedResources = new IResource[selected.size()];
***************
*** 158,242 ****
  
  	private class ElementSelectionLabelProvider extends LabelProvider {
! 		private WorkbenchLabelProvider workbenchLabelProvider = new WorkbenchLabelProvider();
! 
! 		private CompareConfiguration compareConfiguration = new CompareConfiguration();
! 
! 		private AbstractSynchronizeLabelProvider syncLabelProvider = new AbstractSynchronizeLabelProvider() {
  
! 			protected ILabelProvider getDelegateLabelProvider() {
! 				return workbenchLabelProvider;
! 			}
  
! 			protected boolean isDecorationEnabled() {
! 				return true;
! 			}
  
- 			protected IDiff getDiff(Object element) {
- 				IResource resource = (IResource) element;
- 				return null;
- 				//return new ResourceSelectionDiff(resource);
  			}
  
! 		};
  
- 		public Image getImage(Object element) {
- 			if (resourceList.contains(element)) {
- 				IResource resource = (IResource) element;
- 				Image image = null;
- 				if (resource instanceof IContainer && !resource.isAccessible()) {
- 					image = workbenchLabelProvider.getImage(element);
- 					image = compareConfiguration.getImage(image, Differencer.NO_CHANGE);
- 				} else {
- //					if (statusKind != null) {
- //						if (statusKind.hasTreeConflict()) {
- //							image = workbenchLabelProvider.getImage(element);
- //							image = resourceSelectionTreeDecorator.getImage(image, ResourceSelectionTreeDecorator.TREE_CONFLICT);
- //						} else if (statusKind != null && statusKind.equals(SVNStatusKind.CONFLICTED)) {
- //							image = workbenchLabelProvider.getImage(element);
- //							image = resourceSelectionTreeDecorator.getImage(image, ResourceSelectionTreeDecorator.TEXT_CONFLICTED);
- //						}
- //					}
- 					if (image == null)
- 						image = syncLabelProvider.getImage(element);
- 					if (element instanceof IContainer)
- 						return image;
- //					if (unversionedResourceList.contains(element)) {
- //						image = resourceSelectionTreeDecorator.getImage(image, ResourceSelectionTreeDecorator.UNVERSIONED);
- //					}
- //					if (statusKind != null && statusKind.equals(SVNStatusKind.MISSING)) {
- //						image = resourceSelectionTreeDecorator.getImage(image, ResourceSelectionTreeDecorator.MISSING);
- //					}
- 				}
- //				String propertyStatus = ResourceWithStatusUtil.getPropertyStatus((IResource) element);
- //				if (propertyStatus != null && propertyStatus.length() > 0) {
- //					if (propertyStatus.equals("conflicted")) //$NON-NLS-1$
- //						image = resourceSelectionTreeDecorator.getImage(image, ResourceSelectionTreeDecorator.PROPERTY_CONFLICTED);
- //					else
- //						image = resourceSelectionTreeDecorator.getImage(image, ResourceSelectionTreeDecorator.PROPERTY_CHANGE);
- 				}
- //				return image;
- //			} else {
- //				Image image = workbenchLabelProvider.getImage(element);
- //				return compareConfiguration.getImage(image, Differencer.NO_CHANGE);
- //			}
- 			return null;
- 			
- 		
  		}
  
  		public String getText(Object element) {
- 			
- //			if (statusMap == null)
- //				return workbenchLabelProvider.getText(element);
  			String text = null;
  			IResource resource = (IResource) element;
! //			if (mode == MODE_FLAT)
! //				text = resource.getName() + " - " + resource.getFullPath().toString(); //$NON-NLS-1$			
! 				if (element instanceof IContainer) {
! 					IContainer container = (IContainer) element;
! 					text = container.getFullPath().makeRelative().toString();
! 				} else
! 					text = resource.getName();
! 			
  			return text;
  		}
--- 158,188 ----
  
  	private class ElementSelectionLabelProvider extends LabelProvider {
! 		WorkbenchLabelProvider wlp = new WorkbenchLabelProvider();
  
! 		public Image getImage(Object element) {
! 			Image image = null;
! 			if (resourceList.contains(element)) {
  
! 				if (element instanceof IContainer) {
! 					image = wlp.getImage(element);
! 				} else {
! 					image = wlp.getImage(element);
! 				}
  
  			}
  
! 			return image;
  
  		}
  
  		public String getText(Object element) {
  			String text = null;
  			IResource resource = (IResource) element;
! 			if (element instanceof IContainer) {
! 				IContainer container = (IContainer) element;
! 				text = container.getFullPath().makeRelative().toString();
! 			} else
! 				text = resource.getName();
! 
  			return text;
  		}
***************
*** 263,267 ****
  		return compressedFolders;
  	}
! 	
  	private IResource[] getChildResources(IContainer parent) {
  		ArrayList<IResource> children = new ArrayList<IResource>();
--- 209,213 ----
  		return compressedFolders;
  	}
! 
  	private IResource[] getChildResources(IContainer parent) {
  		ArrayList<IResource> children = new ArrayList<IResource>();