[Rubyeclipse-commit] org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching RubyApplicationLaunchConfigurationDelegate.java,1.11,1.12 InterpreterRunnerConfiguration.java,1.13,1.14

[Markus B. <mba...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22479/src/org/rubypeople/rdt/internal/launching

Modified Files:
	RubyApplicationLaunchConfigurationDelegate.java 
	InterpreterRunnerConfiguration.java 
Log Message:
merged from SRB_0-6-1_3

Index: RubyApplicationLaunchConfigurationDelegate.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyApplicationLaunchConfigurationDelegate.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** RubyApplicationLaunchConfigurationDelegate.java	25 Sep 2005 16:49:46 -0000	1.11
--- RubyApplicationLaunchConfigurationDelegate.java	4 Oct 2005 22:53:14 -0000	1.12
***************
*** 26,36 ****
  
  		if (mode.equals("debug")) {
! 			debuggerRunner.run( this.wrapConfiguration(configuration), launch);
  		} else {
! 			interpreterRunner.run( this.wrapConfiguration(configuration), launch);
  		}		
  	}
      
!     protected InterpreterRunnerConfiguration wrapConfiguration(ILaunchConfiguration configuration) {
      	return new InterpreterRunnerConfiguration(configuration) ;
      }
--- 26,36 ----
  
  		if (mode.equals("debug")) {
! 			debuggerRunner.run( this.wrapConfigurationAndHandleLaunch(configuration, launch), launch);
  		} else {
! 			interpreterRunner.run( this.wrapConfigurationAndHandleLaunch(configuration, launch), launch);
  		}		
  	}
      
!     protected InterpreterRunnerConfiguration wrapConfigurationAndHandleLaunch(ILaunchConfiguration configuration, ILaunch launch) {
      	return new InterpreterRunnerConfiguration(configuration) ;
      }

Index: InterpreterRunnerConfiguration.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/InterpreterRunnerConfiguration.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** InterpreterRunnerConfiguration.java	25 Sep 2005 17:57:01 -0000	1.13
--- InterpreterRunnerConfiguration.java	4 Oct 2005 22:53:14 -0000	1.14
***************
*** 70,74 ****
  			RdtLaunchingPlugin.log(e);
  		}
! 		return new File(file);
  	}
  	
--- 70,76 ----
  			RdtLaunchingPlugin.log(e);
  		}
! 		// it is valid not to specify a working directroy by returning null
! 		// whereas new File("") would specify an invalid directory
! 		return file == "" ? null : new File(file);
  	}