[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor PythonCompletionProcessor.java,1.11,1.12

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22463/src/org/python/pydev/editor

Modified Files:
	PythonCompletionProcessor.java 
Log Message:
Added template proposals.

Index: PythonCompletionProcessor.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/PythonCompletionProcessor.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PythonCompletionProcessor.java	10 Aug 2004 02:00:57 -0000	1.11
--- PythonCompletionProcessor.java	10 Aug 2004 11:39:11 -0000	1.12
***************
*** 2,7 ****
   * Created on Mar 29, 2004
   *
-  * To change the template for this generated file go to
-  * Window>Preferences>Java>Code Generation>Code and Comments
   */
  package org.python.pydev.editor;
--- 2,5 ----
***************
*** 16,19 ****
--- 14,18 ----
  import java.net.URL;
  import java.util.ArrayList;
+ import java.util.Arrays;
  import java.util.Iterator;
  import java.util.List;
***************
*** 26,29 ****
--- 25,29 ----
  import org.eclipse.core.runtime.Platform;
  import org.eclipse.jface.text.IDocument;
+ import org.eclipse.jface.text.IRegion;
  import org.eclipse.jface.text.ITextViewer;
  import org.eclipse.jface.text.contentassist.CompletionProposal;
***************
*** 32,46 ****
  import org.eclipse.jface.text.contentassist.IContextInformation;
  import org.eclipse.jface.text.contentassist.IContextInformationValidator;
  import org.eclipse.swt.graphics.Point;
  import org.osgi.framework.Bundle;
  import org.python.pydev.plugin.PydevPlugin;
  
  /**
   * @author Dmoore
   * 
!  * To change the template for this generated type comment go to
!  * Window>Preferences>Java>Code Generation>Code and Comments
   */
! public class PythonCompletionProcessor implements IContentAssistProcessor {
  
  	/*
--- 32,73 ----
  import org.eclipse.jface.text.contentassist.IContextInformation;
  import org.eclipse.jface.text.contentassist.IContextInformationValidator;
+ import org.eclipse.jface.text.templates.Template;
+ import org.eclipse.jface.text.templates.TemplateCompletionProcessor;
+ import org.eclipse.jface.text.templates.TemplateContextType;
+ import org.eclipse.swt.graphics.Image;
  import org.eclipse.swt.graphics.Point;
  import org.osgi.framework.Bundle;
+ import org.python.pydev.editor.templates.PyContextType;
  import org.python.pydev.plugin.PydevPlugin;
  
  /**
   * @author Dmoore
+  * @author Fabio Zadrozny - added template completion.
   * 
!  * This class is responsible for code completion / template completion.
   */
! public class PythonCompletionProcessor  extends TemplateCompletionProcessor implements IContentAssistProcessor {
!     /* (non-Javadoc)
!      * @see org.eclipse.jface.text.templates.TemplateCompletionProcessor#getTemplates(java.lang.String)
!      */
!     protected Template[] getTemplates(String contextTypeId) {
!         return PydevPlugin.getDefault().getTemplateStore().getTemplates();
!     }
! 
!     /* (non-Javadoc)
!      * @see org.eclipse.jface.text.templates.TemplateCompletionProcessor#getContextType(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
!      */
!     protected TemplateContextType getContextType(ITextViewer viewer, IRegion region) {
!         return PydevPlugin.getDefault().getContextTypeRegistry().getContextType(PyContextType.PY_CONTEXT_TYPE);
!     }
! 
! 
!     /* (non-Javadoc)
!      * @see org.eclipse.jface.text.templates.TemplateCompletionProcessor#getImage(org.eclipse.jface.text.templates.Template)
!      */
!     protected Image getImage(Template template) {
!         // TODO Auto-generated method stub
!         return null;
!     }
  
  	/*
***************
*** 82,86 ****
  			propList.add(proposal);
  		}
! 
  		ICompletionProposal[] proposals = new ICompletionProposal[propList
  				.size()];
--- 109,118 ----
  			propList.add(proposal);
  		}
! 		
! 		//templates proposals are added here.
! 		ICompletionProposal[] templateProposals = super.computeCompletionProposals(viewer, documentOffset);
! 		propList.addAll(Arrays.asList(templateProposals));
! 		
! 		
  		ICompletionProposal[] proposals = new ICompletionProposal[propList
  				.size()];