[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/correctionassist PythonCorrectionProcessor.java,1.11,1.12

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

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

Modified Files:
	PythonCorrectionProcessor.java 
Log Message:


Index: PythonCorrectionProcessor.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/correctionassist/PythonCorrectionProcessor.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PythonCorrectionProcessor.java	16 Feb 2005 16:48:48 -0000	1.11
--- PythonCorrectionProcessor.java	23 Feb 2005 14:29:36 -0000	1.12
***************
*** 100,104 ****
  	        } catch (BadLocationException e) {
  	        }
!         } else if(sel.indexOf("import") == -1){
  
              try {
--- 100,104 ----
  	        } catch (BadLocationException e) {
  	        }
!         } else if(sel.indexOf("import ") == -1){
  
              try {
***************
*** 189,193 ****
          for (int line = 0; line < lines; line++) {
              String str = ps.getLine(line);
!             if(str.startsWith("import")){
                  lineToMoveImport = line;
                  break;
--- 189,193 ----
          for (int line = 0; line < lines; line++) {
              String str = ps.getLine(line);
!             if(str.startsWith("import ") || str.startsWith("from ")){
                  lineToMoveImport = line;
                  break;
***************
*** 195,202 ****
          }
          
!         int offset = ps.doc.getLineOffset(lineToMoveImport+1);
          
          
!         if(i != -1){
              l.add(new FixCompletionProposal(sel+delimiter, offset, 0, ps.startLine.getOffset(), imageCache.get(UIConstants.ASSIST_MOVE_IMPORT),
                      "Move import to global scope", null, null, ps.startLineIndex+1));
--- 195,202 ----
          }
          
!         int offset = ps.doc.getLineOffset(lineToMoveImport);
          
          
!         if(i >= 0){
              l.add(new FixCompletionProposal(sel+delimiter, offset, 0, ps.startLine.getOffset(), imageCache.get(UIConstants.ASSIST_MOVE_IMPORT),
                      "Move import to global scope", null, null, ps.startLineIndex+1));