can't assume workbench anymore

rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/eclipse/filesystem/RSEFileStoreRemoteFileWrapper.java

@@ -156,13 +156,19 @@ public class RSEFileStoreRemoteFileWrapper extends FileStore implements IFileSto
 				*/
 				if (_remoteFile.getName().equals(".project"))
 				{
+					
 					try
 					{
 						// only temp file has contents
 						file = (IFile)UniversalFileTransferUtility.getTempFileFor(_remoteFile);
+						if (file == null || !file.exists())
+						{
+							file.create(null, true, monitor);
+						}
 					}
 					catch (Exception e)
 					{
+						e.printStackTrace();
 					}
 				}
 				if (file == null || !file.exists())

rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/eclipse/filesystem/RSEFileSystem.java

@@ -93,7 +93,13 @@ public class RSEFileSystem extends FileSystem
 			IRemoteFileSubSystem ss = store.getRemoteFileSubSystem();
 			if (!ss.isConnected())
 			{
-				Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+				Shell shell = null;
+	
+				if (PlatformUI.isWorkbenchRunning())
+				{
+					shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+				}
+				
 				try
 				{
 					ss.connect(shell);
@@ -121,8 +127,12 @@ public class RSEFileSystem extends FileSystem
 						Shell shell = null;
 						try
 						{
-							shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+							//if (PlatformUI.isWorkbenchRunning())
-							//shell = RSEUIPlugin.getActiveWorkbenchShell();
+							{
+								//shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+				
+								shell = RSEUIPlugin.getActiveWorkbenchShell();
+							}
 						}
 						catch (Exception e)
 						{							

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java

@@ -59,6 +59,7 @@ import org.eclipse.rse.ui.dialogs.SystemRenameSingleDialog;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
 
 
 /**
@@ -137,10 +138,18 @@ public class UniversalFileTransferUtility
 		    srcFS.download(srcFileOrFolder, tempFile, SystemEncodingUtil.ENCODING_UTF_8, monitor);
 		    
 		    if (!tempFile.exists() && !tempFile.isSynchronized(IResource.DEPTH_ZERO))
+		    {
+		    	// eclipse doesn't like this if the resource appears to be from another project
+		    	try
 		    	{
 		    		//tempFile.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, monitor);
 		    		tempFile.refreshLocal(IResource.DEPTH_ZERO, null/*monitor*/);
 		    	}
+		    	catch (Exception e)
+		    	{
+		    		
+		    	}
+		    }
 		    if (tempFile.exists())
 		    {		    	
 				// if the file is virtual, set read only if necessary
@@ -376,9 +385,12 @@ public class UniversalFileTransferUtility
 			{
 				// refresh temp file in project
 				try
+				{
+					if (PlatformUI.isWorkbenchRunning())
 					{
 						tempFile.refreshLocal(IResource.DEPTH_ONE, monitor);
 					}
+				}
 				catch (CoreException e)
 				{
 					e.printStackTrace();

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java

@@ -35,6 +35,7 @@ import org.eclipse.jface.viewers.DecoratingLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IBasicPropertyConstants;
 import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ILabelDecorator;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.ISelectionProvider;
@@ -121,8 +122,10 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.PropertyDialogAction;
 import org.eclipse.ui.part.EditorInputTransfer;
 import org.eclipse.ui.part.PluginTransfer;
@@ -358,7 +361,13 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	 */
 	public void setLabelAndContentProvider(SystemViewLabelAndContentProvider lcProvider)
 	{
-		setLabelProvider(new DecoratingLabelProvider(lcProvider, RSEUIPlugin.getDefault().getWorkbench().getDecoratorManager().getLabelDecorator()));
+		ILabelDecorator decorator = null;
+		if (PlatformUI.isWorkbenchRunning())
+		{
+			IWorkbench wb = PlatformUI.getWorkbench();
+			decorator = wb.getDecoratorManager().getLabelDecorator();
+		}
+		setLabelProvider(new DecoratingLabelProvider(lcProvider, decorator));
 		setContentProvider(lcProvider);
 	}
 	

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java

@@ -35,6 +35,7 @@ import org.eclipse.jface.viewers.DecoratingLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IBasicPropertyConstants;
 import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ILabelDecorator;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.ISelectionProvider;
@@ -121,8 +122,10 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.PropertyDialogAction;
 import org.eclipse.ui.part.EditorInputTransfer;
 import org.eclipse.ui.part.PluginTransfer;
@@ -358,7 +361,13 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	 */
 	public void setLabelAndContentProvider(SystemViewLabelAndContentProvider lcProvider)
 	{
-		setLabelProvider(new DecoratingLabelProvider(lcProvider, RSEUIPlugin.getDefault().getWorkbench().getDecoratorManager().getLabelDecorator()));
+		ILabelDecorator decorator = null;
+		if (PlatformUI.isWorkbenchRunning())
+		{
+			IWorkbench wb = PlatformUI.getWorkbench();
+			decorator = wb.getDecoratorManager().getLabelDecorator();
+		}
+		setLabelProvider(new DecoratingLabelProvider(lcProvider, decorator));
 		setContentProvider(lcProvider);
 	}
 	

rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java

@@ -1915,7 +1915,17 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents
 	{
 		if (clipboard == null)
 		{
-			clipboard = new Clipboard(getShell().getDisplay());
+			Display display = null;
+			Shell shell = getShell();
+			if (shell == null)
+			{
+				display = Display.getDefault();
+			}
+			else
+			{
+				display = shell.getDisplay();
+			}
+			clipboard = new Clipboard(display);
 		}
 
 		return clipboard;