[Rubyeclipse-commit] org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/views FailureTrace.java,1.2,1.3 TestUnitMessages.properties,1.9,1.10

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

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/views
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1489/src/org/rubypeople/rdt/testunit/views

Modified Files:
	FailureTrace.java TestUnitMessages.properties 
Log Message:
apply david corbin's patches

Index: FailureTrace.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/views/FailureTrace.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FailureTrace.java	2 Mar 2005 00:54:39 -0000	1.2
--- FailureTrace.java	28 Mar 2005 23:23:24 -0000	1.3
***************
*** 16,19 ****
--- 16,27 ----
  import java.io.StringReader;
  
+ import org.eclipse.jface.action.Action;
+ import org.eclipse.jface.action.IMenuListener;
+ import org.eclipse.jface.action.IMenuManager;
+ import org.eclipse.jface.action.MenuManager;
+ import org.eclipse.jface.action.ToolBarManager;
+ import org.eclipse.jface.util.Assert;
+ import org.eclipse.jface.util.IOpenEventListener;
+ import org.eclipse.jface.util.OpenStrategy;
  import org.eclipse.swt.SWT;
  import org.eclipse.swt.dnd.Clipboard;
***************
*** 21,24 ****
--- 29,33 ----
  import org.eclipse.swt.events.DisposeListener;
  import org.eclipse.swt.events.SelectionEvent;
+ import org.eclipse.swt.events.SelectionListener;
  import org.eclipse.swt.graphics.Image;
  import org.eclipse.swt.widgets.Composite;
***************
*** 28,40 ****
  import org.eclipse.swt.widgets.TableItem;
  import org.eclipse.swt.widgets.ToolBar;
! 
! import org.eclipse.jface.action.Action;
! import org.eclipse.jface.action.IMenuListener;
! import org.eclipse.jface.action.IMenuManager;
! import org.eclipse.jface.action.MenuManager;
! import org.eclipse.jface.action.ToolBarManager;
! import org.eclipse.jface.util.Assert;
! import org.eclipse.jface.util.IOpenEventListener;
! import org.eclipse.jface.util.OpenStrategy;
  
  /**
--- 37,41 ----
  import org.eclipse.swt.widgets.TableItem;
  import org.eclipse.swt.widgets.ToolBar;
! import org.rubypeople.rdt.internal.ui.util.StackTraceLine;
  
  /**
***************
*** 85,88 ****
--- 86,97 ----
  		
  		initMenu();
+ 		fTable.addSelectionListener(new SelectionListener() {
+ 		
+ 			public void widgetSelected(SelectionEvent e) {}
+ 			
+ 			public void widgetDefaultSelected(SelectionEvent e) {
+ 					new StackTraceLine(getSelectedText()).openEditor();
+ 			}
+ 		});
  		
  		parent.addDisposeListener(new DisposeListener() {
***************
*** 119,143 ****
  	private String getSelectedText() {
  		return fTable.getSelection()[0].getText();
! 	}				
! 
! 	private Action createOpenEditorAction(String pLine) {
! 	    // FIXME This is hard-coded to only .rb extensions
! 	    // FIXME This is duplicated from the ConsoleTracker code in debug.ui
! 	    String file = pLine.substring(0, pLine.indexOf(".rb:") + 3);
! 	    int startOfSuffix = pLine.indexOf(".rb:");
! 		if (startOfSuffix == -1) {
! 			return null;
! 		}
! 		int startLineNumber = startOfSuffix + 4 ;
! 		int endLineNumber = pLine.indexOf(":", startLineNumber);
! 		if (endLineNumber == -1) {
! 			endLineNumber = pLine.length();
! 		}
  		
! 		int line = Integer.parseInt(pLine.substring(startLineNumber, endLineNumber));		
! 		return new OpenEditorAtLineAction(fTestRunner, file, line);
  	}
  
!     private void disposeIcons(){
  		if (fExceptionIcon != null && !fExceptionIcon.isDisposed()) 
  			fExceptionIcon.dispose();
--- 128,138 ----
  	private String getSelectedText() {
  		return fTable.getSelection()[0].getText();
! 	}	
  		
! 	private Action createOpenEditorAction(String traceLine) {
! 		return new OpenEditorAction(new StackTraceLine(traceLine));
  	}
  
! 	private void disposeIcons(){
  		if (fExceptionIcon != null && !fExceptionIcon.isDisposed()) 
  			fExceptionIcon.dispose();
***************
*** 296,298 ****
--- 291,306 ----
          return fTable.getShell();
      }
+ 	
+ 	private class OpenEditorAction extends Action {
+ 		private final StackTraceLine trace;
+ 	
+ 		public OpenEditorAction(StackTraceLine trace) {
+ 			super(TestUnitMessages.getString("OpenEditor.action.label"));
+ 			this.trace = trace;
+ 		}
+ 	
+ 		public void run() {
+ 			trace.openEditor();
+ 		}	
+ 	}
  }

Index: TestUnitMessages.properties
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/views/TestUnitMessages.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TestUnitMessages.properties	24 Nov 2004 15:04:55 -0000	1.9
--- TestUnitMessages.properties	28 Mar 2005 23:23:25 -0000	1.10
***************
*** 1,2 ****
--- 1,4 ----
+ OpenEditor.action.label=Open
+ 
  CopyTrace.action.label=Copy Trace
  CopyTraceAction.problem=Problem Copying to Clipboard
***************
*** 147,152 ****
--- 149,157 ----
  ExpandAllAction.tooltip=Expand All Nodes
  
+ LaunchConfigurationTab.RubyEntryPoint.allTestCases=Run all TestCases
  LaunchConfigurationTab.RubyEntryPoint.classLabel=Test Class:
  LaunchConfigurationTab.RubyEntryPoint.classSelectorMessage=Choose the test class:
+ LaunchConfigurationTab.RubyEntryPoint.allTestMethods=Run all tests
+ LaunchConfigurationTab.RubyEntryPoint.methodLabel=Test Method:
  RubyClassSelector.Title=Class Selection