[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [1830] trunk/org.rubypeople.rdt.launching/src/org/ rubypeople/rdt/internal/launching

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

Revision: 1830
          http://svn.sourceforge.net/rubyeclipse/?rev=1830&view=rev
Author:   cawilliams
Date:     2007-01-20 14:07:49 -0800 (Sat, 20 Jan 2007)

Log Message:
-----------
standard VM type works ok on Mac OSX, so don't complain and say it doesn't!

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingMessages.java
    trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingMessages.properties
    trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMType.java

Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingMessages.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingMessages.java	2007-01-20 22:05:00 UTC (rev 1829)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingMessages.java	2007-01-20 22:07:49 UTC (rev 1830)
@@ -26,11 +26,9 @@
 	public static String RubyRuntime_exceptionsOccurred;
 	public static String vmInstallType_duplicateVM;
 	public static String StandardVMType_Standard_VM_3;
-	public static String StandardVMType_Standard_VM_not_supported_on_MacOS__1;
 	public static String StandardVMType_Not_a_JDK_Root__Java_executable_was_not_found_1;
 	public static String StandardVMType_ok_2;
 	public static String StandardVMType_Not_a_JDK_root__System_library_was_not_found__1;
-
 	public static String AbstractVMRunner_0;
 	public static String vmRunnerConfig_assert_classNotNull;
 	public static String vmRunnerConfig_assert_classPathNotNull;

Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingMessages.properties
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingMessages.properties	2007-01-20 22:05:00 UTC (rev 1829)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingMessages.properties	2007-01-20 22:07:49 UTC (rev 1830)
@@ -26,7 +26,6 @@
 LaunchingPlugin_34=Unable to create XML parser.
 vmInstallType_duplicateVM=Duplicate VM: {0}
 StandardVMType_Standard_VM_3=Standard VM
-StandardVMType_Standard_VM_not_supported_on_MacOS__1=Standard VM not supported on MacOS.
 StandardVMType_Not_a_JDK_Root__Java_executable_was_not_found_1=Target is not a Ruby installation root. Ruby executable was not found
 StandardVMType_ok_2=ok
 StandardVMType_Not_a_JDK_root__System_library_was_not_found__1=Target is not a Ruby installation root. System library was not found.

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-01-20 22:05:00 UTC (rev 1829)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMType.java	2007-01-20 22:07:49 UTC (rev 1830)
@@ -57,18 +57,14 @@
 
 	public IStatus validateInstallLocation(File rubyHome) {
 		IStatus status = null;
-		if (Platform.getOS().equals(Constants.OS_MACOSX)) {
-			status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), 0, LaunchingMessages.StandardVMType_Standard_VM_not_supported_on_MacOS__1, null); 
+		File rubyExecutable = findRubyExecutable(rubyHome);
+		if (rubyExecutable == null) {
+			status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), 0, LaunchingMessages.StandardVMType_Not_a_JDK_Root__Java_executable_was_not_found_1, null);						
 		} else {
-			File rubyExecutable = findRubyExecutable(rubyHome);
-			if (rubyExecutable == null) {
-				status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), 0, LaunchingMessages.StandardVMType_Not_a_JDK_Root__Java_executable_was_not_found_1, null); //			
+			if (canDetectDefaultSystemLibraries(rubyHome, rubyExecutable)) {
+				status = new Status(IStatus.OK, LaunchingPlugin.getUniqueIdentifier(), 0, LaunchingMessages.StandardVMType_ok_2, null); 
 			} else {
-				if (canDetectDefaultSystemLibraries(rubyHome, rubyExecutable)) {
-					status = new Status(IStatus.OK, LaunchingPlugin.getUniqueIdentifier(), 0, LaunchingMessages.StandardVMType_ok_2, null); 
-				} else {
-					status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), 0, LaunchingMessages.StandardVMType_Not_a_JDK_root__System_library_was_not_found__1, null); 
-				}
+				status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), 0, LaunchingMessages.StandardVMType_Not_a_JDK_root__System_library_was_not_found__1, null); 
 			}
 		}
 		return status;		


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