Attachment #20646 for bug #93559

Lines 104-110 Link Here

(-)plugin.xml (-1 / +1 lines)
104	class="org.eclipse.jdt.internal.ui.LogicalPackageAdapterFactory"	104	class="org.eclipse.jdt.internal.ui.LogicalPackageAdapterFactory"
105	adaptableType="org.eclipse.jdt.internal.ui.browsing.LogicalPackage">	105	adaptableType="org.eclipse.jdt.internal.ui.browsing.LogicalPackage">
106	<adapter type="org.eclipse.search.ui.ISearchPageScoreComputer"/>	106	<adapter type="org.eclipse.search.ui.ISearchPageScoreComputer"/>
107	<adapter type="org.eclipse.core.resources.mapping.ResourceMapping"/>	107	<adapter type="org.eclipse.core.internal.resources.mapping.ResourceMapping"/>
108	</factory>	108	</factory>
109		109
110	<factory	110	<factory




import java.util.List;
import java.util.Set;

import org.eclipse.core.internal.resources.mapping.RemoteResourceMappingContext;
import org.eclipse.core.internal.resources.mapping.ResourceMapping;
import org.eclipse.core.internal.resources.mapping.ResourceMappingContext;
import org.eclipse.core.internal.resources.mapping.ResourceTraversal;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceVisitor;
import org.eclipse.core.resources.mapping.RemoteResourceMappingContext;
import org.eclipse.core.resources.mapping.ResourceMapping;
import org.eclipse.core.resources.mapping.ResourceMappingContext;
import org.eclipse.core.resources.mapping.ResourceTraversal;

import org.eclipse.jdt.core.IClassFile;
import org.eclipse.jdt.core.ICompilationUnit;

Lines 10-20 Link Here

(-)core refactoring/org/eclipse/jdt/internal/corext/refactoring/changes/CompilationUnitReorgChange.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.jdt.internal.corext.refactoring.changes;	11	package org.eclipse.jdt.internal.corext.refactoring.changes;
12		12
		13	import org.eclipse.core.internal.resources.mapping.ResourceMapping;
		14
13	import org.eclipse.core.runtime.CoreException;	15	import org.eclipse.core.runtime.CoreException;
14	import org.eclipse.core.runtime.IProgressMonitor;	16	import org.eclipse.core.runtime.IProgressMonitor;
15	import org.eclipse.core.runtime.SubProgressMonitor;	17	import org.eclipse.core.runtime.SubProgressMonitor;
16		18
17	import org.eclipse.core.resources.mapping.ResourceMapping;
18		19
19	import org.eclipse.ltk.core.refactoring.Change;	20	import org.eclipse.ltk.core.refactoring.Change;
20	import org.eclipse.ltk.core.refactoring.participants.ReorgExecutionLog;	21	import org.eclipse.ltk.core.refactoring.participants.ReorgExecutionLog;

Lines 10-15 Link Here

(-)core refactoring/org/eclipse/jdt/internal/corext/refactoring/changes/PackageFragmentRootReorgChange.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.jdt.internal.corext.refactoring.changes;	11	package org.eclipse.jdt.internal.corext.refactoring.changes;
12		12
		13	import org.eclipse.core.internal.resources.mapping.ResourceMapping;
		14
13	import org.eclipse.core.runtime.CoreException;	15	import org.eclipse.core.runtime.CoreException;
14	import org.eclipse.core.runtime.IPath;	16	import org.eclipse.core.runtime.IPath;
15	import org.eclipse.core.runtime.IProgressMonitor;	17	import org.eclipse.core.runtime.IProgressMonitor;
Lines 17-23 Link Here
17		19
18	import org.eclipse.core.resources.IProject;	20	import org.eclipse.core.resources.IProject;
19	import org.eclipse.core.resources.IResource;	21	import org.eclipse.core.resources.IResource;
20	import org.eclipse.core.resources.mapping.ResourceMapping;
21		22
22	import org.eclipse.ltk.core.refactoring.Change;	23	import org.eclipse.ltk.core.refactoring.Change;
23	import org.eclipse.ltk.core.refactoring.RefactoringStatus;	24	import org.eclipse.ltk.core.refactoring.RefactoringStatus;

