[Rubyeclipse-commit] org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/text RubySourceViewerConfiguration.java,1.7,1.8

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

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/text
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31010/src/org/rubypeople/rdt/ui/text

Modified Files:
	RubySourceViewerConfiguration.java 
Log Message:


Index: RubySourceViewerConfiguration.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/text/RubySourceViewerConfiguration.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RubySourceViewerConfiguration.java	5 May 2006 21:45:24 -0000	1.7
--- RubySourceViewerConfiguration.java	12 May 2006 21:39:35 -0000	1.8
***************
*** 41,44 ****
--- 41,45 ----
  import org.rubypeople.rdt.internal.ui.rubyeditor.IRubyScriptDocumentProvider;
  import org.rubypeople.rdt.internal.ui.rubyeditor.RubyAbstractEditor;
+ import org.rubypeople.rdt.internal.ui.text.ContentAssistPreference;
  import org.rubypeople.rdt.internal.ui.text.HTMLTextPresenter;
  import org.rubypeople.rdt.internal.ui.text.IRubyColorConstants;
***************
*** 47,51 ****
  import org.rubypeople.rdt.internal.ui.text.RubyAnnotationHover;
  import org.rubypeople.rdt.internal.ui.text.RubyCommentScanner;
- import org.rubypeople.rdt.internal.ui.text.RubyContentAssistPreference;
  import org.rubypeople.rdt.internal.ui.text.RubyDoubleClickSelector;
  import org.rubypeople.rdt.internal.ui.text.RubyPartitionScanner;
--- 48,51 ----
***************
*** 321,325 ****
          contentAssistant.setContextInformationPopupOrientation(ContentAssistant.CONTEXT_INFO_ABOVE);
  
!         RubyContentAssistPreference.configure(contentAssistant, getPreferenceStore());
          return contentAssistant;
      }
--- 321,325 ----
          contentAssistant.setContextInformationPopupOrientation(ContentAssistant.CONTEXT_INFO_ABOVE);
  
!         ContentAssistPreference.configure(contentAssistant, getPreferenceStore());
          return contentAssistant;
      }
***************
*** 376,396 ****
       */
      public IReconciler getReconciler(ISourceViewer sourceViewer) {
!     	final ITextEditor editor = getEditor();
! 		if (editor != null && editor.isEditable()) {
! 			RubyReconciler reconciler = new RubyReconciler(editor,
! 					new RubyReconcilingStrategy(
! 							(RubyAbstractEditor) fTextEditor), true);
! 			reconciler.setIsIncrementalReconciler(false);
! 			// TODO Uncomment when we move to Eclipse 3.2
! 			// ECLIPSE 3.2
! 			// reconciler.setIsAllowedToModifyDocument(false);
! 			reconciler.setProgressMonitor(new NullProgressMonitor());
! 			reconciler.setDelay(500);
! 			return reconciler;
! 		}
! 		return null;
      }
! 
! 	private IRubyProject getProject() {
  		ITextEditor editor= getEditor();
  		if (editor == null)
--- 376,391 ----
       */
      public IReconciler getReconciler(ISourceViewer sourceViewer) {
!         RubyReconciler reconciler = new RubyReconciler(fTextEditor, new RubyReconcilingStrategy(
!                 (RubyAbstractEditor) fTextEditor), true);
!         reconciler.setIsIncrementalReconciler(false);
!         // TODO Uncomment when we move to Eclipse 3.2
!         // ECLIPSE 3.2
!         //reconciler.setIsAllowedToModifyDocument(false);
!         reconciler.setProgressMonitor(new NullProgressMonitor());
!         reconciler.setDelay(500);
!         return reconciler;
      }
!     
!     private IRubyProject getProject() {
  		ITextEditor editor= getEditor();
  		if (editor == null)
***************
*** 410,414 ****
  		return element.getRubyProject();
  	}
!     
      public String[] getIndentPrefixes(ISourceViewer sourceViewer, String contentType) {
  
--- 405,409 ----
  		return element.getRubyProject();
  	}
! 
      public String[] getIndentPrefixes(ISourceViewer sourceViewer, String contentType) {
  
***************
*** 451,461 ****
  		return (String[]) vector.toArray(new String[vector.size()]);
      }
-     
- 	/*
- 	 * @see SourceViewerConfiguration#getTabWidth(ISourceViewer)
- 	 */
- 	public int getTabWidth(ISourceViewer sourceViewer) {
- 		return CodeFormatterUtil.getTabWidth(getProject());
- 	}
  
      public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer,
--- 446,449 ----
***************
*** 466,469 ****
--- 454,464 ----
          return fRubyDoubleClickSelector;
      }
+     
+ 	/*
+ 	 * @see SourceViewerConfiguration#getTabWidth(ISourceViewer)
+ 	 */
+ 	public int getTabWidth(ISourceViewer sourceViewer) {
+ 		return CodeFormatterUtil.getTabWidth(getProject());
+ 	}
  
      public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {