Attachment #136242 for bug #164483

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 164483
Collapse All | Expand All




/**********************************************************************
 * Copyright (c) 2005, 2009 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

import java.io.DataOutputStream;
import java.io.IOException;

import org.eclipse.hyades.test.ui.internal.navigator.ResourceTestNavigatorContentProvider;
import org.eclipse.swt.dnd.ByteArrayTransfer;
import org.eclipse.swt.dnd.TransferData;

/** 
 * <p>Transfer class used by copy and paste actions of proxy nodes in the Resource view of the Test Navigator.</p>
 * 
 * 
 * @author  Jerome Gout
 * @author  Paul Slauenwhite
 * @version May 18, 2009
 * @since   March 7, 2005
 */
 public class ProxyNodeTransfer extends ByteArrayTransfer {
	private static final ProxyNodeTransfer instance = new ProxyNodeTransfer();
	//- Create a unique ID to make sure that different Eclipse
	//- applications use different "types" of <code>ProxyNodeTransfer</code>

	private IProxyNode readProxy(DataInputStream dataIn) throws IOException {
		String fileName = dataIn.readUTF();
		String identifier = dataIn.readUTF();
		return ResourceTestNavigatorContentProvider.getSharedFileProxyManager().getCorrespondingProxy(fileName, identifier);
	}
	
	/**

Lines 1-5 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/navigator/TestNavigatorLabelProvider.java (-7 / +9 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2007 IBM Corporation and others.	2	* Copyright (c) 2005, 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 26-35 Link Here
26	import org.eclipse.ui.model.IWorkbenchAdapter;	26	import org.eclipse.ui.model.IWorkbenchAdapter;
27	import org.eclipse.ui.model.WorkbenchLabelProvider;	27	import org.eclipse.ui.model.WorkbenchLabelProvider;
28		28
29	/** Label provider used by the views of the test navigator	29	/**
		30	* <p>Abstract label provider for the Test Navigator.</p>
30	*	31	*
31	* @author jgout	32	*
32	* @since 4.0	33	* @author Jerome Gout
		34	* @author Paul Slauenwhite
		35	* @version May 18, 2009
		36	* @since February 1, 2005
33	*/	37	*/
34	public class TestNavigatorLabelProvider implements ILabelProvider, ILabelProviderListener {	38	public class TestNavigatorLabelProvider implements ILabelProvider, ILabelProviderListener {
35		39
Lines 48-54 Link Here
48		52
49	return workbenchAdapter;	53	return workbenchAdapter;
50	}	54	}
51		55
52	public Image getImage(Object element) {	56	public Image getImage(Object element) {
53	if (element == null)	57	if (element == null)
54	return null;	58	return null;
Lines 98-104 Link Here
98	}	102	}
99		103
100	public void dispose() {	104	public void dispose() {
101	// listeners.clear();
102	workbenchProvider.dispose();	105	workbenchProvider.dispose();
103	}	106	}
104		107
Lines 111-115 Link Here
111	UiPlugin.logInfo("Unable to remove listener '" + listener.toString()); //$NON-NLS-1$	114	UiPlugin.logInfo("Unable to remove listener '" + listener.toString()); //$NON-NLS-1$
112	}	115	}
113	}	116	}
114
115	}	117	}




/*******************************************************************************
 * Copyright (c) 2005, 2007 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: ResourceTestNavigatorProvider.java,v 1.10 2007/04/06 13:49:24 jgout Exp $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.hyades.test.ui.internal.navigator;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.hyades.test.ui.UiPlugin;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.FileProxyManager;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.async.FileProxiesRequest;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.async.IProxiesRequestListener;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.async.ProxiesRequest;
import org.eclipse.hyades.test.ui.navigator.IFileProxyManager;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.hyades.ui.util.IDisposable;

/** This the resource oriented provider for the test navigator view.
 * @author jgout
 * @since 4.0
 */
public class ResourceTestNavigatorProvider extends TestNavigatorProvider {

    /** The file proxy manager to acces to proxies from files */
    private static FileProxyManager fileProxyManager = new FileProxyManager();
    
    /**
     * @return Returns the fileProxyManager.
     */
    public static FileProxyManager getSharedFileProxyManager() {
        return fileProxyManager;
    }

    public ResourceTestNavigatorProvider(TestNavigator testNavigator) {
    	super(testNavigator);
    }
    
    private FileProxyRequests requests = new FileProxyRequests();
    
    protected IFileProxyManager getFileProxyManager() {
    	return fileProxyManager;
    }

	public Object getParent(Object element) {
		if (element instanceof IResource) {
			return ((IResource) element).getParent();
		}
		return super.getParent(element);
	}
	
	public boolean hasChildren(Object parentElement) {
		if (parentElement == null)
			return false;
		if (parentElement instanceof IContainer) {
			IContainer container = (IContainer) parentElement;
			if (!container.isAccessible())
				return false;

			IResource[] resources = null;
			try {
				resources = container.members();
			} catch (CoreException e) {
				UiPlugin.logError(e);
				return false;
			}
			if (resources.length == 0) return false;
			if (parentElement instanceof IProject) {
				return true;
			}
			for (int i = 0; i < resources.length; i++) {
				if (resources[i].getType() != IResource.FILE) {
					if (!TestNavigator.getFiltersManager().filter(resources[i]))
						return true;
				} else {
					String fileExtension = resources[i].getFileExtension();
					if (fileExtension != null) {
						if (TestNavigator.getFiltersManager().isVisibleResource(resources[i])) return true;
					}
				}
			}
			return false;
		}
		return super.hasChildren(parentElement);
	}
	
	public Object[] getChildren(Object parentElement) {
		if (parentElement instanceof IContainer) {
			return getContainerChildren(parentElement);
		} else {
			return super.getChildren(parentElement);
		}
	}

	/** returns the children of a container node (project or folder)
	 * @param parentElement
	 * @return an array of Object which cn be empty but not null
	 */
	private Object[] getContainerChildren(Object parentElement) {
		IResource[] resources = null;
		IContainer container = ((IContainer) parentElement);
        if (container.isAccessible()) {
            try {
                resources = container.members();
            } catch (CoreException e) {
                UiPlugin.logError(e);
                return new Object[0];
            }
            List children = new ArrayList(resources.length);
            FileProxiesRequest request = requests.getRequest(container, resources);
            for (int i = 0, maxi = resources.length; i < maxi; i++) {
                if (!TestNavigator.getFiltersManager().filter(resources[i])) {
                	if (resources[i].getType() != IResource.FILE) { 
                		children.add(resources[i]);
                	} else {
                        //- convert the file in something else (proxy)
                    	IFile file = (IFile)resources[i];
                        IProxyNode node = request.getProxy(file);
                        if (!TestNavigator.getFiltersManager().filter(node)) {
                            children.add(node);
                            fileProxyManager.cacheProxy(file, node);
                        }
                    }
                }
            }
            return children.toArray();
        }
        return new Object[0];
	}

    public IGlobalProxyNodeListener getProxyNodeListener() {
    	return requests;
    }

	private class FileProxyRequests implements IProxiesRequestListener, IDisposable, IGlobalProxyNodeListener {
		
	    private Map containerToRequestMap = Collections.synchronizedMap(new HashMap());
	    
	    public FileProxiesRequest getRequest(IContainer container, IResource[] members) {
	    	FileProxiesRequest request = (FileProxiesRequest)containerToRequestMap.get(container);
	    	if (request == null) {
	    		request = newRequest(container, members);
	    	}
	    	return request;
	    }
	    
	    public FileProxiesRequest newRequest(IContainer container, IResource[] members) {
	    	ArrayList filesToRequest = new ArrayList(members.length);
            for (int i = 0, maxi = members.length; i < maxi; i++) {
            	if (members[i].getType() == IResource.FILE) {
            		if (!TestNavigator.getFiltersManager().filter(members[i])) {
                    	filesToRequest.add(members[i]);
                    }
                }
            }
            if (filesToRequest.isEmpty()) return null;
            FileProxiesRequest req = new FileProxiesRequest(filesToRequest, fileProxyManager, container, testNavigator);
            req.setPriority(getJobPriority());
            testNavigator.getJobPool().scheduleJob(req);
            if (!req.wait(getResponseTime(), this, 2000)) {
            	containerToRequestMap.put(container, req);
            }
            return req;
	    }
	    
		public void proxyComputed(final ProxiesRequest request, Object key) {
		}
	
		public void computationCompleted(ProxiesRequest request) {
			IContainer parent = ((FileProxiesRequest)request).getParent();
			if (containerToRequestMap.containsKey(parent)) {
				testNavigator.refresh(parent);
			}
		}

		public void dispose() {
			// Cancel all running requests. As the atomic action of FileProxiesRequest is
			// the computation of a single file proxy, all requests should honor the cancel
			// request quite quickly. However we don't wait them to complete (i.e. they may
			// be still running while this instance has been disposed).
			for (Iterator it = containerToRequestMap.values().iterator(); it.hasNext();) {
				FileProxiesRequest request = (FileProxiesRequest) it.next();
				request.dispose();
				it.remove();
			}
		}

		public void proxiesComputed(ProxiesRequest request) {
			testNavigator.refresh(((FileProxiesRequest)request).getParent());
		}

		public void nodeChanged(Object node) {
			if (node instanceof IContainer) {
				FileProxiesRequest req = (FileProxiesRequest) containerToRequestMap.remove(node);
				if (req != null) {
					// Then we need to cancel the current request. A new one will be spawned
					// when getChildren() is invoked on this project.
					if (req.cancel(1000)) {
						containerToRequestMap.remove(node);
					}
				}
			}
		}
		
		public void nodesChanged() {
			for (Iterator it = containerToRequestMap.keySet().iterator(); it.hasNext();) {
				nodeChanged(it.next());
			}
		}
		
