Attachment #163389 for bug #306508

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




package org.eclipse.team.internal.ccvs.ui.subscriber;

import java.lang.reflect.InvocationTargetException;
import java.util.*;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

import org.eclipse.compare.structuremergeviewer.IDiffElement;
import org.eclipse.core.resources.*;
import org.eclipse.core.resources.mapping.ResourceMapping;
import org.eclipse.core.resources.mapping.ResourceMappingContext;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.MultiRule;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.osgi.util.NLS;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.mapping.provider.SynchronizationScopeManager;
import org.eclipse.team.core.synchronize.*;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter.*;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter.AndSyncInfoFilter;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter.OrSyncInfoFilter;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter.SyncInfoDirectionFilter;
import org.eclipse.team.core.variants.IResourceVariant;
import org.eclipse.team.internal.ccvs.core.*;
import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin;
import org.eclipse.team.internal.ccvs.core.ICVSFile;
import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer;
import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
import org.eclipse.team.internal.ccvs.ui.*;
import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.team.internal.ccvs.ui.operations.*;
import org.eclipse.team.internal.ui.TeamUIPlugin;
import org.eclipse.team.internal.ui.Utils;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;

/**

	public boolean shouldRun() {
		return promptIfNeeded();
	}

	/**
	 * Run the operation for the sync infos from the given project. By default, a lock
	 * is acquired on the project.
	 * @param projectSyncInfos the project syncInfos
	 * @param project the project
	 * @param monitor a progress monitor
	 * @throws InvocationTargetException
	 */
	protected void run(final Map projectSyncInfos, final IProject project,
			IProgressMonitor monitor) throws InvocationTargetException {
		try {
			IResource[] resources = getIResourcesFrom(((SyncInfoSet) projectSyncInfos
					.get(project)).getSyncInfos());
			ResourceMapping[] selectedMappings = Utils
					.getResourceMappings(resources);
			ResourceMappingContext context = new SingleProjectSubscriberContext(
					CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber(),
					false, project);
			SynchronizationScopeManager manager = new SingleProjectScopeManager(
					getJobName(), selectedMappings, context, true, project);
			manager.initialize(null);
			ISchedulingRule updateRule = getUpdateRule(manager);

			// Pass the scheduling rule to the synchronizer so that sync change
			// events
			// and cache commits to disk are batched
			EclipseSynchronizer.getInstance().run(updateRule,
					new ICVSRunnable() {
						public void run(IProgressMonitor monitor)
								throws CVSException {
							try {
								runWithProjectRule(project,
										(SyncInfoSet) projectSyncInfos
												.get(project), monitor);
							} catch (TeamException e) {
								throw CVSException.wrapException(e);
							}
						}
					}, Policy.subMonitorFor(monitor, 100));
		} catch (TeamException e) {
			throw new InvocationTargetException(e);
		} catch (CoreException e) {
			throw new InvocationTargetException(e);
		}
	}

	private ISchedulingRule getUpdateRule(SynchronizationScopeManager manager) {
		ISchedulingRule rule = null;
		ResourceMapping[] mappings = manager.getScope().getMappings();
		for (int i = 0; i < mappings.length; i++) {
			ResourceMapping mapping = mappings[i];
			IProject[] mappingProjects = mapping.getProjects();
			for (int j = 0; j < mappingProjects.length; j++) {
				if (rule == null) {
					rule = mappingProjects[j];
				} else {
					rule = MultiRule.combine(rule, mappingProjects[j]);
				}
			}
		}
		return rule;
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberOperation#run(org.eclipse.core.runtime.IProgressMonitor)

Lines 1-5 Link Here

(-)src/org/eclipse/team/tests/ccvs/core/subscriber/TestUpdateOperation.java (-1 / +45 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2006 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 10-19 Link Here
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.team.tests.ccvs.core.subscriber;	11	package org.eclipse.team.tests.ccvs.core.subscriber;
12		12
		13	import java.lang.reflect.InvocationTargetException;
		14
13	import org.eclipse.compare.structuremergeviewer.IDiffElement;	15	import org.eclipse.compare.structuremergeviewer.IDiffElement;
		16	import org.eclipse.core.resources.IProject;
		17	import org.eclipse.core.resources.IResource;
		18	import org.eclipse.core.runtime.IProgressMonitor;
		19	import org.eclipse.team.core.TeamException;
		20	import org.eclipse.team.core.mapping.ISynchronizationScope;
14	import org.eclipse.team.core.synchronize.SyncInfoSet;	21	import org.eclipse.team.core.synchronize.SyncInfoSet;
		22	import org.eclipse.team.internal.ccvs.core.CVSException;
		23	import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
		24	import org.eclipse.team.internal.ccvs.ui.Policy;
		25	import org.eclipse.team.internal.ccvs.ui.operations.UpdateOnlyMergableOperation;
15	import org.eclipse.team.internal.ccvs.ui.subscriber.WorkspaceUpdateOperation;	26	import org.eclipse.team.internal.ccvs.ui.subscriber.WorkspaceUpdateOperation;
		27	import org.eclipse.team.internal.ui.mapping.BuildScopeOperation;
16	import org.eclipse.team.tests.ccvs.core.EclipseTest;	28	import org.eclipse.team.tests.ccvs.core.EclipseTest;
		29	import org.eclipse.team.tests.ccvs.ui.ReflectionUtils;
17		30
18	class TestUpdateOperation extends WorkspaceUpdateOperation {	31	class TestUpdateOperation extends WorkspaceUpdateOperation {
19		32
Lines 42-45 Link Here
42	EclipseTest.fail("Should never prompt on update, simply update nodes that are valid.");	55	EclipseTest.fail("Should never prompt on update, simply update nodes that are valid.");
43	return false;	56	return false;
44	}	57	}
		58
		59	protected void safeUpdate(IProject project, IResource[] resources, LocalOption[] localOptions, IProgressMonitor monitor) throws TeamException {
		60	try {
		61	UpdateOnlyMergableOperation operation = new UpdateOnlyMergableOperation(getPart(), project, resources, localOptions) {
		62	public ISynchronizationScope buildScope(IProgressMonitor monitor) throws InterruptedException, CVSException {
		63	if (getScopeManager() == null) {
		64	// manager = createScopeManager(consultModelsWhenBuildingScope && consultModelsForMappings());
		65	ReflectionUtils.setField(this, "manager", createScopeManager(consultModelsWhenBuildingScope && consultModelsForMappings()));
		66	BuildScopeOperation op = new BuildScopeOperation(getPart(), getScopeManager()) {
		67	protected boolean promptForInputChange(String requestPreviewMessage, IProgressMonitor monitor) {
		68	return false; // do not prompt
		69	}
		70	};
		71	try {
		72	op.run(monitor);
		73	} catch (InvocationTargetException e) {
		74	throw CVSException.wrapException(e);
		75	}
		76	}
		77	return getScope();
		78	}
		79	};
		80	operation.run(monitor);
		81	// addSkippedFiles(operation.getSkippedFiles());
		82	ReflectionUtils.callMethod(this, "addSkippedFiles", new Object[] {operation.getSkippedFiles()});
		83	} catch (InvocationTargetException e) {
		84	throw CVSException.wrapException(e);
		85	} catch (InterruptedException e) {
		86	Policy.cancelOperation();
		87	}
		88	}
45	}	89	}

