[174945] split importexport icons from rse.ui

rse/plugins/org.eclipse.rse.importexport/HelpContexts.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2006, 2007 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 http://www.eclipse.org/legal/epl-v10.html
+
+Initial Contributors:
+The following IBM employees contributed to the Remote System Explorer
+component that contains this file: David McKnight, Kushal Munir, 
+Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
+Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+
+Contributors:
+Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
+-->
+<?NLS TYPE="org.eclipse.help.contexts"?>
+<contexts>
+
+<!-- Import wizard help -->
+<context id="import_context">
+	<description>Import files from a remote server to a project on your local workstation.</description>
+	<topic href="../org.eclipse.rse.doc.user/tasks/tremoimp.htm" label="Importing resources from a remote file system"/>
+</context>
+	
+<!-- Export wizard help -->
+<context id="export_context">
+	<description>Export files from your local workstation to a folder on a remote server.</description>
+	<topic href="../org.eclipse.rse.doc.user/tasks/tremoexp.htm" label="Exporting resources to a remote file system"/>
+</context>
+	
+</contexts>

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/RemoteImportExportPlugin.java

@@ -7,17 +7,35 @@
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport;
 
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.rse.core.SystemBasePlugin;
 import org.osgi.framework.BundleContext;
 
 /**
  * The main plugin class to be used in the desktop.
  */
-public class RemoteImportExportPlugin extends AbstractUIPlugin {
+public class RemoteImportExportPlugin extends SystemBasePlugin {
+
+	public static final String PLUGIN_ID ="org.eclipse.rse.importexport"; //$NON-NLS-1$
+	public static final String HELPPREFIX = "org.eclipse.rse.importexport."; //$NON-NLS-1$
+	
+	// Icons
+	public static final String PREFIX = PLUGIN_ID + "."; //$NON-NLS-1$
+	public static final String ICON_BANNER_SUFFIX = "BannerIcon";	 //$NON-NLS-1$
+	public static final String ICON_EXT = ".gif";	 //$NON-NLS-1$
+
+	// WIZARD ICONS...    		
+    public static final String ICON_WIZARD_DIR = "full/wizban/"; //$NON-NLS-1$
+	public static final String ICON_EXPORTWIZARD_ROOT = "export_wiz";	 //$NON-NLS-1$
+	public static final String ICON_EXPORTWIZARD    = ICON_WIZARD_DIR + ICON_EXPORTWIZARD_ROOT + ICON_EXT;
+	public static final String ICON_EXPORTWIZARD_ID = PREFIX + ICON_EXPORTWIZARD_ROOT + ICON_BANNER_SUFFIX;
+	public static final String ICON_IMPORTWIZARD_ROOT = "import_wiz";	 //$NON-NLS-1$
+	public static final String ICON_IMPORTWIZARD    = ICON_WIZARD_DIR + ICON_EXPORTWIZARD_ROOT + ICON_EXT;
+	public static final String ICON_IMPORTWIZARD_ID = PREFIX + ICON_EXPORTWIZARD_ROOT + ICON_BANNER_SUFFIX;
+	
 	//The shared instance.
 	private static RemoteImportExportPlugin plugin;
 
@@ -51,14 +69,21 @@ public class RemoteImportExportPlugin extends AbstractUIPlugin {
 		return plugin;
 	}
 
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.importexport", path); //$NON-NLS-1$
-	}
+    /* (non-Javadoc)
+     * @see org.eclipse.rse.core.SystemBasePlugin#initializeImageRegistry()
+     */
+    protected void initializeImageRegistry()    
+    {
+    	//SystemElapsedTimer timer = new SystemElapsedTimer();
+    	//timer.setStartTime();
+    	
+    	String path = getIconPath();
+    	// Wizards...
+		putImageInRegistry(ICON_EXPORTWIZARD_ID, path+ICON_EXPORTWIZARD);
+		putImageInRegistry(ICON_IMPORTWIZARD_ID, path+ICON_IMPORTWIZARD);
+		
+        //timer.setEndTime();
+        //System.out.println("Time to load images: "+timer);
+    }
+
 }

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteExportWizard.java

@@ -1,5 +1,3 @@
-package org.eclipse.rse.internal.importexport.files;
-
 /*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
@@ -9,14 +7,17 @@ package org.eclipse.rse.internal.importexport.files;
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  *******************************************************************************/
+package org.eclipse.rse.internal.importexport.files;
+
 import org.eclipse.core.resources.IResource;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.rse.internal.importexport.RemoteImportExportPlugin;
 import org.eclipse.rse.internal.importexport.SystemImportExportResources;
