Attachment #156372 for bug #298923





import java.util.*;

import org.eclipse.compare.internal.core.patch.DiffProject;
import org.eclipse.compare.internal.core.patch.FilePatch2;
import org.eclipse.compare.internal.patch.PatchProjectDiffNode;
import org.eclipse.compare.internal.patch.WorkspacePatcher;
import org.eclipse.compare.structuremergeviewer.IDiffElement;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.CoreException;

			IResourceVariant variant = null;
			if (resource.getType() == IResource.FILE) {
				for (int i = 0; i < diffs.length; i++) {
					if (resource.equals(PatchModelProvider.getFile(diffs[i], getPatcher()))) {
						// null as 'variant' for deletions
						if (diffs[i].getDiffType(patcher.isReversed()) != FilePatch2.DELETION)
							variant =  new PatchedFileVariant(getPatcher(), diffs[i]);
						IResourceVariant base = resource.exists() ?  new LocalResourceVariant(resource) : null;
						SyncInfo info = new SyncInfo(resource, base, variant, getResourceComparator()) {
							protected int calculateKind() throws TeamException {
								// TODO: this will work only for files, what about excluding individual hunks?
								if (!getPatcher().isEnabled(PatchModelProvider.getPatchObject(getLocal(), patcher)))
									return IN_SYNC;
								if (getRemote() != null 
										&& getPatcher().getDiffResult(((PatchedFileVariant)getRemote()).getDiff()).containsProblems())
									return CONFLICTING;
								return super.calculateKind();
							}
						};
						info.init();
						return info;
								}
							};
							info.init();
							return info;
						}
					}
				}
			}

		}
	}



	public boolean isSupervised(IResource resource) throws TeamException {
		// TODO Auto-generated method stub
		System.out.println(">> [true] isSupervised: " + resource.getName()); //$NON-NLS-1$

	}

	public IResource[] members(IResource resource) throws TeamException {
		FilePatch2[] diffs = getPatcher().getDiffs();
		try {
			if(resource.getType() == IResource.FILE)
				// file has no members

			List existingChildren = new ArrayList(Arrays.asList(container.members()));

			// patch members, subscriber location
			FilePatch2[] diffs = getPatcher().getDiffs();
			for (int i = 0; i < diffs.length; i++) {
				IResource file = PatchModelProvider.getFile(diffs[i], getPatcher());
				if (!container.exists(file.getProjectRelativePath())) {
					existingChildren.add(file);
					IResource file = project.getFile(diffs[i].getPath(getPatcher().isReversed()));
					if (!existingChildren.contains(file)) {
						existingChildren.add(file);
					}
				}
			}
			return (IResource[]) existingChildren.toArray(new IResource[existingChildren.size()]);

	}

	public IResource[] roots() {
		IDiffElement[] children = PatchWorkspace.getInstance().getChildren();
		Set roots = new HashSet();
		if (getPatcher().isWorkspacePatch()) {
			IDiffElement[] children = PatchWorkspace.getInstance().getChildren();
			for (int i = 0; i < children.length; i++) {
				// return array of projects from the patch
				DiffProject diffProject = ((PatchProjectDiffNode)children[i]).getDiffProject();
				IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(diffProject.getName());
				roots.add(project);
			} else {
				FileDiffResult diffResult = ((PatchFileDiffNode)children[i]).getDiffResult();
				IFile file = ((WorkspaceFileDiffResult)diffResult).getTargetFile();
				roots.add(file);
			}
		} else {
			roots.add(getPatcher().getTarget());
		}
		return (IResource[]) roots.toArray(new IResource[0]);
	}




		return resource;
	}

	static Object getPatchObject(IResource resource, WorkspacePatcher patcher) {
		switch (resource.getType()) {
		case IResource.PROJECT: {
			if (patcher.isWorkspacePatch()) {
				DiffProject[] diffProjects = patcher.getDiffProjects();
				DiffProject[] diffProjects = wp.getDiffProjects();
				for (int i = 0; i < diffProjects.length; i++) {
					if (diffProjects[i].getName().equals(resource.getName()))
						return diffProjects[i];
				}
			} else {
				return patcher.getTarget().getProject();
			}
			// TODO: else return FilePatch2[] for that project(?)
		}
		case IResource.FILE: {
			FilePatch2[] diffs = patcher.getDiffs();
			for (int i = 0; i < diffs.length; i++) {
				if (resource.equals(getFile(diffs[i], patcher))) {
					return diffs[i];
					IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(diffProject.getName());
					IFile file = project.getFile(diffs[i].getPath(patcher.isReversed()));
					if (file.equals(resource)) {
						return diffs[i];
					}
				}
			}
		}
		}
		return null;
	}
	
	static IFile getFile(FilePatch2 diff, WorkspacePatcher patcher) {
		IProject project = null;
		if (patcher.isWorkspacePatch()) {
			DiffProject diffProject = (diff).getProject();
			project = ResourcesPlugin.getWorkspace().getRoot().getProject(diffProject.getName());
			if (project.getName().equals(diffProject.getName())) {
				return project.getFile(diff.getPath(patcher.isReversed()));
			}
		} else {
			project = patcher.getTarget().getProject();
			if (project.getName().equals(patcher.getTarget().getProject().getName())) {
				return project.getFile(diff.getPath(patcher.isReversed()));
			}
		}
		return project.getFile(diff.getPath(patcher.isReversed()));
	}
}

