[Pydev-cvs] /org.python.pydev/src/org/python/pydev/editor/codecompletion PyCompletionProposal.java, 1.1.2.4, 1.1.2.5 PythonCompletionProcessor.java, 1.33.2.4, 1.33.2.5

[Sean H. <se...@us...>]

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

Modified Files:
      Tag: SoC_2006
	PyCompletionProposal.java PythonCompletionProcessor.java 
Log Message:
re-sync with head

Index: PyCompletionProposal.java
===================================================================
RCS file: /cvsroot/pydev//org.python.pydev/src/org/python/pydev/editor/codecompletion/PyCompletionProposal.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** PyCompletionProposal.java	3 Jun 2006 17:53:12 -0000	1.1.2.4
--- PyCompletionProposal.java	3 Jun 2006 18:18:26 -0000	1.1.2.5
***************
*** 46,49 ****
--- 46,65 ----
  	public PyCompletionProposal(String replacementString, int replacementOffset, int replacementLength, int cursorPosition, int priority) {
  		this(replacementString, replacementOffset, replacementLength, cursorPosition, null, null, null, null, priority);
+ 		fContextInformation = new IContextInformation(){
+ 
+             public String getContextDisplayString() {
+                 return "testing,context,display";
+             }
+ 
+             public Image getImage() {
+                 return null;
+             }
+ 
+             public String getInformationDisplayString() {
+                 return "testing,context,info";
+             }
+            
+         };
+ 
  	}
  
***************
*** 75,78 ****
--- 91,110 ----
  		fAdditionalProposalInfo= additionalProposalInfo;
  		this.priority = priority;
+ 		fContextInformation = new IContextInformation(){
+ 
+             public String getContextDisplayString() {
+                 return "testing,context,display";
+             }
+ 
+             public Image getImage() {
+                 return null;
+             }
+ 
+             public String getInformationDisplayString() {
+                 return "testing,context,info";
+             }
+            
+         };
+ 
  	}
  

Index: PythonCompletionProcessor.java
===================================================================
RCS file: /cvsroot/pydev//org.python.pydev/src/org/python/pydev/editor/codecompletion/PythonCompletionProcessor.java,v
retrieving revision 1.33.2.4
retrieving revision 1.33.2.5
diff -C2 -d -r1.33.2.4 -r1.33.2.5
*** PythonCompletionProcessor.java	3 Jun 2006 17:53:12 -0000	1.33.2.4
--- PythonCompletionProcessor.java	3 Jun 2006 18:18:26 -0000	1.33.2.5
***************
*** 250,259 ****
      }
  
      /**
!      * 
       * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
       */
      public IContextInformationValidator getContextInformationValidator() {
!         return null;
      }
  
--- 250,269 ----
      }
  
+ 
      /**
!      *
       * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
       */
      public IContextInformationValidator getContextInformationValidator() {
!         return new IContextInformationValidator(){
! 
!             public void install(IContextInformation info, ITextViewer viewer, int offset) {
!             }
! 
!             public boolean isContextInformationValid(int offset) {
!                 return true;
!             }
!            
!         };
      }