[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2208] trunk

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

Revision: 2208
          http://svn.sourceforge.net/rubyeclipse/?rev=2208&view=rev
Author:   cawilliams
Date:     2007-03-22 08:06:49 -0700 (Thu, 22 Mar 2007)

Log Message:
-----------
handle case where user selects the bin directory where ruby executable resides (which is a common case)

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/rubyvms/AddVMDialog.java
    trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMType.java

Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/rubyvms/AddVMDialog.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/rubyvms/AddVMDialog.java	2007-03-22 13:58:39 UTC (rev 2207)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/rubyvms/AddVMDialog.java	2007-03-22 15:06:49 UTC (rev 2208)
@@ -111,13 +111,7 @@
 					if (segs == 1) {
 						genName = path.segment(0);
 					} else if (segs >= 2) {
-						String last = path.lastSegment();
-						// FIXME What is this reference to a jre directory?
-						if ("jre".equalsIgnoreCase(last)) { //$NON-NLS-1$
-							genName = path.segment(segs - 2);
-						} else {
-							genName = last;
-						}
+						genName = path.lastSegment();
 					}
 					if (genName != null) {
 						fVMName.setText(genName);

Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMType.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMType.java	2007-03-22 13:58:39 UTC (rev 2207)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMType.java	2007-03-22 15:06:49 UTC (rev 2208)
@@ -42,7 +42,7 @@
 	 * VM install locations, relative to the VM install location.
 	 */
 	private static final String[] fgCandidateRubyFiles = {"rubyw", "rubyw.exe", "ruby", "ruby.exe"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	private static final String[] fgCandidateRubyLocations = {"bin" + fgSeparator}; //$NON-NLS-1$ 
+	private static final String[] fgCandidateRubyLocations = {"", "bin" + fgSeparator}; //$NON-NLS-1$ //$NON-NLS-2$
 	
 	
 	@Override


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