Lines 1-5 Link Here

(-)src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java (-4 / +86 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 13-36 Link Here
13	import java.io.ByteArrayInputStream;	13	import java.io.ByteArrayInputStream;
14	import java.io.IOException;	14	import java.io.IOException;
15	import java.lang.reflect.InvocationTargetException;	15	import java.lang.reflect.InvocationTargetException;
16	import java.util.*;	16	import java.util.Arrays;
		17	import java.util.HashSet;
		18	import java.util.Set;
17		19
18	import junit.framework.Test;	20	import junit.framework.Test;
19	import junit.framework.TestSuite;	21	import junit.framework.TestSuite;
20		22
21	import org.eclipse.core.resources.*;	23	import org.eclipse.core.resources.IContainer;
		24	import org.eclipse.core.resources.IFile;
		25	import org.eclipse.core.resources.IFolder;
		26	import org.eclipse.core.resources.IProject;
		27	import org.eclipse.core.resources.IProjectDescription;
		28	import org.eclipse.core.resources.IResource;
		29	import org.eclipse.core.resources.IResourceVisitor;
		30	import org.eclipse.core.resources.ResourcesPlugin;
22	import org.eclipse.core.runtime.CoreException;	31	import org.eclipse.core.runtime.CoreException;
		32	import org.eclipse.core.runtime.NullProgressMonitor;
23	import org.eclipse.core.runtime.Path;	33	import org.eclipse.core.runtime.Path;
24	import org.eclipse.team.core.RepositoryProvider;	34	import org.eclipse.team.core.RepositoryProvider;
25	import org.eclipse.team.core.TeamException;	35	import org.eclipse.team.core.TeamException;
26	import org.eclipse.team.core.subscribers.ISubscriberChangeEvent;	36	import org.eclipse.team.core.subscribers.ISubscriberChangeEvent;
27	import org.eclipse.team.core.synchronize.SyncInfo;	37	import org.eclipse.team.core.synchronize.SyncInfo;
28	import org.eclipse.team.internal.ccvs.core.*;	38	import org.eclipse.team.internal.ccvs.core.CVSException;
		39	import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin;
		40	import org.eclipse.team.internal.ccvs.core.CVSSyncTreeSubscriber;
		41	import org.eclipse.team.internal.ccvs.core.CVSTag;
		42	import org.eclipse.team.internal.ccvs.core.CVSTeamProvider;
		43	import org.eclipse.team.internal.ccvs.core.ICVSFile;
		44	import org.eclipse.team.internal.ccvs.core.ICVSFolder;
		45	import org.eclipse.team.internal.ccvs.core.ICVSResource;
29	import org.eclipse.team.internal.ccvs.core.client.Command;	46	import org.eclipse.team.internal.ccvs.core.client.Command;
30	import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption;	47	import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption;
31	import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;	48	import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
32	import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo;	49	import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo;
		50	import org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation;
33	import org.eclipse.team.tests.ccvs.core.CVSTestSetup;	51	import org.eclipse.team.tests.ccvs.core.CVSTestSetup;
		52	import org.eclipse.team.tests.ccvs.core.mappings.model.ModelProject;
		53	import org.eclipse.team.tests.ccvs.core.mappings.model.mapping.ModelResourceMapping;
		54	import org.eclipse.team.tests.ccvs.ui.ModelParticipantSyncInfoSource;
34		55
35	/**	56	/**
36	* This class tests the CVSWorkspaceSubscriber	57	* This class tests the CVSWorkspaceSubscriber
Lines 277-282 Link Here
277	* Tests	298	* Tests
278	******************************************************************/	299	******************************************************************/
279		300
		301	public void testBug302163WithoutModel() throws CoreException {
		302	// Create a test project
		303	IProject modelProject = getUniqueTestProject("test1");
		304	buildResources(modelProject, new String[] { "file.mod", "f1.moe" }, true);
		305	modelProject.getFile("file.mod").setContents(new ByteArrayInputStream(("\nf1.moe").getBytes()), false, true, null);
		306	shareProject(modelProject);
		307	assertValidCheckout(modelProject);
		308
		309	// Checkout and modify a copy
		310	IProject copyModelProject = checkoutCopy(modelProject, "-copy");
		311	copyModelProject.getFile("file.mod").setContents(new ByteArrayInputStream(("\nf1.moe\nf2.moe").getBytes()), false, true, null);
		312	commitProject(copyModelProject);
		313
		314	refresh(getSubscriber(), modelProject);
		315
		316	RepositoryProviderOperation.consultModelsWhenBuildingScope = true;
		317	setSyncSource(new SyncInfoSource());
		318	// Update
		319	try {
		320	update(modelProject, new String[] { "file.mod" });
		321	} catch (CVSException e) {
		322	fail("Update without models failed", e);
		323	}
		324	// Reset settings
		325	RepositoryProviderOperation.consultModelsWhenBuildingScope = false;
		326	setSyncSource(new ModelParticipantSyncInfoSource());
		327	}
		328
		329	public void testBug302163WithModel() throws CoreException {
		330	// Create a test project
		331	IProject project = createProject("test", new String[] { "file1.txt" });
		332	ModelResourceMapping.projectName = project.getName();
		333
		334	// Create a test model project
		335	IProject modelProject = getUniqueTestProject("test1");
		336	buildResources(modelProject, new String[] { "file.mod", "f1.moe" }, true);
		337	modelProject.getFile("file.mod").setContents(new ByteArrayInputStream(("\nf1.moe").getBytes()), false, true, null);
		338	ModelProject.makeModProject(modelProject, new NullProgressMonitor());
		339	shareProject(modelProject);
		340	assertValidCheckout(modelProject);
		341
		342	// Checkout and modify a copy of the model project
		343	IProject copyModelProject = checkoutCopy(modelProject, "-copy");
		344	copyModelProject.getFile("file.mod").setContents(new ByteArrayInputStream(("\nf1.moe\nf2.moe").getBytes()), false, true, null);
		345	commitProject(copyModelProject);
		346
		347	refresh(getSubscriber(), modelProject);
		348
		349	RepositoryProviderOperation.consultModelsWhenBuildingScope = true;
		350	setSyncSource(new SyncInfoSource());
		351	// Update
		352	try {
		353	update(modelProject, new String[] { "file.mod" });
		354	} catch (CVSException e) {
		355	fail("Update without models failed", e);
		356	}
		357	// Reset settings
		358	RepositoryProviderOperation.consultModelsWhenBuildingScope = false;
		359	setSyncSource(new ModelParticipantSyncInfoSource());
		360	}
		361
280	/*	362	/*
281	* Perform a simple test that checks for the different types of incoming changes	363	* Perform a simple test that checks for the different types of incoming changes
282	*/	364	*/




/*******************************************************************************
 * Copyright (c) 2009, 2010 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 java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

import org.eclipse.team.tests.ccvs.core.EclipseTest;

public class ReflectionUtils {

	public static Object callMethod(Object object, String name, Object args[]) {
		try {
			Class types[] = new Class[args.length];
			for (int i = 0; i < args.length; i++) {
				types[i] = args[i].getClass();
			}
			Method method = null;
			Class clazz = object.getClass();
			NoSuchMethodException ex = null;
			while (method == null && clazz != null) {
				try {
					method = clazz.getDeclaredMethod(name, types);
				} catch (NoSuchMethodException e) {
					if (ex == null) {
						ex = e;
					}
					clazz = clazz.getSuperclass();
				}
				clazz = clazz.getSuperclass();
			}
			if (method == null) {
				throw ex;
			}
			method.setAccessible(true);
			Object ret = method.invoke(object, args);
			return ret;
		} catch (IllegalArgumentException e) {
			EclipseTest.fail(e.getMessage());
		} catch (IllegalAccessException e) {
			EclipseTest.fail(e.getMessage());
		} catch (SecurityException e) {
			EclipseTest.fail(e.getMessage());
		} catch (NoSuchMethodException e) {
			EclipseTest.fail(e.getMessage());
		} catch (InvocationTargetException e) {
			EclipseTest.fail(e.getMessage());
		}
		return null;
	}

	public static Object getField(Object object, String name) {
		try {
			Field field = null;
			Class clazz = object.getClass();
			NoSuchFieldException ex = null;
			while (field == null && clazz != null) {
				try {
					field = clazz.getDeclaredField(name);
				} catch (NoSuchFieldException e) {
					if (ex == null) {
						ex = e;
					}
					clazz = clazz.getSuperclass();
				}
			}
			if (field == null) {
				throw ex;
			}
			field.setAccessible(true);
			Object ret = field.get(object);
			return ret;
		} catch (IllegalArgumentException e) {
			EclipseTest.fail(e.getMessage());
		} catch (IllegalAccessException e) {
			EclipseTest.fail(e.getMessage());
		} catch (SecurityException e) {
			EclipseTest.fail(e.getMessage());
		} catch (NoSuchFieldException e) {
			EclipseTest.fail(e.getMessage());
		}
		return null;
		Object ret = method.invoke(object, args);
		return ret;
	}

	public static void setField(Object object, String name, Object value) {
		try {
			Field field = null;
			Class clazz = object.getClass();
			NoSuchFieldException ex = null;
			while (field == null && clazz != null) {
				try {
					field = clazz.getDeclaredField(name);
				} catch (NoSuchFieldException e) {
					if (ex == null) {
						ex = e;
					}
					clazz = clazz.getSuperclass();
				}
			}
			if (field == null) {
				throw ex;
			}
			field.setAccessible(true);
			field.set(object, value);
		} catch (IllegalArgumentException e) {
			EclipseTest.fail(e.getMessage());
		} catch (IllegalAccessException e) {
			EclipseTest.fail(e.getMessage());
		} catch (SecurityException e) {
			EclipseTest.fail(e.getMessage());
		} catch (NoSuchFieldException e) {
			EclipseTest.fail(e.getMessage());
		}
	}

}




/*******************************************************************************
 * Copyright (c) 2009, 2010 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 java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.lang.reflect.InvocationTargetException;
import java.net.URL;

import junit.framework.Test;

	}

	private Text getText(Object object, String name) {
		return (Text) ReflectionUtils.getField(object, name);
	}

	private Button getButton(Object object, String name) {
		return (Button) ReflectionUtils.getField(object, name);
	}

	private Object getField(Object object, String name) {
		Object ret = null;
		try {
			ret = ReflectionUtils.getField(object, name);
		} catch (IllegalArgumentException e) {
			fail(e.getMessage());
		} catch (SecurityException e) {
			fail(e.getMessage());
		} catch (IllegalAccessException e) {
			fail(e.getMessage());
		} catch (NoSuchFieldException e) {
			fail(e.getMessage());
		}
		return ret;
	}

	private Object callMethod(Object object, String name) {
		return ReflectionUtils.callMethod(object, name, new Object[] {});
	}

	private Object callMethod(Object object, String name, Object args[]) {
		Object ret = null;
		try {
			ret = ReflectionUtils.callMethod(object, name, args);
		} catch (IllegalArgumentException e) {
			fail(e.getMessage());
		} catch (IllegalAccessException e) {
			fail(e.getMessage());
		} catch (InvocationTargetException e) {
			fail(e.getMessage());
		} catch (NoSuchMethodException e) {
			fail(e.getMessage());
		}
		return ret;
	}

	private Shell getShell() {




            name="CVS Test Editor">
      </editor>
   </extension>

<!-- Other declarations -->
   
   <!-- ***** Nature that identifies model projects used in tests for bug 302163 ***** -->
   <extension
         id="bug302163_ModelNature"
         name="Project nature for bug 302163"
         point="org.eclipse.core.resources.natures">
     <runtime>
        <run class="org.eclipse.team.tests.ccvs.core.mappings.model.ModelNature"/>
     </runtime>
   </extension>
 
   <!-- ***** Model provider for the model used in tests for bug 302163 ***** -->
   <extension
         id="bug302163_ModelProvider"
         name="Model Provider for bug 302163"
         point="org.eclipse.core.resources.modelProviders">
      <modelProvider class="org.eclipse.team.tests.ccvs.core.mappings.model.mapping.CustomModelProvider"/>
      <extends-model id="org.eclipse.core.resources.modelProvider"/>
      <enablement>
          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.team.tests.cvs.core.bug302163_ModelNature" />
      </enablement>
   </extension>
</plugin>




/*******************************************************************************
 * Copyright (c) 2010 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
 *
 * Contributors:
 * IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.team.tests.ccvs.core.mappings.model.mapping;

import org.eclipse.core.resources.*;
import org.eclipse.core.resources.mapping.*;
import org.eclipse.core.runtime.*;
import org.eclipse.team.tests.ccvs.core.mappings.model.*;

/**
 * The model provider for our example
 */
public class CustomModelProvider extends
		org.eclipse.core.resources.mapping.ModelProvider {

	public static final String ID = "org.eclipse.team.tests.cvs.core.bug302163_ModelProvider";

	public CustomModelProvider() {
		super();
	}

	public IStatus validateChange(IResourceDelta delta, IProgressMonitor monitor) {
		return super.validateChange(delta, monitor);
	}

	public ResourceMapping[] getMappings(IResource resource,
			ResourceMappingContext context, IProgressMonitor monitor)
			throws CoreException {
		if (ModelProject.isModProject(resource.getProject())) {
			ModelObject object = ModelObject.create(resource);
			if (object != null)
				return new ResourceMapping[] { ModelResourceMapping
						.create(object) };
		}
		return super.getMappings(resource, context, monitor);
	}
}




/*******************************************************************************
 * Copyright (c) 2010 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
 *
 * Contributors:
 * IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.team.tests.ccvs.core.mappings.model;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;

public class ModelFile extends ModelObject {

	public static final String MODEL_FILE_EXTENSION = "mod";

	public static boolean isModFile(IResource resource) {
		if (resource instanceof IFile) {
			String fileExtension = resource.getFileExtension();
			if (fileExtension != null)
				return fileExtension.equals(MODEL_FILE_EXTENSION);
		}
		return false;
	}

	public static IResource[] getReferencedResources(String projectName,
			IStorage storage) {
		if (storage == null)
			return new IResource[0];
		List result = new ArrayList();
		return (IResource[]) result.toArray(new IResource[result.size()]);
	}

	public ModelFile(IFile file) {
		super(file);
	}

	public ModelObject[] getChildren() throws CoreException {
		return null;
	}

	public String getName() {
		String name = super.getName();
		int index = name.lastIndexOf(".");
		return name.substring(0, index);
	}

}




/*******************************************************************************
 * Copyright (c) 2010 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
 *
 * Contributors:
 * IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.team.tests.ccvs.core.mappings.model.mapping;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.resources.mapping.ResourceMapping;
import org.eclipse.core.resources.mapping.ResourceMappingContext;
import org.eclipse.core.resources.mapping.ResourceTraversal;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.team.tests.ccvs.core.mappings.model.*;

public class ModelResourceMapping extends ResourceMapping {

	public static String projectName = "";
	private final ModelObject object;

	public static ResourceMapping create(ModelObject object) {
		if (object instanceof ModelProject) {
			return new ModelResourceMapping(object);
		}
		if (object instanceof ModelFile) {
			return new ModelResourceMapping(object);
		}
		return null;
	}

	public ResourceTraversal[] getTraversals(ResourceMappingContext context,
			IProgressMonitor monitor) throws CoreException {
		return new ResourceTraversal[] { new ResourceTraversal(
				new IResource[] { ResourcesPlugin.getWorkspace().getRoot()
						.getProject(projectName).getFile("file1.txt") },
				IResource.DEPTH_ZERO, IResource.NONE) };
	}

	protected ModelResourceMapping(ModelObject object) {
		this.object = object;
	}

	public Object getModelObject() {
		return object;
	}

	public String getModelProviderId() {
		return CustomModelProvider.ID;
	}

	public IProject[] getProjects() {
		return new IProject[] { (IProject) object.getProject().getResource() };
	}

	public boolean contains(ResourceMapping mapping) {
		if (mapping instanceof ModelResourceMapping) {
			ModelObject object = (ModelObject) mapping.getModelObject();
			IResource resource = object.getResource();
			return getResource().getFullPath().isPrefixOf(
					resource.getFullPath());
		}
		return false;
	}

	private IResource getResource() {
		return ((ModelProject) getModelObject()).getResource();
	}

}




/*******************************************************************************
 * Copyright (c) 2010 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
 *
 * Contributors:
 * IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.team.tests.ccvs.core.mappings.model;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectNature;

/**
 * Nature used to identify a model project
 */
public class ModelNature implements IProjectNature {

	public static final String NATURE_ID = "org.eclipse.team.tests.cvs.core.bug302163_ModelNature";

	private IProject project;

	public void configure() {
		// Nothing to do
	}

	public void deconfigure() {
		// Nothing to do
	}

	public IProject getProject() {
		return project;
	}

	public void setProject(IProject project) {
		this.project = project;
	}

}




/*******************************************************************************
 * Copyright (c) 2010 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
 *
 * Contributors:
 * IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.team.tests.ccvs.core.mappings.model;

import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.PlatformObject;

public abstract class ModelObject extends PlatformObject {

	private final IResource resource;

	public static ModelObject create(IResource resource) {
		switch (resource.getType()) {
		case IResource.PROJECT:
			return new ModelProject((IProject) resource);
		case IResource.FILE:
			if (ModelFile.isModFile(resource)) {
				return new ModelFile((IFile) resource);
			}
		}
		return null;
	}

	protected ModelObject(IResource resource) {
		this.resource = resource;
	}

	public abstract ModelObject[] getChildren() throws CoreException;

	public IResource getResource() {
		return resource;
	}

	public String getName() {
		return getResource().getName();
	}

	public String getPath() {
		return getResource().getFullPath().makeRelative().toString();
	}

	public ModelObject getParent() {
		return ModelObject.create(getResource().getParent());
	}

	public boolean equals(Object obj) {
		if (obj instanceof ModelObject) {
			ModelObject mr = (ModelObject) obj;
			return getResource().equals(mr.getResource());
		}
		return super.equals(obj);
	}

	public int hashCode() {
		return getResource().hashCode();
	}

	public void delete() throws CoreException {
		getResource().delete(false, null);
	}

	public ModelProject getProject() {
		return (ModelProject) ModelObject.create(getResource().getProject());
	}
}




/*******************************************************************************
 * Copyright (c) 2010 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
 *
 * Contributors:
 * IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.team.tests.ccvs.core.mappings.model;

import java.util.ArrayList;
import java.util.List;

import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;

public class ModelProject extends ModelObject {

	public static boolean isModProject(IProject project) throws CoreException {
		if (!project.isOpen())
			return false;
		IProjectDescription description = project.getDescription();
		return description.hasNature(ModelNature.NATURE_ID);
	}

	public static void makeModProject(IProject project, IProgressMonitor monitor)
			throws CoreException {
		IProjectDescription description = project.getDescription();
		String[] natureIds = description.getNatureIds();
		List result = new ArrayList();
		for (int i = 0; i < natureIds.length; i++) {
			result.add(natureIds[i]);
		}
		result.add(ModelNature.NATURE_ID);
		description.setNatureIds((String[]) result.toArray(new String[result
				.size()]));
		project.setDescription(description, monitor);
	}

	public ModelProject(IProject project) {
		super(project);
	}

	protected IContainer getContainer() {
		return (IContainer) getResource();
	}

	public ModelObject[] getChildren() throws CoreException {
		IResource[] members = getContainer().members();
		List result = new ArrayList();
		for (int i = 0; i < members.length; i++) {
			IResource resource = members[i];
			if (ModelFile.isModFile(resource)) {
				result.add(new ModelFile((IFile) resource));
			} else if (resource instanceof IProject
					&& ModelProject.isModProject((IProject) resource)) {
				result.add(new ModelProject((IProject) resource));
			}
		}
		return (ModelObject[]) result.toArray(new ModelObject[result.size()]);
	}

}

Return to bug 306508

Lines 11-43 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateOperation.java (-14 / +77 lines)
11	package org.eclipse.team.internal.ccvs.ui.subscriber;	11	package org.eclipse.team.internal.ccvs.ui.subscriber;
12		12
13	import java.lang.reflect.InvocationTargetException;	13	import java.lang.reflect.InvocationTargetException;
14	import java.util.ArrayList;	14	import java.util.*;
15	import java.util.HashSet;
16	import java.util.List;
17	import java.util.Set;
18		15
19	import org.eclipse.compare.structuremergeviewer.IDiffElement;	16	import org.eclipse.compare.structuremergeviewer.IDiffElement;
20	import org.eclipse.core.resources.*;	17	import org.eclipse.core.resources.*;
		18	import org.eclipse.core.resources.mapping.ResourceMapping;
		19	import org.eclipse.core.resources.mapping.ResourceMappingContext;
		20	import org.eclipse.core.runtime.CoreException;
21	import org.eclipse.core.runtime.IProgressMonitor;	21	import org.eclipse.core.runtime.IProgressMonitor;
		22	import org.eclipse.core.runtime.jobs.ISchedulingRule;
		23	import org.eclipse.core.runtime.jobs.MultiRule;
22	import org.eclipse.jface.dialogs.MessageDialog;	24	import org.eclipse.jface.dialogs.MessageDialog;
23	import org.eclipse.osgi.util.NLS;	25	import org.eclipse.osgi.util.NLS;
24	import org.eclipse.team.core.TeamException;	26	import org.eclipse.team.core.TeamException;
25	import org.eclipse.team.core.synchronize.FastSyncInfoFilter;	27	import org.eclipse.team.core.mapping.provider.SynchronizationScopeManager;
26	import org.eclipse.team.core.synchronize.SyncInfo;	28	import org.eclipse.team.core.synchronize.*;
27	import org.eclipse.team.core.synchronize.SyncInfoSet;	29	import org.eclipse.team.core.synchronize.FastSyncInfoFilter.*;
28	import org.eclipse.team.core.synchronize.FastSyncInfoFilter.AndSyncInfoFilter;
29	import org.eclipse.team.core.synchronize.FastSyncInfoFilter.OrSyncInfoFilter;
30	import org.eclipse.team.core.synchronize.FastSyncInfoFilter.SyncInfoDirectionFilter;
31	import org.eclipse.team.core.variants.IResourceVariant;	30	import org.eclipse.team.core.variants.IResourceVariant;
32	import org.eclipse.team.internal.ccvs.core.CVSException;	31	import org.eclipse.team.internal.ccvs.core.*;
33	import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin;
34	import org.eclipse.team.internal.ccvs.core.ICVSFile;
35	import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;	32	import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
36	import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;	33	import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
		34	import org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer;
37	import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;	35	import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
38	import org.eclipse.team.internal.ccvs.ui.*;	36	import org.eclipse.team.internal.ccvs.ui.*;
39	import org.eclipse.team.internal.ccvs.ui.operations.UpdateOnlyMergableOperation;	37	import org.eclipse.team.internal.ccvs.ui.Policy;
		38	import org.eclipse.team.internal.ccvs.ui.operations.*;
40	import org.eclipse.team.internal.ui.TeamUIPlugin;	39	import org.eclipse.team.internal.ui.TeamUIPlugin;
		40	import org.eclipse.team.internal.ui.Utils;
41	import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;	41	import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
42		42
43	/**	43	/**
Lines 64-69 Link Here
64	public boolean shouldRun() {	64	public boolean shouldRun() {
65	return promptIfNeeded();	65	return promptIfNeeded();
66	}	66	}
		67
		68	/**
		69	* Run the operation for the sync infos from the given project. By default, a lock
		70	* is acquired on the project.
		71	* @param projectSyncInfos the project syncInfos
		72	* @param project the project
		73	* @param monitor a progress monitor
		74	* @throws InvocationTargetException
		75	*/
		76	protected void run(final Map projectSyncInfos, final IProject project,
		77	IProgressMonitor monitor) throws InvocationTargetException {
		78	try {
		79	IResource[] resources = getIResourcesFrom(((SyncInfoSet) projectSyncInfos
		80	.get(project)).getSyncInfos());
		81	ResourceMapping[] selectedMappings = Utils
		82	.getResourceMappings(resources);
		83	ResourceMappingContext context = new SingleProjectSubscriberContext(
		84	CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber(),
		85	false, project);
		86	SynchronizationScopeManager manager = new SingleProjectScopeManager(
		87	getJobName(), selectedMappings, context, true, project);
		88	manager.initialize(null);
		89	ISchedulingRule updateRule = getUpdateRule(manager);
		90
		91	// Pass the scheduling rule to the synchronizer so that sync change
		92	// events
		93	// and cache commits to disk are batched
		94	EclipseSynchronizer.getInstance().run(updateRule,
		95	new ICVSRunnable() {
		96	public void run(IProgressMonitor monitor)
		97	throws CVSException {
		98	try {
		99	runWithProjectRule(project,
		100	(SyncInfoSet) projectSyncInfos
		101	.get(project), monitor);
		102	} catch (TeamException e) {
		103	throw CVSException.wrapException(e);
		104	}
		105	}
		106	}, Policy.subMonitorFor(monitor, 100));
		107	} catch (TeamException e) {
		108	throw new InvocationTargetException(e);
		109	} catch (CoreException e) {
		110	throw new InvocationTargetException(e);
		111	}
		112	}
		113
		114	private ISchedulingRule getUpdateRule(SynchronizationScopeManager manager) {
		115	ISchedulingRule rule = null;
		116	ResourceMapping[] mappings = manager.getScope().getMappings();
		117	for (int i = 0; i < mappings.length; i++) {
		118	ResourceMapping mapping = mappings[i];
		119	IProject[] mappingProjects = mapping.getProjects();
		120	for (int j = 0; j < mappingProjects.length; j++) {
		121	if (rule == null) {
		122	rule = mappingProjects[j];
		123	} else {
		124	rule = MultiRule.combine(rule, mappingProjects[j]);
		125	}
		126	}
		127	}
		128	return rule;
		129	}
67		130
68	/* (non-Javadoc)	131	/* (non-Javadoc)
69	* @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberOperation#run(org.eclipse.core.runtime.IProgressMonitor)	132	* @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberOperation#run(org.eclipse.core.runtime.IProgressMonitor)

Lines 1-5 Link Here

(-)src/org/eclipse/team/tests/ccvs/ui/ReflectionUtils.java (-30 / +98 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2009 IBM Corporation and others.	2	* Copyright (c) 2009, 2010 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 14-56 Link Here
14	import java.lang.reflect.InvocationTargetException;	14	import java.lang.reflect.InvocationTargetException;
15	import java.lang.reflect.Method;	15	import java.lang.reflect.Method;
16		16
		17	import org.eclipse.team.tests.ccvs.core.EclipseTest;
		18
17	public class ReflectionUtils {	19	public class ReflectionUtils {
18		20
19	public static Object callMethod(Object object, String name, Object args[])	21	public static Object callMethod(Object object, String name, Object args[]) {
20	throws IllegalArgumentException, IllegalAccessException,	22	try {
21	InvocationTargetException, NoSuchMethodException {	23	Class types[] = new Class[args.length];
22	Class types[] = new Class[args.length];	24	for (int i = 0; i < args.length; i++) {
23	for (int i = 0; i < args.length; i++) {	25	types[i] = args[i].getClass();
24	types[i] = args[i].getClass();	26	}
25	}	27	Method method = null;
26	Method method = null;	28	Class clazz = object.getClass();
27	Class clazz = object.getClass();	29	NoSuchMethodException ex = null;
28	NoSuchMethodException ex = null;	30	while (method == null && clazz != null) {
29	while (method == null && clazz != null) {	31	try {
30	try {	32	method = clazz.getDeclaredMethod(name, types);
31	method = clazz.getDeclaredMethod(name, types);	33	} catch (NoSuchMethodException e) {
32	} catch (NoSuchMethodException e) {	34	if (ex == null) {
33	if (ex == null) {	35	ex = e;
34	ex = e;	36	}
		37	clazz = clazz.getSuperclass();
35	}	38	}
36	clazz = clazz.getSuperclass();
37	}	39	}
		40	if (method == null) {
		41	throw ex;
		42	}
		43	method.setAccessible(true);
		44	Object ret = method.invoke(object, args);
		45	return ret;
		46	} catch (IllegalArgumentException e) {
		47	EclipseTest.fail(e.getMessage());
		48	} catch (IllegalAccessException e) {
		49	EclipseTest.fail(e.getMessage());
		50	} catch (SecurityException e) {
		51	EclipseTest.fail(e.getMessage());
		52	} catch (NoSuchMethodException e) {
		53	EclipseTest.fail(e.getMessage());
		54	} catch (InvocationTargetException e) {
		55	EclipseTest.fail(e.getMessage());
38	}	56	}
39	if (method == null) {	57	return null;
40	throw ex;	58	}
		59
		60	public static Object getField(Object object, String name) {
		61	try {
		62	Field field = null;
		63	Class clazz = object.getClass();
		64	NoSuchFieldException ex = null;
		65	while (field == null && clazz != null) {
		66	try {
		67	field = clazz.getDeclaredField(name);
		68	} catch (NoSuchFieldException e) {
		69	if (ex == null) {
		70	ex = e;
		71	}
		72	clazz = clazz.getSuperclass();
		73	}
		74	}
		75	if (field == null) {
		76	throw ex;
		77	}
		78	field.setAccessible(true);
		79	Object ret = field.get(object);
		80	return ret;
		81	} catch (IllegalArgumentException e) {
		82	EclipseTest.fail(e.getMessage());
		83	} catch (IllegalAccessException e) {
		84	EclipseTest.fail(e.getMessage());
		85	} catch (SecurityException e) {
		86	EclipseTest.fail(e.getMessage());
		87	} catch (NoSuchFieldException e) {
		88	EclipseTest.fail(e.getMessage());
41	}	89	}
42	method.setAccessible(true);	90	return null;
43	Object ret = method.invoke(object, args);
44	return ret;
45	}	91	}
46		92
47	public static Object getField(Object object, String name)	93	public static void setField(Object object, String name, Object value) {
48	throws IllegalArgumentException, IllegalAccessException,	94	try {
49	SecurityException, NoSuchFieldException {	95	Field field = null;
50	Field field = object.getClass().getDeclaredField(name);	96	Class clazz = object.getClass();
51	field.setAccessible(true);	97	NoSuchFieldException ex = null;
52	Object ret = field.get(object);	98	while (field == null && clazz != null) {
53	return ret;	99	try {
		100	field = clazz.getDeclaredField(name);
		101	} catch (NoSuchFieldException e) {
		102	if (ex == null) {
		103	ex = e;
		104	}
		105	clazz = clazz.getSuperclass();
		106	}
		107	}
		108	if (field == null) {
		109	throw ex;
		110	}
		111	field.setAccessible(true);
		112	field.set(object, value);
		113	} catch (IllegalArgumentException e) {
		114	EclipseTest.fail(e.getMessage());
		115	} catch (IllegalAccessException e) {
		116	EclipseTest.fail(e.getMessage());
		117	} catch (SecurityException e) {
		118	EclipseTest.fail(e.getMessage());
		119	} catch (NoSuchFieldException e) {
		120	EclipseTest.fail(e.getMessage());
		121	}
54	}	122	}
55		123
56	}	124	}

Lines 1-5 Link Here

(-)src/org/eclipse/team/tests/ccvs/ui/CreatePatchTest.java (-37 / +4 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2009 IBM Corporation and others.	2	* Copyright (c) 2009, 2010 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 14-20 Link Here
14	import java.io.IOException;	14	import java.io.IOException;
15	import java.io.InputStream;	15	import java.io.InputStream;
16	import java.io.InputStreamReader;	16	import java.io.InputStreamReader;
17	import java.lang.reflect.InvocationTargetException;
18	import java.net.URL;	17	import java.net.URL;
19		18
20	import junit.framework.Test;	19	import junit.framework.Test;
Lines 241-287 Link Here
241	}	240	}
242		241
243	private Text getText(Object object, String name) {	242	private Text getText(Object object, String name) {
244	return (Text) getField(object, name);	243	return (Text) ReflectionUtils.getField(object, name);
245	}	244	}
246		245
247	private Button getButton(Object object, String name) {	246	private Button getButton(Object object, String name) {
248	return (Button) getField(object, name);	247	return (Button) ReflectionUtils.getField(object, name);
249	}
250
251	private Object getField(Object object, String name) {
252	Object ret = null;
253	try {
254	ret = ReflectionUtils.getField(object, name);
255	} catch (IllegalArgumentException e) {
256	fail(e.getMessage());
257	} catch (SecurityException e) {
258	fail(e.getMessage());
259	} catch (IllegalAccessException e) {
260	fail(e.getMessage());
261	} catch (NoSuchFieldException e) {
262	fail(e.getMessage());
263	}
264	return ret;
265	}	248	}
266		249
267	private Object callMethod(Object object, String name) {	250	private Object callMethod(Object object, String name) {
268	return callMethod(object, name, new Object[] {});	251	return ReflectionUtils.callMethod(object, name, new Object[] {});
269	}
270
271	private Object callMethod(Object object, String name, Object args[]) {
272	Object ret = null;
273	try {
274	ret = ReflectionUtils.callMethod(object, name, args);
275	} catch (IllegalArgumentException e) {
276	fail(e.getMessage());
277	} catch (IllegalAccessException e) {
278	fail(e.getMessage());
279	} catch (InvocationTargetException e) {
280	fail(e.getMessage());
281	} catch (NoSuchMethodException e) {
282	fail(e.getMessage());
283	}
284	return ret;
285	}	252	}
286		253
287	private Shell getShell() {	254	private Shell getShell() {

Lines 49-52 Link Here

(-)plugin.xml (+24 lines)
49	name="CVS Test Editor">	49	name="CVS Test Editor">
50	</editor>	50	</editor>
51	</extension>	51	</extension>
		52
		53	<!-- Other declarations -->
		54
		55	<!-- *** Nature that identifies model projects used in tests for bug 302163 *** -->
		56	<extension
		57	id="bug302163_ModelNature"
		58	name="Project nature for bug 302163"
		59	point="org.eclipse.core.resources.natures">
		60	<runtime>
		61	<run class="org.eclipse.team.tests.ccvs.core.mappings.model.ModelNature"/>
		62	</runtime>
		63	</extension>
		64
		65	<!-- *** Model provider for the model used in tests for bug 302163 *** -->
		66	<extension
		67	id="bug302163_ModelProvider"
		68	name="Model Provider for bug 302163"
		69	point="org.eclipse.core.resources.modelProviders">
		70	<modelProvider class="org.eclipse.team.tests.ccvs.core.mappings.model.mapping.CustomModelProvider"/>
		71	<extends-model id="org.eclipse.core.resources.modelProvider"/>
		72	<enablement>
		73	<test property="org.eclipse.core.resources.projectNature" value="org.eclipse.team.tests.cvs.core.bug302163_ModelNature" />
		74	</enablement>
		75	</extension>
52	</plugin>	76	</plugin>

Added Link Here

(-)src/org/eclipse/team/tests/ccvs/core/mappings/model/mapping/CustomModelProvider.java (+45 lines)
1	/*******************************************************************************
2	* Copyright (c) 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.team.tests.ccvs.core.mappings.model.mapping;
12
13	import org.eclipse.core.resources.*;
14	import org.eclipse.core.resources.mapping.*;
15	import org.eclipse.core.runtime.*;
16	import org.eclipse.team.tests.ccvs.core.mappings.model.*;
17
18	/**
19	* The model provider for our example
20	*/
21	public class CustomModelProvider extends
22	org.eclipse.core.resources.mapping.ModelProvider {
23
24	public static final String ID = "org.eclipse.team.tests.cvs.core.bug302163_ModelProvider";
25
26	public CustomModelProvider() {
27	super();
28	}
29
30	public IStatus validateChange(IResourceDelta delta, IProgressMonitor monitor) {
31	return super.validateChange(delta, monitor);
32	}
33
34	public ResourceMapping[] getMappings(IResource resource,
35	ResourceMappingContext context, IProgressMonitor monitor)
36	throws CoreException {
37	if (ModelProject.isModProject(resource.getProject())) {
38	ModelObject object = ModelObject.create(resource);
39	if (object != null)
40	return new ResourceMapping[] { ModelResourceMapping
41	.create(object) };
42	}
43	return super.getMappings(resource, context, monitor);
44	}
45	}