Lines 10-19 Link Here

(-)core refactoring/org/eclipse/jdt/internal/corext/refactoring/changes/PackageReorgChange.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.jdt.internal.corext.refactoring.changes;	11	package org.eclipse.jdt.internal.corext.refactoring.changes;
12		12
		13	import org.eclipse.core.internal.resources.mapping.ResourceMapping;
		14
13	import org.eclipse.core.runtime.CoreException;	15	import org.eclipse.core.runtime.CoreException;
14	import org.eclipse.core.runtime.IProgressMonitor;	16	import org.eclipse.core.runtime.IProgressMonitor;
15		17
16	import org.eclipse.core.resources.mapping.ResourceMapping;
17		18
18	import org.eclipse.ltk.core.refactoring.Change;	19	import org.eclipse.ltk.core.refactoring.Change;
19	import org.eclipse.ltk.core.refactoring.RefactoringStatus;	20	import org.eclipse.ltk.core.refactoring.RefactoringStatus;

Lines 12-17 Link Here

(-)core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/CreateCopyOfCompilationUnitChange.java (-1 / +2 lines)
12		12
13	import org.eclipse.text.edits.ReplaceEdit;	13	import org.eclipse.text.edits.ReplaceEdit;
14		14
		15	import org.eclipse.core.internal.resources.mapping.ResourceMapping;
		16
15	import org.eclipse.core.runtime.CoreException;	17	import org.eclipse.core.runtime.CoreException;
16	import org.eclipse.core.runtime.IPath;	18	import org.eclipse.core.runtime.IPath;
17	import org.eclipse.core.runtime.IProgressMonitor;	19	import org.eclipse.core.runtime.IProgressMonitor;
Lines 20-26 Link Here
20		22
21	import org.eclipse.core.resources.IFile;	23	import org.eclipse.core.resources.IFile;
22	import org.eclipse.core.resources.IResource;	24	import org.eclipse.core.resources.IResource;
23	import org.eclipse.core.resources.mapping.ResourceMapping;
24		25
25	import org.eclipse.ltk.core.refactoring.Change;	26	import org.eclipse.ltk.core.refactoring.Change;
26	import org.eclipse.ltk.core.refactoring.RefactoringStatus;	27	import org.eclipse.ltk.core.refactoring.RefactoringStatus;

Lines 10-17 Link Here

(-)core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/MonitoringNewNameQueries.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.jdt.internal.corext.refactoring.reorg;	11	package org.eclipse.jdt.internal.corext.refactoring.reorg;
12		12
		13	import org.eclipse.core.internal.resources.mapping.ResourceMapping;
		14
13	import org.eclipse.core.resources.IResource;	15	import org.eclipse.core.resources.IResource;
14	import org.eclipse.core.resources.mapping.ResourceMapping;
15		16
16	import org.eclipse.ltk.core.refactoring.participants.ReorgExecutionLog;	17	import org.eclipse.ltk.core.refactoring.participants.ReorgExecutionLog;
17		18

Lines 18-23 Link Here

(-)core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/ReorgPolicyFactory.java (-1 / +2 lines)
18		18
19	import org.eclipse.text.edits.TextEdit;	19	import org.eclipse.text.edits.TextEdit;
20		20
		21	import org.eclipse.core.internal.resources.mapping.ResourceMapping;
		22
