[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[tm-cvs-commit] dmcknight org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources SystemEditableRemoteFile.java

Update of /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources
In directory dev1:/tmp/cvs-serv8523/src/org/eclipse/rse/files/ui/resources

Modified Files:
      Tag: R3_2_maintenance
	SystemEditableRemoteFile.java 
Log Message:
[359704] SystemEditableRemoteFile does not release reference to editor


Index: SystemEditableRemoteFile.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java,v
retrieving revision 1.70.2.2
retrieving revision 1.70.2.3
diff -C2 -d -r1.70.2.2 -r1.70.2.3
*** SystemEditableRemoteFile.java	1 Mar 2011 15:36:07 -0000	1.70.2.2
--- SystemEditableRemoteFile.java	4 Oct 2011 15:41:17 -0000	1.70.2.3
***************
*** 42,45 ****
--- 42,46 ----
   * David McKnight   (IBM)        - [324519] SystemEditableRemoteFile throws NPE when used in headless mode
   * David McKnight   (IBM)        - [334839] File Content Conflict is not handled properly
+  * David McKnight   (IBM)        - [359704] SystemEditableRemoteFile does not release reference to editor
   *******************************************************************************/
  
***************
*** 1760,1776 ****
  	public void partClosed(IWorkbenchPart part)
  	{
! 		/*
! 		        if (editor == part)
! 		        {
! 		            delete();
! 		        }
! 		*/
! 		SystemUniversalTempFileListener.getListener().unregisterEditedFile(this);
  
! 		IWorkbenchPage page = SystemBasePlugin.getActiveWorkbenchWindow().getActivePage();
  
! 		if (page != null)
! 		{
! 			page.removePartListener(this);
  		}
  	}
--- 1761,1776 ----
  	public void partClosed(IWorkbenchPart part)
  	{
! 		if (editor == part){
! 			//delete();
! 		      
! 			SystemUniversalTempFileListener.getListener().unregisterEditedFile(this);
  
! 			IWorkbenchPage page = SystemBasePlugin.getActiveWorkbenchWindow().getActivePage();
  
! 			if (page != null)
! 			{
! 				page.removePartListener(this);
! 				editor = null;
! 			}
  		}
  	}