diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelReplaceOperation.java')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelReplaceOperation.java | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelReplaceOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelReplaceOperation.java index 3f2cf9ccc..c44647716 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelReplaceOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelReplaceOperation.java @@ -34,42 +34,27 @@ public class ModelReplaceOperation extends ModelUpdateOperation { super(part, selectedMappings, consultModels); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.TeamOperation#getJobName() - */ @Override protected String getJobName() { return CVSUIMessages.ReplaceOperation_taskName; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.operations.ResourceMappingMergeOperation#isAttemptHeadlessMerge() - */ @Override protected boolean isAttemptHeadlessMerge() { return true; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.operations.ResourceMappingMergeOperation#hasChangesOfInterest() - */ @Override protected boolean hasChangesOfInterest() { IMergeContext context = (IMergeContext)getContext(); return !context.getDiffTree().isEmpty(); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.mappings.ModelUpdateOperation#getMergeType() - */ @Override protected int getMergeType() { return ISynchronizationContext.TWO_WAY; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.operations.ResourceMappingMergeOperation#performMerge(org.eclipse.core.runtime.IProgressMonitor) - */ @Override protected IStatus performMerge(IProgressMonitor monitor) throws CoreException { if (!hasLocalChanges() || promptForOverwrite()) { |