Return to bug 298923

Lines 12-19 Link Here

(-)src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java (-40 / +33 lines)
12		12
13	import java.util.*;	13	import java.util.*;
14		14
15	import org.eclipse.compare.internal.core.patch.*;	15	import org.eclipse.compare.internal.core.patch.DiffProject;
16	import org.eclipse.compare.internal.patch.*;	16	import org.eclipse.compare.internal.core.patch.FilePatch2;
		17	import org.eclipse.compare.internal.patch.PatchProjectDiffNode;
		18	import org.eclipse.compare.internal.patch.WorkspacePatcher;
17	import org.eclipse.compare.structuremergeviewer.IDiffElement;	19	import org.eclipse.compare.structuremergeviewer.IDiffElement;
18	import org.eclipse.core.resources.*;	20	import org.eclipse.core.resources.*;
19	import org.eclipse.core.runtime.CoreException;	21	import org.eclipse.core.runtime.CoreException;
Lines 53-81 Link Here
53	IResourceVariant variant = null;	55	IResourceVariant variant = null;
54	if (resource.getType() == IResource.FILE) {	56	if (resource.getType() == IResource.FILE) {
55	for (int i = 0; i < diffs.length; i++) {	57	for (int i = 0; i < diffs.length; i++) {
56	if (diffs[i] instanceof FilePatch2) {	58	if (resource.equals(PatchModelProvider.getFile(diffs[i], getPatcher()))) {
57	DiffProject diffProject = (diffs[i]).getProject();	59	// null as 'variant' for deletions
58	IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(diffProject.getName());	60	if (diffs[i].getDiffType(patcher.isReversed()) != FilePatch2.DELETION)
59	IFile file = project.getFile(diffs[i].getPath(getPatcher().isReversed()));	61	variant = new PatchedFileVariant(getPatcher(), diffs[i]);
60	if (file.equals(resource)) {	62	IResourceVariant base = resource.exists() ? new LocalResourceVariant(resource) : null;
61	// null as 'variant' for deletions	63	SyncInfo info = new SyncInfo(resource, base, variant, getResourceComparator()) {
62	if (diffs[i].getDiffType(patcher.isReversed()) != FilePatch2.DELETION)	64	protected int calculateKind() throws TeamException {
63	variant = new PatchedFileVariant(getPatcher(), diffs[i]);	65	// TODO: this will work only for files, what about excluding individual hunks?
64	IResourceVariant base = resource.exists() ? new LocalResourceVariant(resource) : null;	66	if (!getPatcher().isEnabled(PatchModelProvider.getPatchObject(getLocal(), patcher)))
65	SyncInfo info = new SyncInfo(resource, base, variant, getResourceComparator()) {	67	return IN_SYNC;
66	protected int calculateKind() throws TeamException {	68	if (getRemote() != null
67	// TODO: this will work only for files, what about excluding individual hunks?	69	&& getPatcher().getDiffResult(((PatchedFileVariant)getRemote()).getDiff()).containsProblems())
68	if (!getPatcher().isEnabled(PatchModelProvider.getPatchObject(getLocal(), patcher)))	70	return CONFLICTING;
69	return IN_SYNC;	71	return super.calculateKind();
70	if (getRemote() != null	72	}
71	&& getPatcher().getDiffResult(((PatchedFileVariant)getRemote()).getDiff()).containsProblems())	73	};
72	return CONFLICTING;	74	info.init();
73	return super.calculateKind();	75	return info;
74	}
75	};
76	info.init();
77	return info;
78	}
79	}	76	}
80	}	77	}
81	}	78	}
Lines 85-90 Link Here
85	}	82	}
86	}	83	}
87		84
		85
		86
