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

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

Revision: 1861
          http://svn.sourceforge.net/rubyeclipse/?rev=1861&view=rev
Author:   cawilliams
Date:     2007-01-23 09:17:20 -0800 (Tue, 23 Jan 2007)

Log Message:
-----------
more hooking up the launching stuff for loadpaths to core

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingPlugin.java
    trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyVMContainer.java
    trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java

Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingPlugin.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingPlugin.java	2007-01-23 16:29:38 UTC (rev 1860)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingPlugin.java	2007-01-23 17:17:20 UTC (rev 1861)
@@ -131,13 +131,14 @@
 	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
-		
+		getPluginPreferences().addPropertyChangeListener(this);
 		RubyRuntime.addVMInstallChangedListener(this);
 	}
 	
 	@Override
 	public void stop(BundleContext context) throws Exception {
 		try {
+			getPluginPreferences().removePropertyChangeListener(this);
 			RubyRuntime.removeVMInstallChangedListener(this);
 			RubyRuntime.saveVMConfiguration();
 			savePluginPreferences();

Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyVMContainer.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyVMContainer.java	2007-01-23 16:29:38 UTC (rev 1860)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyVMContainer.java	2007-01-23 17:17:20 UTC (rev 1861)
@@ -78,6 +78,9 @@
 	 */
 	private static ILoadpathEntry[] computeLoadpathEntries(IVMInstall vm) {
 		IPath[] libs = vm.getLibraryLocations();
+		if (libs == null) {
+			libs = RubyRuntime.getLibraryLocations(vm);
+		}
 		List entries = new ArrayList(libs.length);
 		for (int i = 0; i < libs.length; i++) {
 			entries.add(RubyCore.newLibraryEntry(libs[i], false));

Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java	2007-01-23 16:29:38 UTC (rev 1860)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java	2007-01-23 17:17:20 UTC (rev 1861)
@@ -76,7 +76,7 @@
 	 * </ol>
 	 * @since 0.9.0
 	 */
-	public static final String RUBY_CONTAINER = LaunchingPlugin.getUniqueIdentifier() + "RUBY_CONTAINER"; //$NON-NLS-1$
+	public static final String RUBY_CONTAINER = LaunchingPlugin.getUniqueIdentifier() + ".RUBY_CONTAINER"; //$NON-NLS-1$
 	
 	/**
 	 * Preference key for the String of XML that defines all installed VMs.


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