Attachment 75681 Details for Bug 196582 – Updated to deprecate getRemoteObjectIdentifier

[patch] Updated to deprecate getRemoteObjectIdentifier

patch.txt (text/plain), 6.57 KB, created by Kevin Doyle

on 2007-08-08 11:38:01 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Doyle

Created: 2007-08-08 11:38:01 EDT

Size: 6.57 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.ui
>Index: UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java,v
>retrieving revision 1.10
>diff -u -r1.10 SystemCommonDeleteAction.java
>--- UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java	5 Jun 2007 00:07:25 -0000	1.10
>+++ UI/org/eclipse/rse/internal/ui/actions/SystemCommonDeleteAction.java	8 Aug 2007 14:44:57 -0000
>@@ -13,12 +13,13 @@
>  * Contributors:
>  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
>  * Kevin Doyle (IBM) - [188637] Handle the caught exception in DeleteJob.run when file fails to be deleted
>+ * Kevin Doyle (IBM) - [196582] ClassCastException when doing copy/paste with Remote Search view open
>  ********************************************************************************/
> 
> package org.eclipse.rse.internal.ui.actions;
>-import java.util.ArrayList;
> import java.util.Iterator;
> import java.util.List;
>+import java.util.Vector;
> 
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
>@@ -110,8 +111,8 @@
> 		public IStatus run(IProgressMonitor monitor)
> 		{
> 			boolean ok = true;
>-			List localDeletedObjects = new ArrayList();
>-			List remoteDeletedObjects = new ArrayList();
>+			List localDeletedObjects = new Vector();
>+			List remoteDeletedObjects = new Vector();
> 			
> 			// local delete is pretty straight-forward
> 			for (int l = 0; l < _localResources.size() && ok; l++)
>@@ -190,7 +191,7 @@
> 		setProcessAllSelections(true);
> 		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE);		
>   	    setHelp(RSEUIPlugin.HELPPREFIX+"actn0021"); //$NON-NLS-1$
>-  	    _setList = new ArrayList();
>+  	    _setList = new Vector();
> 	}
> 	
> 	/**
>@@ -280,7 +281,7 @@
> 			if (selection instanceof IStructuredSelection)
> 			{				
> 				// keep track of the current set
>-				List localSet = new ArrayList();
>+				List localSet = new Vector();
> 
> 				// divide up all objects to delete
> 				IStructuredSelection ssel = (IStructuredSelection)selection;
>Index: UI/org/eclipse/rse/internal/ui/view/SystemTableTreeView.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeView.java,v
>retrieving revision 1.15
>diff -u -r1.15 SystemTableTreeView.java
>--- UI/org/eclipse/rse/internal/ui/view/SystemTableTreeView.java	23 Jul 2007 19:28:37 -0000	1.15
>+++ UI/org/eclipse/rse/internal/ui/view/SystemTableTreeView.java	8 Aug 2007 14:44:57 -0000
>@@ -1428,8 +1428,8 @@
> 	}
> 
> 	/**
>-	 * Returns the implementation of ISystemRemoteElement for the given
>-	 * object.  Returns null if this object does not adaptable to this.
>+	 * Returns the implementation of ISystemRemoteElementAdapter for the given
>+	 * object.  Returns null if this object is not adaptable to this.
> 	 */
> 	protected ISystemRemoteElementAdapter getRemoteAdapter(Object o)
> 	{
>@@ -1445,7 +1445,10 @@
> 
> 	/**
> 	 * Returns the implementation of IRemoteObjectIdentifier for the given
>-	 * object.  Returns null if this object does not adaptable to this.
>+	 * object.  Returns null if this object is not adaptable to this.
>+	 * 
>+	 * @deprecated 	should use getViewAdapter(Object) as IRemoteObjectIdentifier
>+	 * 		is not defined in the adapter factories
> 	 */
> 	protected IRemoteObjectIdentifier getRemoteObjectIdentifier(Object o) 
> 	{
>Index: UI/org/eclipse/rse/internal/ui/view/SystemView.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java,v
>retrieving revision 1.145
>diff -u -r1.145 SystemView.java
>--- UI/org/eclipse/rse/internal/ui/view/SystemView.java	7 Aug 2007 10:09:30 -0000	1.145
>+++ UI/org/eclipse/rse/internal/ui/view/SystemView.java	8 Aug 2007 14:44:57 -0000
>@@ -1349,14 +1349,21 @@
> 		}
> 	}
> 
>+	/**
>+	 * Returns the implementation of IRemoteObjectIdentifier for the given
>+	 * object.  Returns null if this object is not adaptable to this.
>+	 *
>+	 * @deprecated 	should use getViewAdapter(Object) as IRemoteObjectIdentifier
>+	 * 		is not defined in the adapter factories
>+	 */
> 	protected IRemoteObjectIdentifier getRemoteObjectIdentifier(Object o) 
> 	{
> 		return (IRemoteObjectIdentifier)((IAdaptable)o).getAdapter(IRemoteObjectIdentifier.class);
> 	}
> 	
> 	/**
>-	 * Returns the implementation of IRemoteObjectIdentifier for the given
>-	 * object.  Returns null if this object does not adaptable to this.
>+	 * Returns the implementation of ISystemRemoteElementAdapter for the given
>+	 * object.  Returns null if this object is not adaptable to this.
> 	 */
> 	protected ISystemRemoteElementAdapter getRemoteAdapter(Object o) 
> 	{
>Index: UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java,v
>retrieving revision 1.6
>diff -u -r1.6 SystemMonitorViewPart.java
>--- UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java	20 Jul 2007 18:47:25 -0000	1.6
>+++ UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java	8 Aug 2007 14:44:58 -0000
>@@ -16,6 +16,7 @@
>  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
>  * Kevin Doyle (IBM) - [177587] Made MonitorViewPart a SelectionProvider
>  * Kevin Doyle (IBM) - [160378] Subset action should be disabled when there are no tabs in Monitor
>+ * Kevin Doyle (IBM) - [196582] ClassCastException when doing copy/paste
>  ********************************************************************************/
> 
> package org.eclipse.rse.internal.ui.view.monitor;
>@@ -926,11 +927,11 @@
> 		int eventType = event.getEventType();
> 		Object remoteResource = event.getResource();
> 	
>-		Vector remoteResourceNames = null;
>-		if (remoteResource instanceof Vector)
>+		java.util.List remoteResourceNames = null;
>+		if (remoteResource instanceof java.util.List)
> 		{
>-			remoteResourceNames = (Vector) remoteResource;
>-			remoteResource = remoteResourceNames.elementAt(0);
>+			remoteResourceNames = (java.util.List) remoteResource;
>+			remoteResource = remoteResourceNames.get(0);
> 		}
> 
> 		Object child = event.getResource();

Actions: View | Diff

Attachments on bug 196582: 74390 | 74471 | 75681 | 75712