Attachment #157160 for bug #300724

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




	 * @since 1.0
	 */
	@SuppressWarnings("unchecked")
	public static MatchResourceSet doResourceSetMatch(Resource leftResource, Resource rightResource,
			Map<String, Object> options) throws InterruptedException {
		// Resolve all proxies so that all resources get loaded
		ResourceSet leftResourceSet = getResolvedResourceSet(leftResource);
		ResourceSet rightResourceSet = getResolvedResourceSet(rightResource);

		final List<Resource> remainingLeftResources = new ArrayList<Resource>(leftResourceSet.getResources());
		final List<Resource> remainingRightResources = new ArrayList<Resource>(rightResourceSet

	 * @since 1.0
	 */
	@SuppressWarnings("unchecked")
	public static MatchResourceSet doResourceSetMatch(Resource leftResource, Resource rightResource,
			Resource ancestorResource, Map<String, Object> options) throws InterruptedException {
		// resolve all proxies
		ResourceSet leftResourceSet = getResolvedResourceSet(leftResource);
		ResourceSet rightResourceSet = getResolvedResourceSet(rightResource);
		ResourceSet ancestorResourceSet = getResolvedResourceSet(ancestorResource);
		resolveAll(ancestorResourceSet);

		final List<Resource> remainingLeftResources = new ArrayList<Resource>(leftResourceSet.getResources());
		final List<Resource> remainingRightResources = new ArrayList<Resource>(rightResourceSet

		return match;
	}

	private static ResourceSet getResolvedResourceSet(Resource resource) {
		resolveAll(resource.getResourceSet());
		// if the matching resource was detected as FRAGMENT, remove it from this list
		FRAGMENT_RESOURCES.remove(resource);
		return resource.getResourceSet();
	}

	/**
	 * This will try and find a resource in <code>candidates</code> similar to <code>resource</code>.
	 * 

Return to bug 300724

Lines 227-237 Link Here

(-)src/org/eclipse/emf/compare/match/service/MatchService.java (-11 / +17 lines)
227	* @since 1.0	227	* @since 1.0
228	*/	228	*/
229	@SuppressWarnings("unchecked")	229	@SuppressWarnings("unchecked")
230	public static MatchResourceSet doResourceSetMatch(ResourceSet leftResourceSet,	230	public static MatchResourceSet doResourceSetMatch(Resource leftResource, Resource rightResource,
231	ResourceSet rightResourceSet, Map<String, Object> options) throws InterruptedException {	231	Map<String, Object> options) throws InterruptedException {
232	// Resolve all proxies so that all resources get loaded	232	// Resolve all proxies so that all resources get loaded
233	resolveAll(leftResourceSet);	233	ResourceSet leftResourceSet = getResolvedResourceSet(leftResource);
234	resolveAll(rightResourceSet);	234	ResourceSet rightResourceSet = getResolvedResourceSet(rightResource);
235		235
236	final List<Resource> remainingLeftResources = new ArrayList<Resource>(leftResourceSet.getResources());	236	final List<Resource> remainingLeftResources = new ArrayList<Resource>(leftResourceSet.getResources());
237	final List<Resource> remainingRightResources = new ArrayList<Resource>(rightResourceSet	237	final List<Resource> remainingRightResources = new ArrayList<Resource>(rightResourceSet
Lines 310-322 Link Here
310	* @since 1.0	310	* @since 1.0
311	*/	311	*/
312	@SuppressWarnings("unchecked")	312	@SuppressWarnings("unchecked")
313	public static MatchResourceSet doResourceSetMatch(ResourceSet leftResourceSet,	313	public static MatchResourceSet doResourceSetMatch(Resource leftResource, Resource rightResource,
314	ResourceSet rightResourceSet, ResourceSet ancestorResourceSet, Map<String, Object> options)	314	Resource ancestorResource, Map<String, Object> options) throws InterruptedException {
315	throws InterruptedException {	315	// resolve all proxies
316	// Resolve all proxies so that all resources get loaded	316	ResourceSet leftResourceSet = getResolvedResourceSet(leftResource);
317	resolveAll(leftResourceSet);	317	ResourceSet rightResourceSet = getResolvedResourceSet(rightResource);
318	resolveAll(rightResourceSet);	318	ResourceSet ancestorResourceSet = getResolvedResourceSet(ancestorResource);
319	resolveAll(ancestorResourceSet);
320		319
321	final List<Resource> remainingLeftResources = new ArrayList<Resource>(leftResourceSet.getResources());	320	final List<Resource> remainingLeftResources = new ArrayList<Resource>(leftResourceSet.getResources());
322	final List<Resource> remainingRightResources = new ArrayList<Resource>(rightResourceSet	321	final List<Resource> remainingRightResources = new ArrayList<Resource>(rightResourceSet
Lines 412-417 Link Here
412	return match;	411	return match;
413	}	412	}
414		413
		414	private static ResourceSet getResolvedResourceSet(Resource resource) {
		415	resolveAll(resource.getResourceSet());
		416	// if the matching resource was detected as FRAGMENT, remove it from this list
		417	FRAGMENT_RESOURCES.remove(resource);
		418	return resource.getResourceSet();
		419	}
		420
415	/**	421	/**
416	* This will try and find a resource in <code>candidates</code> similar to <code>resource</code>.	422	* This will try and find a resource in <code>candidates</code> similar to <code>resource</code>.
417	*	423	*