pydev-cvs

[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-serv1125/src/org/python/pydev/editor

Modified Files:
	PyEditConfiguration.java PyEdit.java 
Log Message:
New code completion.

Index: PyEditConfiguration.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/PyEditConfiguration.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** PyEditConfiguration.java	25 Aug 2004 17:26:08 -0000	1.18
--- PyEditConfiguration.java	13 Sep 2004 17:11:53 -0000	1.19
***************
*** 63,69 ****
  //	private ColorManager colorManager;
  	private String[] indentPrefixes = { "    ", "\t", ""};
  	
! 	public PyEditConfiguration(ColorCache colorManager) {
  		colorCache = colorManager;
  	}
  
--- 63,71 ----
  //	private ColorManager colorManager;
  	private String[] indentPrefixes = { "    ", "\t", ""};
+ 	private PyEdit edit;
  	
! 	public PyEditConfiguration(ColorCache colorManager, PyEdit edit) {
  		colorCache = colorManager;
+ 		this.setEdit(edit);
  	}
  
***************
*** 291,295 ****
  		
  		// next create a content assistant processor to populate the completions window
! 		IContentAssistProcessor processor = new PythonCompletionProcessor();
  		
  		// No code completion in strings
--- 293,297 ----
  		
  		// next create a content assistant processor to populate the completions window
! 		IContentAssistProcessor processor = new PythonCompletionProcessor(this.getEdit());
  		
  		// No code completion in strings
***************
*** 359,362 ****
--- 361,378 ----
  	}
  
+     /**
+      * @param edit The edit to set.
+      */
+     private void setEdit(PyEdit edit) {
+         this.edit = edit;
+     }
+ 
+     /**
+      * @return Returns the edit.
+      */
+     private PyEdit getEdit() {
+         return edit;
+     }
+ 
  
  

Index: PyEdit.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/PyEdit.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** PyEdit.java	6 Aug 2004 17:20:02 -0000	1.20
--- PyEdit.java	13 Sep 2004 17:11:53 -0000	1.21
***************
*** 99,103 ****
  			setDocumentProvider(new PyDocumentProvider());
  		}
! 		editConfiguration = new PyEditConfiguration(colorCache);
  		setSourceViewerConfiguration(editConfiguration);
  		indentStrategy = (PyAutoIndentStrategy)editConfiguration.getAutoIndentStrategy(null, IDocument.DEFAULT_CONTENT_TYPE);
--- 99,103 ----
  			setDocumentProvider(new PyDocumentProvider());
  		}
! 		editConfiguration = new PyEditConfiguration(colorCache,this);
  		setSourceViewerConfiguration(editConfiguration);
  		indentStrategy = (PyAutoIndentStrategy)editConfiguration.getAutoIndentStrategy(null, IDocument.DEFAULT_CONTENT_TYPE);