mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 23:05:47 +02:00
Code Issues Wiki Activity

[334839] File Content Conflict is not handled properly

Browse source
This commit is contained in:
David McKnight 2011-02-28 17:38:44 +00:00
parent cc4791018d
commit d3e71e99f5
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java
View file

@ -34,7 +34,6 @@ import java.util.ArrayList;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents; import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.events.SystemResourceChangeEvent; import org.eclipse.rse.core.events.SystemResourceChangeEvent;
@ -55,8 +54,8 @@ import org.eclipse.rse.ui.view.ISystemEditableRemoteObject;
import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PartInitException; import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.activities.WorkbenchActivityHelper; import org.eclipse.ui.activities.WorkbenchActivityHelper;
import org.eclipse.ui.internal.Workbench;
/** /**
* This class manages listening for resource changes within our temp file project * This class manages listening for resource changes within our temp file project
@ -440,7 +439,7 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener
{ {
public void run() public void run()
{ {
boolean closing = Workbench.getInstance().isClosing(); boolean closing = PlatformUI.getWorkbench().isClosing();
Shell shell = null; Shell shell = null;
if (closing){ if (closing){
shell = Display.getDefault().getActiveShell(); shell = Display.getDefault().getActiveShell();

4
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java
View file

@ -87,7 +87,7 @@ import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.internal.Workbench; import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.part.FileEditorInput;
@ -681,7 +681,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn
IRemoteFile remoteFile = cnfDialog.getSaveasLocation(); IRemoteFile remoteFile = cnfDialog.getSaveasLocation();
BackgroundSaveasJob sjob = new BackgroundSaveasJob(remoteFile); BackgroundSaveasJob sjob = new BackgroundSaveasJob(remoteFile);
if (Workbench.getInstance().isClosing()){ if (PlatformUI.getWorkbench().isClosing()){
sjob.run(new NullProgressMonitor()); sjob.run(new NullProgressMonitor());
} }
else { else {