[Pydev-cvs] org.python.pydev/src_dltk_console/org/python/pydev/dltk/console ScriptConsoleHistory.java, 1.3, 1.4

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

Update of /cvsroot/pydev/org.python.pydev/src_dltk_console/org/python/pydev/dltk/console
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28933/src_dltk_console/org/python/pydev/dltk/console

Modified Files:
	ScriptConsoleHistory.java 
Log Message:
- up/down should select content in history based on what's already in the console
- stdout/stderr gotten from the server without using sockets
- sys.exit may halt shell
- shell still seems open after 'killing' eclipse.
	

Index: ScriptConsoleHistory.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_dltk_console/org/python/pydev/dltk/console/ScriptConsoleHistory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ScriptConsoleHistory.java	28 Mar 2008 02:05:11 -0000	1.3
--- ScriptConsoleHistory.java	30 Mar 2008 21:45:12 -0000	1.4
***************
*** 85,88 ****
--- 85,89 ----
       */
      public boolean prev() {
+         int initialCurrLine = currLine;
          while(true){
              if (currLine <= 0) {
***************
*** 95,99 ****
              }
          }
! 
          return false;
      }
--- 96,100 ----
              }
          }
!         currLine = initialCurrLine; //don't change if we weren't able to find a match.
          return false;
      }
***************
*** 103,108 ****
       */
      public boolean next() {
          while(true){
!             if (currLine >= lines.size() - 1) {
                  break;
              }
--- 104,110 ----
       */
      public boolean next() {
+         int initialCurrLine = currLine;
          while(true){
!             if (currLine >= lines.size() - 2) { //we don't want to add the 'current' line here
                  break;
              }
***************
*** 113,116 ****
--- 115,119 ----
              }
          }
+         currLine = initialCurrLine; //don't change if we weren't able to find a match.
          
          return false;