View | Details | Raw Unified | Return to bug 238762 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java (-7 / +9 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2006 IBM Corporation and others.
2
 * Copyright (c) 2000, 2009 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 10-35 Link Here
10
 *******************************************************************************/
10
 *******************************************************************************/
11
package org.eclipse.team.internal.ccvs.ui.operations;
11
package org.eclipse.team.internal.ccvs.ui.operations;
12
12
13
import java.util.ArrayList;
13
import java.util.*;
14
import java.util.Arrays;
15
import java.util.List;
16
14
17
import org.eclipse.core.resources.IResource;
15
import org.eclipse.core.resources.IResource;
18
import org.eclipse.core.resources.mapping.ResourceMapping;
16
import org.eclipse.core.resources.mapping.ResourceMapping;
19
import org.eclipse.core.resources.mapping.ResourceMappingContext;
17
import org.eclipse.core.resources.mapping.ResourceMappingContext;
20
import org.eclipse.core.runtime.IProgressMonitor;
18
import org.eclipse.core.runtime.IProgressMonitor;
21
import org.eclipse.core.runtime.IStatus;
19
import org.eclipse.core.runtime.IStatus;
20
import org.eclipse.jface.action.IAction;
22
import org.eclipse.osgi.util.NLS;
21
import org.eclipse.osgi.util.NLS;
23
import org.eclipse.team.core.subscribers.SubscriberResourceMappingContext;
22
import org.eclipse.team.core.subscribers.SubscriberResourceMappingContext;
24
import org.eclipse.team.internal.ccvs.core.*;
23
import org.eclipse.team.internal.ccvs.core.*;
25
import org.eclipse.team.internal.ccvs.core.client.Command;
24
import org.eclipse.team.internal.ccvs.core.client.*;
26
import org.eclipse.team.internal.ccvs.core.client.Session;
27
import org.eclipse.team.internal.ccvs.core.client.Update;
28
import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
25
import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
29
import org.eclipse.team.internal.ccvs.core.client.listeners.ICommandOutputListener;
26
import org.eclipse.team.internal.ccvs.core.client.listeners.ICommandOutputListener;
30
import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
27
import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
31
import org.eclipse.team.internal.ccvs.ui.Policy;
28
import org.eclipse.team.internal.ccvs.ui.Policy;
32
import org.eclipse.ui.IWorkbenchPart;
29
import org.eclipse.ui.IWorkbenchPart;
30
import org.eclipse.ui.actions.RefreshAction;
33
31
34
/**
32
/**
35
 * Operation which performs a CVS update
33
 * Operation which performs a CVS update
Lines 155-158 Link Here
155
	public void setTag(CVSTag tag) {
153
	public void setTag(CVSTag tag) {
156
		this.tag = tag;
154
		this.tag = tag;
157
	}
155
	}
156
	
157
	protected IAction getGotoAction() {
158
		return new RefreshAction(getPart().getSite());
159
	}
158
}
160
}
(-)src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java (-2 / +9 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2005, 2006 IBM Corporation and others.
2
 * Copyright (c) 2005, 2009 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 16-22 Link Here
16
import org.eclipse.core.resources.IResource;
16
import org.eclipse.core.resources.IResource;
17
import org.eclipse.core.resources.ResourcesPlugin;
17
import org.eclipse.core.resources.ResourcesPlugin;
18
import org.eclipse.core.resources.mapping.ResourceMapping;
18
import org.eclipse.core.resources.mapping.ResourceMapping;
19
import org.eclipse.core.runtime.*;
19
import org.eclipse.core.runtime.CoreException;
20
import org.eclipse.core.runtime.IProgressMonitor;
21
import org.eclipse.jface.action.IAction;
20
import org.eclipse.team.core.mapping.ISynchronizationContext;
22
import org.eclipse.team.core.mapping.ISynchronizationContext;
21
import org.eclipse.team.core.mapping.provider.SynchronizationContext;
23
import org.eclipse.team.core.mapping.provider.SynchronizationContext;
22
import org.eclipse.team.core.subscribers.SubscriberScopeManager;
24
import org.eclipse.team.core.subscribers.SubscriberScopeManager;
Lines 28-33 Link Here
28
import org.eclipse.team.internal.core.mapping.CompoundResourceTraversal;
30
import org.eclipse.team.internal.core.mapping.CompoundResourceTraversal;
29
import org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant;
31
import org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant;
30
import org.eclipse.ui.IWorkbenchPart;
32
import org.eclipse.ui.IWorkbenchPart;
33
import org.eclipse.ui.actions.RefreshAction;
31
34
32
public class ModelUpdateOperation extends AbstractModelMergeOperation {
35
public class ModelUpdateOperation extends AbstractModelMergeOperation {
33
	
36
	
Lines 102-105 Link Here
102
				(ICVSResource[]) cvsResources.toArray(new ICVSResource[cvsResources.size()]));
105
				(ICVSResource[]) cvsResources.toArray(new ICVSResource[cvsResources.size()]));
103
		}
106
		}
104
	}
107
	}
108
	
109
	protected IAction getGotoAction() {
110
		return new RefreshAction(getPart().getSite());
111
	}
105
}
112
}

Return to bug 238762