Attachment 141506 Details for Bug 238762 – Patch v02

[patch] Patch v02

clipboard.txt (text/plain), 4.59 KB, created by Tomasz Zarna

on 2009-07-14 08:21:58 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2009-07-14 08:21:58 EDT

Size: 4.59 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.cvs.ui
>Index: src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java,v
>retrieving revision 1.27
>diff -u -r1.27 UpdateOperation.java
>--- src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java	29 Mar 2006 17:13:56 -0000	1.27
>+++ src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java	10 Jul 2009 11:38:45 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2006 IBM Corporation and others.
>+ * Copyright (c) 2000, 2009 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
>@@ -10,26 +10,24 @@
>  *******************************************************************************/
> package org.eclipse.team.internal.ccvs.ui.operations;
> 
>-import java.util.ArrayList;
>-import java.util.Arrays;
>-import java.util.List;
>+import java.util.*;
> 
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.resources.mapping.ResourceMapping;
> import org.eclipse.core.resources.mapping.ResourceMappingContext;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.jface.action.IAction;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.team.core.subscribers.SubscriberResourceMappingContext;
> import org.eclipse.team.internal.ccvs.core.*;
>-import org.eclipse.team.internal.ccvs.core.client.Command;
>-import org.eclipse.team.internal.ccvs.core.client.Session;
>-import org.eclipse.team.internal.ccvs.core.client.Update;
>+import org.eclipse.team.internal.ccvs.core.client.*;
> import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
> import org.eclipse.team.internal.ccvs.core.client.listeners.ICommandOutputListener;
> import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
> import org.eclipse.team.internal.ccvs.ui.Policy;
> import org.eclipse.ui.IWorkbenchPart;
>+import org.eclipse.ui.actions.RefreshAction;
> 
> /**
>  * Operation which performs a CVS update
>@@ -155,4 +153,8 @@
> 	public void setTag(CVSTag tag) {
> 		this.tag = tag;
> 	}
>+	
>+	protected IAction getGotoAction() {
>+		return new RefreshAction(getPart().getSite());
>+	}
> }
>Index: src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java,v
>retrieving revision 1.18
>diff -u -r1.18 ModelUpdateOperation.java
>--- src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java	11 Apr 2006 23:09:58 -0000	1.18
>+++ src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java	10 Jul 2009 11:38:45 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2006 IBM Corporation and others.
>+ * Copyright (c) 2005, 2009 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
>@@ -16,7 +16,9 @@
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.resources.ResourcesPlugin;
> import org.eclipse.core.resources.mapping.ResourceMapping;
>-import org.eclipse.core.runtime.*;
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IProgressMonitor;
>+import org.eclipse.jface.action.IAction;
> import org.eclipse.team.core.mapping.ISynchronizationContext;
> import org.eclipse.team.core.mapping.provider.SynchronizationContext;
> import org.eclipse.team.core.subscribers.SubscriberScopeManager;
>@@ -28,6 +30,7 @@
> import org.eclipse.team.internal.core.mapping.CompoundResourceTraversal;
> import org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant;
> import org.eclipse.ui.IWorkbenchPart;
>+import org.eclipse.ui.actions.RefreshAction;
> 
> public class ModelUpdateOperation extends AbstractModelMergeOperation {
> 	
>@@ -102,4 +105,8 @@
> 				(ICVSResource[]) cvsResources.toArray(new ICVSResource[cvsResources.size()]));
> 		}
> 	}
>+	
>+	protected IAction getGotoAction() {
>+		return new RefreshAction(getPart().getSite());
>+	}
> }

Actions: View | Diff

Attachments on bug 238762: 137183 | 137184 | 141506 | 141507