-import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.wizards.AbstractSystemWizard;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IExportWizard;
@@ -54,7 +55,7 @@ public class RemoteExportWizard extends AbstractSystemWizard implements IExportW
 	 * Creates a wizard for exporting workspace resources to the local file system.
 	 */
 	public RemoteExportWizard() {
-		IDialogSettings workbenchSettings = RSEUIPlugin.getDefault().getDialogSettings();
+		IDialogSettings workbenchSettings = RemoteImportExportPlugin.getDefault().getDialogSettings();
 		IDialogSettings section = workbenchSettings.getSection("RemoteExportWizard"); //$NON-NLS-1$
 		if (section == null) section = workbenchSettings.addNewSection("RemoteExportWizard"); //$NON-NLS-1$
 		setDialogSettings(section);
@@ -69,11 +70,10 @@ public class RemoteExportWizard extends AbstractSystemWizard implements IExportW
 	}
 
 	/**
-	 * Returns the image descriptor with the given relative path.
+	 * Returns the image descriptor with the given key.
 	 */
-	private ImageDescriptor getImageDescriptor(String relativePath) {
-		String iconPath = "icons/full/"; //$NON-NLS-1$
-		return RSEUIPlugin.getDefault().getPluginImage(iconPath + relativePath);
+	private ImageDescriptor getImageDescriptor(String key) {
+		return RemoteImportExportPlugin.getDefault().getImageDescriptor(key);
 	}
 
 	/* (non-Javadoc)
@@ -94,7 +94,7 @@ public class RemoteExportWizard extends AbstractSystemWizard implements IExportW
 		}
 		setInitializeFromExportData(false);
 		setWindowTitle(SystemImportExportResources.RESID_FILEEXPORT_TITLE);
-		setDefaultPageImageDescriptor(getImageDescriptor("wizban/export_wiz.gif")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(getImageDescriptor(RemoteImportExportPlugin.ICON_EXPORTWIZARD_ID));
 		setNeedsProgressMonitor(true);
 	}
 
@@ -103,7 +103,7 @@ public class RemoteExportWizard extends AbstractSystemWizard implements IExportW
 		this.exportData = exportData;
 		setInitializeFromExportData(true);
 		setWindowTitle(SystemImportExportResources.RESID_FILEEXPORT_TITLE);
-		setDefaultPageImageDescriptor(getImageDescriptor("wizban/export_wiz.gif")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(getImageDescriptor(RemoteImportExportPlugin.ICON_EXPORTWIZARD_ID));
 		setNeedsProgressMonitor(true);
 	}
 

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteExportWizardPage1.java

@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport.files;
 
@@ -31,6 +32,7 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.rse.core.SystemBasePlugin;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.files.ui.actions.SystemSelectRemoteFolderAction;
+import org.eclipse.rse.internal.importexport.RemoteImportExportPlugin;
 import org.eclipse.rse.internal.importexport.RemoteImportExportResources;
 import org.eclipse.rse.internal.importexport.RemoteImportExportUtil;
 import org.eclipse.rse.internal.importexport.SystemImportExportResources;
@@ -136,13 +138,13 @@ class RemoteExportWizardPage1 extends WizardExportResourcesPage implements Liste
 		if (helpId != null) {
 			SystemWidgetHelpers.setHelp(parentComposite, helpId);
 		} else {
-			SystemWidgetHelpers.setHelp(parentComposite, RSEUIPlugin.HELPPREFIX + "import_context"); //$NON-NLS-1$
+			SystemWidgetHelpers.setHelp(parentComposite, RemoteImportExportPlugin.HELPPREFIX + "import_context"); //$NON-NLS-1$
 		}
 		setControl(parentComposite);
 		//		super.createControl(parent);
 		//		parentComposite = parent;
 		//		giveFocusToDestination();
-		//		SystemWidgetHelpers.setHelp(getControl(), RSEUIPlugin.HELPPREFIX + "export_context");
+		//		SystemWidgetHelpers.setHelp(getControl(), RemoteImportExportPlugin.HELPPREFIX + "export_context");
 		//		Control c = getControl();
 		//		if (c instanceof Composite)
 		//		{

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileExportActionDelegate.java

@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport.files;
 
@@ -23,6 +24,7 @@ import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.internal.importexport.RemoteImportExportPlugin;
 import org.eclipse.rse.internal.importexport.RemoteImportExportProblemDialog;
 import org.eclipse.rse.internal.importexport.RemoteImportExportResources;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -52,7 +54,7 @@ public class RemoteFileExportActionDelegate extends RemoteFileImportExportAction
 		} else {
 			message = RemoteImportExportResources.IMPORT_EXPORT_ERROR_CREATE_FILE_FAILED;
 		}
-		MultiStatus readStatus = new MultiStatus(RSEUIPlugin.getDefault().getSymbolicName(), 0, message, null);
+		MultiStatus readStatus = new MultiStatus(RemoteImportExportPlugin.getDefault().getSymbolicName(), 0, message, null);
 		RemoteFileExportData[] exportDatas = readExportDatas(descriptions, readStatus);
 		if (exportDatas.length > 0) {
 			IStatus status = export(exportDatas);
@@ -65,7 +67,7 @@ public class RemoteFileExportActionDelegate extends RemoteFileImportExportAction
 				message = status.getMessage();
 			}
 			// create new status because we want another message - no API to set message
-			mergedStatus = new MultiStatus(RSEUIPlugin.getDefault().getSymbolicName(), status.getCode(), readStatus.getChildren(), message, null);
+			mergedStatus = new MultiStatus(RemoteImportExportPlugin.getDefault().getSymbolicName(), status.getCode(), readStatus.getChildren(), message, null);
 			mergedStatus.merge(status);
 		} else {
 			mergedStatus = readStatus;
@@ -130,10 +132,10 @@ public class RemoteFileExportActionDelegate extends RemoteFileImportExportAction
 				status = op.getStatus();
 			} catch (InvocationTargetException e) {
 				SystemBasePlugin.logError("Error occured trying to export", e); //$NON-NLS-1$
-				status = new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getBundle().getSymbolicName(), 0, "", e); //$NON-NLS-1$
+				status = new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getBundle().getSymbolicName(), 0, "", e); //$NON-NLS-1$
 			} catch (InterruptedException e) {
 				SystemBasePlugin.logError("Error occured trying to export", e); //$NON-NLS-1$
-				status = new Status(IStatus.OK, RSEUIPlugin.getDefault().getBundle().getSymbolicName(), 0, "", e); //$NON-NLS-1$
+				status = new Status(IStatus.OK, RemoteImportExportPlugin.getDefault().getBundle().getSymbolicName(), 0, "", e); //$NON-NLS-1$
 			}
 			if (!status.isOK()) {
 				SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_EXPORT_FAILED);

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileExportDescriptionReader.java

@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport.files;
 
@@ -30,7 +31,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.ui.RSEUIPlugin;
+import org.eclipse.rse.internal.importexport.RemoteImportExportPlugin;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -59,10 +60,10 @@ public class RemoteFileExportDescriptionReader implements IRemoteFileExportDescr
 			readXML(exportData);
 		} catch (IOException ex) {
 			String message = (ex.getLocalizedMessage() != null ? ex.getLocalizedMessage() : ""); //$NON-NLS-1$
-			throw new CoreException(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getSymbolicName(), 0, message, ex));
+			throw new CoreException(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getSymbolicName(), 0, message, ex));
 		} catch (SAXException ex) {
 			String message = (ex.getLocalizedMessage() != null ? ex.getLocalizedMessage() : ""); //$NON-NLS-1$
-			throw new CoreException(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getSymbolicName(), 0, message, ex));
+			throw new CoreException(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getSymbolicName(), 0, message, ex));
 		}
 	}
 
@@ -188,7 +189,7 @@ public class RemoteFileExportDescriptionReader implements IRemoteFileExportDescr
 				fInputStream.close();
 			} catch (IOException ex) {
 				String message = (ex.getLocalizedMessage() != null ? ex.getLocalizedMessage() : ""); //$NON-NLS-1$
-				throw new CoreException(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getSymbolicName(), 0, message, ex));
+				throw new CoreException(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getSymbolicName(), 0, message, ex));
 			}
 		}
 	}
@@ -197,6 +198,6 @@ public class RemoteFileExportDescriptionReader implements IRemoteFileExportDescr
 	 * @see org.eclipse.rse.internal.importexport.files.IRemoteFileExportDescriptionReader#getStatus()
 	 */
 	public IStatus getStatus() {
-		return new Status(IStatus.OK, RSEUIPlugin.getDefault().getSymbolicName(), 0, "", null); //$NON-NLS-1$
+		return new Status(IStatus.OK, RemoteImportExportPlugin.getDefault().getSymbolicName(), 0, "", null); //$NON-NLS-1$
 	}
 }

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileExportDescriptionWriter.java

