Attachment 74382 Details for Bug 193394 – Deleting parent of folder shown in table will no longer display error

[patch] Deleting parent of folder shown in table will no longer display error

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

on 2007-07-23 14:21:23 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Doyle

Created: 2007-07-23 14:21:23 EDT

Size: 6.19 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.ui
>Index: UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java,v
>retrieving revision 1.19
>diff -u -r1.19 SystemTableViewPart.java
>--- UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java	9 Jul 2007 20:43:48 -0000	1.19
>+++ UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java	23 Jul 2007 18:12:17 -0000
>@@ -20,6 +20,7 @@
>  * David McKnight (IBM) - [191288] Up To Action doesn't go all the way back to the connections
>  * Xuan Chen        (IBM)        - [192716] Refresh Error in Table View after Renaming folder shown in table
>  * Xuan Chen        (IBM)        - [194838] Move the code for comparing two objects by absolute name to a common location
>+ * Kevin Doyle (IBM) - [193394] After Deleting the folder shown in Table get an error
>  ********************************************************************************/
> 
> package org.eclipse.rse.internal.ui.view;
>@@ -28,7 +29,6 @@
> import java.net.URL;
> import java.util.ArrayList;
> import java.util.StringTokenizer;
>-import java.util.Vector;
> 
> import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.core.runtime.IProgressMonitor;
>@@ -66,6 +66,7 @@
> import org.eclipse.rse.core.model.ISystemProfile;
> import org.eclipse.rse.core.model.ISystemRegistry;
> import org.eclipse.rse.core.subsystems.ISubSystem;
>+import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter;
> import org.eclipse.rse.internal.ui.SystemPropertyResources;
> import org.eclipse.rse.internal.ui.SystemResources;
> import org.eclipse.rse.internal.ui.actions.SystemCommonDeleteAction;
>@@ -1266,7 +1267,10 @@
> 		selectionService.removeSelectionListener(this);
> 		_viewer.removeSelectionChangedListener(this);
> 
>-		RSECorePlugin.getTheSystemRegistry().removeSystemResourceChangeListener(this);
>+		ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
>+		registry.removeSystemRemoteChangeListener(this);
>+		registry.removeSystemResourceChangeListener(this);
>+	
> 		if (_viewer != null)
> 		{
> 			_viewer.dispose();
>@@ -1549,14 +1553,11 @@
> 	 case ISystemResourceChangeEvents.EVENT_DELETE:   	    	  
>   	  case ISystemResourceChangeEvents.EVENT_DELETE_MANY:
>   	  	{
>-  	      if (child instanceof ISystemFilterReference)
>-  	      {
>-  	          
>-  	          if (child == input)
>-  	          {
>-  	              removeFromHistory(input);
>-	    	  }
>-  	      }
>+  	  		Object[] multi = event.getMultiSource();
>+  	  		for (int i = 0; i < multi.length; i++) {
>+  	  			// Update the history to remove all references to object
>+  	  			removeFromHistory(multi[i]);
>+  	  		}
>   	  	}
>   	      break;  
>   	      default:
>@@ -1567,11 +1568,12 @@
> 	protected void removeFromHistory(Object c)
> 	{
> 	    // if the object is in history, remove it since it's been deleted
>+		// and remove all objects whose parent is the deleted object
> 	    for (int i = 0; i < _browseHistory.size(); i++)
> 	    {
> 	        HistoryItem hist = (HistoryItem)_browseHistory.get(i);
> 	        Object historyObj = hist.getObject();
>-	        if (historyObj == c || historyObj.equals(c))
>+	        if (historyObj == c || historyObj.equals(c) || isParentOf(c,historyObj))
> 	        {
> 	            _browseHistory.remove(hist);
> 	            if (_browsePosition >= i)
>@@ -1582,25 +1584,51 @@
> 	                    _browsePosition = 0;
> 	                }
> 	            }
>-	            if (hist == _currentItem)
>-	            {
>-	                if (_browseHistory.size() > 0)
>-	                {
>-	                    _currentItem = (HistoryItem)_browseHistory.get(_browsePosition);
>-	                    setInput(_currentItem.getObject(), null, false);
>-	                }
>-	                else
>-	                {
>-	                    _currentItem = null;
>-	                    setInput((IAdaptable)null, null, false);
>-	                }
>-	                
>-	               
>-	            }
>-	        }
>+	            // 	Since we are removing an item the size decreased by one so i
>+	            // needs to decrease by one or we will skip elements in _browseHistory
>+	            i--;
>+	        } 
> 	    }
>+	    
>+	    Object currentObject = _currentItem.getObject();
>+	    
>+	    // Update the input of the viewer to the closest item in the history
>+	    // that still exists if the current viewer item has been deleted.
>+	    if (c == currentObject || c.equals(currentObject) || isParentOf(c,currentObject))
>+        {
>+            if (_browseHistory.size() > 0)
>+            {
>+                _currentItem = (HistoryItem)_browseHistory.get(_browsePosition);
>+                setInput(_currentItem.getObject(), null, false);
>+            }
>+            else
>+            {
>+                _currentItem = null;
>+                setInput(RSECorePlugin.getTheSystemRegistry(), null, true);
>+            }
>+        }
>+	}
>+	
>+	protected boolean isParentOf(Object parent, Object child) {
>+		if (parent instanceof IAdaptable && child instanceof IAdaptable) {
>+			ISystemDragDropAdapter adapterParent = (ISystemDragDropAdapter) ((IAdaptable)parent).getAdapter(ISystemDragDropAdapter.class);
>+			ISystemDragDropAdapter adapterChild = (ISystemDragDropAdapter) ((IAdaptable)child).getAdapter(ISystemDragDropAdapter.class);
>+			// Check that both parent and child are from the same SubSystem
>+			if (adapterParent != null && adapterChild != null &&
>+					adapterParent.getSubSystem(parent) == adapterChild.getSubSystem(child)) {
>+				String parentAbsoluteName = adapterParent.getAbsoluteName(parent);  
>+				String childAbsoluteName = adapterChild.getAbsoluteName(child); 
>+				// Check if the child's absolute name starts with the parents absolute name
>+				// if it does then parent is the parent of child.
>+				if(childAbsoluteName != null && childAbsoluteName.startsWith(parentAbsoluteName)) {
>+					return true;
>+				}
>+			}
>+		}
>+		return false;
> 	}
> 	
>+	
> 	/**
> 	 * This is the method in your class that will be called when a remote resource
> 	 *  changes. You will be called after the resource is changed.

Flags:

mober.at+eclipse: iplog+

Actions: View | Diff

Attachments on bug 193394: 73369 | 74382