syntax highlighting for all open documents

sockcreature · sockcreature · commit b41fc73324e2 · 2014-12-16T17:40:42.000-06:00
diff --git a/drjava/src/edu/rice/cs/drjava/ui/ReportGenerator.java b/drjava/src/edu/rice/cs/drjava/ui/ReportGenerator.java
@@ -58,6 +58,9 @@ public class ReportGenerator {
  private final ArrayList<String> targetNames;
  private final String mainClassFileName;
  
+ private  CoverageBuilder cb;
+ 
+ 
  /**
   * A class loader that loads classes from in-memory data.
   */
@@ -151,7 +154,7 @@ public ReportGenerator(final SingleDisplayModel _model, final List<OpenDefinitio
 
   List<File> targets = new ArrayList<File>();
   for(File dir:CollectUtil.makeList(_model.getClassPath())){
-    if( dir.getName().equals("lib") || dir.getName().equals("base") || dir.getName().equals("test"))
+    if(!dir.isDirectory() || dir.getName().equals("lib") || dir.getName().equals("base") || dir.getName().equals("test"))
 		continue;
   	targets.addAll(rec_init_target(dir));
   }
@@ -280,6 +283,7 @@ public void create() throws Exception {
 	analyzer.analyzeClass(getTargetClass(targets.get(i)), targetNames.get(i));
   }
   
+  this.cb = coverageBuilder;
   printCoverage(coverageBuilder);
   
   // Run the structure analyzer on a single class folder to build up
@@ -316,6 +320,30 @@ private void createReport(final IBundleCoverage bundleCoverage, ExecutionDataSto
 
  }
  
+ 
+ public ArrayList<String> getLineColorsForClass(String className) {
+	 
+	 ArrayList<String> lineColors = new ArrayList<String>();
+	 
+	 for (final IClassCoverage cc : cb.getClasses()) {
+		   if (!cc.getName().equals(className)) {
+			   continue;
+		   }
+		   
+		   for (int i = 0; i < cc.getFirstLine(); i++) {
+			   lineColors.add("");
+			   
+		   }
+
+		   for (int i = cc.getFirstLine(); i <= cc.getLastLine(); i++) {
+			   lineColors.add(getColor(cc.getLine(i).getStatus()));
+		   }
+		  }
+	 
+	 return lineColors;
+ }
+ 
+ 
  private void printCoverage(CoverageBuilder coverageBuilder){
   for (final IClassCoverage cc : coverageBuilder.getClasses()) {
    System.out.printf("Coverage of class %s%n", cc.getName());
diff --git a/drjava/src/edu/rice/cs/drjava/ui/coverage/CoverageFrame.java b/drjava/src/edu/rice/cs/drjava/ui/coverage/CoverageFrame.java
@@ -43,14 +43,18 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.Vector;
 import java.util.Map;
 import java.util.HashMap;
+
 import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.border.EmptyBorder;
 
+import edu.rice.cs.drjava.model.OpenDefinitionsDocument;
 import edu.rice.cs.drjava.model.SingleDisplayModel;
+import edu.rice.cs.drjava.model.definitions.ClassNameNotFoundException;
 import edu.rice.cs.drjava.config.Option;
 import edu.rice.cs.drjava.config.OptionParser;
 import edu.rice.cs.drjava.config.OptionConstants;
@@ -59,12 +63,10 @@
 import edu.rice.cs.drjava.ui.config.*;
 import edu.rice.cs.drjava.ui.*;
 import edu.rice.cs.drjava.DrJava;
-
 import edu.rice.cs.plt.iter.IterUtil;
 import edu.rice.cs.plt.collect.CollectUtil;
 import edu.rice.cs.plt.lambda.Runnable1;
 import edu.rice.cs.plt.lambda.LambdaUtil;
-
 import edu.rice.cs.util.FileOps;
 import edu.rice.cs.util.AbsRelFile;
 import edu.rice.cs.util.swing.FileSelectorComponent;
@@ -75,6 +77,7 @@
 import edu.rice.cs.util.swing.Utilities;
 
 import javax.swing.filechooser.FileFilter;
+
 import java.awt.Desktop;
 import java.net.URI;
 import java.net.URISyntaxException;;
@@ -207,9 +210,12 @@ public boolean generateReport(){
 		if(_useCurrentFile.isSelected()){
 			final ReportGenerator generator = new ReportGenerator(_model, _model.getDocumentNavigator().getSelectedDocuments(), _outputDirSelector.getFileFromField());
              generator.create();
+             highlight(generator);
+             
 		}else{
 			final ReportGenerator generator = new ReportGenerator(_model, _srcRootSelector.getFileFromField(), _mainDocumentSelector.getText(), _outputDirSelector.getFileFromField());
 			generator.create();
+			highlight(generator);
 		}
              
     } catch (Exception e){
@@ -220,6 +226,44 @@ public boolean generateReport(){
 	return true;
   }
 
+  
+  private void highlight(ReportGenerator generator) {
+    
+	  Iterator<OpenDefinitionsDocument> iter = _model.getDocumentNavigator().getDocuments().iterator();
+	  while (iter.hasNext()) {
+		  OpenDefinitionsDocument o = iter.next(); 
+		  DefinitionsPane pane = _mainFrame.getDefPaneGivenODD(o);
+		  try {
+		  ArrayList<String> colors = generator.getLineColorsForClass(o.getQualifiedClassName());
+		  
+		  for (int i = 0; i < colors.size(); i ++) {
+			  String color = colors.get(i);
+			  
+			  Color c = Color.black;
+			  if (color.equals("")) {
+				  continue;
+			  }
+			  if (color.equals("green")) {
+				  c = Color.green;
+			  }
+			  if (color.equals("red")) {
+				  c = Color.red;
+			  }
+			  if (color.equals("yellow")) {
+				  c = Color.yellow;
+			  }
+			  
+			  
+			  pane.getHighlightManager().
+	                     addHighlight(o._getOffset(i), o._getOffset(i+1),  new ReverseHighlighter.DrJavaHighlightPainter(c));
+		  }
+		  }
+		  catch (ClassNameNotFoundException e) {
+			  continue;
+		  }
+		 
+	  }
+  }
 
   /** Caches the settings in the global model */
   public boolean saveSettings() {//throws IOException {
