Attachment 15354 Details for Bug 75201 – slightly modified patch for MacOSXVMInstallType.java

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] slightly modified patch for MacOSXVMInstallType.java

patch75201.txt (text/plain), 3.09 KB, created by Andre Weinand

on 2004-10-22 18:37:49 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andre Weinand

Created: 2004-10-22 18:37:49 EDT

Size: 3.09 KB

patch

obsolete

>Index: macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstallType.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstallType.java,v
>retrieving revision 1.16
>diff -u -r1.16 MacOSXVMInstallType.java
>--- macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstallType.java	18 Sep 2004 21:09:36 -0000	1.16
>+++ macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstallType.java	22 Oct 2004 22:20:47 -0000
>@@ -22,6 +22,7 @@
> import org.eclipse.core.runtime.Path;
> import org.eclipse.core.runtime.Status;
> 
>+import org.eclipse.jdt.internal.launching.LaunchingPlugin;
> import org.eclipse.jdt.internal.launching.LibraryInfo;
> import org.eclipse.jdt.internal.launching.StandardVMType;
> 
>@@ -97,30 +98,39 @@
> 			File[] versions= versionDir.listFiles();
> 			for (int i= 0; i < versions.length; i++) {
> 				String version= versions[i].getName();
>-				File home=  new File(versions[i], JVM_ROOT);
>-				if (home.exists() && findVMInstall(version) == null && !CURRENT_JVM.equals(version)) {
>-					
>+				File home= new File(versions[i], JVM_ROOT);
>+				if (home.exists()) {
> 					boolean isDefault= currentJDK.equals(versions[i]);
>-					
>-					VMStandin vm= new VMStandin(this, version);
>-					vm.setInstallLocation(home);
>-					String format= MacOSXLaunchingPlugin.getString(isDefault
>-												? "MacOSXVMType.jvmDefaultName"		//$NON-NLS-1$
>-												: "MacOSXVMType.jvmName");				//$NON-NLS-1$
>-					vm.setName(MessageFormat.format(format, new Object[] { version } ));
>-					vm.setLibraryLocations(getDefaultLibraryLocations(home));
>-					URL doc= getDefaultJavadocLocation(home);
>-					if (doc != null)
>-						vm.setJavadocLocation(doc);
>-					
>-					IVMInstall rvm= vm.convertToRealVM();
>-					
>-					if (isDefault) {
>-						defaultLocation= home;
>-						try {
>-							JavaRuntime.setDefaultVMInstall(rvm, null);
>-						} catch (CoreException e) {
>-							// NeedWork
>+					IVMInstall install= findVMInstall(version);
>+					if (install == null && !CURRENT_JVM.equals(version)) {
>+						VMStandin vm= new VMStandin(this, version);
>+						vm.setInstallLocation(home);
>+						String format= MacOSXLaunchingPlugin.getString(isDefault
>+													? "MacOSXVMType.jvmDefaultName"		//$NON-NLS-1$
>+													: "MacOSXVMType.jvmName");				//$NON-NLS-1$
>+						vm.setName(MessageFormat.format(format, new Object[] { version } ));
>+						vm.setLibraryLocations(getDefaultLibraryLocations(home));
>+						URL doc= getDefaultJavadocLocation(home);
>+						if (doc != null)
>+							vm.setJavadocLocation(doc);
>+						
>+						IVMInstall rvm= vm.convertToRealVM();					
>+						if (isDefault) {
>+							defaultLocation= home;
>+							try {
>+								JavaRuntime.setDefaultVMInstall(rvm, null);
>+							} catch (CoreException e) {
>+								LaunchingPlugin.log(e);
>+							}
>+						}
>+					} else {
>+						if (isDefault) {
>+							defaultLocation= home;
>+							try {
>+								JavaRuntime.setDefaultVMInstall(install, null);
>+							} catch (CoreException e) {
>+								LaunchingPlugin.log(e);
>+							}
> 						}
> 					}
> 				}

Actions: View | Diff

Attachments on bug 75201: 14846 | 15354