21	import org.eclipse.core.runtime.CoreException;	23	import org.eclipse.core.runtime.CoreException;
22	import org.eclipse.core.runtime.IPath;	24	import org.eclipse.core.runtime.IPath;
23	import org.eclipse.core.runtime.IProgressMonitor;	25	import org.eclipse.core.runtime.IProgressMonitor;
Lines 34-40 Link Here
34	import org.eclipse.core.resources.IResource;	36	import org.eclipse.core.resources.IResource;
35	import org.eclipse.core.resources.ResourceAttributes;	37	import org.eclipse.core.resources.ResourceAttributes;
36	import org.eclipse.core.resources.ResourcesPlugin;	38	import org.eclipse.core.resources.ResourcesPlugin;
37	import org.eclipse.core.resources.mapping.ResourceMapping;
38		39
39	import org.eclipse.jface.text.BadLocationException;	40	import org.eclipse.jface.text.BadLocationException;
40	import org.eclipse.jface.text.IDocument;	41	import org.eclipse.jface.text.IDocument;

Lines 12-21 Link Here

(-)ui/org/eclipse/jdt/internal/ui/JavaElementAdapterFactory.java (-1 / +2 lines)
12	package org.eclipse.jdt.internal.ui;	12	package org.eclipse.jdt.internal.ui;
13		13
14		14
		15	import org.eclipse.core.internal.resources.mapping.ResourceMapping;
		16
15	import org.eclipse.core.resources.IFile;	17	import org.eclipse.core.resources.IFile;
16	import org.eclipse.core.resources.IProject;	18	import org.eclipse.core.resources.IProject;
17	import org.eclipse.core.resources.IResource;	19	import org.eclipse.core.resources.IResource;
18	import org.eclipse.core.resources.mapping.ResourceMapping;
19		20
20	import org.eclipse.core.runtime.IAdaptable;	21	import org.eclipse.core.runtime.IAdaptable;
21	import org.eclipse.core.runtime.IAdapterFactory;	22	import org.eclipse.core.runtime.IAdapterFactory;

Lines 10-18 Link Here

(-)ui/org/eclipse/jdt/internal/ui/LogicalPackageAdapterFactory.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.jdt.internal.ui;	11	package org.eclipse.jdt.internal.ui;
12		12
		13	import org.eclipse.core.internal.resources.mapping.ResourceMapping;
		14
13	import org.eclipse.core.runtime.IAdapterFactory;	15	import org.eclipse.core.runtime.IAdapterFactory;
14		16
15	import org.eclipse.core.resources.mapping.ResourceMapping;
16		17
17	import org.eclipse.search.ui.ISearchPageScoreComputer;	18	import org.eclipse.search.ui.ISearchPageScoreComputer;
18		19




 *******************************************************************************/
package org.eclipse.jdt.ui.refactoring;

import org.eclipse.core.internal.resources.mapping.ResourceMapping;
import org.eclipse.core.internal.resources.mapping.ResourceMappingContext;

import org.eclipse.core.runtime.IProgressMonitor;

import org.eclipse.core.resources.IResourceVisitor;
import org.eclipse.core.resources.mapping.ResourceMapping;
import org.eclipse.core.resources.mapping.ResourceMappingContext;

import org.eclipse.jdt.internal.corext.refactoring.rename.RenameCompilationUnitProcessor;
import org.eclipse.jdt.internal.corext.refactoring.rename.RenameEnumConstProcessor;

	 * to enumerate the resources which form the Java element. <code>ResourceMappingContext.LOCAL_CONTEXT</code> 
	 * should be use as the <code>ResourceMappingContext</code> passed to the accept methdod.
	 * </p>
	 * @see org.eclipse.core.internal.resources.mapping.ResourceMapping
	 * @since 3.1
	 */
	public static String COPY_PROCESSOR= "org.eclipse.jdt.ui.CopyProcessor";  //$NON-NLS-1$

Return to bug 93559

Lines 15-20 Link Here