@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport.files;
 
@@ -31,7 +32,7 @@ import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.rse.ui.RSEUIPlugin;
+import org.eclipse.rse.internal.importexport.RemoteImportExportPlugin;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -58,7 +59,7 @@ public class RemoteFileExportDescriptionWriter implements IRemoteFileExportDescr
 			writeXML(exportData);
 		} catch (IOException ex) {
 			String message = (ex.getLocalizedMessage() != null ? ex.getLocalizedMessage() : ""); //$NON-NLS-1$
-			throw new CoreException(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getSymbolicName(), 0, message, ex));
+			throw new CoreException(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getSymbolicName(), 0, message, ex));
 		}
 	}
 
@@ -155,7 +156,7 @@ public class RemoteFileExportDescriptionWriter implements IRemoteFileExportDescr
 				fOutputStream.close();
 			} catch (IOException ex) {
 				String message = (ex.getLocalizedMessage() != null ? ex.getLocalizedMessage() : ""); //$NON-NLS-1$
-				throw new CoreException(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getSymbolicName(), 0, message, ex));
+				throw new CoreException(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getSymbolicName(), 0, message, ex));
 			}
 		}
 	}
@@ -164,6 +165,6 @@ public class RemoteFileExportDescriptionWriter implements IRemoteFileExportDescr
 	 * @see org.eclipse.rse.internal.importexport.files.IRemoteFileExportDescriptionWriter#getStatus()
 	 */
 	public IStatus getStatus() {
-		return new Status(IStatus.OK, RSEUIPlugin.getDefault().getSymbolicName(), 0, "", null); //$NON-NLS-1$
+		return new Status(IStatus.OK, RemoteImportExportPlugin.getDefault().getSymbolicName(), 0, "", null); //$NON-NLS-1$
 	}
 }

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileExportOperation.java

