[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2645] trunk/org.rubypeople.rdt.debug.ui

[<caw...@us...>]

Revision: 2645
          http://svn.sourceforge.net/rubyeclipse/?rev=2645&view=rev
Author:   cawilliams
Date:     2007-06-20 12:42:01 -0700 (Wed, 20 Jun 2007)

Log Message:
-----------
fix broken test

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/console/RubyConsoleTracker.java
    trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/TC_RubyConsoleTracker.java

Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/console/RubyConsoleTracker.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/console/RubyConsoleTracker.java	2007-06-20 16:45:57 UTC (rev 2644)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/console/RubyConsoleTracker.java	2007-06-20 19:42:01 UTC (rev 2645)
@@ -107,15 +107,7 @@
 						
 			String text = fConsole.getDocument().get(offset, length);
 			while (StackTraceLine.isTraceLine(text)) {
-				String projectName = null;
-				try {
-					projectName = fConsole.getProcess().getLaunch().getLaunchConfiguration().getAttribute(IRubyLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String) null);
-				} catch (CoreException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-				IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-				StackTraceLine stackTraceLine = new StackTraceLine(text, project);
+				StackTraceLine stackTraceLine = new StackTraceLine(text, getProject());
 				if (! existanceChecker.fileExists(stackTraceLine.getFilename()))
 					return;
 				IHyperlink link = new RubyStackTraceHyperlink(fConsole, stackTraceLine);
@@ -137,6 +129,18 @@
 		}
 	}
 
+	protected IProject getProject() {
+		String projectName = null;
+		try {
+			projectName = fConsole.getProcess().getLaunch().getLaunchConfiguration().getAttribute(IRubyLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String) null);
+		} catch (CoreException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return null;
+		}
+		return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+	}
+
 	/**
 	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#dispose()
 	 */

Modified: trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/TC_RubyConsoleTracker.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/TC_RubyConsoleTracker.java	2007-06-20 16:45:57 UTC (rev 2644)
+++ trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/TC_RubyConsoleTracker.java	2007-06-20 19:42:01 UTC (rev 2645)
@@ -5,6 +5,7 @@
 
 import junit.framework.TestCase;
 
+import org.eclipse.core.resources.IProject;
 import org.eclipse.debug.core.model.IProcess;
 import org.eclipse.debug.core.model.IStreamMonitor;
 import org.eclipse.debug.core.model.IStreamsProxy;
@@ -99,7 +100,14 @@
 		RubyConsoleTracker tracker ;
 		
 		public TestConsole(FileExistanceChecker fileChecker) throws Exception {
-			tracker = new RubyConsoleTracker(fileChecker);						
+			tracker = new RubyConsoleTracker(fileChecker){
+			
+				@Override
+				protected IProject getProject() {
+					return null;
+				}
+			
+			};						
 			tracker.init(this) ;			
 		}
 		


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.