[225506] [api][breaking] RSE UI leaks non-API types

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java

@@ -14,6 +14,7 @@
  * Kevin Doyle (IBM) - Added Double Click Listener that closes dialog on file double click
  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
  * Martin Oberhuber (Wind River) - [190442] made SystemActionViewerFilter API
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 package org.eclipse.rse.files.ui.dialogs;
@@ -23,9 +24,9 @@ import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
-import org.eclipse.rse.internal.ui.view.SystemView;
 import org.eclipse.rse.ui.SystemActionViewerFilter;
 import org.eclipse.rse.ui.dialogs.SystemRemoteResourceDialog;
+import org.eclipse.rse.ui.view.ISystemTree;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
@@ -70,7 +71,7 @@ public class SystemRemoteFileDialog extends SystemRemoteResourceDialog
 	protected Control createContents(Composite parent) 
 	{
 		Control control = super.createContents(parent);
-		_form.getSystemViewForm().getSystemView().addDoubleClickListener(new IDoubleClickListener() {
+		getSystemTree().addDoubleClickListener(new IDoubleClickListener() {
 			public void doubleClick(DoubleClickEvent event) {
 				handleDoubleClick(event);
 			}
@@ -84,12 +85,12 @@ public class SystemRemoteFileDialog extends SystemRemoteResourceDialog
 	 */
 	protected void handleDoubleClick(DoubleClickEvent event) 
 	{
-		SystemView tree = _form.getSystemViewForm().getSystemView();
+		ISystemTree tree = getSystemTree();
 		IStructuredSelection s = (IStructuredSelection) event.getSelection();
 		Object element = s.getFirstElement();
 		if (element == null)
 			return;
-		if (_form.isPageComplete() && !tree.isExpandable(element))
+		if (isPageComplete() && !tree.isExpandable(element))
 		{
 			setReturnCode(OK);
 			if (processOK())

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileSelectionInputProvider.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 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,15 +12,15 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.files.ui.dialogs;
 
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.ui.view.SystemResourceSelectionInputProvider;
 import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility;
+import org.eclipse.rse.ui.view.SystemResourceSelectionInputProvider;
 
 
 public class SystemRemoteFileSelectionInputProvider extends

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.java

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2008 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
@@ -13,6 +13,7 @@
  * Contributors:
  * Kevin Doyle (IBM) - Added a double click listener that closes the dialog if appropriate
  * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 package org.eclipse.rse.files.ui.dialogs;
@@ -26,13 +27,12 @@ import org.eclipse.rse.files.ui.ISystemAddFileListener;
 import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
 import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
 import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.view.SystemView;
-import org.eclipse.rse.internal.ui.view.SystemViewForm;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
 import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
+import org.eclipse.rse.ui.view.ISystemTree;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
@@ -402,14 +402,7 @@ public class SystemSelectRemoteFileOrFolderDialog
     {
     	return multipleSelectionMode;
     }
-    /**
+
-     * Return the embedded System Tree object.
-     * Will be null until createContents is called.
-     */
-    public SystemViewForm getSystemViewForm()
-    {
-    	return form.getSystemViewForm();
-    }
 
     // ------------------
     // PRIVATE METHODS...
@@ -421,7 +414,7 @@ public class SystemSelectRemoteFileOrFolderDialog
     protected Control createContents(Composite parent) 
 	{
     	Control control = super.createContents(parent);
-    	form.getSystemViewForm().getSystemView().addDoubleClickListener(new IDoubleClickListener() {
+    	form.getSystemTree().addDoubleClickListener(new IDoubleClickListener() {
 			public void doubleClick(DoubleClickEvent event) {
 				handleDoubleClick(event);
 			}
@@ -435,7 +428,7 @@ public class SystemSelectRemoteFileOrFolderDialog
 	 */
 	protected void handleDoubleClick(DoubleClickEvent event) 
 	{
-		SystemView tree = form.getSystemViewForm().getSystemView();
+		ISystemTree tree = form.getSystemTree();
 		IStructuredSelection s = (IStructuredSelection) event.getSelection();
 		Object element = s.getFirstElement();
 		if (element == null)
@@ -609,4 +602,6 @@ public class SystemSelectRemoteFileOrFolderDialog
 	        form.setAllowFolderSelection(allow);
 	    }
 	}
+	
+    
 }

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SaveAsForm.java

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2008 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
@@ -14,6 +14,7 @@
  * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin
  * David McKnight   (IBM)        - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
  * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 package org.eclipse.rse.files.ui.widgets;
@@ -209,7 +210,7 @@ public class SaveAsForm extends SystemSelectRemoteFileOrFolderForm {
 					if (fileNameText != null)
 					{	
 						// simulate the parent file being selected...
-						Object parentFile = tree.getSelectedParent();
+						Object parentFile = getSelectedParent();
 															    		
 						if (remoteFile.isFile())
 						{	

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemFileFilterStringEditPane.java

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2008 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
@@ -14,6 +14,7 @@
  * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin
  * David McKnight   (IBM)        - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
  * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 package org.eclipse.rse.files.ui.widgets;
@@ -33,6 +34,7 @@ import org.eclipse.rse.internal.files.ui.FileResources;
 import org.eclipse.rse.internal.files.ui.ISystemFileConstants;
 import org.eclipse.rse.internal.files.ui.actions.SystemSelectFileTypesAction;
 import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
+import org.eclipse.rse.internal.ui.actions.SystemTestFilterStringAction;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString;
@@ -43,7 +45,6 @@ import org.eclipse.rse.subsystems.files.core.util.ValidatorFileFilterString;
 import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
-import org.eclipse.rse.ui.actions.SystemTestFilterStringAction;
 import org.eclipse.rse.ui.filters.SystemFilterStringEditPane;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
 import org.eclipse.rse.ui.validators.ISystemValidator;
@@ -97,8 +98,8 @@ public class SystemFileFilterStringEditPane
 	protected RemoteFileSubSystemConfiguration inputSubsystemConfiguration = null;
 	
 	// actions
-	protected SystemTestFilterStringAction testAction = null;
+	private SystemTestFilterStringAction testAction = null;
-    protected SystemSelectFileTypesAction typesAction = null;
+    private SystemSelectFileTypesAction typesAction = null;
 
 	
 	/**
@@ -474,7 +475,7 @@ public class SystemFileFilterStringEditPane
 	/**
 	 * Get the action to run when "Select Types..." is pressed by the user
 	 */
-	protected SystemSelectFileTypesAction getSelectTypesAction()
+	private SystemSelectFileTypesAction getSelectTypesAction()
 	{
 		if (typesAction == null)
 		  typesAction = new SystemSelectFileTypesAction(selectTypesButton.getShell());

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java

@@ -14,6 +14,7 @@
  * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
  * David Dykstal (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 package org.eclipse.rse.files.ui.widgets;
@@ -54,6 +55,8 @@ import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
 import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
 import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
+import org.eclipse.rse.ui.view.ISystemSelectRemoteObjectAPIProvider;
+import org.eclipse.rse.ui.view.ISystemTree;
 import org.eclipse.rse.ui.view.SystemAdapterHelpers;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Point;
@@ -106,8 +109,8 @@ public class SystemSelectRemoteFileOrFolderForm
 	// GUI widgets
     protected Label                   verbiageLabel, spacer1, spacer2;
 	protected Text                    nameEntryValue;
-	protected SystemViewForm          tree;
+	private SystemViewForm          tree;
-    protected SystemPropertySheetForm ps;
+    private SystemPropertySheetForm ps;
 	protected ISystemMessageLine      msgLine;	
 	protected Composite               outerParent, ps_composite;	
 	// inputs
@@ -135,7 +138,7 @@ public class SystemSelectRemoteFileOrFolderForm
 	protected IHost outputConnection = null;
 	// state
 	//protected ResourceBundle rb;
-    protected SystemSelectRemoteObjectAPIProviderImpl inputProvider = null;
+    protected ISystemSelectRemoteObjectAPIProvider inputProvider = null;
     protected ISystemFilter preSelectFilter;
     protected String       preSelectFilterChild;
     protected boolean      preSelectRoot;
@@ -195,7 +198,7 @@ public class SystemSelectRemoteFileOrFolderForm
 	 * Returns the input provider that drives the contents of the tree
 	 * Subclasses can override to provide custom tree contents
 	 */
-	protected SystemSelectRemoteObjectAPIProviderImpl getInputProvider()
+	protected ISystemSelectRemoteObjectAPIProvider getInputProvider()
 	{
 		if (inputProvider == null)
 		{
@@ -568,14 +571,6 @@ public class SystemSelectRemoteFileOrFolderForm
     	return outputConnection;
     }
 
-    /**
-     * Return the embedded System Tree object.
-     * Will be null until createContents is called.
-     */
-    public SystemViewForm getSystemViewForm()
-    {
-    	return tree;
-    }
 	
     /**
      * Return the multiple selection mode current setting
@@ -753,7 +748,7 @@ public class SystemSelectRemoteFileOrFolderForm
 		  //tree.setToolTipText(treeTip); //EXTREMELY ANNOYING!
 		if (autoExpandDepth != 0)
 		{
-		  tree.getSystemView().setAutoExpandLevel(autoExpandDepth);
+		  tree.getSystemTree().setAutoExpandLevel(autoExpandDepth);
 		  tree.reset(inputProvider);
 		}
 
@@ -803,7 +798,7 @@ public class SystemSelectRemoteFileOrFolderForm
      */
     protected IHost internalGetConnection()
     {
-    	Object parent = tree.getSystemView().getRootParent();
+    	Object parent = tree.getSystemTree().getRootParent();
     	if (parent instanceof IHost)
     	{
     		return (IHost)parent;
@@ -1058,4 +1053,18 @@ public class SystemSelectRemoteFileOrFolderForm
 	public void setAllowFolderSelection(boolean allow) {
 	    allowFolderSelection = allow;
 	}
+	
+	/**
+	 * Returns the system tree
+	 * @return the system tree
+	 */
+	public ISystemTree getSystemTree()
+	{
+		return tree.getSystemTree();
+	}
+	
+	public Object getSelectedParent()
+	{
+		return tree.getSelectedParent();
+	}
 }

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFilesForm.java

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -14,6 +14,7 @@
  * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
  * David McKnight   (IBM)        - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
  * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 package org.eclipse.rse.files.ui.widgets;
@@ -511,7 +512,7 @@ public class SystemSelectRemoteFilesForm extends Composite
 	/**
 	 * Get the action to run when "Select Types..." is pressed by the user
 	 */
-	protected SystemSelectFileTypesAction getSelectTypesAction()
+	private SystemSelectFileTypesAction getSelectTypesAction()
 	{
 		if (typesAction == null)
 		  typesAction = new SystemSelectFileTypesAction(getShell());

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemSelectFileTypesAction.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.internal.files.ui.actions;

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchRemoteFolderForm.java

@@ -1,18 +1,19 @@
 /********************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation. All rights reserved. 
+ * Copyright (c) 2006, 2008 IBM Corporation. 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
  * 
  * Contributors:
  * Kushal Munir (IBM) - initial API and implementation.
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 package org.eclipse.rse.internal.files.ui.search;
 
 import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
-import org.eclipse.rse.internal.ui.view.SystemSelectRemoteObjectAPIProviderImpl;
 import org.eclipse.rse.subsystems.files.core.model.ISystemFileRemoteTypes;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
+import org.eclipse.rse.ui.view.ISystemSelectRemoteObjectAPIProvider;
 
 /**
  * The selection form to use is search selection dialogs.
@@ -32,7 +33,7 @@ public class SystemSearchRemoteFolderForm extends SystemSelectRemoteFileOrFolder
 	 * Returns an instance of the search input provider {@link SystemSearchRemoteObjectAPIProvider}
 	 * @see org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm#getInputProvider()
 	 */
-	protected SystemSelectRemoteObjectAPIProviderImpl getInputProvider() {
+	protected ISystemSelectRemoteObjectAPIProvider getInputProvider() {
 		
 		if (inputProvider == null) {
 		    // create the input provider that drives the contents of the tree

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchSelectFileTypesAction.java

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation. All rights reserved.
+ * Copyright (c) 2006, 2008 IBM Corporation. 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
@@ -11,7 +11,7 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 

rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileAPIProviderImpl.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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
@@ -14,6 +14,7 @@
  * Contributors:
  * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.internal.subsystems.files.core;
@@ -21,9 +22,9 @@ import org.eclipse.rse.core.RSECorePlugin;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.ui.view.SystemAbstractAPIProvider;
 import org.eclipse.rse.subsystems.files.core.model.ISystemFileAPIProvider;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
+import org.eclipse.rse.ui.view.SystemAbstractAPIProvider;
 
 
 /**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterNewFilterPoolAction.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.internal.ui.actions;
@@ -22,17 +22,17 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
 import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
 import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider;
 import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs;
 import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterNewFilterPoolWizard;
 import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardDialog;
-import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardInterface;
 import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterWorkWithFilterPoolsDialog;
 import org.eclipse.rse.ui.ISystemContextMenuConstants;
 import org.eclipse.rse.ui.ISystemIconConstants;
 import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.actions.ISystemWizardAction;
 import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
 import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolWizardAction;
+import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardInterface;
 import org.eclipse.swt.widgets.Shell;
 
 

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterSelectFilterPoolsAction.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.internal.ui.actions;
@@ -24,12 +24,12 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
 import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
 import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider;
 import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface;
 import org.eclipse.rse.ui.ISystemContextMenuConstants;
 import org.eclipse.rse.ui.ISystemIconConstants;
 import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
 import org.eclipse.rse.ui.dialogs.SystemSimpleSelectDialog;
+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface;
 import org.eclipse.rse.ui.filters.SystemFilterUIHelpers;
 import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
 import org.eclipse.swt.widgets.Shell;

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemFilterWorkWithFilterPoolsAction.java

@@ -14,6 +14,7 @@
  * Contributors:
  * David Dykstal (IBM) - [194268] action now assumes the first filter pool manager is selected if there was no selection
  *                       provided by the caller.
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types                    
  *******************************************************************************/
 
 package org.eclipse.rse.internal.ui.actions;
@@ -21,13 +22,13 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
 import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider;
 import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface;
 import org.eclipse.rse.internal.ui.filters.SystemFilterPoolManagerUIProvider;
 import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterWorkWithFilterPoolsDialog;
 import org.eclipse.rse.ui.ISystemContextMenuConstants;
 import org.eclipse.rse.ui.ISystemIconConstants;
 import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface;
 import org.eclipse.rse.ui.filters.SystemFilterUIHelpers;
 import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
 import org.eclipse.rse.ui.validators.ValidatorFilterPoolName;

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemResolveFilterStringAction.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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,14 +12,13 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.internal.ui.actions;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.internal.ui.dialogs.SystemResolveFilterStringDialog;
-import org.eclipse.rse.ui.actions.SystemTestFilterStringAction;
 import org.eclipse.swt.widgets.Shell;
 
 
@@ -61,9 +60,7 @@ public class SystemResolveFilterStringAction extends SystemTestFilterStringActio
 	 */
 	protected Dialog createDialog(Shell shell)
 	{
-	  dlg = new SystemResolveFilterStringDialog(shell, subsystem, filterString);
+	  return new SystemResolveFilterStringDialog(shell, subsystem, filterString);
-
-	  return dlg;
 	} // end createDialog()
 	
 	/**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemTestFilterStringAction.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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,14 +12,15 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
-package org.eclipse.rse.ui.actions;
+package org.eclipse.rse.internal.ui.actions;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.internal.ui.SystemResources;
 import org.eclipse.rse.internal.ui.dialogs.SystemTestFilterStringDialog;
+import org.eclipse.rse.ui.actions.SystemBaseDialogAction;
 import org.eclipse.swt.widgets.Shell;
 
 
@@ -32,8 +33,6 @@ public class SystemTestFilterStringAction extends SystemBaseDialogAction
 	
 	protected ISubSystem subsystem;
 	protected String filterString;
-	protected SystemTestFilterStringDialog dlg;
-
 	
 	/**
 	 * Constructor when input subsystem and filter string are known already
@@ -84,13 +83,7 @@ public class SystemTestFilterStringAction extends SystemBaseDialogAction
 	 */
 	protected Dialog createDialog(Shell shell)
 	{
-		//if (dlg == null) // I hoped to reduce memory requirements by re-using but doesn't work. Phil
+		return new SystemTestFilterStringDialog(shell, subsystem, filterString);
-		  dlg = new SystemTestFilterStringDialog(shell, subsystem, filterString);
-		//else
-		//{
-		  //dlg.reset(subsystem, filterString);
-		//}
-		return dlg;
 	}
 	
 	/**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemControlEnableState.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.internal.ui.dialogs;

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemResolveFilterStringDialog.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.internal.ui.dialogs;

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemTestFilterStringDialog.java

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2008 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
@@ -13,6 +13,7 @@
  * Contributors:
  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
  * Martin Oberhuber (Wind River) - [175680] Deprecate obsolete ISystemRegistry methods
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 package org.eclipse.rse.internal.ui.dialogs;

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizard.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 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)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.internal.ui.filters.dialogs;
@@ -21,12 +21,13 @@ import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.rse.core.filters.ISystemFilterPool;
 import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
 import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.ui.ISystemIconConstants;
 import org.eclipse.rse.ui.ISystemMessages;
 import org.eclipse.rse.ui.RSEUIPlugin;
+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
 import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
+import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardInterface;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
 import org.eclipse.rse.ui.validators.ValidatorFolderName;
 import org.eclipse.rse.ui.wizards.AbstractSystemWizard;

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardDefaultMainPage.java

@@ -12,16 +12,16 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.internal.ui.filters.dialogs;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
 import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
 import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
 import org.eclipse.rse.ui.validators.ISystemValidator;
 import org.eclipse.rse.ui.validators.ValidatorFilterPoolName;

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterNewFilterPoolWizardMainPageInterface.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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,13 +12,13 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.internal.ui.filters.dialogs;
 
 import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs;
+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
 import org.eclipse.rse.ui.validators.ISystemValidator;
 import org.eclipse.rse.ui.wizards.ISystemWizardPage;
 

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterPoolWizardDialog.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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,14 +12,15 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.internal.ui.filters.dialogs;
-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface;
-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs;
 import org.eclipse.rse.ui.dialogs.SystemWizardDialog;
+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface;
+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
 import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
+import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardInterface;
 import org.eclipse.swt.widgets.Shell;
 
 

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java

@@ -16,6 +16,7 @@
  * David Dykstal (IBM) - [197036] fixed delete filter pool bug found during testing of this bug
  *                                see also bug 194260 regarding deleting filter pools
  * David Dykstal (IBM) - [194268] fixed initial selection and new action selection
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.internal.ui.filters.dialogs;
@@ -43,8 +44,6 @@ import org.eclipse.rse.internal.ui.actions.SystemFilterCopyFilterPoolAction;
 import org.eclipse.rse.internal.ui.actions.SystemFilterMoveFilterPoolAction;
 import org.eclipse.rse.internal.ui.actions.SystemFilterNewFilterPoolAction;
 import org.eclipse.rse.internal.ui.actions.SystemFilterWorkWithFilterPoolsRefreshAllAction;
-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface;
-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogOutputs;
 import org.eclipse.rse.internal.ui.filters.SystemFilterPoolManagerUIProvider;
 import org.eclipse.rse.internal.ui.filters.SystemFilterWorkWithFilterPoolsTreeViewer;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -58,6 +57,8 @@ import org.eclipse.rse.ui.actions.ISystemAction;
 import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
 import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
 import org.eclipse.rse.ui.dialogs.SystemSimpleContentProvider;
+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface;
+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogOutputs;
 import org.eclipse.rse.ui.filters.SystemFilterUIHelpers;
 import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/filters/dialogs/SystemNewFilterWizardNamePage.java

@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David Dykstal (IBM) - [160403] filters should be connection private by default
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.internal.ui.filters.dialogs;

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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
@@ -13,11 +13,13 @@
  * 
  * Contributors:
  * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.internal.ui.view;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.model.ISystemViewInputProvider;
+import org.eclipse.rse.ui.view.SystemAbstractAPIProvider;
 
 
 /**

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2006, 2008 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
@@ -16,6 +16,7 @@
  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
  * Martin Oberhuber (Wind River) - [190442] made SystemActionViewerFilter API
  * Martin Oberhuber (Wind River) - [202866] Fix exceptions in RSE browse dialog when SystemRegistry is not yet fully initialized
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 package org.eclipse.rse.internal.ui.view;
@@ -43,8 +44,10 @@ import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
 import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
 import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
+import org.eclipse.rse.ui.view.ISystemTree;
 import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
 import org.eclipse.rse.ui.view.SystemAdapterHelpers;
+import org.eclipse.rse.ui.view.SystemResourceSelectionInputProvider;
 import org.eclipse.rse.ui.widgets.SystemHostCombo;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -69,7 +72,7 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener
 	private SystemHostCombo _connectionCombo;
 	private SystemViewForm _systemViewForm;
 	private Composite _propertySheetContainer;
-    protected SystemPropertySheetForm _ps;
+    private SystemPropertySheetForm _ps;
 	
 	private Text _pathText;
 	private boolean _isValid;
@@ -139,9 +142,9 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener
      * Return the embedded System Tree object.
      * Will be null until createControls is called.
      */
-    public SystemViewForm getSystemViewForm()
+    public ISystemTree getSystemTree()
     {
-    	return _systemViewForm;
+    	return _systemViewForm.getSystemTree();
     }
     
 	public void createControls(Composite parent)
@@ -243,7 +246,7 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener
 	{
 		if (filter != null)
 		{
-			_systemViewForm.getSystemView().addFilter(filter);
+			_systemViewForm.getSystemTree().addFilter(filter);
 		}
 	}
     
@@ -340,11 +343,11 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener
 			}
 			List filterRefs = registry.findFilterReferencesFor(selection, ss, false);
 			
-			SystemView systemView = _systemViewForm.getSystemView();
+			ISystemTree systemTree = _systemViewForm.getSystemTree();
 			if (filterRefs.size() > 0)
 			{
 				ISystemFilterReference ref = (ISystemFilterReference)filterRefs.get(0);
-				systemView.expandTo(ref, selection);
+				systemTree.expandTo(ref, selection);
 
 				return true;
 			}
@@ -352,7 +355,7 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener
 			{
 				if (setPreSelection(parent))
 				{
-					systemView.expandTo(parent, selection);
+					systemTree.expandTo(parent, selection);
 					return true;
 				}				
 			}

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

@@ -18,6 +18,7 @@
  * Tobias Schwarz   (Wind River) - [173267] "empty list" should not be displayed 
  * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core
  * David Dykstal (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 package org.eclipse.rse.internal.ui.view;
@@ -29,14 +30,15 @@ import org.eclipse.rse.core.filters.ISystemFilterReference;
 import org.eclipse.rse.core.filters.ISystemFilterStringReference;
 import org.eclipse.rse.core.filters.SystemFilterUtil;
 import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemViewInputProvider;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.rse.ui.internal.model.SystemNewConnectionPromptObject;
 import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
+import org.eclipse.rse.ui.view.ISystemSelectRemoteObjectAPIProvider;
 import org.eclipse.rse.ui.view.ISystemSelectRemoteObjectAPIProviderCaller;
 import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
+import org.eclipse.rse.ui.view.SystemAbstractAPIProvider;
 import org.eclipse.rse.ui.view.SystemAdapterHelpers;
 import org.eclipse.swt.widgets.Shell;
 
@@ -53,7 +55,7 @@ import org.eclipse.swt.widgets.Shell;
  */
 public class SystemSelectRemoteObjectAPIProviderImpl 
        extends SystemAbstractAPIProvider
-       implements ISystemViewInputProvider
+       implements ISystemSelectRemoteObjectAPIProvider
  {
 
 

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation. All rights reserved.
+ * Copyright (c) 2004, 2008 IBM Corporation. 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
@@ -20,11 +20,12 @@ import java.util.HashMap;
 
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.rse.ui.SystemPreferencesManager;
+import org.eclipse.rse.ui.view.ISystemTableViewColumnManager;
 import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
 
 
-public class SystemTableViewColumnManager
+public class SystemTableViewColumnManager implements ISystemTableViewColumnManager
 {
     private Viewer _viewer;
 	protected HashMap _descriptorCache;

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

@@ -30,6 +30,7 @@
  * David McKnight   (IBM)        - [224313] [api] Create RSE Events for MOVE and COPY holding both source and destination fields
  * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  * Xuan Chen        (IBM)        - [225685] NPE when running archive testcases
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API type
  ********************************************************************************/
 
 package org.eclipse.rse.internal.ui.view;
@@ -96,6 +97,7 @@ import org.eclipse.rse.ui.dialogs.SystemSelectAnythingDialog;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
 import org.eclipse.rse.ui.model.ISystemShellProvider;
 import org.eclipse.rse.ui.view.IRSEViewPart;
+import org.eclipse.rse.ui.view.ISystemTableViewColumnManager;
 import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
 import org.eclipse.rse.ui.view.SystemTableView;
 import org.eclipse.rse.ui.view.SystemTableViewProvider;
@@ -807,7 +809,7 @@ public class SystemTableViewPart extends ViewPart
 	    class SelectColumnsDialog extends SystemPromptDialog
 		{
 	        private ISystemViewElementAdapter _adapter;
-	        private SystemTableViewColumnManager _columnManager;
+	        private ISystemTableViewColumnManager _columnManager;
 			private IPropertyDescriptor[] _uniqueDescriptors;
 			private ArrayList _currentDisplayedDescriptors;
 			private ArrayList _availableDescriptors;
@@ -821,7 +823,7 @@ public class SystemTableViewPart extends ViewPart
 			private Button _downButton;
 			
 
-			public SelectColumnsDialog(Shell shell, ISystemViewElementAdapter viewAdapter, SystemTableViewColumnManager columnManager)
+			public SelectColumnsDialog(Shell shell, ISystemViewElementAdapter viewAdapter, ISystemTableViewColumnManager columnManager)
 			{
 				super(shell, SystemResources.RESID_TABLE_SELECT_COLUMNS_LABEL);
 				setToolTipText(SystemResources.RESID_TABLE_SELECT_COLUMNS_TOOLTIP);
@@ -1093,7 +1095,7 @@ public class SystemTableViewPart extends ViewPart
 		}
 		public void run()
 		{
-		    SystemTableViewColumnManager mgr = _viewer.getColumnManager();		    
+		    ISystemTableViewColumnManager mgr = _viewer.getColumnManager();		    
 		    ISystemViewElementAdapter adapter = _viewer.getAdapterForContents();
 		    SelectColumnsDialog dlg = new SelectColumnsDialog(getShell(), adapter, mgr);
 		    if (dlg.open() == Window.OK)

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2008 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
@@ -14,6 +14,7 @@
  * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
  * Tobias Schwarz   (Wind River) - [173267] "empty list" should not be displayed 
  * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 package org.eclipse.rse.internal.ui.view;
@@ -22,6 +23,7 @@ import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.model.ISystemViewInputProvider;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.ui.SystemBasePlugin;
+import org.eclipse.rse.ui.view.SystemAbstractAPIProvider;
 
 
 /**

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2008 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,11 +12,13 @@
  * 
  * Contributors:
  * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 package org.eclipse.rse.internal.ui.view;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.rse.core.model.IHost;
+import org.eclipse.rse.ui.view.SystemAbstractAPIProvider;
 
 /**
  * This class is a provider of root nodes to the remote systems tree viewer part.

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.internal.ui.view;
@@ -20,6 +20,7 @@ import org.eclipse.rse.core.filters.ISystemFilterPool;
 import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.subsystems.ISubSystem;
+import org.eclipse.rse.ui.view.SystemAbstractAPIProvider;
 
 
 /**

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

@@ -14,6 +14,7 @@
  * Contributors:
  * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
  * Tobias Schwarz   (Wind River) - [173267] "empty list" should not be displayed 
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.internal.ui.view;
@@ -30,6 +31,7 @@ import org.eclipse.rse.core.model.SystemMessageObject;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.ui.ISystemMessages;
 import org.eclipse.rse.ui.RSEUIPlugin;
+import org.eclipse.rse.ui.view.SystemAbstractAPIProvider;
 
 
 /**

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

@@ -18,6 +18,7 @@
  * Tobias Schwarz   (Wind River) - [173267] "empty list" should not be displayed 
  * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core
  * Martin Oberhuber (Wind River) - [218524][api] Remove deprecated ISystemViewInputProvider#getShell()
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 package org.eclipse.rse.internal.ui.view;
@@ -41,6 +42,7 @@ import org.eclipse.rse.ui.ISystemMessages;
 import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.rse.ui.subsystems.ISubSystemConfigurationAdapter;
+import org.eclipse.rse.ui.view.SystemAbstractAPIProvider;
 
 
 

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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,12 +12,13 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.internal.ui.view;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.subsystems.ISubSystem;
+import org.eclipse.rse.ui.view.SystemAbstractAPIProvider;
 
 
 /**

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2006, 2008 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
@@ -14,6 +14,7 @@
  * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
  * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core
  * Xuan Chen        (IBM)        - [222263] Need to provide a PropertySet Adapter for System Team View
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 package org.eclipse.rse.internal.ui.view;
@@ -164,16 +165,5 @@ public class SystemViewAdapterFactory implements IAdapterFactory {
 		return adapter;
 	}
 
-	/**
+
-	 * Because we use singletons for our adapters, it is possible to speed up 
-	 * access to them by simply returning them from here.
-	 * <p>
-	 * This method returns the RSE adapter for profile objects
-	 * @return SystemViewProfileAdapter
-	 * 
-	 * @deprecated Call getAdapter(...) directly with a <code>ISystemProfile</code>. instance as adaptable object.
-	 */
-	public SystemTeamViewProfileAdapter getProfileAdapter() {
-		return profileAdapter;
-	}
 }

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2008 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
@@ -14,6 +14,7 @@
  * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
  * David McKnight (IBM) - [192704] work around drag&drop issues from Project Explorer
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 package org.eclipse.rse.internal.ui.view;
@@ -114,7 +115,7 @@ extends ViewerDropAdapter
 		for (int i = 0;i < tokens.length; i++)
 		{
 			String srcStr = tokens[i];
-			if (srcStr.equals("org.eclipse.ui.navigator.ProjectExplorer"))
+			if (srcStr.equals("org.eclipse.ui.navigator.ProjectExplorer")) //$NON-NLS-1$
 			{
 				return true;
 			}

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

@@ -15,12 +15,14 @@
  * Kevin Doyle (IBM) - [187553] - Removed code and related methods for toolbar/button bar.
  * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core
  * David McKnight    (IBM)   - [187711] select SystemView APIs exposed by the ISystemTree interface
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 package org.eclipse.rse.internal.ui.view;
 import java.util.List;
 import java.util.Vector;
 
 import org.eclipse.jface.action.ToolBarManager;
+import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.ViewerFilter;
@@ -149,7 +151,7 @@ public class SystemViewForm extends Composite implements  ISystemTree
 	/**
 	 * Return the system view tree viewer
 	 */
-	public SystemView getSystemView()
+	public ISystemTree getSystemTree()
 	{
 		return tree;
 	}
@@ -515,4 +517,26 @@ public class SystemViewForm extends Composite implements  ISystemTree
 			ISystemFilter filter) {
 		return tree.revealAndExpand(parentSubSystem, filter);
 	}
+	public void addDoubleClickListener(IDoubleClickListener listener) {
+		tree.addDoubleClickListener(listener);
+	}
+	public void addFilter(ViewerFilter filter) {
+		tree.addFilter(filter);
+		
+	}
+	public void expandTo(Object parentObject, Object remoteObject) {
+		tree.expandTo(parentObject, remoteObject);
+		
+	}
+	public void expandTo(String filterString) {
+		tree.expandTo(filterString);
+		
+	}
+	public boolean isExpandable(Object elementOrTreePath) {
+		return tree.isExpandable(elementOrTreePath);
+	}
+	public void setAutoExpandLevel(int level) {
+		tree.setAutoExpandLevel(level);
+	}
+	
 }

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java

@@ -19,6 +19,7 @@
  * Kevin Doyle (IBM) - [196582] ClassCastException when doing copy/paste
  * Kevin Doyle		(IBM)		 - [212940] Duplicate Help Context Identifiers
  * David McKnight   (IBM)        - [223103] [cleanup] fix broken externalized strings
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 package org.eclipse.rse.internal.ui.view.monitor;
@@ -49,7 +50,6 @@ import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.internal.ui.SystemPropertyResources;
 import org.eclipse.rse.internal.ui.SystemResources;
 import org.eclipse.rse.internal.ui.view.SystemTableTreeViewProvider;
-import org.eclipse.rse.internal.ui.view.SystemTableViewColumnManager;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.ui.ISystemIconConstants;
 import org.eclipse.rse.ui.RSEUIPlugin;
@@ -58,6 +58,7 @@ import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
 import org.eclipse.rse.ui.model.ISystemShellProvider;
 import org.eclipse.rse.ui.view.IRSEViewPart;
+import org.eclipse.rse.ui.view.ISystemTableViewColumnManager;
 import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
 import org.eclipse.rse.ui.view.SystemTableView;
 import org.eclipse.swt.SWT;
@@ -311,7 +312,7 @@ class SubSetAction extends BrowseAction
 	    class SelectColumnsDialog extends SystemPromptDialog
 		{
 	        private ISystemViewElementAdapter _adapter;
-	        private SystemTableViewColumnManager _columnManager;
+	        private ISystemTableViewColumnManager _columnManager;
 			private IPropertyDescriptor[] _uniqueDescriptors;
 			private ArrayList _currentDisplayedDescriptors;
 			private ArrayList _availableDescriptors;
@@ -325,7 +326,7 @@ class SubSetAction extends BrowseAction
 			private Button _downButton;
 			
 
-			public SelectColumnsDialog(Shell shell, ISystemViewElementAdapter viewAdapter, SystemTableViewColumnManager columnManager)
+			public SelectColumnsDialog(Shell shell, ISystemViewElementAdapter viewAdapter, ISystemTableViewColumnManager columnManager)
 			{
 				super(shell, SystemResources.RESID_TABLE_SELECT_COLUMNS_LABEL);
 				setToolTipText(SystemResources.RESID_TABLE_SELECT_COLUMNS_TOOLTIP);
@@ -600,7 +601,7 @@ class SubSetAction extends BrowseAction
 		public void run()
 		{
 			SystemTableView viewer = getViewer();
-		    SystemTableViewColumnManager mgr = viewer.getColumnManager();		    
+		    ISystemTableViewColumnManager mgr = viewer.getColumnManager();		    
 		    ISystemViewElementAdapter adapter = viewer.getAdapterForContents();
 		    SelectColumnsDialog dlg = new SelectColumnsDialog(getShell(), adapter, mgr);
 		    if (dlg.open() == Window.OK)

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPart.java

@@ -715,6 +715,7 @@ public class SystemTeamViewPart
 	 */
 	private SystemTeamViewProfileAdapter getProfileAdapter(ISystemProfile profile) {
 		RSEUIPlugin plugin = RSEUIPlugin.getDefault();
+		
 		IAdapterFactory factory = plugin.getSystemViewAdapterFactory();
 		SystemTeamViewProfileAdapter adapter = (SystemTeamViewProfileAdapter) factory.getAdapter(profile, SystemTeamViewProfileAdapter.class);
 		return adapter;

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewPropertySetAdapter.java

@@ -6,6 +6,7 @@
  * 
  * Contributors:
  * Xuan Chen (IBM) - [222263] initial contribution.
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API type
  *********************************************************************************/
 
 package org.eclipse.rse.internal.ui.view.team;
@@ -242,7 +243,7 @@ public class SystemTeamViewPropertySetAdapter
 	public String getMementoHandleKey(Object element)
 	{
 		SystemTeamViewPropertySetNode factory = (SystemTeamViewPropertySetNode)element;	
-		return  factory.getLabel(); //$NON-NLS-1$  
+		return  factory.getLabel(); 
 	}
 
 	/**

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

@@ -31,6 +31,7 @@
  * David Dykstal (IBM) - [197036] formatted the initialize job to be able to read it                     
  * Martin Oberhuber (Wind River) - [215820] Move SystemRegistry implementation to Core
  * David Dykstal (IBM) - [197167] adding notification and waiting for RSE model
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 package org.eclipse.rse.ui;
@@ -38,6 +39,7 @@ package org.eclipse.rse.ui;
 import java.net.URL;
 import java.util.Vector;
 
+import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.core.runtime.IAdapterManager;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.jobs.Job;
@@ -417,7 +419,7 @@ public class RSEUIPlugin extends SystemBasePlugin
      * For fastpath access to our adapters for non-local objects in our model.
      * Exploits the knowledge we use singleton adapters.
      */
-    public SystemViewAdapterFactory getSystemViewAdapterFactory()
+    public IAdapterFactory getSystemViewAdapterFactory()
     {
     	return svaf;
     }

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseSubMenuAction.java

@@ -42,7 +42,7 @@ public abstract class SystemBaseSubMenuAction
 
 {
 	
-    protected SystemSubMenuManager subMenu = null;
+    private SystemSubMenuManager subMenu = null;
     protected String actionLabel;
     protected String menuID;
     protected boolean createMenuEachTime = true;

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java

@@ -16,6 +16,7 @@
  * Martin Oberhuber (Wind River) - [190442] made SystemActionViewerFilter API
  * Kevin Doyle (IBM) - [198114] Allowed to move file into existing folder/archive on first attempt
  * Xuan Chen (IBM) - [220999] [api] Need to change class SystemSelectRemoteFileAction to use SystemRemoteFileDialog
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.ui.dialogs;
@@ -23,10 +24,11 @@ package org.eclipse.rse.ui.dialogs;
 import org.eclipse.rse.core.IRSESystemType;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.internal.ui.view.SystemResourceSelectionForm;
-import org.eclipse.rse.internal.ui.view.SystemResourceSelectionInputProvider;
 import org.eclipse.rse.ui.SystemActionViewerFilter;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
 import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
+import org.eclipse.rse.ui.view.ISystemTree;
+import org.eclipse.rse.ui.view.SystemResourceSelectionInputProvider;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
@@ -34,7 +36,7 @@ import org.eclipse.swt.widgets.Shell;
 
 public abstract class SystemRemoteResourceDialog extends SystemPromptDialog
 {
-	protected SystemResourceSelectionForm	_form;
+	private SystemResourceSelectionForm	_form;
 	private SystemResourceSelectionInputProvider _inputProvider;
 	private Object _preSelection;
 	private IValidatorRemoteSelection _selectionValidator;
@@ -276,6 +278,24 @@ public abstract class SystemRemoteResourceDialog extends SystemPromptDialog
 		return true;
 	}	
 	
+	/**
+	 * Returns the system tree
+	 * @return the system tree
+	 */
+	public ISystemTree getSystemTree()
+	{
+		return _form.getSystemTree();
+	}
+    
+	/**
+	 * Indicates whether the page for the form is complete or not.
+	 * @return true if the page associated with the form is complete
+	 */
+	public boolean isPageComplete()
+	{
+		return _form.isPageComplete();
+	}
+	
 	public abstract SystemActionViewerFilter getViewerFilter();
 	public abstract String getVerbiage();
 	public abstract String getTreeTip();

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectAnythingDialog.java

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2008 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
@@ -14,6 +14,7 @@
  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
  * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core
  * David McKnight   (IBM)        - [187543] added setViewerFilter() method
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 package org.eclipse.rse.ui.dialogs;
@@ -48,10 +49,10 @@ public class SystemSelectAnythingDialog extends SystemPromptDialog
 	{
 		
 		_view = new SystemViewForm(getShell(), parent, SWT.NONE, getInputProvider(), true, this); 
-		_view.getSystemView().addSelectionChangedListener(this);	
+		_view.getSystemTree().addSelectionChangedListener(this);	
 		
 		if (_filter != null){
-			_view.getSystemView().addFilter(_filter);
+			_view.getSystemTree().addFilter(_filter);
 		}
 		
 		return _view.getTreeControl();
@@ -104,7 +105,7 @@ public class SystemSelectAnythingDialog extends SystemPromptDialog
 		_filter = filter;
 		if (_view != null)
 		{
-			_view.getSystemView().addFilter(filter);
+			_view.getSystemTree().addFilter(filter);
 		}
 
 	}

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogInputs.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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,10 +12,10 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
-package org.eclipse.rse.internal.ui.filters;
+package org.eclipse.rse.ui.filters;
 //import org.eclipse.rse.core.*;
 import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
 import org.eclipse.rse.core.filters.ISystemFilterPoolManagerProvider;

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogInterface.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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,10 +12,10 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
-package org.eclipse.rse.internal.ui.filters;
+package org.eclipse.rse.ui.filters;
 import org.eclipse.rse.ui.filters.actions.SystemFilterAbstractFilterPoolAction;
 
 

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterPoolDialogOutputs.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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,10 +12,10 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
-package org.eclipse.rse.internal.ui.filters;
+package org.eclipse.rse.ui.filters;
 //import org.eclipse.rse.core.*;
 import org.eclipse.rse.core.filters.ISystemFilterPool;
 import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterAbstractFilterPoolAction.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.ui.filters.actions;
@@ -30,10 +30,10 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManagerProvider;
 import org.eclipse.rse.core.filters.ISystemFilterReference;
 import org.eclipse.rse.core.filters.ISystemFilterString;
 import org.eclipse.rse.core.filters.ISystemFilterStringReference;
-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInputs;
-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface;
 import org.eclipse.rse.ui.actions.SystemBaseDialogAction;
 import org.eclipse.rse.ui.dialogs.SystemSimpleContentElement;
+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInputs;
+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface;
 import org.eclipse.swt.widgets.Shell;
 
 
@@ -466,6 +466,7 @@ public abstract class SystemFilterAbstractFilterPoolAction
 	/**
 	 * Where you create the dialog meeting our interface. If you override
 	 * createDialog, then override this to return null
+	 * @since 3.0
 	 */
 	public abstract SystemFilterPoolDialogInterface createFilterPoolDialog(Shell parent);
 

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterAbstractFilterPoolWizardAction.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.ui.filters.actions;
@@ -20,10 +20,10 @@ package org.eclipse.rse.ui.filters.actions;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface;
 import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardDialog;
-import org.eclipse.rse.internal.ui.filters.dialogs.SystemFilterPoolWizardInterface;
 import org.eclipse.rse.ui.ISystemContextMenuConstants;
+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface;
+import org.eclipse.rse.ui.filters.dialogs.SystemFilterPoolWizardInterface;
 import org.eclipse.swt.widgets.Shell;
 
 
@@ -82,6 +82,7 @@ public abstract class SystemFilterAbstractFilterPoolWizardAction
 
 	/**
 	 * Return the wizard so we can customize it prior to showing it.
+	 * @since 3.0
 	 */
 	public abstract SystemFilterPoolWizardInterface getFilterPoolWizard();
 

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterPoolWizardInterface.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2008 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,11 +12,11 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
-package org.eclipse.rse.internal.ui.filters.dialogs;
+package org.eclipse.rse.ui.filters.dialogs;
-import org.eclipse.rse.internal.ui.filters.SystemFilterPoolDialogInterface;
+import org.eclipse.rse.ui.filters.SystemFilterPoolDialogInterface;
 import org.eclipse.rse.ui.wizards.ISystemWizard;
 
 /**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java

@@ -14,6 +14,7 @@
  * Contributors:
  * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin
  * David Dykstal (IBM) - [222270] clean up interfaces in org.eclipse.rse.core.filters
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.ui.filters.dialogs;
@@ -77,7 +78,7 @@ public class SystemNewFilterWizard
 	    extends AbstractSystemWizard 
 {
 	protected SystemNewFilterWizardMainPage mainPage;	
-	protected SystemNewFilterWizardNamePage namePage;	
+	private SystemNewFilterWizardNamePage namePage;	
 	protected SystemNewFilterWizardInfoPage infoPage;	
 	protected ISystemFilterContainer         filterContainer;
 	protected ISystemFilterPool              parentPool;
@@ -326,12 +327,10 @@ public class SystemNewFilterWizard
 	    return mainPage;
 	}
 	/**
-	 * Extendable point for child classes. You don't need to override typically though.
-	 * <p>
 	 * By default, this page uses the wizard page title as set in setWizardPageTitle(...) or the constructor.
 	 * @return the wizard page prompting for the filter name and parent filter pool
 	 */
-	protected SystemNewFilterWizardNamePage createNamePage()
+	private SystemNewFilterWizardNamePage createNamePage()
 	{
 		namePage = new SystemNewFilterWizardNamePage(this, parentPool, configurator);
 	    return namePage;

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

@@ -0,0 +1,98 @@
+/********************************************************************************
+ * Copyright (c) 2008 IBM Corporation. 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.
+ * 
+ * Contributors:
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
+ ********************************************************************************/
+package org.eclipse.rse.ui.view;
+
+import org.eclipse.rse.core.IRSESystemType;
+import org.eclipse.rse.core.filters.ISystemFilter;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.rse.core.model.ISystemViewInputProvider;
+
+public interface ISystemSelectRemoteObjectAPIProvider 
+		extends ISystemViewInputProvider
+{
+	/**
+	 * This method is called by the connection adapter when the user expands
+	 *  a connection. This method must return the child objects to show for that
+	 *  connection.
+	 */
+	public Object[] getConnectionChildren(IHost selectedConnection);
+	
+	/**
+	 * Get the name of the item to select when the first filter is expanded.
+	 * Called by the filter adapter.
+	 */
+	public String getPreSelectFilterChild();
+	
+	/**
+	 * Get the actual object of the item to select when the first filter is expanded.
+	 * Called by the GUI form after expansion, so it can select this object
+	 */
+	public Object getPreSelectFilterChildObject();
+	
+	/**
+	 * Set the filter string to use to resolve the inputs. 
+	 * If this is an absolute filter string, it gets turned into a quick filter string,
+	 *  so that the user sees it and can expand it. If it is a relative filter string 
+	 *  to apply to all expansions, it is used to decorate all filtering as the user drills down.
+	 */
+	public void setFilterString(String string);
+	
+	/**
+	 * Set actual child object of the first filter to preselect. Called
+	 * by the filter adapter once the children are resolved and a match on
+	 * the name is found.
+	 */
+	public void setPreSelectFilterChildObject(Object obj);
+
+	/**
+	 * Set child of the first filter to preselect 
+	 */
+	public void setPreSelectFilterChild(String name);
+	
+	/**
+	 * Set the quick filters to be exposed to the user. These will be shown to the
+	 *  user when they expand a connection.
+	 * @see org.eclipse.rse.core.filters.SystemFilterSimple
+	 */
+	public void setQuickFilters(ISystemFilter[] filters);
+
+	
+	/**
+	 * Specify whether the user should see the "New Connection..." special connection prompt
+	 */
+	public void setShowNewConnectionPrompt(boolean show);
+	
+	
+	/** 
+	 * Default or Restrict to a specific connection.
+	 * If default mode, it is preselected.
+	 * If only mode, it is the only connection listed.
+	 * @param connection The connection to default or restrict to
+	 * @param onlyMode true if this is to be the only connection shown in the list
+	 */
+	public void setSystemConnection(IHost connection, boolean onlyMode);
+
+
+	/**
+	 * Specify system types to restrict what types of connections
+	 * the user can create, and see.
+	 * This will override subsystemConfigurationId,if that has been set!
+	 * 
+     * @param systemTypes An array of system types, or
+     *     <code>null</code> to allow all registered valid system types.
+     *     A system type is valid if at least one subsystem configuration
+     *     is registered against it.
+	 */
+	public void setSystemTypes(IRSESystemType[] systemTypes);
+}

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

@@ -0,0 +1,23 @@
+/********************************************************************************
+ * Copyright (c) 2008 IBM Corporation. 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.
+ * 
+ * Contributors:
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
+ ********************************************************************************/
+package org.eclipse.rse.ui.view;
+
+import org.eclipse.ui.views.properties.IPropertyDescriptor;
+
+public interface ISystemTableViewColumnManager {
+
+	public IPropertyDescriptor[] getVisibleDescriptors(ISystemViewElementAdapter adapter);
+	
+	public void setCustomDescriptors(ISystemViewElementAdapter adapter, IPropertyDescriptor[] descriptors);
+}

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

@@ -13,12 +13,16 @@
  * 
  * Contributors:
  * David McKnight    (IBM)   - [187711] Select SystemView APIs exposed by the ISystemTree interface
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  *******************************************************************************/
 
 package org.eclipse.rse.ui.view;
 
 import java.util.List;
 
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.rse.core.filters.ISystemFilter;
 import org.eclipse.rse.core.filters.ISystemFilterReference;
 import org.eclipse.rse.core.subsystems.ISubSystem;
@@ -179,5 +183,56 @@ public interface ISystemTree {
 	 */
 	public List findAllRemoteItemReferences(Object element, Object elementObject, List matches);
 	
+	/**
+	 * Sets the auto expand level for the corresponding tree
+	 * @param level the level to expand
+	 * @since 3.0
+	 */
+	public void setAutoExpandLevel(int level);
+	
+	/**
+	 * Adds a double-click listener
+	 * @param listener the listener to add
+	 * @since 3.0
+	 */
+	public void addDoubleClickListener(IDoubleClickListener listener);
+	
+	/**
+	 * Checks whether the element is expandable or not
+	 * @param elementOrTreePath the object to expand
+	 * @return whether the item is expandable
+	 * @since 3.0
+	 */
+	public boolean isExpandable(Object elementOrTreePath);
+
+	/**
+	 * Expands the parent object down to the remote object
+	 * @param parentObject the parent object
+	 * @param remoteObject the child object
+	 * @since 3.0
+	 */
+	public void expandTo(Object parentObject, Object remoteObject);
+	
+	/**
+	 * Expand to the object specified by the filter string
+	 * @param filterString the string represending the object to expand to
+	 * @since 3.0
+	 */
+	public void expandTo(String filterString);
+	
+	/**
+	 * Adds a view filter
+	 * @param filter the view filter
+	 * @since 3.0
+	 */
+	public void addFilter(ViewerFilter filter);
+	
+
+	/**
+	 * Adds a selection changed listener
+	 * @param listener the listener
+	 * @since 3.0
+	 */
+	public void addSelectionChangedListener(ISelectionChangedListener listener);
 
 }

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

@@ -15,9 +15,10 @@
  * Tobias Schwarz   (Wind River) - [173267] "empty list" should not be displayed 
  * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core
  * Martin Oberhuber (Wind River) - [218524][api] Remove deprecated ISystemViewInputProvider#getShell()
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
-package org.eclipse.rse.internal.ui.view;
+package org.eclipse.rse.ui.view;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Preferences;
 import org.eclipse.jface.viewers.Viewer;
@@ -29,10 +30,6 @@ import org.eclipse.rse.core.model.SystemMessageObject;
 import org.eclipse.rse.ui.ISystemMessages;
 import org.eclipse.rse.ui.ISystemPreferencesConstants;
 import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
-import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
-import org.eclipse.rse.ui.view.SystemAdapterHelpers;
-import org.eclipse.swt.widgets.Shell;
 
 
 

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2004, 2008 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
@@ -14,9 +14,10 @@
  * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
  * Martin Oberhuber (Wind River) - [202866] Fix exceptions in RSE browse dialog when SystemRegistry is not yet fully initialized
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
-package org.eclipse.rse.internal.ui.view;
+package org.eclipse.rse.ui.view;
 import org.eclipse.rse.core.IRSESystemType;
 import org.eclipse.rse.core.RSECorePlugin;
 import org.eclipse.rse.core.model.IHost;

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2008 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
@@ -487,7 +487,7 @@ public class SystemTableView
 			return new IPropertyDescriptor[0];
 	}
 
-	public SystemTableViewColumnManager getColumnManager()
+	public ISystemTableViewColumnManager getColumnManager()
 	{
 	    return _columnManager;
 	}
@@ -1406,7 +1406,7 @@ public class SystemTableView
 	 * Get the common "Open to->" action for opening a new Remote System Explorer view,
 	 *  scoped to the currently selected object.
 	 */
-	protected SystemOpenExplorerPerspectiveAction getOpenToPerspectiveAction()
+	private SystemOpenExplorerPerspectiveAction getOpenToPerspectiveAction()
 	{
 		if (_openToPerspectiveAction == null)
 		{
@@ -1419,7 +1419,7 @@ public class SystemTableView
 		return _openToPerspectiveAction;
 	}
 
-	protected SystemShowInTableAction getShowInTableAction()
+	private SystemShowInTableAction getShowInTableAction()
 	{
 		if (_showInTableAction == null)
 		{

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

@@ -38,7 +38,6 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.rse.core.filters.ISystemFilterReference;
 import org.eclipse.rse.core.model.ISystemContainer;
 import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.ui.view.SystemTableViewColumnManager;
 import org.eclipse.rse.internal.ui.view.SystemViewPromptableAdapter;
 import org.eclipse.rse.internal.ui.view.SystemViewRootInputAdapter;
 import org.eclipse.swt.graphics.Image;
@@ -69,14 +68,14 @@ public class SystemTableViewProvider implements ILabelProvider, ITableLabelProvi
 	 * Maps ImageDescriptor->Image.
 	 */
 	private Map imageTable = new Hashtable(40);
-	private SystemTableViewColumnManager _columnManager;
+	private ISystemTableViewColumnManager _columnManager;
 	private HashMap cache;
 	/**
 	 * Constructor for table view provider where a column manager is present.
 	 * In this case, the columns are customizable by the user.
 	 * @param columnManager
 	 */
-	public SystemTableViewProvider(SystemTableViewColumnManager columnManager)
+	public SystemTableViewProvider(ISystemTableViewColumnManager columnManager)
 	{
 		super();
 		_columnManager= columnManager;

rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java

@@ -32,6 +32,7 @@
  * David McKnight   (IBM)        - [220309] [nls] Some GenericMessages and SubSystemResources should move from UI to Core
  * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  * Xuan Chen        (IBM)        - [223126] [api][breaking] Remove API related to User Actions in RSE Core/UI
+ * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  ********************************************************************************/
 
 package org.eclipse.rse.core.subsystems;
@@ -58,6 +59,7 @@ import org.eclipse.rse.core.filters.ISystemFilterPool;
 import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
 import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
 import org.eclipse.rse.core.filters.ISystemFilterPoolReferenceManager;
+import org.eclipse.rse.core.filters.ISystemFilterPoolWrapperInformation;
 import org.eclipse.rse.core.filters.ISystemFilterString;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.model.ILabeledObject;
@@ -1414,7 +1416,7 @@ public abstract class SubSystemConfiguration  implements ISubSystemConfiguration
 	 * Overridable entry for child classes to supply their own flavour of ISystemFilterPoolWrapperInformation for
 	 *  the new filter wizards.
 	 */
-	protected SystemFilterPoolWrapperInformation getNewFilterWizardPoolWrapperInformation()
+	protected ISystemFilterPoolWrapperInformation getNewFilterWizardPoolWrapperInformation()
 	{
 		return new SystemFilterPoolWrapperInformation(SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_LABEL, SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_TOOLTIP, 
 				SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_VERBIAGE);