@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport.files;
 
@@ -33,6 +34,7 @@ import org.eclipse.jface.operation.ModalContext;
 import org.eclipse.rse.core.SystemBasePlugin;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.files.ui.resources.SystemIFileProperties;
+import org.eclipse.rse.internal.importexport.RemoteImportExportPlugin;
 import org.eclipse.rse.internal.importexport.RemoteImportExportUtil;
 import org.eclipse.rse.internal.importexport.SystemImportExportResources;
 import org.eclipse.rse.services.files.RemoteFileIOException;
@@ -178,7 +180,7 @@ class RemoteFileExportOperation implements IRunnableWithProgress {
 				} catch (Exception e) {
 					String msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_EXPORT_ERROR, new Object[] { destination, e.getLocalizedMessage() == null ? e.toString() : e.getMessage(), e })
 							.toString();
-					errorTable.add(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getBundle().getSymbolicName(), 0, msg, e));
+					errorTable.add(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getBundle().getSymbolicName(), 0, msg, e));
 				}
 				try {
 					exportChildren(((IContainer) child).members(), destination);
@@ -188,7 +190,7 @@ class RemoteFileExportOperation implements IRunnableWithProgress {
 					// i.  this method is called recursively iterating over the result of #members,
 					//		which only answers existing children
 					// ii. there is an #isAccessible check done before #members is invoked
-					errorTable.add(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getBundle().getSymbolicName(), 0, e.getMessage(), e));
+					errorTable.add(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getBundle().getSymbolicName(), 0, e.getMessage(), e));
 					//errorTable.add(e.getStatus());
 				}
 			}
@@ -218,7 +220,7 @@ class RemoteFileExportOperation implements IRunnableWithProgress {
 				// Assume that communication has failed.  
 				String msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_EXPORT_ERROR,
 						new Object[] { fullPath, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_IMPORT_EXPORT_UNABLE_TO_USE_CONNECTION).getLevelOneText(), e }).toString();
-				errorTable.add(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getBundle().getSymbolicName(), 0, msg, e));
+				errorTable.add(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getBundle().getSymbolicName(), 0, msg, e));
 				throw e;
 			}
 		}
@@ -273,10 +275,10 @@ class RemoteFileExportOperation implements IRunnableWithProgress {
 			errorTable.add(new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, 0, msg, e));
 		} catch (RemoteFileIOException e) {
 			String msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_EXPORT_ERROR, new Object[] { fullPath, e.getLocalizedMessage(), e }).toString();
-			errorTable.add(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getBundle().getSymbolicName(), 0, msg, e));
+			errorTable.add(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getBundle().getSymbolicName(), 0, msg, e));
 		} catch (RemoteFileSecurityException e) {
 			String msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_EXPORT_ERROR, new Object[] { fullPath, e.getLocalizedMessage(), e }).toString();
-			errorTable.add(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getBundle().getSymbolicName(), 0, msg, e));
+			errorTable.add(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getBundle().getSymbolicName(), 0, msg, e));
 		} catch (Exception e) {
 			String msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_EXPORT_ERROR, new Object[] { fullPath, e.getLocalizedMessage(), e }).toString();
 			errorTable.add(new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, 0, msg, e));
@@ -427,7 +429,7 @@ class RemoteFileExportOperation implements IRunnableWithProgress {
 					errorTable.add(e.getStatus());
 				} catch (IOException e) {
 					SystemBasePlugin.logError("Error occured trying to save description " + descriptionFilePath, e); //$NON-NLS-1$
-					errorTable.add(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getSymbolicName(), 0, e.getLocalizedMessage(), e));
+					errorTable.add(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getSymbolicName(), 0, e.getLocalizedMessage(), e));
 				}
 			}
 		} finally {

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileImportActionDelegate.java

@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport.files;
 
@@ -23,6 +24,7 @@ import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.internal.importexport.RemoteImportExportPlugin;
 import org.eclipse.rse.internal.importexport.RemoteImportExportProblemDialog;
 import org.eclipse.rse.internal.importexport.RemoteImportExportResources;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -52,7 +54,7 @@ public class RemoteFileImportActionDelegate extends RemoteFileImportExportAction
 		} else {
 			message = RemoteImportExportResources.IMPORT_EXPORT_ERROR_CREATE_FILE_FAILED;
 		}
