[Pydev-cvs] org.python.pydev.debug/src/org/python/pydev/debug/codecoverage CoverageCache.java, 1.5, 1.6 FileNode.java, 1.5, 1.6

[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-serv3418/src/org/python/pydev/debug/codecoverage

Modified Files:
	CoverageCache.java FileNode.java 
Log Message:
Wild imports considered when organizing imports.

Index: FileNode.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/codecoverage/FileNode.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FileNode.java	17 Jun 2007 13:31:30 -0000	1.5
--- FileNode.java	16 Jun 2008 00:55:38 -0000	1.6
***************
*** 11,14 ****
--- 11,16 ----
  import java.util.List;
  
+ import org.python.pydev.core.structure.FastStringBuffer;
+ 
  /**
   * @author Fabio Zadrozny
***************
*** 41,45 ****
      
      public static String toString(String str, int stmts, int exec, String notExecuted) {
!         return getName(str) + "   " +getStmts(stmts)+"     "+exec+"      "+calcCover(stmts, exec) +"  "+notExecuted;
      }
      
--- 43,56 ----
      
      public static String toString(String str, int stmts, int exec, String notExecuted) {
!         return new FastStringBuffer().
!             append(getName(str)).
!             append("   ").
!             append(getStmts(stmts)).
!             append("     ").
!             append(exec).
!             append("      ").
!             append(calcCover(stmts, exec)).
!             append("  ").
!             append(notExecuted).toString();
      }
      
***************
*** 56,75 ****
  
      public static String getStmts(int stmts){
!         String str = stmts+"";
          while (str.length() < 4){
!             str = " "+str;
          }
!         return str;
      }
  
      public static String getExec(int exec){
!         String str = exec+"";
!         while (str.length() < 4){
!             str = " "+str;
!         }
!         return str;
      }
  
!     public static String calcCover( int stmts, int exec){
          double v = 0;
          if(stmts != 0){
--- 67,83 ----
  
      public static String getStmts(int stmts){
!         FastStringBuffer str = new FastStringBuffer();
!         str.append(stmts);
          while (str.length() < 4){
!             str.insert(0, " ");
          }
!         return str.toString();
      }
  
      public static String getExec(int exec){
!         return getStmts(exec);
      }
  
!     public static String calcCover(int stmts, int exec){
          double v = 0;
          if(stmts != 0){

Index: CoverageCache.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/codecoverage/CoverageCache.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CoverageCache.java	17 Jun 2007 13:31:30 -0000	1.5
--- CoverageCache.java	16 Jun 2008 00:55:38 -0000	1.6
***************
*** 12,15 ****
--- 12,17 ----
  import java.util.Map;
  
+ import org.python.pydev.core.structure.FastStringBuffer;
+ 
  
  /**
***************
*** 183,187 ****
          
  
!         StringBuffer buffer = new StringBuffer();
          try {
              List<Object> list = getFiles(node);  //array of FileNode
--- 185,189 ----
          
  
!         FastStringBuffer buffer = new FastStringBuffer();
          try {
              List<Object> list = getFiles(node);  //array of FileNode
***************
*** 196,200 ****
              for (Iterator<Object> it = list.iterator(); it.hasNext();) {
                  Object element = it.next();
!                 buffer.append(element.toString()+"\n");
                  if(element instanceof FileNode){ //it may have been an error node...
  	                totalExecuted += ((FileNode)element).exec;
--- 198,202 ----
              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...
  	                totalExecuted += ((FileNode)element).exec;
***************
*** 204,208 ****
              
              buffer.append("-----------------------------------------------------------------------------\n");
!             buffer.append(FileNode.toString("TOTAL",totalStmts, totalExecuted, "")+"\n");
              
          } catch (NodeNotFoudException e) {
--- 206,210 ----
              
              buffer.append("-----------------------------------------------------------------------------\n");
!             buffer.append(FileNode.toString("TOTAL",totalStmts, totalExecuted, "")).append("\n");
              
          } catch (NodeNotFoudException e) {