(-)core extension/org/eclipse/jdt/internal/corext/util/JavaElementResourceMapping.java (-4 / +5 lines)
15	import java.util.List;	15	import java.util.List;
16	import java.util.Set;	16	import java.util.Set;
17		17
		18	import org.eclipse.core.internal.resources.mapping.RemoteResourceMappingContext;
		19	import org.eclipse.core.internal.resources.mapping.ResourceMapping;
		20	import org.eclipse.core.internal.resources.mapping.ResourceMappingContext;
		21	import org.eclipse.core.internal.resources.mapping.ResourceTraversal;
		22
18	import org.eclipse.core.runtime.CoreException;	23	import org.eclipse.core.runtime.CoreException;
19	import org.eclipse.core.runtime.IProgressMonitor;	24	import org.eclipse.core.runtime.IProgressMonitor;
20	import org.eclipse.core.runtime.NullProgressMonitor;	25	import org.eclipse.core.runtime.NullProgressMonitor;
Lines 24-33 Link Here
24	import org.eclipse.core.resources.IProject;	29	import org.eclipse.core.resources.IProject;
25	import org.eclipse.core.resources.IResource;	30	import org.eclipse.core.resources.IResource;
26	import org.eclipse.core.resources.IResourceVisitor;	31	import org.eclipse.core.resources.IResourceVisitor;
27	import org.eclipse.core.resources.mapping.RemoteResourceMappingContext;
28	import org.eclipse.core.resources.mapping.ResourceMapping;
29	import org.eclipse.core.resources.mapping.ResourceMappingContext;
30	import org.eclipse.core.resources.mapping.ResourceTraversal;
31		32
32	import org.eclipse.jdt.core.IClassFile;	33	import org.eclipse.jdt.core.IClassFile;
33	import org.eclipse.jdt.core.ICompilationUnit;	34	import org.eclipse.jdt.core.ICompilationUnit;

Lines 10-20 Link Here

(-)ui/org/eclipse/jdt/ui/refactoring/IRefactoringProcessorIds.java (-3 / +4 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.jdt.ui.refactoring;	11	package org.eclipse.jdt.ui.refactoring;
12		12
		13	import org.eclipse.core.internal.resources.mapping.ResourceMapping;
		14	import org.eclipse.core.internal.resources.mapping.ResourceMappingContext;
		15
13	import org.eclipse.core.runtime.IProgressMonitor;	16	import org.eclipse.core.runtime.IProgressMonitor;
14		17
15	import org.eclipse.core.resources.IResourceVisitor;	18	import org.eclipse.core.resources.IResourceVisitor;
16	import org.eclipse.core.resources.mapping.ResourceMapping;
17	import org.eclipse.core.resources.mapping.ResourceMappingContext;
18		19
19	import org.eclipse.jdt.internal.corext.refactoring.rename.RenameCompilationUnitProcessor;	20	import org.eclipse.jdt.internal.corext.refactoring.rename.RenameCompilationUnitProcessor;
20	import org.eclipse.jdt.internal.corext.refactoring.rename.RenameEnumConstProcessor;	21	import org.eclipse.jdt.internal.corext.refactoring.rename.RenameEnumConstProcessor;
Lines 246-252 Link Here
246	* to enumerate the resources which form the Java element. <code>ResourceMappingContext.LOCAL_CONTEXT</code>	247	* to enumerate the resources which form the Java element. <code>ResourceMappingContext.LOCAL_CONTEXT</code>
247	* should be use as the <code>ResourceMappingContext</code> passed to the accept methdod.	248	* should be use as the <code>ResourceMappingContext</code> passed to the accept methdod.
248	* </p>	249	* </p>
249	* @see org.eclipse.core.resources.mapping.ResourceMapping	250	* @see org.eclipse.core.internal.resources.mapping.ResourceMapping
250	* @since 3.1	251	* @since 3.1
251	*/	252	*/
252	public static String COPY_PROCESSOR= "org.eclipse.jdt.ui.CopyProcessor"; //$NON-NLS-1$	253	public static String COPY_PROCESSOR= "org.eclipse.jdt.ui.CopyProcessor"; //$NON-NLS-1$