diff options
| author | Pawel Pogorzelski | 2010-04-20 13:35:28 +0000 |
|---|---|---|
| committer | Pawel Pogorzelski | 2010-04-20 13:35:28 +0000 |
| commit | c391f787c4c87dec4b8816e7200459e7b24f028b (patch) | |
| tree | 35d73c55e21255a57a9af02bb2d52d8154b18855 /bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings | |
| parent | f9530ec633c30e3c998668d0ca4f3d8aac773ed3 (diff) | |
| download | eclipse.platform.team-c391f787c4c87dec4b8816e7200459e7b24f028b.tar.gz eclipse.platform.team-c391f787c4c87dec4b8816e7200459e7b24f028b.tar.xz eclipse.platform.team-c391f787c4c87dec4b8816e7200459e7b24f028b.zip | |
Bug 305993 - [Sync View][Apply Patch] Add preference that allows Team > Apply Patch to show result in Synchronize view
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ApplyPatchAction.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ApplyPatchAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ApplyPatchAction.java index 88fb09b14..cec2df0b3 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ApplyPatchAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ApplyPatchAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 IBM Corporation and others. + * Copyright (c) 2008, 2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,7 +11,6 @@ package org.eclipse.team.internal.ccvs.ui.mappings; import org.eclipse.compare.CompareConfiguration; -import org.eclipse.compare.patch.ApplyPatchOperation; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.*; @@ -20,6 +19,7 @@ import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.widgets.Display; import org.eclipse.team.core.diff.*; import org.eclipse.team.internal.ui.TeamUIPlugin; +import org.eclipse.team.internal.ui.synchronize.patch.ApplyPatchOperation; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; public class ApplyPatchAction extends CVSModelProviderAction implements |