[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion PythonShell.java,1.35,1.36 PyCodeCompletion.java,1.46,1.47 PyCodeCompletionPreferencesPage.java,1.13,1.14 PythonCompletionProcessor.java,1.25,1.26

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

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

Modified Files:
	PythonShell.java PyCodeCompletion.java 
	PyCodeCompletionPreferencesPage.java 
	PythonCompletionProcessor.java 
Log Message:
making compatible to 3.1

Index: PyCodeCompletion.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/PyCodeCompletion.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** PyCodeCompletion.java	25 Jun 2005 17:33:53 -0000	1.46
--- PyCodeCompletion.java	9 Jul 2005 01:05:52 -0000	1.47
***************
*** 83,91 ****
      
      /**
-      * Position in document prior to the activation token
-      */
-     private int docBoundary = -1; 
-     
-     /**
       * 
       */
--- 83,86 ----
***************
*** 163,170 ****
  
              List theList = new ArrayList();
-             PythonShell serverShell = null;
              try {
                  if (CompiledModule.COMPILED_MODULES_ENABLED) {
!                     serverShell = PythonShell.getServerShell(PythonShell.COMPLETION_SHELL);
                  }
              } catch (Exception e) {
--- 158,164 ----
  
              List theList = new ArrayList();
              try {
                  if (CompiledModule.COMPILED_MODULES_ENABLED) {
!                     PythonShell.getServerShell(PythonShell.COMPLETION_SHELL); //just start it
                  }
              } catch (Exception e) {
***************
*** 557,568 ****
      }
  
-     /**
-      * The docBoundary should get until the last line before the one we are
-      * editing.
-      */
-     public void calcDocBoundary(String theDoc, int documentOffset) {
-         this.docBoundary = theDoc.substring(0, documentOffset)
-                 .lastIndexOf('\n');
-     }
      
  	private static String extractPrefix(IDocument document, int offset) {
--- 551,554 ----

Index: PythonShell.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/PythonShell.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** PythonShell.java	3 Jun 2005 18:49:33 -0000	1.35
--- PythonShell.java	9 Jul 2005 01:05:52 -0000	1.36
***************
*** 129,139 ****
      }
  
!     /**
!      * Just wait a little...
!      */
!     private void sleepALittle() {
!         sleepALittle(25); //25 millis
!     }
! 
      /**
       * Just wait a little...
--- 129,133 ----
      }
  
!     
      /**
       * Just wait a little...
***************
*** 428,432 ****
              str = URLEncoder.encode(str);
              this.write("@@CHANGE_DIR:"+str+"END@@");
!             String ok = this.read(); //this should be the ok message...
              
          } catch (IOException e) {
--- 422,427 ----
              str = URLEncoder.encode(str);
              this.write("@@CHANGE_DIR:"+str+"END@@");
! //            String ok = this.read(); //this should be the ok message...
!             this.read(); //this should be the ok message...
              
          } catch (IOException e) {

Index: PyCodeCompletionPreferencesPage.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/PyCodeCompletionPreferencesPage.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** PyCodeCompletionPreferencesPage.java	2 Feb 2005 15:56:22 -0000	1.13
--- PyCodeCompletionPreferencesPage.java	9 Jul 2005 01:05:52 -0000	1.14
***************
*** 11,15 ****
  import org.eclipse.jface.preference.IntegerFieldEditor;
  import org.eclipse.swt.widgets.Composite;
- import org.eclipse.swt.widgets.Label;
  import org.eclipse.ui.IWorkbench;
  import org.eclipse.ui.IWorkbenchPreferencePage;
--- 11,14 ----
***************
*** 42,47 ****
  	public static final boolean DEFAULT_AUTOCOMPLETE_ON_PAR = false;
  	
-     private Label labelWarning;
- 
      /**
       */
--- 41,44 ----

Index: PythonCompletionProcessor.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/PythonCompletionProcessor.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** PythonCompletionProcessor.java	23 Jun 2005 22:31:07 -0000	1.25
--- PythonCompletionProcessor.java	9 Jul 2005 01:05:53 -0000	1.26
***************
*** 70,80 ****
              IDocument doc = viewer.getDocument();
  
-             java.lang.String completeDoc = doc.get();
-             
  
              //list for storing the proposals
              ArrayList pythonAndTemplateProposals = new ArrayList();
- 
-             
              
              
--- 70,76 ----