-		MultiStatus readStatus = new MultiStatus(RSEUIPlugin.getDefault().getSymbolicName(), 0, message, null);
+		MultiStatus readStatus = new MultiStatus(RemoteImportExportPlugin.getDefault().getSymbolicName(), 0, message, null);
 		RemoteFileImportData[] importDatas = readImportDatas(descriptions, readStatus);
 		if (importDatas.length > 0) {
 			IStatus status = importFiles(importDatas);
@@ -65,7 +67,7 @@ public class RemoteFileImportActionDelegate extends RemoteFileImportExportAction
 				message = status.getMessage();
 			}
 			// create new status because we want another message - no API to set message
-			mergedStatus = new MultiStatus(RSEUIPlugin.getDefault().getSymbolicName(), status.getCode(), readStatus.getChildren(), message, null);
+			mergedStatus = new MultiStatus(RemoteImportExportPlugin.getDefault().getSymbolicName(), status.getCode(), readStatus.getChildren(), message, null);
 			mergedStatus.merge(status);
 		} else {
 			mergedStatus = readStatus;
@@ -130,10 +132,10 @@ public class RemoteFileImportActionDelegate extends RemoteFileImportExportAction
 				status = op.getStatus();
 			} catch (InvocationTargetException e) {
 				SystemBasePlugin.logError("Error occured trying to import", e); //$NON-NLS-1$
-				status = new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getBundle().getSymbolicName(), 0, "", e); //$NON-NLS-1$
+				status = new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getBundle().getSymbolicName(), 0, "", e); //$NON-NLS-1$
 			} catch (InterruptedException e) {
 				SystemBasePlugin.logError("Error occured trying to import", e); //$NON-NLS-1$
-				status = new Status(IStatus.OK, RSEUIPlugin.getDefault().getBundle().getSymbolicName(), 0, "", e); //$NON-NLS-1$
+				status = new Status(IStatus.OK, RemoteImportExportPlugin.getDefault().getBundle().getSymbolicName(), 0, "", e); //$NON-NLS-1$
 			}
 			if (!status.isOK()) {
 				SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_IMPORT_FAILED);

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileImportDescriptionReader.java

@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport.files;
 
@@ -27,10 +28,10 @@ import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.internal.importexport.RemoteImportExportPlugin;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
-import org.eclipse.rse.ui.RSEUIPlugin;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -60,10 +61,10 @@ public class RemoteFileImportDescriptionReader implements IRemoteFileImportDescr
 			readXML(importData);
 		} catch (IOException ex) {
 			String message = (ex.getLocalizedMessage() != null ? ex.getLocalizedMessage() : ""); //$NON-NLS-1$
-			throw new CoreException(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getSymbolicName(), 0, message, ex));
+			throw new CoreException(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getSymbolicName(), 0, message, ex));
 		} catch (SAXException ex) {
 			String message = (ex.getLocalizedMessage() != null ? ex.getLocalizedMessage() : ""); //$NON-NLS-1$
-			throw new CoreException(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getSymbolicName(), 0, message, ex));
+			throw new CoreException(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getSymbolicName(), 0, message, ex));
 		}
 	}
 
@@ -179,7 +180,7 @@ public class RemoteFileImportDescriptionReader implements IRemoteFileImportDescr
 				subsystem = null;
 			} catch (IOException ex) {
 				String message = (ex.getLocalizedMessage() != null ? ex.getLocalizedMessage() : ""); //$NON-NLS-1$
-				throw new CoreException(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getSymbolicName(), 0, message, ex));
+				throw new CoreException(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getSymbolicName(), 0, message, ex));
 			}
 		}
 	}
@@ -188,6 +189,6 @@ public class RemoteFileImportDescriptionReader implements IRemoteFileImportDescr
 	 * @see org.eclipse.rse.internal.importexport.files.IRemoteFileImportDescriptionReader#getStatus()
 	 */
 	public IStatus getStatus() {
-		return new Status(IStatus.OK, RSEUIPlugin.getDefault().getSymbolicName(), 0, "", null); //$NON-NLS-1$
+		return new Status(IStatus.OK, RemoteImportExportPlugin.getDefault().getSymbolicName(), 0, "", null); //$NON-NLS-1$
 	}
 }

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileImportDescriptionWriter.java

@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport.files;
 
