Attachment 20646 Details for Bug 93559 – Patch to org.eclipse.jdt.ui

[patch] Patch to org.eclipse.jdt.ui

org.eclipse.jdt.ui.patch93559.txt (text/plain), 13.05 KB, created by Michael Valenta

on 2005-05-03 12:51:53 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Valenta

Created: 2005-05-03 12:51:53 EDT

Size: 13.05 KB

patch

obsolete

>Index: plugin.xml
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.ui/plugin.xml,v
>retrieving revision 1.529
>diff -u -r1.529 plugin.xml
>--- plugin.xml	2 May 2005 16:11:07 -0000	1.529
>+++ plugin.xml	3 May 2005 16:51:11 -0000
>@@ -104,7 +104,7 @@
>             class="org.eclipse.jdt.internal.ui.LogicalPackageAdapterFactory" 
>             adaptableType="org.eclipse.jdt.internal.ui.browsing.LogicalPackage">
>             <adapter type="org.eclipse.search.ui.ISearchPageScoreComputer"/>
>-            <adapter type="org.eclipse.core.resources.mapping.ResourceMapping"/>
>+            <adapter type="org.eclipse.core.internal.resources.mapping.ResourceMapping"/>
> 		</factory>
> 		
> 		<factory 
>Index: core extension/org/eclipse/jdt/internal/corext/util/JavaElementResourceMapping.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/util/JavaElementResourceMapping.java,v
>retrieving revision 1.7
>diff -u -r1.7 JavaElementResourceMapping.java
>--- core extension/org/eclipse/jdt/internal/corext/util/JavaElementResourceMapping.java	6 Apr 2005 22:33:16 -0000	1.7
>+++ core extension/org/eclipse/jdt/internal/corext/util/JavaElementResourceMapping.java	3 May 2005 16:51:11 -0000
>@@ -15,6 +15,11 @@
> 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;
>@@ -24,10 +29,6 @@
> 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;
>Index: core refactoring/org/eclipse/jdt/internal/corext/refactoring/changes/CompilationUnitReorgChange.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/changes/CompilationUnitReorgChange.java,v
>retrieving revision 1.16
>diff -u -r1.16 CompilationUnitReorgChange.java
>--- core refactoring/org/eclipse/jdt/internal/corext/refactoring/changes/CompilationUnitReorgChange.java	13 Apr 2005 17:35:10 -0000	1.16
>+++ core refactoring/org/eclipse/jdt/internal/corext/refactoring/changes/CompilationUnitReorgChange.java	3 May 2005 16:51:11 -0000
>@@ -10,11 +10,12 @@
>  *******************************************************************************/
> package org.eclipse.jdt.internal.corext.refactoring.changes;
> 
>+import org.eclipse.core.internal.resources.mapping.ResourceMapping;
>+
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.SubProgressMonitor;
> 
>-import org.eclipse.core.resources.mapping.ResourceMapping;
> 
> import org.eclipse.ltk.core.refactoring.Change;
> import org.eclipse.ltk.core.refactoring.participants.ReorgExecutionLog;
>Index: core refactoring/org/eclipse/jdt/internal/corext/refactoring/changes/PackageFragmentRootReorgChange.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/changes/PackageFragmentRootReorgChange.java,v
>retrieving revision 1.19
>diff -u -r1.19 PackageFragmentRootReorgChange.java
>--- core refactoring/org/eclipse/jdt/internal/corext/refactoring/changes/PackageFragmentRootReorgChange.java	24 Apr 2005 11:38:39 -0000	1.19
>+++ core refactoring/org/eclipse/jdt/internal/corext/refactoring/changes/PackageFragmentRootReorgChange.java	3 May 2005 16:51:11 -0000
>@@ -10,6 +10,8 @@
>  *******************************************************************************/
> package org.eclipse.jdt.internal.corext.refactoring.changes;
> 
>+import org.eclipse.core.internal.resources.mapping.ResourceMapping;
>+
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.IProgressMonitor;
>@@ -17,7 +19,6 @@
> 
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.IResource;
>-import org.eclipse.core.resources.mapping.ResourceMapping;
> 
> import org.eclipse.ltk.core.refactoring.Change;
> import org.eclipse.ltk.core.refactoring.RefactoringStatus;
>Index: core refactoring/org/eclipse/jdt/internal/corext/refactoring/changes/PackageReorgChange.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/changes/PackageReorgChange.java,v
>retrieving revision 1.18
>diff -u -r1.18 PackageReorgChange.java
>--- core refactoring/org/eclipse/jdt/internal/corext/refactoring/changes/PackageReorgChange.java	24 Apr 2005 11:38:39 -0000	1.18
>+++ core refactoring/org/eclipse/jdt/internal/corext/refactoring/changes/PackageReorgChange.java	3 May 2005 16:51:11 -0000
>@@ -10,10 +10,11 @@
>  *******************************************************************************/
> package org.eclipse.jdt.internal.corext.refactoring.changes;
> 
>+import org.eclipse.core.internal.resources.mapping.ResourceMapping;
>+
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IProgressMonitor;
> 
>-import org.eclipse.core.resources.mapping.ResourceMapping;
> 
> import org.eclipse.ltk.core.refactoring.Change;
> import org.eclipse.ltk.core.refactoring.RefactoringStatus;
>Index: core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/CreateCopyOfCompilationUnitChange.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/CreateCopyOfCompilationUnitChange.java,v
>retrieving revision 1.34
>diff -u -r1.34 CreateCopyOfCompilationUnitChange.java
>--- core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/CreateCopyOfCompilationUnitChange.java	13 Apr 2005 17:35:11 -0000	1.34
>+++ core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/CreateCopyOfCompilationUnitChange.java	3 May 2005 16:51:11 -0000
>@@ -12,6 +12,8 @@
> 
> import org.eclipse.text.edits.ReplaceEdit;
> 
>+import org.eclipse.core.internal.resources.mapping.ResourceMapping;
>+
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.IProgressMonitor;
>@@ -20,7 +22,6 @@
> 
> import org.eclipse.core.resources.IFile;
> import org.eclipse.core.resources.IResource;
>-import org.eclipse.core.resources.mapping.ResourceMapping;
> 
> import org.eclipse.ltk.core.refactoring.Change;
> import org.eclipse.ltk.core.refactoring.RefactoringStatus;
>Index: core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/MonitoringNewNameQueries.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/MonitoringNewNameQueries.java,v
>retrieving revision 1.4
>diff -u -r1.4 MonitoringNewNameQueries.java
>--- core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/MonitoringNewNameQueries.java	25 Feb 2005 15:34:51 -0000	1.4
>+++ core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/MonitoringNewNameQueries.java	3 May 2005 16:51:11 -0000
>@@ -10,8 +10,9 @@
>  *******************************************************************************/
> package org.eclipse.jdt.internal.corext.refactoring.reorg;
> 
>+import org.eclipse.core.internal.resources.mapping.ResourceMapping;
>+
> import org.eclipse.core.resources.IResource;
>-import org.eclipse.core.resources.mapping.ResourceMapping;
> 
> import org.eclipse.ltk.core.refactoring.participants.ReorgExecutionLog;
> 
>Index: core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/ReorgPolicyFactory.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/ReorgPolicyFactory.java,v
>retrieving revision 1.74
>diff -u -r1.74 ReorgPolicyFactory.java
>--- core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/ReorgPolicyFactory.java	13 Apr 2005 17:35:11 -0000	1.74
>+++ core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/ReorgPolicyFactory.java	3 May 2005 16:51:11 -0000
>@@ -18,6 +18,8 @@
> 
> import org.eclipse.text.edits.TextEdit;
> 
>+import org.eclipse.core.internal.resources.mapping.ResourceMapping;
>+
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.IProgressMonitor;
>@@ -34,7 +36,6 @@
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.resources.ResourceAttributes;
> import org.eclipse.core.resources.ResourcesPlugin;
>-import org.eclipse.core.resources.mapping.ResourceMapping;
> 
> import org.eclipse.jface.text.BadLocationException;
> import org.eclipse.jface.text.IDocument;
>Index: ui/org/eclipse/jdt/internal/ui/JavaElementAdapterFactory.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JavaElementAdapterFactory.java,v
>retrieving revision 1.29
>diff -u -r1.29 JavaElementAdapterFactory.java
>--- ui/org/eclipse/jdt/internal/ui/JavaElementAdapterFactory.java	25 Feb 2005 15:34:57 -0000	1.29
>+++ ui/org/eclipse/jdt/internal/ui/JavaElementAdapterFactory.java	3 May 2005 16:51:11 -0000
>@@ -12,10 +12,11 @@
> package org.eclipse.jdt.internal.ui;
> 
> 
>+import org.eclipse.core.internal.resources.mapping.ResourceMapping;
>+
> import org.eclipse.core.resources.IFile;
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.IResource;
>-import org.eclipse.core.resources.mapping.ResourceMapping;
> 
> import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.core.runtime.IAdapterFactory;
>Index: ui/org/eclipse/jdt/internal/ui/LogicalPackageAdapterFactory.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/LogicalPackageAdapterFactory.java,v
>retrieving revision 1.5
>diff -u -r1.5 LogicalPackageAdapterFactory.java
>--- ui/org/eclipse/jdt/internal/ui/LogicalPackageAdapterFactory.java	6 Apr 2005 22:33:16 -0000	1.5
>+++ ui/org/eclipse/jdt/internal/ui/LogicalPackageAdapterFactory.java	3 May 2005 16:51:11 -0000
>@@ -10,9 +10,10 @@
>  *******************************************************************************/
> package org.eclipse.jdt.internal.ui;
> 
>+import org.eclipse.core.internal.resources.mapping.ResourceMapping;
>+
> import org.eclipse.core.runtime.IAdapterFactory;
> 
>-import org.eclipse.core.resources.mapping.ResourceMapping;
> 
> import org.eclipse.search.ui.ISearchPageScoreComputer;
> 
>Index: ui/org/eclipse/jdt/ui/refactoring/IRefactoringProcessorIds.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/refactoring/IRefactoringProcessorIds.java,v
>retrieving revision 1.13
>diff -u -r1.13 IRefactoringProcessorIds.java
>--- ui/org/eclipse/jdt/ui/refactoring/IRefactoringProcessorIds.java	12 Apr 2005 14:08:07 -0000	1.13
>+++ ui/org/eclipse/jdt/ui/refactoring/IRefactoringProcessorIds.java	3 May 2005 16:51:12 -0000
>@@ -10,11 +10,12 @@
>  *******************************************************************************/
> 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;
>@@ -246,7 +247,7 @@
> 	 * 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.resources.mapping.ResourceMapping
>+	 * @see org.eclipse.core.internal.resources.mapping.ResourceMapping
> 	 * @since 3.1
> 	 */
> 	public static String COPY_PROCESSOR= "org.eclipse.jdt.ui.CopyProcessor";  //$NON-NLS-1$

Actions: View | Diff

Attachments on bug 93559: 20646 | 20675 | 20676