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

Modified Files:
	PyEdit.java 
Log Message:
Synching from mercurial:

- Pydev debugger watch working in eclipse 3.4
- Pydev debugger breakpoint properties accept new lines and tabs
- Incremental find backspace works correctly
- Interactive console Fixed problem when more attempts to connect were needed
- Launch icons: Transparent background (thanks to Radim Kubacki)
- Creating workbench test for debugger

Index: PyEdit.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/PyEdit.java,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** PyEdit.java	31 Jul 2008 01:47:36 -0000	1.132
--- PyEdit.java	13 Aug 2008 21:12:15 -0000	1.133
***************
*** 37,44 ****
--- 37,46 ----
  import org.eclipse.swt.SWT;
  import org.eclipse.swt.custom.StyledText;
+ import org.eclipse.swt.custom.VerifyKeyListener;
  import org.eclipse.swt.events.KeyEvent;
  import org.eclipse.swt.events.KeyListener;
  import org.eclipse.swt.events.MouseEvent;
  import org.eclipse.swt.events.MouseListener;
+ import org.eclipse.swt.events.VerifyEvent;
  import org.eclipse.swt.graphics.Font;
  import org.eclipse.swt.graphics.FontData;
***************
*** 70,73 ****
--- 72,76 ----
  import org.python.pydev.editor.actions.OfflineActionTarget;
  import org.python.pydev.editor.actions.PyAction;
+ import org.python.pydev.editor.actions.PyBackspace;
  import org.python.pydev.editor.actions.PyOpenAction;
  import org.python.pydev.editor.autoedit.DefaultIndentPrefs;
***************
*** 77,80 ****
--- 80,84 ----
  import org.python.pydev.editor.codefolding.CodeFoldingSetter;
  import org.python.pydev.editor.codefolding.PyEditProjection;
+ import org.python.pydev.editor.codefolding.PySourceViewer;
  import org.python.pydev.editor.model.IModelListener;
  import org.python.pydev.editor.scripting.PyEditScripting;
***************
*** 279,287 ****
  
      /**
!      * Overriden so that we can set up the cursor listener (notifies changes in the cursor position)
       */
      @Override
      protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) {
!         ISourceViewer viewer = super.createSourceViewer(parent, ruler, styles);
          //add a cursor listener
          StyledText textWidget = viewer.getTextWidget();
--- 283,295 ----
  
      /**
!      * Overridden so that we can:
!      * - Set up the cursor listener (notifies changes in the cursor position)
!      * - Make the backspace handling in a way that the incremental find works (note: having the listener in the
!      * textWidget does not work for that, as the event used in the IncrementalFindTarget is not the same event
!      * that goes to the textWidget).
       */
      @Override
      protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) {
!         PySourceViewer viewer = (PySourceViewer) super.createSourceViewer(parent, ruler, styles);
          //add a cursor listener
          StyledText textWidget = viewer.getTextWidget();
***************
*** 290,293 ****
--- 298,315 ----
          textWidget.addKeyListener(cursorListener);
          
+         VerifyKeyListener verifyKeyListener = new VerifyKeyListener(){
+         	
+         	public void verifyKey(VerifyEvent event) {
+         		if((event.doit && event.character == SWT.BS && event.stateMask == 0)){ //isBackspace
+         			PyBackspace pyBackspace = new PyBackspace();
+         			pyBackspace.setEditor(PyEdit.this);
+         			pyBackspace.perform(new PySelection(PyEdit.this));
+         			event.doit = false;
+         		}
+         	}
+         };
+         
+ 		viewer.appendVerifyKeyListener(verifyKeyListener);
+ 		
          return viewer;
      }