[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [3009] trunk/com.aptana.rdt/src/com/aptana/rdt/ internal/core/gems/GemManager.java

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

Revision: 3009
          http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3009&view=rev
Author:   cawilliams
Date:     2007-08-20 06:55:35 -0700 (Mon, 20 Aug 2007)

Log Message:
-----------


Modified Paths:
--------------
    trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemManager.java

Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemManager.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemManager.java	2007-08-20 13:17:20 UTC (rev 3008)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemManager.java	2007-08-20 13:55:35 UTC (rev 3009)
@@ -61,6 +61,7 @@
 
 public class GemManager implements IGemManager {
 
+	private static final String INSTALLATION_DIRECTORY = "INSTALLATION DIRECTORY:";
 	private static final String INCLUDE_DEPENDENCIES_SWITCH = "-y";
 	private static final String LOCAL_SWITCH = "-l";
 	private static final String LIST_COMMAND = "list";
@@ -607,10 +608,13 @@
 			List<String> commands = new ArrayList<String>();
 			commands.add("environment");
 			String output = execAndReadOutput(commands);
+			if (output == null) return null;
 			String[] lines = output.split("\n");
 			if (lines == null || lines.length < 3) return null;
 			String path = lines[2];
-			path = path.substring(path.indexOf("INSTALLATION DIRECTORY:") + 23);
+			int index = path.indexOf(INSTALLATION_DIRECTORY);
+			if (index == -1) return null;
+			path = path.substring(index + INSTALLATION_DIRECTORY.length());
 			fGemInstallPath = new Path(path.trim());
 		}
 		return fGemInstallPath;


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