[tm-cvs-commit] dmcknight org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/

[Eclipse CVS Genie <genie@xxxxxxxxxxx>]

Update of /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view
In directory dev2:/tmp/cvs-serv10389/UI/org/eclipse/rse/internal/ui/view

Modified Files:
      Tag: R3_2_maintenance
	SystemView.java 
Log Message:
[380613] Problem in SystemView with disposed TreeItem when Link With Editor toolbar icon is used


Index: SystemView.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java,v
retrieving revision 1.197.2.11
retrieving revision 1.197.2.12
diff -C2 -d -r1.197.2.11 -r1.197.2.12
*** SystemView.java	4 Apr 2012 21:06:23 -0000	1.197.2.11
--- SystemView.java	28 May 2012 13:46:40 -0000	1.197.2.12
***************
*** 83,86 ****
--- 83,87 ----
   * David McKnight   (IBM)        - [372976] ClassCastException when SystemView assumes widget a TreeItem when it's a Tree
   * David Dykstal    (IBM)        - [257110] Prompting filter called twice on double click rather than just once
+  * David McKnight   (IBM)        - [380613] Problem in SystemView with disposed TreeItem when Link With Editor toolbar icon is used
   ********************************************************************************/
  
***************
*** 4601,4605 ****
  
  		Item match = mappedFindFirstRemoteItemReference(remoteObject);
! 		if (match != null)
  			return match;
  
--- 4602,4606 ----
  
  		Item match = mappedFindFirstRemoteItemReference(remoteObject);
! 		if (match != null && !match.isDisposed())
  			return match;
  
***************
*** 4776,4780 ****
  		Item match = mappedFindFirstRemoteItemReference(elementObject);
  
! 		for (int idx = 0; (match == null) && (idx < roots.length); idx++) {
  			//System.out.println("recursiveFindFirstRemoteItemReference(parentItem, remoteObjectName, remoteObject, subsystem)");
  			match = recursiveFindFirstRemoteItemReference(roots[idx], searchString, elementObject, subsystem);
--- 4777,4781 ----
  		Item match = mappedFindFirstRemoteItemReference(elementObject);
  
! 		for (int idx = 0; (match == null || match.isDisposed()) && (idx < roots.length); idx++) {
  			//System.out.println("recursiveFindFirstRemoteItemReference(parentItem, remoteObjectName, remoteObject, subsystem)");
  			match = recursiveFindFirstRemoteItemReference(roots[idx], searchString, elementObject, subsystem);
***************
*** 5802,5806 ****
  	public Object[] getElementNodes(Object element) {
  		Widget w = findItem(element);
! 		if ((w != null) && (w instanceof TreeItem)) return getElementNodes((TreeItem) w);
  		return null;
  	}
--- 5803,5807 ----
  	public Object[] getElementNodes(Object element) {
  		Widget w = findItem(element);
! 		if ((w != null) && (!w.isDisposed()) && (w instanceof TreeItem)) return getElementNodes((TreeItem) w);
  		return null;
  	}