diff options
author | Tomasz Zarna | 2011-11-10 10:51:56 +0000 |
---|---|---|
committer | Tomasz Zarna | 2011-11-10 10:51:56 +0000 |
commit | 3f762b893c48833cd921ed0dda5d75a9a9f5524f (patch) | |
tree | 618faaa987e89934db34ebf91faf701cf6bde839 /bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java | |
parent | 8bd7229015f8e34a5c3e23ca9b86504023141b51 (diff) | |
download | eclipse.platform.team-3f762b893c48833cd921ed0dda5d75a9a9f5524f.tar.gz eclipse.platform.team-3f762b893c48833cd921ed0dda5d75a9a9f5524f.tar.xz eclipse.platform.team-3f762b893c48833cd921ed0dda5d75a9a9f5524f.zip |
bug 315747: 'Consider file contents in comparison' option is completelyI20111115-0800
broken
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java')
-rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java index 68d8817b2..e8f8e6350 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2011 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 @@ -318,14 +318,6 @@ public class WorkspaceSubscriberContext extends CVSSubscriberMergeContext { } } - private SubscriberDiffTreeEventHandler getHandler() { - Object o = getAdapter(SubscriberDiffTreeEventHandler.class); - if (o instanceof SubscriberDiffTreeEventHandler) { - return (SubscriberDiffTreeEventHandler) o; - } - return null; - } - private GroupProgressMonitor getGroup(IProgressMonitor monitor) { if (monitor instanceof GroupProgressMonitor) { return (GroupProgressMonitor) monitor; |