Improve entry location for LTK copy refactoring

Author: Felix-Schmid

bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CopyFilesAndFoldersOperation.java

@@ -77,6 +77,7 @@
 import org.eclipse.ui.internal.ide.IDEInternalPreferences;
 import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
 import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
+import org.eclipse.ui.internal.ide.actions.LTKLauncher;
 import org.eclipse.ui.internal.ide.dialogs.IDEResourceInfoUtils;
 import org.eclipse.ui.statushandlers.StatusManager;
 import org.eclipse.ui.wizards.datatransfer.FileStoreStructureProvider;
@@ -1241,6 +1242,14 @@ boolean isDestinationSameAsSource(IResource[] sourceResources,
 	private boolean performCopy(IResource[] resources, IPath destination,
 			IProgressMonitor monitor) {
 		try {
+			IPath[] destPaths = new IPath[resources.length];
+			for (int i = 0; i < resources.length; i++) {
+				destPaths[i] = destination.append(resources[i].getName());
+			}
+			if (LTKLauncher.copyResources(resources, destPaths)) {
+				return true;
+			}
+
 			AbstractWorkspaceOperation op = getUndoableCopyOrMoveOperation(
 					resources, destination);
 			op.setModelProviderIds(getModelProviderIds());
@@ -1301,6 +1310,11 @@ private boolean performCopyWithAutoRename(IResource[] resources,
 							workspace);
 				}
 			}
+
+			if (LTKLauncher.copyResources(resources, destinationPaths)) {
+				return true;
+			}
+
 			CopyResourcesOperation op = new CopyResourcesOperation(resources,
 					destinationPaths,
 					IDEWorkbenchMessages.CopyFilesAndFoldersOperation_copyTitle);

bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/undo/CopyResourcesOperation.java

@@ -28,7 +28,6 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.ui.internal.ide.actions.LTKLauncher;
 import org.eclipse.ui.internal.ide.undo.UndoMessages;
 
 /**
@@ -146,14 +145,6 @@ protected void doExecute(IProgressMonitor monitor, IAdaptable uiInfo)
 	 */
 	protected void copy(IProgressMonitor monitor, IAdaptable uiInfo)
 			throws CoreException {
-		IPath[] destPaths = new IPath[resources.length];
-		for (int i = 0; i < resources.length; i++) {
-			destPaths[i] = getDestinationPath(resources[i], i);
-		}
-		if (LTKLauncher.copyResources(resources, destPaths)) {
-			return;
-		}
-
 		SubMonitor subMonitor = SubMonitor.convert(monitor,
 				resources.length + (resourceDescriptions != null ? resourceDescriptions.length : 0));
 		subMonitor.setTaskName(UndoMessages.AbstractResourcesOperation_CopyingResourcesProgress);
@@ -164,7 +155,7 @@ protected void copy(IProgressMonitor monitor, IAdaptable uiInfo)
 			// Copy the resources and record the overwrites that would
 			// be restored if this operation were reversed
 			IResourceSnapshot<? extends IResource>[] overwrites;
-			overwrites = WorkspaceUndoUtil.copy(new IResource[] { resources[i] }, destPaths[i],
+			overwrites = WorkspaceUndoUtil.copy(new IResource[] { resources[i] }, getDestinationPath(resources[i], i),
 					resourcesAtDestination, subMonitor.split(1), uiInfo, true, fCreateGroups, fCreateLinks,
 					fRelativeToVariable);
 			// Accumulate the overwrites into the full list