[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-serv6556/src/org/eclipse/rse/files/ui/resources

Modified Files:
	SystemEditableRemoteFile.java 
Log Message:
[385420] double-click to open System editor from Remote Systems view not working


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.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** SystemEditableRemoteFile.java	25 Apr 2012 15:38:52 -0000	1.79
--- SystemEditableRemoteFile.java	19 Jul 2012 20:29:18 -0000	1.80
***************
*** 47,50 ****
--- 47,51 ----
   * Rick Sawyer      (IBM)        - [376535] RSE does not respect editor overrides
   * David McKnight   (IBM)        - [357111] [DSTORE]File with invalid characters can't be opened in editor
+  * David McKnight   (IBM)        - [385420] double-click to open System editor from Remote Systems view not working
   *******************************************************************************/
  
***************
*** 1738,1741 ****
--- 1739,1743 ----
  				_editorDescriptor = IDE.getEditorDescriptor(file);
  				editorId = _editorDescriptor.getId();
+ 				_usingDefaultDescriptor = false;
  			}	
  			else {
***************
*** 1745,1768 ****
  
  		IDE.setDefaultEditor(file, editorId);
! 
! 		FileEditorInput finput = new FileEditorInput(file);
! 
! 		// check for files already open
! 
! 		// DKM - when _editorId is not lpex, this causes problem
! 		// DY - changed editor from SystemTextEditor to IEditorPart
! 		//editor = (SystemTextEditor)activePage.openEditor(file, _editorId);
! 		if (_editorDescriptor != null && _editorDescriptor.isOpenExternal()){
! 			editor = ((WorkbenchPage)activePage).openEditorFromDescriptor(new FileEditorInput(file), _editorDescriptor, true, null);
  		}
  		else {
! 			editor =  activePage.openEditor(finput, _editorDescriptor.getId());
! 		}
! 
! 
! 		SystemIFileProperties properties = new SystemIFileProperties(file);
! 		properties.setRemoteFileObject(this);
! 		if (properties.getDirty()){
! 			updateDirtyIndicator();
  		}
  	}
--- 1747,1774 ----
  
  		IDE.setDefaultEditor(file, editorId);
! 		if (_editorDescriptor.isOpenExternal()){
! 			openSystemEditor(); // opening regular way doesn't work anymore
  		}
  		else {
! 			FileEditorInput finput = new FileEditorInput(file);
! 	
! 			// check for files already open
! 	
! 			// DKM - when _editorId is not lpex, this causes problem
! 			// DY - changed editor from SystemTextEditor to IEditorPart
! 			//editor = (SystemTextEditor)activePage.openEditor(file, _editorId);
! 			if (_editorDescriptor != null && _editorDescriptor.isOpenExternal()){
! 				editor = ((WorkbenchPage)activePage).openEditorFromDescriptor(new FileEditorInput(file), _editorDescriptor, true, null);
! 			}
! 			else {
! 				editor =  activePage.openEditor(finput, _editorDescriptor.getId());
! 			}
! 	
! 	
! 			SystemIFileProperties properties = new SystemIFileProperties(file);
! 			properties.setRemoteFileObject(this);
! 			if (properties.getDirty()){
! 				updateDirtyIndicator();
! 			}
  		}
  	}