[Rubyeclipse-commit] org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor RubyAbstractEditor.java,1.20,1.21

[Christopher W. <caw...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15773/src/org/rubypeople/rdt/internal/ui/rubyeditor

Modified Files:
	RubyAbstractEditor.java 
Log Message:
fix for when users select import statements in outline view

Index: RubyAbstractEditor.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyAbstractEditor.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** RubyAbstractEditor.java	12 Mar 2005 16:52:13 -0000	1.20
--- RubyAbstractEditor.java	30 Mar 2005 01:55:33 -0000	1.21
***************
*** 148,167 ****
  		}
  		// FIXME Uncomment so we bring editor to top
! 		if (!isActivePart() && RubyPlugin.getActivePage() != null)
! 		  RubyPlugin.getActivePage().bringToTop(this);
  
  		// setSelection(reference, !isActivePart());
  		setSelection(reference, true);
  	}
! 	
  	protected boolean isActivePart() {
! 		IWorkbenchPart part= getActivePart();
  		return part != null && part.equals(this);
  	}
! 	
  	private IWorkbenchPart getActivePart() {
! 		IWorkbenchWindow window= getSite().getWorkbenchWindow();
! 		IPartService service= window.getPartService();
! 		IWorkbenchPart part= service.getActivePart();
  		return part;
  	}
--- 148,166 ----
  		}
  		// FIXME Uncomment so we bring editor to top
! 		if (!isActivePart() && RubyPlugin.getActivePage() != null) RubyPlugin.getActivePage().bringToTop(this);
  
  		// setSelection(reference, !isActivePart());
  		setSelection(reference, true);
  	}
! 
  	protected boolean isActivePart() {
! 		IWorkbenchPart part = getActivePart();
  		return part != null && part.equals(this);
  	}
! 
  	private IWorkbenchPart getActivePart() {
! 		IWorkbenchWindow window = getSite().getWorkbenchWindow();
! 		IPartService service = window.getPartService();
! 		IWorkbenchPart part = service.getActivePart();
  		return part;
  	}
***************
*** 193,218 ****
  			try {
  				ISourceRange range = null;
! 				// if (reference instanceof ILocalVariable) {
! 				// IJavaElement je= ((ILocalVariable)reference).getParent();
! 				// if (je instanceof ISourceReference)
! 				// range= ((ISourceReference)je).getSourceRange();
! 				// } else
! 				// range= reference.getSourceRange();
! 				//				
! 				// if (range == null)
! 				// return;
! 				//				
! 				// int offset= range.getOffset();
! 				// int length= range.getLength();
! 				//				
! 				// if (offset < 0 || length < 0)
! 				// return;
! 				//				
! 				// setHighlightRange(offset, length, moveCursor);
  
! 				if (!moveCursor) return;
  
! 				int offset = -1;
! 				int length = -1;
  
  				if (reference instanceof IMember) {
--- 192,215 ----
  			try {
  				ISourceRange range = null;
! //				if (reference instanceof ILocalVariable) {
! //					IRubyElement je = ((ILocalVariable) reference).getParent();
! //					if (je instanceof ISourceReference) range = ((ISourceReference) je).getSourceRange();
! //				} else
! 					range = reference.getSourceRange();
  
! 				if (range == null) return;
  
! 				int offset = range.getOffset();
! 				int length = range.getLength();
! 
! 				if (offset < 0 || length < 0) return;
! 
! 				setHighlightRange(offset, length, moveCursor);
! 
! 				if (!moveCursor)
! 					return;
! 											
! 				offset= -1;
! 				length= -1;
  
  				if (reference instanceof IMember) {