Show stacktrace

Author: jamo

tmc-plugin/src/fi/helsinki/cs/tmc/actions/DownloadSolutionAction.java

@@ -131,7 +131,7 @@ public Void apply(Boolean yes) {
     private void downloadSolution(final Exercise ex, final TmcProjectInfo proj) {
         Exercise exercise = exerciseForProject(proj.getProject());
         Callable<Exercise> dlModelSolutionTask = TmcCore.get().downloadModelSolution(ProgressObserver.NULL_OBSERVER, exercise);
-        BgTask.start("Downloading modelsolution", dlModelSolutionTask,
+        BgTask.start("Downloading suggested solution", dlModelSolutionTask,
                 new BgTaskListener<Object>() {
                     @Override
                     public void bgTaskReady(Object result) {

tmc-plugin/src/fi/helsinki/cs/tmc/model/SourceFileLookup.java

@@ -29,6 +29,7 @@ public FileObject findSourceFileFor(Exercise exercise, String className) {
         for (FileObject sr : globalPathRegistry.getSourceRoots()) {
             TmcProjectInfo p = projectMediator.tryGetProjectOwningFile(sr);
             if (p != null && p.equals(correctProject)) {
+                
                 FileObject result = sr.getFileObject(path);
                 if (result != null) {
                     return result;

tmc-plugin/src/fi/helsinki/cs/tmc/spyware/eventsources/WindowStatechangesEventSource.java

@@ -160,6 +160,9 @@ private Exercise getExercise(@NullAllowed FileObject obj) {
         }
         ProjectMediator pm = ProjectMediator.getInstance();
         TmcProjectInfo project = pm.tryGetProjectOwningFile(obj);
+        if (project == null) {
+            return null;
+        }
         return pm.tryGetExerciseForProject(project, courseDb);
     }
 

tmc-plugin/src/fi/helsinki/cs/tmc/ui/TestCaseResultCell.java

@@ -5,6 +5,7 @@
 import fi.helsinki.cs.tmc.model.SourceFileLookup;
 import fi.helsinki.cs.tmc.utilities.ExceptionUtils;
 
+import com.google.common.collect.ImmutableList;
 import java.awt.Color;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -13,6 +14,8 @@
 import java.util.HashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.swing.AbstractAction;
 import javax.swing.Action;
@@ -50,6 +53,9 @@ public final class TestCaseResultCell {
     private final GridBagConstraints gbc = new GridBagConstraints();
     private final JPanel detailView;
     private final ResultCell resultCell;
+    
+    private static final Pattern JAVA_STACKTRACE_ELEMENT_PATTERN = Pattern.compile("([\\w.]+)(\\.\\w+|\\$([\\w\\.]+))\\((\\w+.java):(\\d+)\\)");
+
 
     public TestCaseResultCell(final Exercise exercise, final TestResult result, final SourceFileLookup sourceFileLookup) {
 
@@ -65,10 +71,10 @@ public TestCaseResultCell(final Exercise exercise, final TestResult result, fina
         final String title = (result.isSuccessful() ? "PASS: " : "FAIL: ") + result.getName();
 
         this.resultCell = new ResultCell(getResultColor(),
-                                         getResultTextColor(),
-                                         title,
-                                         result.getMessage(),
-                                         detailView);
+                getResultTextColor(),
+                title,
+                result.getMessage(),
+                detailView);
     }
 
     public ResultCell getCell() {
@@ -218,57 +224,54 @@ public void actionPerformed(final ActionEvent event) {
     private Action detailedMessageAction = new AbstractAction("Show detailed message") {
 
         @Override
-        public void actionPerformed(final ActionEvent event) {
+        public void actionPerformed(ActionEvent event) {
 
             detailView.remove(detailedMessageButton);
 
-            final ExceptionDisplay display = new ExceptionDisplay();
-// TODO 
-//            addException(display, result.backtrace, false);
+            ExceptionDisplay display = new ExceptionDisplay();
+            addException(display, result.getException(), false);
             display.finish();
 
             detailView.add(display, gbc);
-            
 
             resultCell.revalidate();
             resultCell.repaint();
         }
 
-//        private void addException(ExceptionDisplay display, ImmutableList<String> ex, boolean isCause) {
-//            String mainLine;
-//            if (ex.message != null) {
-//                mainLine = ex.className + ": " + ex.message;
-//            } else {
-//                mainLine = ex.className;
-//            }
-//            if (isCause) {
-//                mainLine = "Caused by: " + mainLine;
-//            }
-//            display.addBoldTextLine(mainLine);
-//
-//            addStackTraceLines(display, ex.stackTrace);
-//
-//            if (ex.cause != null) {
-//                addException(display, ex.cause, true);
-//            }
-//        }
-
-        private void addStackTraceLines(ExceptionDisplay display, StackTraceElement[] stackTrace) {
-            for (final StackTraceElement ste : stackTrace) {
-                final FileObject sourceFile = sourceFileLookup.findSourceFileFor(exercise, ste.getClassName());
-
-                if (sourceFile != null && ste.getLineNumber() > 0) {
-                    display.addLink(ste.toString(), new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent e) {
-                            openAtLine(sourceFile, ste.getLineNumber());
-                        }
-                    });
-                } else {
-                    display.addTextLine(ste.toString());
+        private void addException(ExceptionDisplay display, ImmutableList<String> ex, boolean isCause) {
+            if (ex.size() > 0) {
+                display.addBoldTextLine(ex.get(0));
+            }
+
+            addStackTraceLines(display, ex);
+        }
+
+        private void addStackTraceLines(ExceptionDisplay display, ImmutableList<String> stackTrace) {
+            for (final String ste : stackTrace) {
+                Matcher matcher = JAVA_STACKTRACE_ELEMENT_PATTERN.matcher(ste);
+                boolean added = false;
+                if (matcher.matches()) {
+                    String packageAndClass = matcher.group(1);
+                    final int row = Integer.parseInt(matcher.group(5));
+                    final FileObject sourceFile = sourceFileLookup.findSourceFileFor(exercise, packageAndClass);
+
+                    if (sourceFile != null && row > 0) {
+                        display.addLink(ste, new ActionListener() {
+                            @Override
+                            public void actionPerformed(ActionEvent e) {
+                                openAtLine(sourceFile, row);
+                            }
+                        });
+                        added = true;
+
+                    }
+                    if (!added) {
+                        display.addTextLine(ste);
+                    }
                 }
             }
         }
+        
 
         private void openAtLine(FileObject sourceFile, final int lineNum) {
             try {

tmc-plugin/src/fi/helsinki/cs/tmc/utilities/BgTask.java

@@ -131,7 +131,7 @@ public void run() {
             });
             return null;
         } catch (final Exception ex) {
-            :wingUtilities.invokeLater(new Runnable() {
+            SwingUtilities.invokeLater(new Runnable() {
                 @Override
                 public void run() {
                     listener.bgTaskFailed(ex);