		public void computationCancelled(ProxiesRequest request) {
			IContainer parent = ((FileProxiesRequest)request).getParent();
			containerToRequestMap.remove(parent);
			testNavigator.refresh(parent);
		}
    	
	}
	
	public void dispose() {
		requests.dispose();
		super.dispose();
	}

}




/*******************************************************************************
 * Copyright (c) 2005, 2009 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: TestNavigatorProvider.java,v 1.13 2009/02/12 19:19:00 paules Exp $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.hyades.test.ui.internal.navigator;

import java.util.LinkedList;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.FileProxyManager;
import org.eclipse.hyades.test.ui.navigator.IFileProxyManager;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.hyades.test.ui.navigator.IProxyNodeListener;
import org.eclipse.jface.viewers.IBaseLabelProvider;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.graphics.Image;

/**
 * TestNavigatorProvider.java
 * <p/>
 *
 * 
 * @author  Jerome Gout
 * @author  Julien Canches
 * @author  Paul E. Slauenwhite
 * @version February 12, 2008
 * @since   March 18, 2005 
 */
public abstract class TestNavigatorProvider extends TestNavigatorLabelProvider implements ITreeContentProvider {

	private static final int MAX_PROXY_NODE_CHILDREN = 100;
	public static final int CONTEXT_LOADING = 0;
	public static final int CONTEXT_INTERACTIVE = 1;
	
	protected TestNavigator testNavigator;
	private int context;
	
	public TestNavigatorProvider(TestNavigator testNavigator) {
		this.testNavigator = testNavigator;
		this.context = CONTEXT_LOADING;
	}

	protected abstract IGlobalProxyNodeListener getProxyNodeListener();

	protected abstract IFileProxyManager getFileProxyManager();
		
	public Object getParent(Object element) {
		if (element instanceof IProxyNode) {
            Object parent = ((IProxyNode) element).getParent();
            if(parent instanceof FileProxyManager.IUnboundedParent) {
                return getFileProxyManager().getParent((IProxyNode) element);
            } else {
                return parent;
            }
		}
		return null;
	}

	public boolean hasChildren(Object parentElement) {
		if (parentElement instanceof IProxyNode) {
			IProxyNode proxy = (IProxyNode) parentElement;
			return proxy.getChildren().length > 0;
		}
		if (parentElement instanceof IProxyGroup) {
			return true;
		}
		return false;
	}

	public Object[] getChildren(Object parentElement) {
		if (parentElement instanceof IProxyNode) {
			IProxyNode proxy = (IProxyNode) parentElement;
			return foldProxyNodes(proxy);
		}
		if (parentElement instanceof IProxyGroup) {
			return ((IProxyGroup)parentElement).getChildren();
		}
		return new Object[0];
	}
	
	public String getText(Object element) {
		if (element instanceof IProxyGroup) {
			return ((IProxyGroup)element).getText();
		}
		return super.getText(element);
	}
	
	public Image getImage(Object element) {
		if (element instanceof IProxyGroup) {
			return ((IProxyGroup)element).getImage();
		}
		return super.getImage(element);
	}
	
	public Object[] getElements(Object inputElement) {
		if (inputElement instanceof IWorkspaceRoot) {
			IProject [] projects = ((IWorkspaceRoot) inputElement).getProjects();
			LinkedList visibleProjects = new LinkedList();
			for(int i = 0; i < projects.length; i++) {
				if(!TestNavigator.getFiltersManager().filter(projects[i])) {
					visibleProjects.add(projects[i]);
				}
			}
			return visibleProjects.toArray();
		}
		return getChildren(inputElement);
	}
    
	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
	}
	
	public static interface IGlobalProxyNodeListener extends IProxyNodeListener {
		
		void nodesChanged();
		
	}
	
	public static interface IProxyGroup {
		IProxyNode[] getChildren();
		String getText();
		Image getImage();
		int getOrder();
	}
	
	private static class ProxyGroup implements IProxyGroup {
		private IProxyNode parent;
		private int sequence;
		public ProxyGroup(IProxyNode node, int sequence) {
			this.parent = node;
			this.sequence = sequence;
		}
		public IProxyNode[] getChildren() {
			int start = sequence * MAX_PROXY_NODE_CHILDREN;
			IProxyNode[] completeChildren = parent.getChildren();
			IProxyNode[] children = new IProxyNode[MAX_PROXY_NODE_CHILDREN];
			System.arraycopy(completeChildren, start, children, 0, MAX_PROXY_NODE_CHILDREN);
			return children;
		}
		public String getText() {
			int start = sequence * MAX_PROXY_NODE_CHILDREN + 1;
			int end = (sequence + 1) * MAX_PROXY_NODE_CHILDREN;
			return ("[".concat(Integer.toString(start)).concat(" - ").concat(Integer.toString(end)).concat("]"));
		}
		public Image getImage() {
			return parent.getImage();
		}
		public int getOrder() {
			return sequence;
		}
	}
	
	private static class RemainingProxyGroup implements IProxyGroup {
		private IProxyNode parent;
		public RemainingProxyGroup(IProxyNode parent) {
			this.parent = parent;
		}
		public IProxyNode[] getChildren() {
			IProxyNode[] completeChildren = parent.getChildren();
			int completeLength = completeChildren.length;
			int length = completeLength % MAX_PROXY_NODE_CHILDREN;
			IProxyNode[] children = new IProxyNode[length];
			System.arraycopy(completeChildren, completeLength - length, children, 0, length);
			return children;
		}
		public String getText() {
			IProxyNode[] completeChildren = parent.getChildren();
			int end = completeChildren.length;
			int length = end % MAX_PROXY_NODE_CHILDREN;
			int start = end - length + 1;
			return ("[".concat(Integer.toString(start)).concat(" - ").concat(Integer.toString(end)).concat("]"));
		}
		public Image getImage() {
			return parent.getImage();
		}
		public int getOrder() {
			return Integer.MAX_VALUE;
		}
	}
	
	protected Object[] foldProxyNodes(IProxyNode parent) {
		IProxyNode[] children = parent.getChildren();
		int length = children.length;
		if (length <= MAX_PROXY_NODE_CHILDREN) return children;
		int size = length / MAX_PROXY_NODE_CHILDREN;
		int remaining = length % MAX_PROXY_NODE_CHILDREN;
		int totalSize = size + (remaining > 0 ? 1 : 0);
		Object[] groups = new IProxyGroup[totalSize];
		for (int i = 0; i < size; i++) {
			groups[i] = new ProxyGroup(parent, i);
		}
		if (remaining > 0) {
			groups[size] = new RemainingProxyGroup(parent);
		}
		return groups;
	}

	/**
	 * Sets the context in which the provider is used. There are two available values:
	 * INTERACTIVE and LOADING. The context has an effect on two parameters:
	 * 1) responsiveness: time that getChildren() is allowed to spent before returning
	 * control. High responsiveness means that the provider will return incomplete nodes,
	 * compute the remaining in a background task, and update the navigator when computation
	 * is complete. Low responsiveness means that the UI will be blocked for a longer period of
	 * time but the returned node are more likely to be complete.
	 * 2) computation job priority: the priority allocated to the computation job, if the provider
	 * does not manage to compute nodes in the allocated time (responsiveness parameter). This does
	 * not affect the thread priority, but helps eclipse decide which job should be launched first.
	 * In LOADING mode, responsiveness is high (100ms) and priority is low (NORMAL).
	 * In INTERACTIVE mode, responsiveness is lower (800ms) and priority is high (INTERACTIVE).
	 */
	public void setContext(int context) {
		this.context = context;
	}
	
	protected int getContext() {
		return context;
	}
	
	protected int getResponseTime() {
		switch (context) {
		case CONTEXT_INTERACTIVE:
			return 800;
		case CONTEXT_LOADING:
			return 100;
		}
		return 100;
	}
	
	protected int getJobPriority() {
		switch(context) {
		case CONTEXT_INTERACTIVE:
			return Job.INTERACTIVE;
		case CONTEXT_LOADING:
			return Job.LONG;
		}
		return Job.LONG;
	}
	
	 /**
	 * Empty implementation of the ({@link TestNavigatorLabelProvider#dispose()}) 
	 * method.
	 * <p/>
	 * Since the {@link TestNavigatorProvider} is both a content provider 
	 * ({@link IContentProvider}) and label provider ({@link IBaseLabelProvider}), 
	 * the {@link #dispose()} method may be invoked as the implementation for the
	 * {@link IContentProvider#dispose()} method or {@link IBaseLabelProvider#dispose()}
	 * method.  Since there is no way to determine if the invocation of this method is 
	 * intended to dispose the  content provider ({@link IContentProvider}) or label 
	 * provider ({@link IBaseLabelProvider}), this method is an empty implementation.  
	 * <p/>
	 * To dispose the label provider, call the {@link TestNavigatorLabelProvider#dispose()}
	 * method directly.
	 * <p/>
	 * 
	 * @see TestNavigatorLabelProvider#dispose()
	 * @see IContentProvider#dispose()
	 * @see IBaseLabelProvider#dispose()
	 */
	public void dispose() {
		//No-operation.
	}
}




import org.eclipse.hyades.test.ui.UiPlugin;
import org.eclipse.hyades.test.ui.internal.editor.BaseEditorPart;
import org.eclipse.hyades.test.ui.internal.model.ResourceUtil.ResourceAdaptable;
import org.eclipse.hyades.test.ui.internal.navigator.TestNavigatorContentProvider.IGlobalProxyNodeListener;
import org.eclipse.hyades.test.ui.internal.navigator.TestNavigatorContentProvider.IProxyGroup;
import org.eclipse.hyades.test.ui.internal.navigator.action.TestNavigatorActionGroup;
import org.eclipse.hyades.test.ui.internal.navigator.action.ToggleViewAction;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.FileFactoryManager;