88	public boolean isSupervised(IResource resource) throws TeamException {	87	public boolean isSupervised(IResource resource) throws TeamException {
89	// TODO Auto-generated method stub	88	// TODO Auto-generated method stub
90	System.out.println(">> [true] isSupervised: " + resource.getName()); //$NON-NLS-1$	89	System.out.println(">> [true] isSupervised: " + resource.getName()); //$NON-NLS-1$
Lines 92-98 Link Here
92	}	91	}
93		92
94	public IResource[] members(IResource resource) throws TeamException {	93	public IResource[] members(IResource resource) throws TeamException {
95	FilePatch2[] diffs = getPatcher().getDiffs();
96	try {	94	try {
97	if(resource.getType() == IResource.FILE)	95	if(resource.getType() == IResource.FILE)
98	// file has no members	96	// file has no members
Lines 103-116 Link Here
103	List existingChildren = new ArrayList(Arrays.asList(container.members()));	101	List existingChildren = new ArrayList(Arrays.asList(container.members()));
104		102
105	// patch members, subscriber location	103	// patch members, subscriber location
		104	FilePatch2[] diffs = getPatcher().getDiffs();
106	for (int i = 0; i < diffs.length; i++) {	105	for (int i = 0; i < diffs.length; i++) {
107	DiffProject diffProject = diffs[i].getProject();	106	IResource file = PatchModelProvider.getFile(diffs[i], getPatcher());
108	IProject project = container.getProject();	107	if (!container.exists(file.getProjectRelativePath())) {
109	if (project.getName().equals(diffProject.getName())) {	108	existingChildren.add(file);
110	IResource file = project.getFile(diffs[i].getPath(getPatcher().isReversed()));
111	if (!existingChildren.contains(file)) {
112	existingChildren.add(file);
113	}
114	}	109	}
115	}	110	}
116	return (IResource[]) existingChildren.toArray(new IResource[existingChildren.size()]);	111	return (IResource[]) existingChildren.toArray(new IResource[existingChildren.size()]);
Lines 131-149 Link Here
131	}	126	}
132		127
133	public IResource[] roots() {	128	public IResource[] roots() {
134	IDiffElement[] children = PatchWorkspace.getInstance().getChildren();
135	Set roots = new HashSet();	129	Set roots = new HashSet();
136	for (int i = 0; i < children.length; i++) {	130	if (getPatcher().isWorkspacePatch()) {
137	if (getPatcher().isWorkspacePatch()) {	131	IDiffElement[] children = PatchWorkspace.getInstance().getChildren();
		132	for (int i = 0; i < children.length; i++) {
138	// return array of projects from the patch	133	// return array of projects from the patch
139	DiffProject diffProject = ((PatchProjectDiffNode)children[i]).getDiffProject();	134	DiffProject diffProject = ((PatchProjectDiffNode)children[i]).getDiffProject();
140	IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(diffProject.getName());	135	IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(diffProject.getName());
141	roots.add(project);	136	roots.add(project);
142	} else {
143	FileDiffResult diffResult = ((PatchFileDiffNode)children[i]).getDiffResult();
144	IFile file = ((WorkspaceFileDiffResult)diffResult).getTargetFile();
145	roots.add(file);
146	}	137	}
		138	} else {
		139	roots.add(getPatcher().getTarget());
147	}	140	}
148	return (IResource[]) roots.toArray(new IResource[0]);	141	return (IResource[]) roots.toArray(new IResource[0]);
149	}	142	}

Lines 136-168 Link Here

(-)src/org/eclipse/team/internal/ui/synchronize/patch/PatchModelProvider.java (-12 / +24 lines)
136	return resource;	136	return resource;
137	}	137	}
138		138
139	static Object getPatchObject(IResource resource, Patcher patcher) {	139	static Object getPatchObject(IResource resource, WorkspacePatcher patcher) {
140	switch (resource.getType()) {	140	switch (resource.getType()) {
141	case IResource.PROJECT: {	141	case IResource.PROJECT: {
142	if (patcher instanceof WorkspacePatcher) {	142	if (patcher.isWorkspacePatch()) {
143	WorkspacePatcher wp = (WorkspacePatcher) patcher;	143	DiffProject[] diffProjects = patcher.getDiffProjects();
144	DiffProject[] diffProjects = wp.getDiffProjects();
145	for (int i = 0; i < diffProjects.length; i++) {	144	for (int i = 0; i < diffProjects.length; i++) {
146	if (diffProjects[i].getName().equals(resource.getName()))	145	if (diffProjects[i].getName().equals(resource.getName()))
147	return diffProjects[i];	146	return diffProjects[i];
148	}	147	}
		148	} else {
		149	return patcher.getTarget().getProject();
149	}	150	}
150	// TODO: else return FilePatch2[] for that project(?)
151	}	151	}
152	case IResource.FILE: {	152	case IResource.FILE: {
153	FilePatch2[] diffs = patcher.getDiffs();	153	FilePatch2[] diffs = patcher.getDiffs();
154	for (int i = 0; i < diffs.length; i++) {	154	for (int i = 0; i < diffs.length; i++) {
155	if (diffs[i] instanceof FilePatch2) {	155	if (resource.equals(getFile(diffs[i], patcher))) {
156	DiffProject diffProject = diffs[i].getProject();	156	return diffs[i];
157	IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(diffProject.getName());
158	IFile file = project.getFile(diffs[i].getPath(patcher.isReversed()));
159	if (file.equals(resource)) {
160	return diffs[i];
161	}
162	}	157	}
163	}	158	}
164	}	159	}
165	}	160	}
166	return null;	161	return null;
167	}	162	}
		163
		164	static IFile getFile(FilePatch2 diff, WorkspacePatcher patcher) {
		165	IProject project = null;
		166	if (patcher.isWorkspacePatch()) {
		167	DiffProject diffProject = (diff).getProject();
		168	project = ResourcesPlugin.getWorkspace().getRoot().getProject(diffProject.getName());
		169	if (project.getName().equals(diffProject.getName())) {
		170	return project.getFile(diff.getPath(patcher.isReversed()));
		171	}
		172	} else {
		173	project = patcher.getTarget().getProject();
		174	if (project.getName().equals(patcher.getTarget().getProject().getName())) {
		175	return project.getFile(diff.getPath(patcher.isReversed()));
		176	}
		177	}
		178	return project.getFile(diff.getPath(patcher.isReversed()));
		179	}
168	}	180	}