[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor PyEdit.java,1.9,1.10

[Dana M. <dan...@us...>]

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

Modified Files:
	PyEdit.java 
Log Message:
added createActions for content assist proposals.
(NOte: Merged With Aleks' PyDictionary checkin)

Index: PyEdit.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/PyEdit.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PyEdit.java	30 Mar 2004 01:03:37 -0000	1.9
--- PyEdit.java	2 Apr 2004 18:17:44 -0000	1.10
***************
*** 16,19 ****
--- 16,21 ----
  import org.eclipse.jface.text.IRegion;
  import org.eclipse.jface.text.source.ISourceViewer;
+ import org.eclipse.jface.text.source.SourceViewer;
+ import org.eclipse.swt.SWT;
  import org.eclipse.ui.IEditorInput;
  import org.eclipse.ui.IEditorSite;
***************
*** 25,28 ****
--- 27,31 ----
  import org.eclipse.ui.texteditor.IEditorStatusLine;
  import org.eclipse.ui.texteditor.MarkerUtilities;
+ import org.eclipse.ui.texteditor.TextOperationAction;
  import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
  import org.python.parser.ParseException;
***************
*** 38,41 ****
--- 41,45 ----
  import org.python.pydev.parser.PyParser;
  import org.python.pydev.ui.ColorCache;
+ import org.eclipse.jface.action.IAction;
  
  
***************
*** 171,174 ****
--- 175,198 ----
  		super.dispose();
  	}
+ 	private static final String CONTENTASSIST_PROPOSAL_ID = 
+ 						 "org.python.pydev.editors.PyEdit.ContentAssistProposal"; 
+ 
+ 	/* (non-Javadoc)
+ 	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#createActions()
+ 	 */
+ 	protected void createActions() {
+ 		super.createActions();
+ 		// This action will fire a CONTENTASSIST_PROPOSALS operation
+ 		// when executed
+ 		
+ 		IAction action= new TextOperationAction(PydevPlugin.getDefault().getResourceBundle(), 
+ 		"ContentAssistProposal",this,SourceViewer.CONTENTASSIST_PROPOSALS);
+ 		action.setActionDefinitionId(CONTENTASSIST_PROPOSAL_ID);
+ 		// Tell the editor about this new action
+ 		setAction(CONTENTASSIST_PROPOSAL_ID, action);
+ 		// Tell the editor to execute this action 
+ 		// when Ctrl+Spacebar is pressed
+ 		setActionActivationCode(CONTENTASSIST_PROPOSAL_ID,' ', -1, SWT.CTRL);
+ 	}