@@ -30,7 +31,7 @@ import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.rse.ui.RSEUIPlugin;
+import org.eclipse.rse.internal.importexport.RemoteImportExportPlugin;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -57,7 +58,7 @@ public class RemoteFileImportDescriptionWriter implements IRemoteFileImportDescr
 			writeXML(importData);
 		} catch (IOException ex) {
 			String message = (ex.getLocalizedMessage() != null ? ex.getLocalizedMessage() : ""); //$NON-NLS-1$
-			throw new CoreException(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getSymbolicName(), 0, message, ex));
+			throw new CoreException(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getSymbolicName(), 0, message, ex));
 		}
 	}
 
@@ -157,7 +158,7 @@ public class RemoteFileImportDescriptionWriter implements IRemoteFileImportDescr
 				fOutputStream.close();
 			} catch (IOException ex) {
 				String message = (ex.getLocalizedMessage() != null ? ex.getLocalizedMessage() : ""); //$NON-NLS-1$
-				throw new CoreException(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getSymbolicName(), 0, message, ex));
+				throw new CoreException(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getSymbolicName(), 0, message, ex));
 			}
 		}
 	}
@@ -166,6 +167,6 @@ public class RemoteFileImportDescriptionWriter implements IRemoteFileImportDescr
 	 * @see org.eclipse.rse.internal.importexport.files.IRemoteFileImportDescriptionWriter#getStatus()
 	 */
 	public IStatus getStatus() {
-		return new Status(IStatus.OK, RSEUIPlugin.getDefault().getSymbolicName(), 0, "", null); //$NON-NLS-1$
+		return new Status(IStatus.OK, RemoteImportExportPlugin.getDefault().getSymbolicName(), 0, "", null); //$NON-NLS-1$
 	}
 }

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileImportOperation.java

@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport.files;
 
@@ -34,6 +35,7 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.internal.importexport.RemoteImportExportPlugin;
 import org.eclipse.rse.internal.importexport.RemoteImportExportUtil;
 import org.eclipse.rse.internal.importexport.SystemImportExportResources;
 import org.eclipse.rse.services.files.RemoteFileIOException;
@@ -303,7 +305,7 @@ public class RemoteFileImportOperation extends WorkspaceModifyOperation {
 					errorTable.add(e.getStatus());
 				} catch (IOException e) {
 					SystemBasePlugin.logError("Error occured trying to save description " + descriptionFilePath, e); //$NON-NLS-1$
-					errorTable.add(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getSymbolicName(), 0, e.getLocalizedMessage(), e));
+					errorTable.add(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getSymbolicName(), 0, e.getLocalizedMessage(), e));
 				}
 			}
 		} catch (CoreException e) {
@@ -415,7 +417,7 @@ public class RemoteFileImportOperation extends WorkspaceModifyOperation {
 		errorTable.toArray(errors);
 		// IFS:
 		String msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_IMPORT_PROBLEMS).getLevelOneText();
-		return new MultiStatus(RSEUIPlugin.getDefault().getBundle().getSymbolicName(), IStatus.OK, errors, msg, null);
+		return new MultiStatus(RemoteImportExportPlugin.getDefault().getBundle().getSymbolicName(), IStatus.OK, errors, msg, null);
 	}
 
 	/**
@@ -446,7 +448,7 @@ public class RemoteFileImportOperation extends WorkspaceModifyOperation {
 		// Use Files for comparison to avoid platform specific case issues
 		if (targetPath != null && (targetPath.toFile().equals(new File(fileObjectPath)))) {
 			String msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_IMPORT_SELF, fileObjectPath).toString();
-			errorTable.add(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getBundle().getSymbolicName(), 0, msg, null));
+			errorTable.add(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getBundle().getSymbolicName(), 0, msg, null));
 			return;
 		}
 		if (!ensureTargetDoesNotExist(targetResource, policy)) {
@@ -474,15 +476,15 @@ public class RemoteFileImportOperation extends WorkspaceModifyOperation {
 			}
 		} catch (RemoteFileIOException e) {
 			String msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_IMPORT_ERROR, new Object[] { fileObjectPath, e.getRemoteException().getLocalizedMessage(), e }).toString();
-			errorTable.add(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getBundle().getSymbolicName(), 0, msg, e));
+			errorTable.add(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getBundle().getSymbolicName(), 0, msg, e));
 			return;
 		} catch (RemoteFileSecurityException e) {
 			String msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_IMPORT_ERROR, new Object[] { fileObjectPath, e.getRemoteException().getLocalizedMessage(), e }).toString();
-			errorTable.add(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getBundle().getSymbolicName(), 0, msg, e));
+			errorTable.add(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getBundle().getSymbolicName(), 0, msg, e));
 			return;
 		} catch (Exception e) {
 			String msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_IMPORT_ERROR, new Object[] { fileObjectPath, e.getMessage() == null ? e.toString() : e.getMessage(), e }).toString();
-			errorTable.add(new Status(IStatus.ERROR, RSEUIPlugin.getDefault().getBundle().getSymbolicName(), 0, msg, e));
+			errorTable.add(new Status(IStatus.ERROR, RemoteImportExportPlugin.getDefault().getBundle().getSymbolicName(), 0, msg, e));
 			return;
 		}
 	}
@@ -508,7 +510,7 @@ public class RemoteFileImportOperation extends WorkspaceModifyOperation {
 					// file systems root. Roots can't copied (at least not
 					// under windows).
 					String msg = RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_COPY_ROOT).toString();
-					errorTable.add(new Status(IStatus.INFO, RSEUIPlugin.getDefault().getBundle().getSymbolicName(), 0, msg, null));
+					errorTable.add(new Status(IStatus.INFO, RemoteImportExportPlugin.getDefault().getBundle().getSymbolicName(), 0, msg, null));
 					continue;
 				}
 				source = sourcePath.toFile();

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteImportWizard.java

@@ -1,5 +1,3 @@
-package org.eclipse.rse.internal.importexport.files;
-
 /*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
@@ -9,13 +7,16 @@ package org.eclipse.rse.internal.importexport.files;
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  *******************************************************************************/
+package org.eclipse.rse.internal.importexport.files;
+
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.rse.internal.importexport.RemoteImportExportPlugin;
 import org.eclipse.rse.internal.importexport.SystemImportExportResources;
