From d3e71e99f5764de81817ba26e2e2c800b59363b5 Mon Sep 17 00:00:00 2001
From: David McKnight <dmcknigh@ca.ibm.com>
Date: Mon, 28 Feb 2011 17:38:44 +0000
Subject: [PATCH] [334839] File Content Conflict is not handled properly

---
 .../files/ui/resources/SystemUniversalTempFileListener.java  | 5 ++---
 .../files/ui/actions/SystemUploadConflictAction.java         | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java
index 5e04182bcba..ea99265231d 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java
@@ -34,7 +34,6 @@ import java.util.ArrayList;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.rse.core.RSECorePlugin;
 import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
 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.Shell;
 import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.activities.WorkbenchActivityHelper;
-import org.eclipse.ui.internal.Workbench;
 
 /**
  * This class manages listening for resource changes within our temp file project
@@ -440,7 +439,7 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener
 				{
 					public void run()
 					{
-						boolean closing = Workbench.getInstance().isClosing();						
+						boolean closing = PlatformUI.getWorkbench().isClosing();			
 						Shell shell = null;
 						if (closing){
 							shell = Display.getDefault().getActiveShell();
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java
index 4edd97fdbf6..8e36440eba5 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java
@@ -87,7 +87,7 @@ import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.internal.Workbench;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.FileEditorInput;
 
 
@@ -681,7 +681,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn
                 IRemoteFile remoteFile = cnfDialog.getSaveasLocation();
                 BackgroundSaveasJob sjob = new BackgroundSaveasJob(remoteFile);
             
-                if (Workbench.getInstance().isClosing()){                
+                if (PlatformUI.getWorkbench().isClosing()){                
 					sjob.run(new NullProgressMonitor());
                 }
                 else {