mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-03 22:35:43 +02:00
Code Issues Wiki Activity

[256644][refresh] RSE Compare with should refresh file cache before opening compare editor

Browse source
This commit is contained in:
David McKnight 2009-03-23 16:21:03 +00:00
parent 24b4fb7a89
commit 3ba55d9c46
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCompareFilesAction.java
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2002, 2007 IBM Corporation and others.
* Copyright (c) 2002, 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
@ -12,7 +12,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
*
* Contributors:
* {Name} (company) - description of contribution.
* David McKnight (IBM) - [256644][refresh] RSE Compare with should refresh file cache before opening compare editor
*******************************************************************************/
package org.eclipse.rse.internal.files.ui.actions;
@ -23,6 +23,7 @@ import java.util.List;
import org.eclipse.compare.CompareConfiguration;
import org.eclipse.compare.CompareUI;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.files.ui.compare.SystemCompareInput;
import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile;
@ -66,6 +67,15 @@ public class SystemCompareFilesAction extends SystemBaseAction
for (int i = 0; i < _selected.size(); i++)
{
IRemoteFile file = (IRemoteFile) _selected.get(i);
// make sure this is the most up-to-date version
try {
file = file.getParentRemoteFileSubSystem().getRemoteFileObject(file.getAbsolutePath(), new NullProgressMonitor());
// ensure that, if this is cached, we get the latest on download
file.markStale(true);
}
catch (Exception e){
}
SystemEditableRemoteFile ef = new SystemEditableRemoteFile(file);
fInput.addRemoteEditable(ef);
}