-import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.wizards.AbstractSystemWizard;
 import org.eclipse.ui.IImportWizard;
 import org.eclipse.ui.IWorkbench;
@@ -55,7 +56,7 @@ public class RemoteImportWizard extends AbstractSystemWizard implements IImportW
 	 * the file system.
 	 */
 	public RemoteImportWizard() {
-		IDialogSettings workbenchSettings = RSEUIPlugin.getDefault().getDialogSettings();
+		IDialogSettings workbenchSettings = RemoteImportExportPlugin.getDefault().getDialogSettings();
 		IDialogSettings section = workbenchSettings.getSection("RemoteImportWizard"); //$NON-NLS-1$
 		if (section == null) section = workbenchSettings.addNewSection("RemoteImportWizard"); //$NON-NLS-1$
 		setDialogSettings(section);
@@ -70,11 +71,10 @@ public class RemoteImportWizard extends AbstractSystemWizard implements IImportW
 	}
 
 	/**
-	 * Returns the image descriptor with the given relative path.
+	 * Returns the image descriptor with the given key.
 	 */
-	private ImageDescriptor getImageDescriptor(String relativePath) {
-		String iconPath = "icons/full/"; //$NON-NLS-1$
-		return RSEUIPlugin.getDefault().getPluginImage(iconPath + relativePath);
+	private ImageDescriptor getImageDescriptor(String key) {
+		return RemoteImportExportPlugin.getDefault().getImageDescriptor(key);
 	}
 
 	/* (non-Javadoc)
@@ -84,7 +84,7 @@ public class RemoteImportWizard extends AbstractSystemWizard implements IImportW
 		this.workbench = workbench;
 		selection = currentSelection;
 		setWindowTitle(SystemImportExportResources.RESID_FILEIMPORT_TITLE);
-		setDefaultPageImageDescriptor(getImageDescriptor("wizban/import_wiz.gif")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(getImageDescriptor(RemoteImportExportPlugin.ICON_IMPORTWIZARD_ID));
 		setNeedsProgressMonitor(true);
 	}
 
@@ -94,7 +94,7 @@ public class RemoteImportWizard extends AbstractSystemWizard implements IImportW
 		this.importData = importData;
 		setInitializeFromImportData(true);
 		setWindowTitle(SystemImportExportResources.RESID_FILEIMPORT_TITLE);
-		setDefaultPageImageDescriptor(getImageDescriptor("wizban/import_wiz.gif")); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(getImageDescriptor(RemoteImportExportPlugin.ICON_IMPORTWIZARD_ID));
 		setNeedsProgressMonitor(true);
 	}
 

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteImportWizardPage1.java

@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport.files;
 
@@ -38,6 +39,7 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.rse.core.SystemBasePlugin;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.files.ui.actions.SystemSelectRemoteFolderAction;
+import org.eclipse.rse.internal.importexport.RemoteImportExportPlugin;
 import org.eclipse.rse.internal.importexport.RemoteImportExportResources;
 import org.eclipse.rse.internal.importexport.RemoteImportExportUtil;
 import org.eclipse.rse.internal.importexport.SystemImportExportResources;
@@ -242,10 +244,10 @@ class RemoteImportWizardPage1 extends WizardResourceImportPage implements Listen
 		if (helpId != null) {
 			SystemWidgetHelpers.setHelp(parentComposite, helpId);
 		} else {
-			SystemWidgetHelpers.setHelp(parentComposite, RSEUIPlugin.HELPPREFIX + "import_context"); //$NON-NLS-1$
+			SystemWidgetHelpers.setHelp(parentComposite, RemoteImportExportPlugin.HELPPREFIX + "import_context"); //$NON-NLS-1$
 		}
 		setControl(parentComposite);
-		//		SystemWidgetHelpers.setHelp(getControl(), RSEUIPlugin.HELPPREFIX + "import_context");
+		//		SystemWidgetHelpers.setHelp(getControl(), RemoteImportExportPlugin.HELPPREFIX + "import_context");
 		//		Control c = getControl();
 		//		if (c instanceof Composite)
 		//		{

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/Utilities.java

@@ -8,10 +8,12 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  * Martin Oberhuber (Wind River) - [180562][api] dont implement IRemoteImportExportConstants
+ * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport.files;
 
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.rse.core.RSECorePlugin;
 import org.eclipse.rse.core.SystemBasePlugin;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.internal.importexport.IRemoteImportExportConstants;
@@ -120,7 +122,7 @@ public class Utilities {
 	 * connectionName string.
 	 */
 	public static IHost getConnection(String profileName, String connectionName) {
-		IHost[] connections = RSEUIPlugin.getTheSystemRegistry().getHosts();
+		IHost[] connections = RSECorePlugin.getTheSystemRegistry().getHosts();
 		if (profileName != null) {
 			// given both profile and connection name...
 			for (int loop = 0; loop < connections.length; loop++) {

rse/plugins/org.eclipse.rse.ui/HelpContexts.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2006 IBM Corporation. All rights reserved.
+Copyright (c) 2006, 2007 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 http://www.eclipse.org/legal/epl-v10.html
@@ -12,7 +12,7 @@ Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
 Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
 
 Contributors:
-{Name} (company) - description of contribution.
+Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
 -->
 <?NLS TYPE="org.eclipse.help.contexts"?>
 <contexts>
@@ -22,18 +22,6 @@ Contributors:
 	<description>Click in the columns to change the enablement state or default user ID for a given system type. Disabled system types do not appear in the New Connection wizard. Default user IDs are used when connecting to a remote system of that type.</description>
 </context>
 
-<!-- Import wizard help -->
-<context id="import_context">
-	<description>Import files from a remote server to a project on your local workstation.</description>
-	<topic href="../org.eclipse.rse.doc.user/tasks/tremoimp.htm" label="Importing resources from a remote file system"/>
-</context>
-	
-<!-- Export wizard help -->
-<context id="export_context">
-	<description>Export files from your local workstation to a folder on a remote server.</description>
-	<topic href="../org.eclipse.rse.doc.user/tasks/tremoexp.htm" label="Exporting resources to a remote file system"/>
-</context>
-	
 <!-- PULLDOWN ACTION: New Connection action...   -->
 <context id="actn0000">
 <description>Open a wizard to create a new connection to a remote system.</description>

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemIconConstants.java

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation. All rights reserved.
+ * Copyright (c) 2000, 2007 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 http://www.eclipse.org/legal/epl-v10.html
@@ -12,6 +12,7 @@
  * 
  * Contributors:
  * Michael Berger (IBM) - 146339 Added refresh action graphic.
+ * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  ********************************************************************************/
 
 package org.eclipse.rse.ui;
@@ -331,10 +332,6 @@ public interface ISystemIconConstants
 	public static final String ICON_SYSTEM_WARNING_ID = PREFIX + ICON_SYSTEM_WARNING_ROOT + ICON_SUFFIX;
 	public static final String ICON_SYSTEM_WARNING    = ICON_OBJS_DIR + ICON_SYSTEM_WARNING_ROOT + ICON_EXT;		
 
-	public static final String ICON_SYSTEM_FAILED_ROOT = "systemfailed"; // not used yet //$NON-NLS-1$
-	public static final String ICON_SYSTEM_FAILED_ID = PREFIX + ICON_SYSTEM_FAILED_ROOT + ICON_SUFFIX;
-	public static final String ICON_SYSTEM_FAILED    = ICON_OBJS_DIR + ICON_SYSTEM_FAILED_ROOT + ICON_EXT;	
-	
 	public static final String ICON_SYSTEM_BLANK_ROOT = "systemblank"; // not used yet //$NON-NLS-1$
 	public static final String ICON_SYSTEM_BLANK_ID = PREFIX + ICON_SYSTEM_BLANK_ROOT + ICON_SUFFIX;
 	public static final String ICON_SYSTEM_BLANK    = ICON_OBJS_DIR + ICON_SYSTEM_BLANK_ROOT + ICON_EXT;