[Pydev-cvs] org.python.pydev.debug/src/org/python/pydev/debug/codecoverage PyCodeCoverageView.java, 1.11, 1.12 CoverageCache.java, 1.7, 1.8 FileNode.java, 1.7, 1.8

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

Update of /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/codecoverage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20604/src/org/python/pydev/debug/codecoverage

Modified Files:
	PyCodeCoverageView.java CoverageCache.java FileNode.java 
Log Message:
Synching to latest changes:

Pydev
<ul>
<li><strong>Editor</strong>: Cursor settings no longer overridden</li>
<li><strong>Code-completion</strong>: If __all__ is defined with runtime elements (and not only in a single assign statement), it's ignored for code-completion purposes</li>
<li><strong>Debugger</strong>: Pythonpath the same in debug and regular modes (sys.path[0] is the same directory as the file run)</li>
<li><strong>Debugger</strong>: Persist choices done in the debugger when files from the debugger are not found</li>
<li><strong>Interpreter config</strong>: "email" automatically added to the "forced builtins"</li>
<li><strong>Parser</strong>: Correctly recognizing absolute import with 3 or more levels</li>
<li><strong>Syntax check</strong>: Option to do only on active editor</li>
</ul>

Also: tabs changed for spaces

Index: PyCodeCoverageView.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/codecoverage/PyCodeCoverageView.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PyCodeCoverageView.java	15 Jun 2008 01:15:13 -0000	1.11
--- PyCodeCoverageView.java	27 Sep 2008 19:59:13 -0000	1.12
***************
*** 262,266 ****
                      File file = null;
                      if(folderFolLocation != null){
!                     	IPath loc = folderFolLocation.getRawLocation();
                          if(loc == null){
                              loc = folderFolLocation.getLocation();
--- 262,266 ----
                      File file = null;
                      if(folderFolLocation != null){
!                         IPath loc = folderFolLocation.getRawLocation();
                          if(loc == null){
                              loc = folderFolLocation.getLocation();
***************
*** 268,272 ****
                          file = loc.toFile();
                      }else{
!                     	file = p.toFile().getAbsoluteFile();
                      }
                      lastChosenFile = file;
--- 268,272 ----
                          file = loc.toFile();
                      }else{
!                         file = p.toFile().getAbsoluteFile();
                      }
                      lastChosenFile = file;

Index: FileNode.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/codecoverage/FileNode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FileNode.java	17 Aug 2008 00:26:56 -0000	1.7
--- FileNode.java	27 Sep 2008 19:59:13 -0000	1.8
***************
*** 103,109 ****
              String tok = toks[i].trim();
              if(tok.length() == 0){
!             	continue;
              }
! 			if(tok.indexOf("-") == -1){
                  l.add(new Integer(tok));
              }else{
--- 103,109 ----
              String tok = toks[i].trim();
              if(tok.length() == 0){
!                 continue;
              }
!             if(tok.indexOf("-") == -1){
                  l.add(new Integer(tok));
              }else{

Index: CoverageCache.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/codecoverage/CoverageCache.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CoverageCache.java	13 Aug 2008 21:12:24 -0000	1.7
--- CoverageCache.java	27 Sep 2008 19:59:13 -0000	1.8
***************
*** 167,180 ****
      }
  
! 	private List<Object> sortCollectionWithToString(Collection<Object> collection) {
! 		List<Object> vals = new ArrayList<Object>(collection);
!     	Collections.sort(vals, new Comparator<Object>(){
  
! 			public int compare(Object o1, Object o2) {
! 				return o1.toString().compareTo(o2.toString());
! 			}}
!     	);
! 		return vals;
! 	}
  
      
--- 167,180 ----
      }
  
!     private List<Object> sortCollectionWithToString(Collection<Object> collection) {
!         List<Object> vals = new ArrayList<Object>(collection);
!         Collections.sort(vals, new Comparator<Object>(){
  
!             public int compare(Object o1, Object o2) {
!                 return o1.toString().compareTo(o2.toString());
!             }}
!         );
!         return vals;
!     }
  
      
***************
*** 210,215 ****
                  buffer.append(element.toString()).append("\n");
                  if(element instanceof FileNode){ //it may have been an error node...
! 	                totalExecuted += ((FileNode)element).exec;
! 	                totalStmts += ((FileNode)element).stmts;
                  }
              }
--- 210,215 ----
                  buffer.append(element.toString()).append("\n");
                  if(element instanceof FileNode){ //it may have been an error node...
!                     totalExecuted += ((FileNode)element).exec;
!                     totalStmts += ((FileNode)element).stmts;
                  }
              }