Update of /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/codecoverage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8481/src/org/python/pydev/debug/codecoverage
Modified Files:
CoverageCache.java PyCoverage.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: CoverageCache.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/codecoverage/CoverageCache.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CoverageCache.java 16 Jun 2008 00:55:38 -0000 1.6
--- CoverageCache.java 13 Aug 2008 21:12:24 -0000 1.7
***************
*** 7,10 ****
--- 7,13 ----
import java.util.ArrayList;
+ import java.util.Collection;
+ import java.util.Collections;
+ import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
***************
*** 156,170 ****
*/
private void recursivelyFillList(FolderNode folderNode, ArrayList<Object> list) {
! //add its files
! for (Iterator<Object> it = folderNode.files.values().iterator(); it.hasNext();) {
! list.add(it.next());
! }
//get its sub folders
! for (Iterator<Object> it = folderNode.subFolders.values().iterator(); it.hasNext();) {
recursivelyFillList((FolderNode) it.next(), list);
}
}
/**
--- 159,181 ----
*/
private void recursivelyFillList(FolderNode folderNode, ArrayList<Object> list) {
! list.addAll(sortCollectionWithToString(folderNode.files.values()));
//get its sub folders
! for (Iterator<Object> it = sortCollectionWithToString(folderNode.subFolders.values()).iterator(); it.hasNext();) {
recursivelyFillList((FolderNode) it.next(), list);
}
}
+ 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;
+ }
+
/**
***************
*** 196,201 ****
int totalStmts = 0;
! for (Iterator<Object> it = list.iterator(); it.hasNext();) {
! Object element = it.next();
buffer.append(element.toString()).append("\n");
if(element instanceof FileNode){ //it may have been an error node...
--- 207,211 ----
int totalStmts = 0;
! for (Object element:list) {
buffer.append(element.toString()).append("\n");
if(element instanceof FileNode){ //it may have been an error node...
Index: PyCoverage.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/codecoverage/PyCoverage.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** PyCoverage.java 31 Jul 2008 23:48:22 -0000 1.22
--- PyCoverage.java 13 Aug 2008 21:12:24 -0000 1.23
***************
*** 21,25 ****
import org.python.pydev.runners.SimpleRunner;
import org.python.pydev.utils.PyFileListing;
! import org.python.pydev.utils.PyFileListing.PyFileListingInfo;
/**
--- 21,25 ----
import org.python.pydev.runners.SimpleRunner;
import org.python.pydev.utils.PyFileListing;
! import org.python.pydev.utils.PyFileListing.PyFileInfo;
/**
***************
*** 50,58 ****
}
try {
! if (file.isDirectory() == false) {
throw new RuntimeException("We can only get information on a dir.");
}
! PyFileListingInfo pyFilesBelow = new PyFileListingInfo();
if (file.exists()) {
--- 50,58 ----
}
try {
! if (!file.isDirectory()) {
throw new RuntimeException("We can only get information on a dir.");
}
! PyFileListing pyFilesBelow = new PyFileListing();
if (file.exists()) {
***************
*** 60,64 ****
}
! if (pyFilesBelow.filesFound.size() == 0) { //no files
return;
}
--- 60,64 ----
}
! if (pyFilesBelow.getFoundPyFileInfos().size() == 0) { //no files
return;
}
***************
*** 66,70 ****
//add the folders to the cache
boolean added = false;
! for (Iterator<File> it = pyFilesBelow.foldersFound.iterator(); it.hasNext();) {
File f = it.next();
if (!added) {
--- 66,70 ----
//add the folders to the cache
boolean added = false;
! for (Iterator<File> it = pyFilesBelow.getFoundFolders().iterator(); it.hasNext();) {
File f = it.next();
if (!added) {
***************
*** 117,122 ****
String files = "";
! for (Iterator<File> iter = pyFilesBelow.filesFound.iterator(); iter.hasNext();) {
! String fStr = iter.next().toString();
files += fStr + "|";
}
--- 117,122 ----
String files = "";
! for (Iterator<PyFileInfo> iter = pyFilesBelow.getFoundPyFileInfos().iterator(); iter.hasNext();) {
! String fStr = iter.next().getFile().toString();
files += fStr + "|";
}
***************
*** 220,229 ****
/**
* @param strings
! * @return
*/
private String getError(String[] strings) {
StringBuffer ret = new StringBuffer();
for (int i = 1; i < strings.length; i++) {
! ret.append(strings[i]+" ");
}
return ret.toString();
--- 220,230 ----
/**
* @param strings
! * @return string concatenating all but first elements from passed argument
! * separated by space
*/
private String getError(String[] strings) {
StringBuffer ret = new StringBuffer();
for (int i = 1; i < strings.length; i++) {
! ret.append(strings[i]).append(' ');
}
return ret.toString();
|
