[Pydev-cvs] org.python.pydev.debug/src_console/org/python/pydev/debug/newconsole PydevConsoleCommunication.java, 1.10, 1.11

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

Update of /cvsroot/pydev/org.python.pydev.debug/src_console/org/python/pydev/debug/newconsole
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8481/src_console/org/python/pydev/debug/newconsole

Modified Files:
	PydevConsoleCommunication.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: PydevConsoleCommunication.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src_console/org/python/pydev/debug/newconsole/PydevConsoleCommunication.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PydevConsoleCommunication.java	15 Jun 2008 19:01:31 -0000	1.10
--- PydevConsoleCommunication.java	13 Aug 2008 21:12:25 -0000	1.11
***************
*** 251,255 ****
                              
                              //executed.o1 is not null only if we had an error
!                             if(executed.o1 != null && executed.o1.indexOf("Connection refused: connect") != -1){
                                  if(firstCommWorked){
                                      break;
--- 251,257 ----
                              
                              //executed.o1 is not null only if we had an error
!                             if(executed.o1 != null && (
!                             	executed.o1.indexOf("Connection refused: connect") != -1 ||
!                             	executed.o1.indexOf("Failed to read servers response: Connection refused") != -1)){
                                  if(firstCommWorked){
                                      break;
***************
*** 257,263 ****
                                      if(commAttempts < maximumAttempts){
                                          commAttempts += 1;
                                          continue;
                                      }else{
!                                         break;
                                      }
                                  }
--- 259,266 ----
                                      if(commAttempts < maximumAttempts){
                                          commAttempts += 1;
+                                         executed.o1 = stdErrReader.getAndClearContents();
                                          continue;
                                      }else{
!                                     	break;
                                      }
                                  }