From 11a38049941892aa5d83c2b89584ce32e76997ab Mon Sep 17 00:00:00 2001 From: Salikh Zakirov Date: Tue, 1 Aug 2006 01:53:57 +0400 Subject: [PATCH] Fixed Harmony VM Eclipse plugin to play with DRLVM nicely (largely based on hyplugin.patch from DRLVM) --- .../eclipse/jdt/launching/HyLaunchingPlugin.java | 3 +++ .../eclipse/jdt/launching/HyVMInstallType.java | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eclipse/org.apache.harmony.eclipse.jdt.launching/src/org/apache/harmony/eclipse/jdt/launching/HyLaunchingPlugin.java b/eclipse/org.apache.harmony.eclipse.jdt.launching/src/org/apache/harmony/eclipse/jdt/launching/HyLaunchingPlugin.java index 495ac1e..bf77850 100644 --- a/eclipse/org.apache.harmony.eclipse.jdt.launching/src/org/apache/harmony/eclipse/jdt/launching/HyLaunchingPlugin.java +++ b/eclipse/org.apache.harmony.eclipse.jdt.launching/src/org/apache/harmony/eclipse/jdt/launching/HyLaunchingPlugin.java @@ -65,6 +65,9 @@ public class HyLaunchingPlugin extends P } public static HyLaunchingPlugin getDefault() { + if (plugin == null) { + plugin = new HyLaunchingPlugin(); + } return plugin; } diff --git a/eclipse/org.apache.harmony.eclipse.jdt.launching/src/org/apache/harmony/eclipse/jdt/launching/HyVMInstallType.java b/eclipse/org.apache.harmony.eclipse.jdt.launching/src/org/apache/harmony/eclipse/jdt/launching/HyVMInstallType.java index 90364b8..6840f6c 100644 --- a/eclipse/org.apache.harmony.eclipse.jdt.launching/src/org/apache/harmony/eclipse/jdt/launching/HyVMInstallType.java +++ b/eclipse/org.apache.harmony.eclipse.jdt.launching/src/org/apache/harmony/eclipse/jdt/launching/HyVMInstallType.java @@ -91,9 +91,6 @@ public class HyVMInstallType extends Abs * @see org.eclipse.jdt.launching.IVMInstallType#detectInstallLocation() */ public File detectInstallLocation() { - // Try to detect wether the current VM is a Harmony installation. - if (!"clear".equals(System.getProperty("com.ibm.oti.configuration", "missing"))) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - return null; File home = new File(System.getProperty("java.home")); //$NON-NLS-1$ IStatus status = validateInstallLocation(home); @@ -114,7 +111,7 @@ public class HyVMInstallType extends Abs List kernelLibraries = getKernelLibraries(installLocation, "default", "clearvm"); //$NON-NLS-1$ //$NON-NLS-2$ if (kernelLibraries == null) { - return new LibraryLocation[] {}; + kernelLibraries = new ArrayList(); } List bootLibraries = getBootLibraries(installLocation); -- 1.4.1.g4b86