Attachment 72635 Details for Bug 194483 – patch

[patch] patch

patch194483.txt (text/plain), 2.82 KB, created by Adam Archer

on 2007-06-27 14:13:30 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Archer

Created: 2007-06-27 14:13:30 EDT

Size: 2.82 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.help.base
>Index: src/org/eclipse/help/internal/standalone/Eclipse.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Eclipse.java,v
>retrieving revision 1.12
>diff -u -r1.12 Eclipse.java
>--- src/org/eclipse/help/internal/standalone/Eclipse.java	17 Apr 2006 15:19:44 -0000	1.12
>+++ src/org/eclipse/help/internal/standalone/Eclipse.java	27 Jun 2007 18:05:38 -0000
>@@ -46,7 +46,6 @@
> 			ensureEclipseExeExists();
> 		} else {
> 			prepareJavaCommand();
>-			ensureStartupJarExists();
> 		}
> 		ensureVmExists();
> 	}
>@@ -65,7 +64,7 @@
> 			cmdarray[4 + eclipseArgs.size() + i] = (String) vmArgs.get(i);
> 		}
> 	}
>-	private void prepareJavaCommand() {
>+	private void prepareJavaCommand() throws Exception {
> 		List vmArgs = Options.getVmArgs();
> 		List eclipseArgs = Options.getEclipseArgs();
> 		cmdarray = new String[1 + vmArgs.size() + 3 + eclipseArgs.size()];
>@@ -74,7 +73,7 @@
> 			cmdarray[1 + i] = (String) vmArgs.get(i);
> 		}
> 		cmdarray[1 + vmArgs.size()] = "-cp"; //$NON-NLS-1$
>-		cmdarray[2 + vmArgs.size()] = "startup.jar"; //$NON-NLS-1$
>+		cmdarray[2 + vmArgs.size()] = getStartupJar();
> 		cmdarray[3 + vmArgs.size()] = "org.eclipse.core.launcher.Main"; //$NON-NLS-1$
> 		for (int i = 0; i < eclipseArgs.size(); i++) {
> 			cmdarray[4 + vmArgs.size() + i] = (String) eclipseArgs.get(i);
>@@ -169,13 +168,19 @@
> 		throw new Exception("File " + eclipseExe.getAbsolutePath() //$NON-NLS-1$
> 				+ " does not exists.  Pass a correct -eclipsehome option"); //$NON-NLS-1$
> 	}
>-	private void ensureStartupJarExists() throws Exception {
>-		File startupJar = new File(Options.getEclipseHome(), "startup.jar"); //$NON-NLS-1$
>-		if (startupJar.exists() && !startupJar.isDirectory()) {
>-			return;
>-		}
>-		throw new Exception("File " + startupJar.getAbsolutePath() //$NON-NLS-1$
>+	private String getStartupJar() throws Exception {
>+		File pluginsDir = new File(Options.getEclipseHome(), "plugins/"); //$NON-NLS-1$
>+		if (!pluginsDir.exists() || !pluginsDir.isDirectory())
>+			throw new Exception("Plugins directory " + pluginsDir.getAbsolutePath() //$NON-NLS-1$
> 				+ " does not exists.  Pass a correct -eclipsehome option"); //$NON-NLS-1$
>+		File[] plugins = pluginsDir.listFiles();
>+		for (int i = 0; i < plugins.length; i++) {
>+			String file = plugins[i].getName();
>+			if (file.startsWith("org.eclipse.equinox.launcher") && file.endsWith(".jar") && !plugins[i].isDirectory()) //$NON-NLS-1$ //$NON-NLS-2$
>+				return "plugins/" + file; //$NON-NLS-1$
>+		}
>+		throw new Exception("Plugins directory " + pluginsDir.getAbsolutePath() //$NON-NLS-1$
>+				+ " does not contain a valid startup jar.  Pass a correct -eclipsehome option"); //$NON-NLS-1$
> 	}
> 	/**
> 	 * @return Exception

Actions: View | Diff

Attachments on bug 194483: 72635