[Pydev-cvs] org.python.pydev/src_completions/org/python/pydev/editor/codecompletion PyCalltipsContextInformation.java, 1.2, 1.3 PyContentAssistant.java, 1.5, 1.6 AbstractPyCodeCompletion.java, 1.7, 1.8

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

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

Modified Files:
	PyCalltipsContextInformation.java PyContentAssistant.java 
	AbstractPyCodeCompletion.java 
Log Message:
Context information being shown for completions

bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1939296&group_id=85796&atid=577329

Index: AbstractPyCodeCompletion.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/AbstractPyCodeCompletion.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AbstractPyCodeCompletion.java	18 Mar 2008 02:55:16 -0000	1.7
--- AbstractPyCodeCompletion.java	12 Apr 2008 13:04:08 -0000	1.8
***************
*** 90,94 ****
                  if(args.length() > 2){
                      String contextArgs = args.substring(1, args.length()-1); //remove the parentesis
!                     pyContextInformation = new PyCalltipsContextInformation(contextArgs, contextArgs, request);
                  }
                  PyCompletionProposal proposal = new PyLinkedModeCompletionProposal(name+args,
--- 90,94 ----
                  if(args.length() > 2){
                      String contextArgs = args.substring(1, args.length()-1); //remove the parentesis
!                     pyContextInformation = new PyCalltipsContextInformation(contextArgs, contextArgs);
                  }
                  PyCompletionProposal proposal = new PyLinkedModeCompletionProposal(name+args,

Index: PyContentAssistant.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/PyContentAssistant.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PyContentAssistant.java	6 Apr 2008 19:51:34 -0000	1.5
--- PyContentAssistant.java	12 Apr 2008 13:04:08 -0000	1.6
***************
*** 7,13 ****
--- 7,19 ----
  
  import org.eclipse.jface.bindings.TriggerSequence;
+ import org.eclipse.jface.text.DefaultInformationControl;
+ import org.eclipse.jface.text.IInformationControl;
+ import org.eclipse.jface.text.IInformationControlCreator;
  import org.eclipse.jface.text.contentassist.ContentAssistant;
+ import org.eclipse.jface.text.source.ISourceViewer;
+ import org.eclipse.swt.widgets.Shell;
  import org.python.copiedfromeclipsesrc.JDTNotAvailableException;
  import org.python.pydev.core.docutils.StringUtils;
+ import org.python.pydev.editor.PyInformationPresenter;
  import org.python.pydev.plugin.KeyBindingHelper;
  import org.python.pydev.plugin.PydevPlugin;
***************
*** 96,98 ****
--- 102,112 ----
      }
      
+     public static IInformationControlCreator createInformationControlCreator(ISourceViewer sourceViewer) {
+         return new IInformationControlCreator() {
+             public IInformationControl createInformationControl(Shell parent) {
+                 return new DefaultInformationControl(parent, new PyInformationPresenter());
+             }
+         };
+     }
+ 
  }

Index: PyCalltipsContextInformation.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/PyCalltipsContextInformation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyCalltipsContextInformation.java	30 Aug 2007 00:23:31 -0000	1.2
--- PyCalltipsContextInformation.java	12 Apr 2008 13:04:08 -0000	1.3
***************
*** 25,29 ****
       * @param informationDisplayString the string to be displayed when presenting the context information
       */
!     public PyCalltipsContextInformation(String contextDisplayString, String informationDisplayString, CompletionRequest request) {
          this(null, contextDisplayString, informationDisplayString);
      }
--- 25,29 ----
       * @param informationDisplayString the string to be displayed when presenting the context information
       */
!     public PyCalltipsContextInformation(String contextDisplayString, String informationDisplayString) {
          this(null, contextDisplayString, informationDisplayString);
      }