import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.ILabelDecorator;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;


/**
 * <p>Concrete implementation of the
 * {@link org.eclipse.hyades.ui.internal.navigator.TreeNavigator} 
 * for test assets.</p>
 * 
 * 
 * @author  Marcelo Paternostro

 * @author  Paul E. Slauewnhite
 * @author  Paul Klicnik
 * @author  Kurtis Martin
 * @version May 18, 2009
 * @since   February 1, 2005
 */
public class TestNavigator extends TreeNavigator implements ISelectionListener, IGlobalProxyNodeListener, ITestNavigator {

    /** actions to switch between both logical and resource views. */
    private ToggleViewAction[] viewActions;

    /**
     * Current content provider for the Test Navigator.
     */
    private TestNavigatorContentProvider currentContentProvider;

    // - constants are used in the IDialogSettings
    protected final static String SET_SHOW_FOLDERS = "SHOW_FOLDERS"; //$NON-NLS-1$

    }
    
    public IFileProxyManager getCurrentFileProxyManager() {
    	return currentContentProvider.getFileProxyManager();
    }

    /**

    private static class TypeProviderContext implements ITypeProviderContext {
		private IProxyNodeListener refresher;
        public IFileProxyManager getFileProxyManager() {
            return LogicalTestNavigatorContentProvider.getSharedFileProxyManager();
        }
		public IProxyNodeListener getProxyNodeListener() {
			if (refresher == null) {

    }

    private void adjustCurrentProviderContext(boolean isLoading) {
		if (currentContentProvider != null) {
			if (isLoading) {
				currentContentProvider.setContext(TestNavigatorContentProvider.CONTEXT_LOADING);
			} else {
				currentContentProvider.setContext(TestNavigatorContentProvider.CONTEXT_INTERACTIVE);
			}
		}
	}

        updateTestNavigatorProvider(treeViewer);
    }

    /**
     * @param treeViewer
     */
    private void updateTestNavigatorProvider(TreeViewer treeViewer) {
    	
    	if (currentViewIndex == VIEW_ID_RESOURCE) {
    		currentContentProvider = new ResourceTestNavigatorContentProvider(this);
    	} 
    	else {
    		currentContentProvider = new LogicalTestNavigatorContentProvider(this);
    	}
    	
    	adjustCurrentProviderContext(true);
        
    	treeViewer.setContentProvider(currentContentProvider);
        treeViewer.setLabelProvider(new TestDecoratingLabelProvider(new TestNavigatorLabelProvider(), PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator(), this));

        adjustCurrentProviderContext(false);
    }


     * Invoked by test providers to notify that a node and its children should be refreshed.
     */
    public void nodeChanged(Object node) {
    	currentContentProvider.getProxyNodeListener().nodeChanged(node);
    	refresh(node);
    }
    
    public void nodesChanged() {
    	currentContentProvider.getProxyNodeListener().nodesChanged();
    	refresh(null);
    }
    

    	switch (currentViewIndex) {
	    	case VIEW_ID_LOGICAL: {
	    		IProject project = file.getProject();
	    		if (project != null)currentContentProvider.getChildren(project);
	    		return proxyManager.getProxy(file, null);
	    	}
	    	case VIEW_ID_RESOURCE: {




/*******************************************************************************
 * Copyright (c) 2005, 2007 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: LogicalTestNavigatorProvider.java,v 1.11 2007/04/06 13:49:24 jgout Exp $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.hyades.test.ui.internal.navigator;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.hyades.test.ui.TestUIExtension;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.FileProxyManager;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.async.IProxiesRequestListener;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.async.LogicalProjectProxiesRequest;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.async.ProxiesRequest;
import org.eclipse.hyades.test.ui.navigator.IFileProxyManager;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.hyades.ui.extension.IAssociationConstants;
import org.eclipse.hyades.ui.extension.IAssociationDescriptor;
import org.eclipse.hyades.ui.extension.IAssociationMapping;
import org.eclipse.hyades.ui.internal.extension.AssociationMappingRegistry;
import org.eclipse.hyades.ui.util.IDisposable;
import org.eclipse.swt.graphics.Image;

/** This is the provider of the logical test navigator.
 * @author jgout
 * @since 4.0
 */
public class LogicalTestNavigatorProvider extends TestNavigatorProvider {

    /** The file proxy manager to acces to proxies from files */
    private static FileProxyManager fileProxyManager = new FileProxyManager();
    
    private ProxiesRequests requests = new ProxiesRequests();
    
    /**
     * @return Returns the fileProxyManager.
     */
    public static IFileProxyManager getSharedFileProxyManager() {
        return fileProxyManager;
    }

    public LogicalTestNavigatorProvider(TestNavigator testNavigator) {
    	super(testNavigator);
    }
    
    protected IFileProxyManager getFileProxyManager() {
    	return fileProxyManager;
    }

	public boolean hasChildren(Object parentElement) {
		if (parentElement == null)
			return false;
		if(parentElement instanceof IProject) {
			return true;
		}
		return super.hasChildren(parentElement);
	}
	
	public Object[] getChildren(Object parentElement) {
		if(parentElement instanceof IProject) {
			IProject project = (IProject)parentElement;
			if (project.isAccessible()) {
				Collection types = getTypes();
				Collection extensions = getExtensions();
				ArrayList ret = new ArrayList(types.size() + extensions.size());
				LogicalProjectProxiesRequest request = requests.getRequest(project, types, extensions);
				for (Iterator it = types.iterator(); it.hasNext();) {
					String type = (String) it.next();
					IProxyNode proxy = request.getProxy(LogicalProjectProxiesRequest.TYPE_PROVIDER_PREFIX + type);
					if (proxy != null) {
						ret.add(proxy);
					}
				}
				for (Iterator it = extensions.iterator(); it.hasNext();) {
					String ext = (String) it.next();
					IProxyNode proxy = request.getProxy(LogicalProjectProxiesRequest.TEST_ASSET_EXTENSION_PREFIX + ext);
					if (proxy != null) {
						ret.add(proxy);
					}
				}
				if (request.isPending()) {
					ret.add(0, new PendingProxy(project));
				}
				return ret.toArray();
			}
			return new Object[0];
		}
		return super.getChildren(parentElement);
	}

	private Collection getTypes() {
        AssociationMappingRegistry registry = (AssociationMappingRegistry)TestUIExtension.getTestSuiteMappingRegistry();
        IAssociationMapping associationMapping = registry.getAssociationMapping(IAssociationConstants.EP_TYPE_DESCRIPTIONS);
        String[] types = associationMapping.getTypes();
        List typeProviders = new ArrayList(types.length);
        for (int i = 0; i < types.length; i++) {
        	IAssociationDescriptor descriptor = associationMapping.getDefaultAssociationDescriptor(types[i]);
        	if (descriptor != null) {
                typeProviders.add(types[i]);
        	}
        }
        return typeProviders;
    }
	
	private Collection getExtensions() {
		return TestNavigator.getTestAssetGroupProxyManager().getExtensions();
	}
	
    public IGlobalProxyNodeListener getProxyNodeListener() {
    	return requests;
    }

	public void dispose() {
		requests.dispose();
		super.dispose();
	}

    class ProxiesRequests implements IProxiesRequestListener, IGlobalProxyNodeListener, IDisposable {
    	
    	private Map projectToRequestMap = new HashMap();
    	
    	public LogicalProjectProxiesRequest getRequest(IProject project, Collection types, Collection extensions) {
    		LogicalProjectProxiesRequest req = (LogicalProjectProxiesRequest)projectToRequestMap.get(project);
    		if (req == null) {
    			ArrayList requests = new ArrayList(types.size() + extensions.size());
    			for(Iterator it = types.iterator(); it.hasNext(); ) {
    				requests.add(LogicalProjectProxiesRequest.TYPE_PROVIDER_PREFIX + (String)it.next());
    			}
    			for(Iterator it = extensions.iterator(); it.hasNext(); ) {
    				requests.add(LogicalProjectProxiesRequest.TEST_ASSET_EXTENSION_PREFIX + (String)it.next());
    			}
    			req = new LogicalProjectProxiesRequest(requests, TestNavigator.getTypeProviderManager(), TestNavigator.getTestAssetGroupProxyManager(), project, testNavigator);
    			req.setPriority(getJobPriority());
    			testNavigator.getJobPool().scheduleJob(req);
                if (!req.wait(getResponseTime(), this, 2000)) {
                	projectToRequestMap.put(project, req);
                }
    		}
    		return req;
    	}
    	
		public void computationCompleted(ProxiesRequest request) {
			IProject project = ((LogicalProjectProxiesRequest)request).getProject();
			if (projectToRequestMap.containsKey(project)) {
				// A last refresh is necessary to remove the "Pending..." node.
				testNavigator.refresh(project);
			}
		}

		public void proxiesComputed(ProxiesRequest request) {
			IProject project = ((LogicalProjectProxiesRequest)request).getProject();
			testNavigator.refresh(project);
		}

		public void proxyComputed(ProxiesRequest request, Object key) {
		}

		public void nodeChanged(Object node) {
			if (node instanceof IProject) {
				LogicalProjectProxiesRequest req = (LogicalProjectProxiesRequest) projectToRequestMap.get(node);
				if (req != null) {
					// Then we need to cancel the current request. A new one will be spawned
					// when getChildren() is invoked on this project.
					if (req.cancel(1000)) {
						projectToRequestMap.remove(node);
					}
				}
			}
		}

		public void nodesChanged() {
			for (Iterator it = projectToRequestMap.keySet().iterator(); it.hasNext();) {
				nodeChanged(it.next());
			}
		}
		
		public void computationCancelled(ProxiesRequest request) {
			IProject project = ((LogicalProjectProxiesRequest)request).getProject();
			projectToRequestMap.remove(project);
			testNavigator.refresh(project);
		}
    	
		public void dispose() {
			// Cancel all running requests. Note that a LogicalProjectProxiesRequest may take
			// considerable time before it can honor the cancel request. So in general the
			// request may be still running for a long time after this instance has been
			// disposed.
			// If the user switches from the logical view to the resource view, and then back
			// to the logical view, this provider is disposed, and then another instance gets
			// created. As a result, two requests for the same project may be running: the old
			// one, which has been cancelled but has not stopped yet, and the new one. This
			// will look as if two jobs are doing the same thing at the same time. However what
			// really happens is that the new job is blocked on a wait until the old request 
			// completes, and then the new job automatically leverages the computation performed
			// by the old one, so there is no CPU waste. The only drawback is that the new job
			// occupies a slot in the Test navigator job pool.
			for (Iterator it = projectToRequestMap.values().iterator(); it.hasNext();) {
				ProxiesRequest request = (ProxiesRequest) it.next();
				request.dispose();
				it.remove();
			}
		}

    }
    
    private static class PendingProxy implements IProxyNode {
    	public PendingProxy(Object parent) {
    		this.parent = parent;
    	}
    	private Object parent;
    	private static IProxyNode[] NO_CHILDREN = new IProxyNode[0];
		public IProxyNode[] getChildren() {
			return NO_CHILDREN;
		}
		public Image getImage() {
			return null;
		}
		public Object getParent() {
			return parent;
		}
		public String getText() {
			return TestNavigatorMessages.NODE_PENDING;
		}
		public Object getAdapter(Class adapter) {
			return null;
		}
		public String getIdentifier() {
			return "~"; //$NON-NLS-1$
		}
		public IResource getUnderlyingResource() {
			return null;
		}
    }

}

Lines 1-5 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/navigator/action/CopyAction.java (-8 / +13 lines)
1	/**********************************************************************	1	/**********************************************************************
2	* Copyright (c) 2005, 2008 IBM Corporation and others.	2	* Copyright (c) 2005, 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 26-32 Link Here
26	import org.eclipse.core.resources.IResource;	26	import org.eclipse.core.resources.IResource;
27	import org.eclipse.core.runtime.IPath;	27	import org.eclipse.core.runtime.IPath;
28	import org.eclipse.hyades.test.ui.UiPlugin;	28	import org.eclipse.hyades.test.ui.UiPlugin;
29	import org.eclipse.hyades.test.ui.internal.navigator.ResourceTestNavigatorProvider;	29	import org.eclipse.hyades.test.ui.internal.navigator.ResourceTestNavigatorContentProvider;
30	import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;	30	import org.eclipse.hyades.test.ui.internal.resources.UiPluginResourceBundle;
31	import org.eclipse.hyades.test.ui.navigator.FileProxyNode;	31	import org.eclipse.hyades.test.ui.navigator.FileProxyNode;
32	import org.eclipse.hyades.test.ui.navigator.IProxyNode;	32	import org.eclipse.hyades.test.ui.navigator.IProxyNode;
Lines 42-51 Link Here
42	import org.eclipse.swt.dnd.Transfer;	42	import org.eclipse.swt.dnd.Transfer;
43	import org.eclipse.ui.part.ResourceTransfer;	43	import org.eclipse.ui.part.ResourceTransfer;
44		44
45	/**	45	/**
46	* Copy Action for the Resource mode.	46	* <p>Copy action for the Resource view of the Test Navigator.</p>
47	* @author jgout,Jerome Bozier	47	*
48	* @version February 26, 2008	48	*
		49	* @author Jerome Gout
		50	* @author Jerome Bozier
		51	* @author Paul Slauenwhite
		52	* @version May 18, 2009
		53	* @since March 7, 2005
49	*/	54	*/
50	public class CopyAction extends Action implements IDisposable {	55	public class CopyAction extends Action implements IDisposable {
51	private Clipboard clipboard;	56	private Clipboard clipboard;
Lines 178-184 Link Here
178	* @return true if this proxy replaces a file	183	* @return true if this proxy replaces a file
179	*/	184	*/
180	private boolean isAFileProxy(IProxyNode proxy) {	185	private boolean isAFileProxy(IProxyNode proxy) {
181	Object parent = ResourceTestNavigatorProvider.getSharedFileProxyManager().getParent(proxy);	186	Object parent = ResourceTestNavigatorContentProvider.getSharedFileProxyManager().getParent(proxy);
182	return proxy instanceof FileProxyNode \|\| parent instanceof IContainer;	187	return proxy instanceof FileProxyNode \|\| parent instanceof IContainer;
183	}	188	}
184		189
Lines 258-264 Link Here
258	return res.getParent();	263	return res.getParent();
259	} else if (sel instanceof IProxyNode) {	264	} else if (sel instanceof IProxyNode) {
260	IProxyNode proxy = (IProxyNode) sel;	265	IProxyNode proxy = (IProxyNode) sel;
261	return ResourceTestNavigatorProvider.getSharedFileProxyManager().getParent(proxy);	266	return ResourceTestNavigatorContentProvider.getSharedFileProxyManager().getParent(proxy);
262	} else {	267	} else {
263	return null;	268	return null;
264	}	269	}

Lines 1-5 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/navigator/action/FileProxyInContainerPaste.java (-9 / +13 lines)
1	/**********************************************************************	1	/**********************************************************************
2	* Copyright (c) 2005, 2008 IBM Corporation and others.	2	* Copyright (c) 2005, 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Common Public License v1.0	4	* are made available under the terms of the Common Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 13-19 Link Here
13		13
14	import org.eclipse.core.resources.IContainer;	14	import org.eclipse.core.resources.IContainer;
15	import org.eclipse.core.resources.IResource;	15	import org.eclipse.core.resources.IResource;
16	import org.eclipse.hyades.test.ui.internal.navigator.ResourceTestNavigatorProvider;	16	import org.eclipse.hyades.test.ui.internal.navigator.ResourceTestNavigatorContentProvider;
17	import org.eclipse.hyades.test.ui.internal.navigator.proxy.FileProxyManager;	17	import org.eclipse.hyades.test.ui.internal.navigator.proxy.FileProxyManager;
18	import org.eclipse.hyades.test.ui.navigator.FileProxyNode;	18	import org.eclipse.hyades.test.ui.navigator.FileProxyNode;
19	import org.eclipse.hyades.test.ui.navigator.IProxyNode;	19	import org.eclipse.hyades.test.ui.navigator.IProxyNode;
Lines 25-38 Link Here
25	import org.eclipse.ui.actions.CopyFilesAndFoldersOperation;	25	import org.eclipse.ui.actions.CopyFilesAndFoldersOperation;
26	import org.eclipse.ui.part.ResourceTransfer;	26	import org.eclipse.ui.part.ResourceTransfer;
27		27
28	/**	28	/**
29	* Paste action for the resource mode.	29	* <p>Paste action for the Resource view of the Test Navigator.</p>
30	* @author jgout,Jerome Bozier	30	*
31	* @since 3.3	31	*
32	* @version February 26, 2008	32	* @author Jerome Gout
		33	* @author Jerome Bozier
		34	* @author Paul Slauenwhite
		35	* @version May 18, 2009
		36	* @since March 16, 2007
33	* @deprecated	37	* @deprecated
34	*/	38	*/
35	public class FileProxyInContainerPaste implements IPaster {	39	public class FileProxyInContainerPaste implements IPaster {
36		40
37	private IResource [] getResourceFromClipboard(final Clipboard clipboard) {	41	private IResource [] getResourceFromClipboard(final Clipboard clipboard) {
38	final IResource[][] clipboardData = new IResource[1][];	42	final IResource[][] clipboardData = new IResource[1][];
Lines 57-63 Link Here
57	IProxyNode proxy = clipContent[i];	61	IProxyNode proxy = clipContent[i];
58	Object parent = proxy.getParent();	62	Object parent = proxy.getParent();
59	if(parent instanceof FileProxyManager.IUnboundedParent) {	63	if(parent instanceof FileProxyManager.IUnboundedParent) {
60	parent = ResourceTestNavigatorProvider.getSharedFileProxyManager().getParent(proxy);	64	parent = ResourceTestNavigatorContentProvider.getSharedFileProxyManager().getParent(proxy);
61	}	65	}
62	if(!(proxy instanceof FileProxyNode) && !(parent instanceof IContainer)) {	66	if(!(proxy instanceof FileProxyNode) && !(parent instanceof IContainer)) {
63	return false;	67	return false;

Lines 1-5 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/navigator/action/FileFolderInContainerPaste.java (-8 / +12 lines)
1	/**********************************************************************	1	/**********************************************************************
2	* Copyright (c) 2005, 2008 IBM Corporation and others.	2	* Copyright (c) 2005, 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Common Public License v1.0	4	* are made available under the terms of the Common Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 21-27 Link Here
21	import org.eclipse.core.runtime.NullProgressMonitor;	21	import org.eclipse.core.runtime.NullProgressMonitor;
22	import org.eclipse.core.runtime.OperationCanceledException;	22	import org.eclipse.core.runtime.OperationCanceledException;
23	import org.eclipse.hyades.test.ui.UiPlugin;	23	import org.eclipse.hyades.test.ui.UiPlugin;
24	import org.eclipse.hyades.test.ui.internal.navigator.ResourceTestNavigatorProvider;	24	import org.eclipse.hyades.test.ui.internal.navigator.ResourceTestNavigatorContentProvider;
25	import org.eclipse.hyades.test.ui.internal.navigator.TestNavigatorMessages;	25	import org.eclipse.hyades.test.ui.internal.navigator.TestNavigatorMessages;
26	import org.eclipse.hyades.test.ui.navigator.IProxyNode;	26	import org.eclipse.hyades.test.ui.navigator.IProxyNode;
27	import org.eclipse.hyades.test.ui.navigator.actions.IPaster;	27	import org.eclipse.hyades.test.ui.navigator.actions.IPaster;
Lines 38-48 Link Here
38	import org.eclipse.ui.actions.CopyFilesAndFoldersOperation;	38	import org.eclipse.ui.actions.CopyFilesAndFoldersOperation;
39	import org.eclipse.ui.part.ResourceTransfer;	39	import org.eclipse.ui.part.ResourceTransfer;
40		40
41	/**	41	/**
42	* Paste action for the resource mode.	42	* <p>Paste action for the Resource view of the Test Navigator.</p>
43	* @author jgout,Jerome Bozier	43	*
44	* @since 3.3	44	*
45	* @version February 26, 2008	45	* @author Jerome Gout
		46	* @author Jerome Bozier
		47	* @author Paul Slauenwhite
		48	* @version May 18, 2009
		49	* @since March 7, 2005
46	* @deprecated	50	* @deprecated
47	*/	51	*/
48	public class FileFolderInContainerPaste implements IPaster {	52	public class FileFolderInContainerPaste implements IPaster {
Lines 191-197 Link Here
191	oneCopied = true;	195	oneCopied = true;
192	if (source instanceof IFile && conflict) {	196	if (source instanceof IFile && conflict) {
193	IFile file = source.getWorkspace().getRoot().getFile(destinationPath);	197	IFile file = source.getWorkspace().getRoot().getFile(destinationPath);
194	IProxyNode proxy = ResourceTestNavigatorProvider.getSharedFileProxyManager().getProxy(file, null);	198	IProxyNode proxy = ResourceTestNavigatorContentProvider.getSharedFileProxyManager().getProxy(file, null);
195	IProxyNodeRenamer renamer = (IProxyNodeRenamer) proxy.getAdapter(IProxyNodeRenamer.class);	199	IProxyNodeRenamer renamer = (IProxyNodeRenamer) proxy.getAdapter(IProxyNodeRenamer.class);
196	if (renamer != null) {	200	if (renamer != null) {
197	//- use the renamer of this proxy node to rename properly	201	//- use the renamer of this proxy node to rename properly




/*******************************************************************************
 * Copyright (c) 2005, 2009 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.hyades.test.ui.UiPlugin;
import org.eclipse.hyades.test.ui.internal.navigator.LogicalTestNavigatorContentProvider;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.hyades.test.ui.navigator.ITestFolderContentValidator;
import org.eclipse.hyades.test.ui.navigator.TestFolderProxyNode;
import org.eclipse.swt.graphics.Image;

/** 
 * <p>Generic test asset group proxy node.</p>
 * 
 * 
 * @author  Jerome Gout
 * @author  Paul Slauenwhite
 * @version May 18, 2009
 * @since   March 18, 2005
 */
 public class TestAssetGroupProxyNode extends TestFolderProxyNode implements ITestAssetGroupProxyNode {
	
	private String extension;
    private String name;

	}
	
	public TestAssetGroupProxyNode(IProject project, String extension, String name, String imageKey, boolean flat, Object parent) {
		super(project, new TestAssetGroupValidator(extension), LogicalTestNavigatorContentProvider.getSharedFileProxyManager(), flat, parent);
		this.extension = extension;
        this.name = name;
        this.imageKey = imageKey;




/*******************************************************************************
 * Copyright (c) 2005, 2009 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: LogicalTestNavigatorProvider.java,v 1.11 2007/04/06 13:49:24 jgout Exp $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.hyades.test.ui.internal.navigator;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.hyades.test.ui.TestUIExtension;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.FileProxyManager;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.async.IProxiesRequestListener;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.async.LogicalProjectProxiesRequest;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.async.ProxiesRequest;
import org.eclipse.hyades.test.ui.navigator.IFileProxyManager;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.hyades.ui.extension.IAssociationConstants;
import org.eclipse.hyades.ui.extension.IAssociationDescriptor;
import org.eclipse.hyades.ui.extension.IAssociationMapping;
import org.eclipse.hyades.ui.internal.extension.AssociationMappingRegistry;
import org.eclipse.hyades.ui.util.IDisposable;
import org.eclipse.swt.graphics.Image;

/** 
 * <p>Content provider for the Logical view of the Test Navigator.</p>
 * 
 * 
 * @author  Jerome Gout
 * @author  Paul Slauenwhite
 * @version May 18, 2009
 * @since   February 1, 2005
 */
public class LogicalTestNavigatorContentProvider extends TestNavigatorContentProvider {

    /** The file proxy manager to acces to proxies from files */
    private static FileProxyManager fileProxyManager = new FileProxyManager();
    
    private ProxiesRequests requests = new ProxiesRequests();
    
    /**
     * @return Returns the fileProxyManager.
     */
    public static IFileProxyManager getSharedFileProxyManager() {
        return fileProxyManager;
    }

    public LogicalTestNavigatorContentProvider(TestNavigator testNavigator) {
    	super(testNavigator);
    }
    
    protected IFileProxyManager getFileProxyManager() {
    	return fileProxyManager;
    }

	public boolean hasChildren(Object parentElement) {
		if (parentElement == null)
			return false;
		if(parentElement instanceof IProject) {
			return true;
		}
		return super.hasChildren(parentElement);
	}
	
	public Object[] getChildren(Object parentElement) {
		if(parentElement instanceof IProject) {
			IProject project = (IProject)parentElement;
			if (project.isAccessible()) {
				Collection types = getTypes();
				Collection extensions = getExtensions();
				ArrayList ret = new ArrayList(types.size() + extensions.size());
				LogicalProjectProxiesRequest request = requests.getRequest(project, types, extensions);
				for (Iterator it = types.iterator(); it.hasNext();) {
					String type = (String) it.next();
					IProxyNode proxy = request.getProxy(LogicalProjectProxiesRequest.TYPE_PROVIDER_PREFIX + type);
					if (proxy != null) {
						ret.add(proxy);
					}
				}
				for (Iterator it = extensions.iterator(); it.hasNext();) {
					String ext = (String) it.next();
					IProxyNode proxy = request.getProxy(LogicalProjectProxiesRequest.TEST_ASSET_EXTENSION_PREFIX + ext);
					if (proxy != null) {
						ret.add(proxy);
					}
				}
				if (request.isPending()) {
					ret.add(0, new PendingProxy(project));
				}
				return ret.toArray();
			}
			return new Object[0];
		}
		return super.getChildren(parentElement);
	}

	private Collection getTypes() {
        AssociationMappingRegistry registry = (AssociationMappingRegistry)TestUIExtension.getTestSuiteMappingRegistry();
        IAssociationMapping associationMapping = registry.getAssociationMapping(IAssociationConstants.EP_TYPE_DESCRIPTIONS);
        String[] types = associationMapping.getTypes();
        List typeProviders = new ArrayList(types.length);
        for (int i = 0; i < types.length; i++) {
        	IAssociationDescriptor descriptor = associationMapping.getDefaultAssociationDescriptor(types[i]);
        	if (descriptor != null) {
                typeProviders.add(types[i]);
        	}
        }
        return typeProviders;
    }
	
	private Collection getExtensions() {
		return TestNavigator.getTestAssetGroupProxyManager().getExtensions();
	}
	
    public IGlobalProxyNodeListener getProxyNodeListener() {
    	return requests;
    }

	public void dispose() {
		requests.dispose();
	}

    class ProxiesRequests implements IProxiesRequestListener, IGlobalProxyNodeListener, IDisposable {
    	
    	private Map projectToRequestMap = new HashMap();
    	
    	public LogicalProjectProxiesRequest getRequest(IProject project, Collection types, Collection extensions) {
    		LogicalProjectProxiesRequest req = (LogicalProjectProxiesRequest)projectToRequestMap.get(project);
    		if (req == null) {
    			ArrayList requests = new ArrayList(types.size() + extensions.size());
    			for(Iterator it = types.iterator(); it.hasNext(); ) {
    				requests.add(LogicalProjectProxiesRequest.TYPE_PROVIDER_PREFIX + (String)it.next());
    			}
    			for(Iterator it = extensions.iterator(); it.hasNext(); ) {
    				requests.add(LogicalProjectProxiesRequest.TEST_ASSET_EXTENSION_PREFIX + (String)it.next());
    			}
    			req = new LogicalProjectProxiesRequest(requests, TestNavigator.getTypeProviderManager(), TestNavigator.getTestAssetGroupProxyManager(), project, testNavigator);
    			req.setPriority(getJobPriority());
    			testNavigator.getJobPool().scheduleJob(req);
                if (!req.wait(getResponseTime(), this, 2000)) {
                	projectToRequestMap.put(project, req);
                }
    		}
    		return req;
    	}
    	
		public void computationCompleted(ProxiesRequest request) {
			IProject project = ((LogicalProjectProxiesRequest)request).getProject();
			if (projectToRequestMap.containsKey(project)) {
				// A last refresh is necessary to remove the "Pending..." node.
				testNavigator.refresh(project);
			}
		}

		public void proxiesComputed(ProxiesRequest request) {
			IProject project = ((LogicalProjectProxiesRequest)request).getProject();
			testNavigator.refresh(project);
		}

		public void proxyComputed(ProxiesRequest request, Object key) {
		}

		public void nodeChanged(Object node) {
			if (node instanceof IProject) {
				LogicalProjectProxiesRequest req = (LogicalProjectProxiesRequest) projectToRequestMap.get(node);
				if (req != null) {
					// Then we need to cancel the current request. A new one will be spawned
					// when getChildren() is invoked on this project.
					if (req.cancel(1000)) {
						projectToRequestMap.remove(node);
					}
				}
			}
		}

		public void nodesChanged() {
			for (Iterator it = projectToRequestMap.keySet().iterator(); it.hasNext();) {
				nodeChanged(it.next());
			}
		}
		
		public void computationCancelled(ProxiesRequest request) {
			IProject project = ((LogicalProjectProxiesRequest)request).getProject();
			projectToRequestMap.remove(project);
			testNavigator.refresh(project);
		}
    	
		public void dispose() {
			// Cancel all running requests. Note that a LogicalProjectProxiesRequest may take
			// considerable time before it can honor the cancel request. So in general the
			// request may be still running for a long time after this instance has been
			// disposed.
			// If the user switches from the logical view to the resource view, and then back
			// to the logical view, this provider is disposed, and then another instance gets
			// created. As a result, two requests for the same project may be running: the old
			// one, which has been cancelled but has not stopped yet, and the new one. This
			// will look as if two jobs are doing the same thing at the same time. However what
			// really happens is that the new job is blocked on a wait until the old request 
			// completes, and then the new job automatically leverages the computation performed
			// by the old one, so there is no CPU waste. The only drawback is that the new job
			// occupies a slot in the Test navigator job pool.
			for (Iterator it = projectToRequestMap.values().iterator(); it.hasNext();) {
				ProxiesRequest request = (ProxiesRequest) it.next();
				request.dispose();
				it.remove();
			}
		}

    }
    
    private static class PendingProxy implements IProxyNode {
    	public PendingProxy(Object parent) {
    		this.parent = parent;
    	}
    	private Object parent;
    	private static IProxyNode[] NO_CHILDREN = new IProxyNode[0];
		public IProxyNode[] getChildren() {
			return NO_CHILDREN;
		}
		public Image getImage() {
			return null;
		}
		public Object getParent() {
			return parent;
		}
		public String getText() {
			return TestNavigatorMessages.NODE_PENDING;
		}
		public Object getAdapter(Class adapter) {
			return null;
		}
		public String getIdentifier() {
			return "~"; //$NON-NLS-1$
		}
		public IResource getUnderlyingResource() {
			return null;
		}
    }

}




/*******************************************************************************
 * Copyright (c) 2005, 2009 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: ResourceTestNavigatorProvider.java,v 1.10 2007/04/06 13:49:24 jgout Exp $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.hyades.test.ui.internal.navigator;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.hyades.test.ui.UiPlugin;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.FileProxyManager;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.async.FileProxiesRequest;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.async.IProxiesRequestListener;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.async.ProxiesRequest;
import org.eclipse.hyades.test.ui.navigator.IFileProxyManager;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.hyades.ui.util.IDisposable;

/** 
 * <p>Content provider for the Resource view of the Test Navigator.</p>
 * 
 * 
 * @author  Jerome Gout
 * @author  Paul Slauenwhite
 * @version May 18, 2009
 * @since   February 1, 2005
 */
public class ResourceTestNavigatorContentProvider extends TestNavigatorContentProvider {

    /** The file proxy manager to acces to proxies from files */
    private static FileProxyManager fileProxyManager = new FileProxyManager();
    
    /**
     * @return Returns the fileProxyManager.
     */
    public static FileProxyManager getSharedFileProxyManager() {
        return fileProxyManager;
    }

    public ResourceTestNavigatorContentProvider(TestNavigator testNavigator) {
    	super(testNavigator);
    }
    
    private FileProxyRequests requests = new FileProxyRequests();
    
    protected IFileProxyManager getFileProxyManager() {
    	return fileProxyManager;
    }

	public Object getParent(Object element) {
		if (element instanceof IResource) {
			return ((IResource) element).getParent();
		}
		return super.getParent(element);
	}
	
	public boolean hasChildren(Object parentElement) {
		if (parentElement == null)
			return false;
		if (parentElement instanceof IContainer) {
			IContainer container = (IContainer) parentElement;
			if (!container.isAccessible())
				return false;

			IResource[] resources = null;
			try {
				resources = container.members();
			} catch (CoreException e) {
				UiPlugin.logError(e);
				return false;
			}
			if (resources.length == 0) return false;
			if (parentElement instanceof IProject) {
				return true;
			}
			for (int i = 0; i < resources.length; i++) {
				if (resources[i].getType() != IResource.FILE) {
					if (!TestNavigator.getFiltersManager().filter(resources[i]))
						return true;
				} else {
					String fileExtension = resources[i].getFileExtension();
					if (fileExtension != null) {
						if (TestNavigator.getFiltersManager().isVisibleResource(resources[i])) return true;
					}
				}
			}
			return false;
		}
		return super.hasChildren(parentElement);
	}
	
	public Object[] getChildren(Object parentElement) {
		if (parentElement instanceof IContainer) {
			return getContainerChildren(parentElement);
		} else {
			return super.getChildren(parentElement);
		}
	}

	/** returns the children of a container node (project or folder)
	 * @param parentElement
	 * @return an array of Object which cn be empty but not null
	 */
	private Object[] getContainerChildren(Object parentElement) {
		IResource[] resources = null;
		IContainer container = ((IContainer) parentElement);
        if (container.isAccessible()) {
            try {
                resources = container.members();
            } catch (CoreException e) {
                UiPlugin.logError(e);
                return new Object[0];
            }
            List children = new ArrayList(resources.length);
            FileProxiesRequest request = requests.getRequest(container, resources);
            for (int i = 0, maxi = resources.length; i < maxi; i++) {
                if (!TestNavigator.getFiltersManager().filter(resources[i])) {
                	if (resources[i].getType() != IResource.FILE) { 
                		children.add(resources[i]);
                	} else {
                        //- convert the file in something else (proxy)
                    	IFile file = (IFile)resources[i];
                        IProxyNode node = request.getProxy(file);
                        if (!TestNavigator.getFiltersManager().filter(node)) {
                            children.add(node);
                            fileProxyManager.cacheProxy(file, node);
                        }
                    }
                }
            }
            return children.toArray();
        }
        return new Object[0];
	}

    public IGlobalProxyNodeListener getProxyNodeListener() {
    	return requests;
    }

	private class FileProxyRequests implements IProxiesRequestListener, IDisposable, IGlobalProxyNodeListener {
		
	    private Map containerToRequestMap = Collections.synchronizedMap(new HashMap());
	    
	    public FileProxiesRequest getRequest(IContainer container, IResource[] members) {
	    	FileProxiesRequest request = (FileProxiesRequest)containerToRequestMap.get(container);
	    	if (request == null) {
	    		request = newRequest(container, members);
	    	}
	    	return request;
	    }
	    
	    public FileProxiesRequest newRequest(IContainer container, IResource[] members) {
	    	ArrayList filesToRequest = new ArrayList(members.length);
            for (int i = 0, maxi = members.length; i < maxi; i++) {
            	if (members[i].getType() == IResource.FILE) {
            		if (!TestNavigator.getFiltersManager().filter(members[i])) {
                    	filesToRequest.add(members[i]);
                    }
                }
            }
            if (filesToRequest.isEmpty()) return null;
            FileProxiesRequest req = new FileProxiesRequest(filesToRequest, fileProxyManager, container, testNavigator);
            req.setPriority(getJobPriority());
            testNavigator.getJobPool().scheduleJob(req);
            if (!req.wait(getResponseTime(), this, 2000)) {
            	containerToRequestMap.put(container, req);
            }
            return req;
	    }
	    
		public void proxyComputed(final ProxiesRequest request, Object key) {
		}
	
		public void computationCompleted(ProxiesRequest request) {
			IContainer parent = ((FileProxiesRequest)request).getParent();
			if (containerToRequestMap.containsKey(parent)) {
				testNavigator.refresh(parent);
			}
		}

		public void dispose() {
			// Cancel all running requests. As the atomic action of FileProxiesRequest is
			// the computation of a single file proxy, all requests should honor the cancel
			// request quite quickly. However we don't wait them to complete (i.e. they may
			// be still running while this instance has been disposed).
			for (Iterator it = containerToRequestMap.values().iterator(); it.hasNext();) {
				FileProxiesRequest request = (FileProxiesRequest) it.next();
				request.dispose();
				it.remove();
			}
		}

		public void proxiesComputed(ProxiesRequest request) {
			testNavigator.refresh(((FileProxiesRequest)request).getParent());
		}

		public void nodeChanged(Object node) {
			if (node instanceof IContainer) {
				FileProxiesRequest req = (FileProxiesRequest) containerToRequestMap.remove(node);
				if (req != null) {
					// Then we need to cancel the current request. A new one will be spawned
					// when getChildren() is invoked on this project.
					if (req.cancel(1000)) {
						containerToRequestMap.remove(node);
					}
				}
			}
		}
		
		public void nodesChanged() {
			for (Iterator it = containerToRequestMap.keySet().iterator(); it.hasNext();) {
				nodeChanged(it.next());
			}
		}
		
		public void computationCancelled(ProxiesRequest request) {
			IContainer parent = ((FileProxiesRequest)request).getParent();
			containerToRequestMap.remove(parent);
			testNavigator.refresh(parent);
		}
    	
	}
	
	public void dispose() {
		requests.dispose();
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2009 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * $Id: TestNavigatorProvider.java,v 1.13 2009/02/12 19:19:00 paules Exp $
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.hyades.test.ui.internal.navigator;

import java.util.LinkedList;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.FileProxyManager;
import org.eclipse.hyades.test.ui.navigator.IFileProxyManager;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.hyades.test.ui.navigator.IProxyNodeListener;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.graphics.Image;

/**
 * <p>Content provider for the Test Navigator.</p>
 *
 * 
 * @author  Jerome Gout
 * @author  Julien Canches
 * @author  Paul E. Slauenwhite
 * @version May 18, 2009
 * @since   March 18, 2005 
 */
public abstract class TestNavigatorContentProvider implements ITreeContentProvider {

	private static final int MAX_PROXY_NODE_CHILDREN = 100;
	public static final int CONTEXT_LOADING = 0;
	public static final int CONTEXT_INTERACTIVE = 1;
	
	protected TestNavigator testNavigator;
	private int context;
	
	public TestNavigatorContentProvider(TestNavigator testNavigator) {
		this.testNavigator = testNavigator;
		this.context = CONTEXT_LOADING;
	}

	protected abstract IGlobalProxyNodeListener getProxyNodeListener();

	protected abstract IFileProxyManager getFileProxyManager();
		
	public Object getParent(Object element) {
		if (element instanceof IProxyNode) {
            Object parent = ((IProxyNode) element).getParent();
            if(parent instanceof FileProxyManager.IUnboundedParent) {
                return getFileProxyManager().getParent((IProxyNode) element);
            } else {
                return parent;
            }
		}
		return null;
	}

	public boolean hasChildren(Object parentElement) {
		if (parentElement instanceof IProxyNode) {
			IProxyNode proxy = (IProxyNode) parentElement;
			return proxy.getChildren().length > 0;
		}
		if (parentElement instanceof IProxyGroup) {
			return true;
		}
		return false;
	}

	public Object[] getChildren(Object parentElement) {
		if (parentElement instanceof IProxyNode) {
			IProxyNode proxy = (IProxyNode) parentElement;
			return foldProxyNodes(proxy);
		}
		if (parentElement instanceof IProxyGroup) {
			return ((IProxyGroup)parentElement).getChildren();
		}
		return new Object[0];
	}
	
	public Object[] getElements(Object inputElement) {
		if (inputElement instanceof IWorkspaceRoot) {
			IProject [] projects = ((IWorkspaceRoot) inputElement).getProjects();
			LinkedList visibleProjects = new LinkedList();
			for(int i = 0; i < projects.length; i++) {
				if(!TestNavigator.getFiltersManager().filter(projects[i])) {
					visibleProjects.add(projects[i]);
				}
			}
			return visibleProjects.toArray();
		}
		return getChildren(inputElement);
	}
    
	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
	}
	
	public static interface IGlobalProxyNodeListener extends IProxyNodeListener {
		
		void nodesChanged();
		
	}
	
	public static interface IProxyGroup extends IProxyNode{
		int getOrder();
	}
	
	private static class ProxyGroup implements IProxyGroup {
		private IProxyNode parent;
		private int sequence;
		public ProxyGroup(IProxyNode node, int sequence) {
			this.parent = node;
			this.sequence = sequence;
		}
		public IProxyNode[] getChildren() {
			int start = sequence * MAX_PROXY_NODE_CHILDREN;
			IProxyNode[] completeChildren = parent.getChildren();
			IProxyNode[] children = new IProxyNode[MAX_PROXY_NODE_CHILDREN];
			System.arraycopy(completeChildren, start, children, 0, MAX_PROXY_NODE_CHILDREN);
			return children;
		}
		public String getText() {
			int start = sequence * MAX_PROXY_NODE_CHILDREN + 1;
			int end = (sequence + 1) * MAX_PROXY_NODE_CHILDREN;
			return ("[".concat(Integer.toString(start)).concat(" - ").concat(Integer.toString(end)).concat("]"));
		}
		public Image getImage() {
			return parent.getImage();
		}
		public int getOrder() {
			return sequence;
		}
		public Object getParent() {	
			return parent;
		}
		public Object getAdapter(Class adapter) {
			return null;
		}
		public String getIdentifier() {
			return null;
		}
		public IResource getUnderlyingResource() {
			return null;
		}
	}
	
	private static class RemainingProxyGroup implements IProxyGroup {
		private IProxyNode parent;
		public RemainingProxyGroup(IProxyNode parent) {
			this.parent = parent;
		}
		public IProxyNode[] getChildren() {
			IProxyNode[] completeChildren = parent.getChildren();
			int completeLength = completeChildren.length;
			int length = completeLength % MAX_PROXY_NODE_CHILDREN;
			IProxyNode[] children = new IProxyNode[length];
			System.arraycopy(completeChildren, completeLength - length, children, 0, length);
			return children;
		}
		public String getText() {
			IProxyNode[] completeChildren = parent.getChildren();
			int end = completeChildren.length;
			int length = end % MAX_PROXY_NODE_CHILDREN;
			int start = end - length + 1;
			return ("[".concat(Integer.toString(start)).concat(" - ").concat(Integer.toString(end)).concat("]"));
		}
		public Image getImage() {
			return parent.getImage();
		}
		public int getOrder() {
			return Integer.MAX_VALUE;
		}
		public Object getParent() {
			return parent;
		}
		public Object getAdapter(Class adapter) {
			return null;
		}
		public String getIdentifier() {
			return null;
		}
		public IResource getUnderlyingResource() {
			return null;
		}
	}
	
	protected Object[] foldProxyNodes(IProxyNode parent) {
		IProxyNode[] children = parent.getChildren();
		int length = children.length;
		if (length <= MAX_PROXY_NODE_CHILDREN) return children;
		int size = length / MAX_PROXY_NODE_CHILDREN;
		int remaining = length % MAX_PROXY_NODE_CHILDREN;
		int totalSize = size + (remaining > 0 ? 1 : 0);
		Object[] groups = new IProxyGroup[totalSize];
		for (int i = 0; i < size; i++) {
			groups[i] = new ProxyGroup(parent, i);
		}
		if (remaining > 0) {
			groups[size] = new RemainingProxyGroup(parent);
		}
		return groups;
	}

	/**
	 * Sets the context in which the provider is used. There are two available values:
	 * INTERACTIVE and LOADING. The context has an effect on two parameters:
	 * 1) responsiveness: time that getChildren() is allowed to spent before returning
	 * control. High responsiveness means that the provider will return incomplete nodes,
	 * compute the remaining in a background task, and update the navigator when computation
	 * is complete. Low responsiveness means that the UI will be blocked for a longer period of
	 * time but the returned node are more likely to be complete.
	 * 2) computation job priority: the priority allocated to the computation job, if the provider
	 * does not manage to compute nodes in the allocated time (responsiveness parameter). This does
	 * not affect the thread priority, but helps eclipse decide which job should be launched first.
	 * In LOADING mode, responsiveness is high (100ms) and priority is low (NORMAL).
	 * In INTERACTIVE mode, responsiveness is lower (800ms) and priority is high (INTERACTIVE).
	 */
	public void setContext(int context) {
		this.context = context;
	}
	
	protected int getContext() {
		return context;
	}
	
	protected int getResponseTime() {
		switch (context) {
		case CONTEXT_INTERACTIVE:
			return 800;
		case CONTEXT_LOADING:
			return 100;
		}
		return 100;
	}
	
	protected int getJobPriority() {
		switch(context) {
		case CONTEXT_INTERACTIVE:
			return Job.INTERACTIVE;
		case CONTEXT_LOADING:
			return Job.LONG;
		}
		return Job.LONG;
	}	
}

Return to bug 164483

Lines 36-43 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/navigator/TestNavigator.java (-26 / +27 lines)
36	import org.eclipse.hyades.test.ui.UiPlugin;	36	import org.eclipse.hyades.test.ui.UiPlugin;
37	import org.eclipse.hyades.test.ui.internal.editor.BaseEditorPart;	37	import org.eclipse.hyades.test.ui.internal.editor.BaseEditorPart;
38	import org.eclipse.hyades.test.ui.internal.model.ResourceUtil.ResourceAdaptable;	38	import org.eclipse.hyades.test.ui.internal.model.ResourceUtil.ResourceAdaptable;
39	import org.eclipse.hyades.test.ui.internal.navigator.TestNavigatorProvider.IGlobalProxyNodeListener;	39	import org.eclipse.hyades.test.ui.internal.navigator.TestNavigatorContentProvider.IGlobalProxyNodeListener;
40	import org.eclipse.hyades.test.ui.internal.navigator.TestNavigatorProvider.IProxyGroup;	40	import org.eclipse.hyades.test.ui.internal.navigator.TestNavigatorContentProvider.IProxyGroup;
41	import org.eclipse.hyades.test.ui.internal.navigator.action.TestNavigatorActionGroup;	41	import org.eclipse.hyades.test.ui.internal.navigator.action.TestNavigatorActionGroup;
42	import org.eclipse.hyades.test.ui.internal.navigator.action.ToggleViewAction;	42	import org.eclipse.hyades.test.ui.internal.navigator.action.ToggleViewAction;
43	import org.eclipse.hyades.test.ui.internal.navigator.proxy.FileFactoryManager;	43	import org.eclipse.hyades.test.ui.internal.navigator.proxy.FileFactoryManager;
Lines 70-76 Link Here
70	import org.eclipse.jface.action.IToolBarManager;	70	import org.eclipse.jface.action.IToolBarManager;
71	import org.eclipse.jface.action.Separator;	71	import org.eclipse.jface.action.Separator;
72	import org.eclipse.jface.viewers.DoubleClickEvent;	72	import org.eclipse.jface.viewers.DoubleClickEvent;
73	import org.eclipse.jface.viewers.ILabelDecorator;
74	import org.eclipse.jface.viewers.ILabelProvider;	73	import org.eclipse.jface.viewers.ILabelProvider;
75	import org.eclipse.jface.viewers.ISelection;	74	import org.eclipse.jface.viewers.ISelection;
76	import org.eclipse.jface.viewers.IStructuredSelection;	75	import org.eclipse.jface.viewers.IStructuredSelection;
Lines 101-108 Link Here
101		100
102	/**	101	/**
103	* <p>Concrete implementation of the	102	* <p>Concrete implementation of the
104	* {@link org.eclipse.hyades.ui.internal.navigator.Navigator}for the Hyades	103	* {@link org.eclipse.hyades.ui.internal.navigator.TreeNavigator}
105	* Test objects.</p>	104	* for test assets.</p>
106	*	105	*
107	*	106	*
108	* @author Marcelo Paternostro	107	* @author Marcelo Paternostro
Lines 110-116 Link Here
110	* @author Paul E. Slauewnhite	109	* @author Paul E. Slauewnhite
111	* @author Paul Klicnik	110	* @author Paul Klicnik
112	* @author Kurtis Martin	111	* @author Kurtis Martin
113	* @version April 23, 2009	112	* @version May 18, 2009
114	* @since February 1, 2005	113	* @since February 1, 2005
115	*/	114	*/
116	public class TestNavigator extends TreeNavigator implements ISelectionListener, IGlobalProxyNodeListener, ITestNavigator {	115	public class TestNavigator extends TreeNavigator implements ISelectionListener, IGlobalProxyNodeListener, ITestNavigator {
Lines 167-174 Link Here
167	/** actions to switch between both logical and resource views. */	166	/** actions to switch between both logical and resource views. */
168	private ToggleViewAction[] viewActions;	167	private ToggleViewAction[] viewActions;
169		168
170	/** Current content and label provider. */	169	/**
171	private TestNavigatorProvider currentProvider;	170	* Current content provider for the Test Navigator.
		171	*/
		172	private TestNavigatorContentProvider currentContentProvider;
172		173
173	// - constants are used in the IDialogSettings	174	// - constants are used in the IDialogSettings
174	protected final static String SET_SHOW_FOLDERS = "SHOW_FOLDERS"; //$NON-NLS-1$	175	protected final static String SET_SHOW_FOLDERS = "SHOW_FOLDERS"; //$NON-NLS-1$
Lines 276-282 Link Here
276	}	277	}
277		278
278	public IFileProxyManager getCurrentFileProxyManager() {	279	public IFileProxyManager getCurrentFileProxyManager() {
279	return currentProvider.getFileProxyManager();	280	return currentContentProvider.getFileProxyManager();
280	}	281	}
281		282
282	/**	283	/**
Lines 306-312 Link Here
306	private static class TypeProviderContext implements ITypeProviderContext {	307	private static class TypeProviderContext implements ITypeProviderContext {
307	private IProxyNodeListener refresher;	308	private IProxyNodeListener refresher;
308	public IFileProxyManager getFileProxyManager() {	309	public IFileProxyManager getFileProxyManager() {
309	return LogicalTestNavigatorProvider.getSharedFileProxyManager();	310	return LogicalTestNavigatorContentProvider.getSharedFileProxyManager();
310	}	311	}
311	public IProxyNodeListener getProxyNodeListener() {	312	public IProxyNodeListener getProxyNodeListener() {
312	if (refresher == null) {	313	if (refresher == null) {
Lines 397-407 Link Here
397	}	398	}
398		399
399	private void adjustCurrentProviderContext(boolean isLoading) {	400	private void adjustCurrentProviderContext(boolean isLoading) {
400	if (currentProvider != null) {	401	if (currentContentProvider != null) {
401	if (isLoading) {	402	if (isLoading) {
402	currentProvider.setContext(TestNavigatorProvider.CONTEXT_LOADING);	403	currentContentProvider.setContext(TestNavigatorContentProvider.CONTEXT_LOADING);
403	} else {	404	} else {
404	currentProvider.setContext(TestNavigatorProvider.CONTEXT_INTERACTIVE);	405	currentContentProvider.setContext(TestNavigatorContentProvider.CONTEXT_INTERACTIVE);
405	}	406	}
406	}	407	}
407	}	408	}
Lines 563-582 Link Here
563	updateTestNavigatorProvider(treeViewer);	564	updateTestNavigatorProvider(treeViewer);
564	}	565	}
565		566
566	/**
567	* @param treeViewer
568	*/
569	private void updateTestNavigatorProvider(TreeViewer treeViewer) {	567	private void updateTestNavigatorProvider(TreeViewer treeViewer) {
		568
570	if (currentViewIndex == VIEW_ID_RESOURCE) {	569	if (currentViewIndex == VIEW_ID_RESOURCE) {
571	currentProvider = new ResourceTestNavigatorProvider(this);	570	currentContentProvider = new ResourceTestNavigatorContentProvider(this);
572	} else {	571	}
573	currentProvider = new LogicalTestNavigatorProvider(this);	572	else {
		573	currentContentProvider = new LogicalTestNavigatorContentProvider(this);
574	}	574	}
		575
575	adjustCurrentProviderContext(true);	576	adjustCurrentProviderContext(true);
576	treeViewer.setContentProvider(currentProvider);	577
577	ILabelDecorator decorator = PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator();	578	treeViewer.setContentProvider(currentContentProvider);
578	ILabelProvider labelProvider = new TestDecoratingLabelProvider(currentProvider, decorator, this);	579	treeViewer.setLabelProvider(new TestDecoratingLabelProvider(new TestNavigatorLabelProvider(), PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator(), this));
579	treeViewer.setLabelProvider(labelProvider);	580
580	adjustCurrentProviderContext(false);	581	adjustCurrentProviderContext(false);
581	}	582	}
582		583
Lines 1081-1092 Link Here
1081	* Invoked by test providers to notify that a node and its children should be refreshed.	1082	* Invoked by test providers to notify that a node and its children should be refreshed.
1082	*/	1083	*/
1083	public void nodeChanged(Object node) {	1084	public void nodeChanged(Object node) {
1084	currentProvider.getProxyNodeListener().nodeChanged(node);	1085	currentContentProvider.getProxyNodeListener().nodeChanged(node);
1085	refresh(node);	1086	refresh(node);
1086	}	1087	}
1087		1088
1088	public void nodesChanged() {	1089	public void nodesChanged() {
1089	currentProvider.getProxyNodeListener().nodesChanged();	1090	currentContentProvider.getProxyNodeListener().nodesChanged();
1090	refresh(null);	1091	refresh(null);
1091	}	1092	}
1092		1093
Lines 1141-1147 Link Here
1141	switch (currentViewIndex) {	1142	switch (currentViewIndex) {
1142	case VIEW_ID_LOGICAL: {	1143	case VIEW_ID_LOGICAL: {
1143	IProject project = file.getProject();	1144	IProject project = file.getProject();
1144	if (project != null)currentProvider.getChildren(project);	1145	if (project != null)currentContentProvider.getChildren(project);
1145	return proxyManager.getProxy(file, null);	1146	return proxyManager.getProxy(file, null);
1146	}	1147	}
1147	case VIEW_ID_RESOURCE: {	1148	case VIEW_ID_RESOURCE: {

Lines 1-5 Link Here

(-)src/org/eclipse/hyades/test/ui/navigator/ProxyNodeTransfer.java (-8 / +10 lines)
1	/**********************************************************************	1	/**********************************************************************
2	* Copyright (c) 2005, 2008 IBM Corporation and others.	2	* Copyright (c) 2005, 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Common Public License v1.0	4	* are made available under the terms of the Common Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 16-33 Link Here
16	import java.io.DataOutputStream;	16	import java.io.DataOutputStream;
17	import java.io.IOException;	17	import java.io.IOException;
18		18
19	import org.eclipse.hyades.test.ui.internal.navigator.ResourceTestNavigatorProvider;	19	import org.eclipse.hyades.test.ui.internal.navigator.ResourceTestNavigatorContentProvider;
20	import org.eclipse.swt.dnd.ByteArrayTransfer;	20	import org.eclipse.swt.dnd.ByteArrayTransfer;
21	import org.eclipse.swt.dnd.TransferData;	21	import org.eclipse.swt.dnd.TransferData;
22		22
23	/**	23	/**
24	* Transfer class used by Copy/Paste actions of proxy nodes, in resource mode.	24	* <p>Transfer class used by copy and paste actions of proxy nodes in the Resource view of the Test Navigator.</p>
25	*	25	*
26	* @author jgout	26	*
27	* @version February 26, 2008	27	* @author Jerome Gout
28	* @since 3.3	28	* @author Paul Slauenwhite
		29	* @version May 18, 2009
		30	* @since March 7, 2005
29	*/	31	*/
30	public class ProxyNodeTransfer extends ByteArrayTransfer {	32	public class ProxyNodeTransfer extends ByteArrayTransfer {
31	private static final ProxyNodeTransfer instance = new ProxyNodeTransfer();	33	private static final ProxyNodeTransfer instance = new ProxyNodeTransfer();
32	//- Create a unique ID to make sure that different Eclipse	34	//- Create a unique ID to make sure that different Eclipse
33	//- applications use different "types" of <code>ProxyNodeTransfer</code>	35	//- applications use different "types" of <code>ProxyNodeTransfer</code>
Lines 66-72 Link Here
66	private IProxyNode readProxy(DataInputStream dataIn) throws IOException {	68	private IProxyNode readProxy(DataInputStream dataIn) throws IOException {
67	String fileName = dataIn.readUTF();	69	String fileName = dataIn.readUTF();
68	String identifier = dataIn.readUTF();	70	String identifier = dataIn.readUTF();
69	return ResourceTestNavigatorProvider.getSharedFileProxyManager().getCorrespondingProxy(fileName, identifier);	71	return ResourceTestNavigatorContentProvider.getSharedFileProxyManager().getCorrespondingProxy(fileName, identifier);
70	}	72	}
71		73
72	/**	74	/**