From d3e902a0676d3f9631d66c955ce6613851040fb9 Mon Sep 17 00:00:00 2001
From: joxe <joxe@23d1a52b-0c3c-0410-b72d-8f29ab48fe35>
Date: Thu, 6 Dec 2007 18:18:23 +0000
Subject: [PATCH] added path argument to SourceViewer

git-svn-id: https://mspsim.svn.sourceforge.net/svnroot/mspsim/mspsim@47 23d1a52b-0c3c-0410-b72d-8f29ab48fe35
---
 se/sics/mspsim/extutil/highlight/HighlightSourceViewer.java | 6 +++---
 se/sics/mspsim/util/ControlUI.java                          | 2 +-
 se/sics/mspsim/util/SourceViewer.java                       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/se/sics/mspsim/extutil/highlight/HighlightSourceViewer.java b/se/sics/mspsim/extutil/highlight/HighlightSourceViewer.java
index 35355d3..98a0e56 100644
--- a/se/sics/mspsim/extutil/highlight/HighlightSourceViewer.java
+++ b/se/sics/mspsim/extutil/highlight/HighlightSourceViewer.java
@@ -63,7 +63,7 @@ public class HighlightSourceViewer implements SourceViewer {
   private SyntaxHighlighter highlighter;
   private ArrayList<File> path = null;
   private JFileChooser fileChooser;
-  
+
   public HighlightSourceViewer() {
     //
   }
@@ -94,7 +94,7 @@ public class HighlightSourceViewer implements SourceViewer {
     window.setVisible(isVisible);
   }
 
-  public void viewFile(final String filename) {
+  public void viewFile(final String path, final String filename) {
     setup();
     SwingUtilities.invokeLater(new Runnable() {
       public void run() {
@@ -182,6 +182,6 @@ public class HighlightSourceViewer implements SourceViewer {
   public static void main(String[] args) {
     HighlightSourceViewer sv = new HighlightSourceViewer();
     sv.setVisible(true);
-    sv.viewFile(args[0]);
+    sv.viewFile(".", args[0]);
   }
 }
diff --git a/se/sics/mspsim/util/ControlUI.java b/se/sics/mspsim/util/ControlUI.java
index dd6ba28..b566966 100644
--- a/se/sics/mspsim/util/ControlUI.java
+++ b/se/sics/mspsim/util/ControlUI.java
@@ -182,7 +182,7 @@ public class ControlUI extends JPanel implements ActionListener {
 	DebugInfo dbg = elfData.getDebugInfo(pc);
 	if (dbg != null) {
 	  if (sourceViewer != null) {
-	    sourceViewer.viewFile(dbg.getFile());
+	    sourceViewer.viewFile(dbg.getPath(), dbg.getFile());
 	    sourceViewer.viewLine(dbg.getLine());
 	  } else {
 	    System.out.println("File: " + dbg.getFile());
diff --git a/se/sics/mspsim/util/SourceViewer.java b/se/sics/mspsim/util/SourceViewer.java
index 05d4ec1..6c31029 100644
--- a/se/sics/mspsim/util/SourceViewer.java
+++ b/se/sics/mspsim/util/SourceViewer.java
@@ -43,7 +43,7 @@ package se.sics.mspsim.util;
 
 public interface SourceViewer {
 
-  public void viewFile(String file);
+  public void viewFile(String path, String file);
   public void viewLine(int line);
 
 }