eliminated some compiler warnings
diff --git a/org.eclipse.jdt.launching.macosx/META-INF/MANIFEST.MF b/org.eclipse.jdt.launching.macosx/META-INF/MANIFEST.MF
index f797d74..cf059a7 100644
--- a/org.eclipse.jdt.launching.macosx/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.launching.macosx/META-INF/MANIFEST.MF
@@ -15,5 +15,5 @@
  org.eclipse.jdt.core,
  org.eclipse.jdt.launching,
  org.eclipse.jdt.ui
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
 Eclipse-PlatformFilter: (osgi.os=macosx)
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstall.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstall.java
index 85cf300..553f9b7 100644
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstall.java
+++ b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstall.java
@@ -13,6 +13,7 @@
 import java.io.File;
 
 import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.jdt.internal.launching.StandardVMType;
 import org.eclipse.jdt.launching.AbstractVMInstall;
 import org.eclipse.jdt.launching.IVMInstallType;
 import org.eclipse.jdt.launching.IVMRunner;
@@ -36,7 +37,7 @@
     public String getJavaVersion() {
         File installLocation= getInstallLocation();
         if (installLocation != null) {
-            File executable= MacOSXVMInstallType.findJavaExecutable(installLocation);
+            File executable= StandardVMType.findJavaExecutable(installLocation);
             if (executable != null) {
                 MacOSXVMInstallType installType= (MacOSXVMInstallType) getVMInstallType();        
                 String vmVersion= installType.getVMVersion(installLocation, executable);
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleBuilder.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleBuilder.java
index 4a6d1db..128cb7e 100644
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleBuilder.java
+++ b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleBuilder.java
@@ -42,7 +42,7 @@
 		File app_dir= new File(tmp_dir, app_dir_name);
 		if (app_dir.exists())
 			deleteDir(app_dir);
-		app_dir= createDir(tmp_dir, app_dir_name, false);	//$NON-NLS-1$
+		app_dir= createDir(tmp_dir, app_dir_name, false);
 		
 		File contents_dir= createDir(app_dir, "Contents", false);	//$NON-NLS-1$
 		createPkgInfo(contents_dir);
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleDescription.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleDescription.java
index dd69c29..151bfb9 100644
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleDescription.java
+++ b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleDescription.java
@@ -18,7 +18,7 @@
 import org.eclipse.core.runtime.CoreException;
 
 import org.eclipse.jface.util.*;
-import org.eclipse.jface.util.ListenerList;
+import org.eclipse.core.commands.util.ListenerList;
 
 import org.eclipse.debug.core.*;
 import org.eclipse.jdt.core.IJavaProject;
@@ -134,7 +134,7 @@
 		try {
 			String[] classpath= lcd.getClasspath(lc);
 			for (int i= 0; i < classpath.length; i++)
-				addResource(new ResourceInfo(classpath[i]), true); //$NON-NLS-1$
+				addResource(new ResourceInfo(classpath[i]), true);
 		} catch (CoreException e) {
 			//
 		}
@@ -187,7 +187,7 @@
 		
 		if (launcher == null) {
 			setValue(JVMVERSION, "1.4*"); //$NON-NLS-1$
-			launcher= STUB;	//$NON-NLS-1$			
+			launcher= STUB;		
 		}
 		setValue(LAUNCHER, launcher);
 
@@ -226,7 +226,7 @@
 				try {
 					String name= dlls[j].getCanonicalPath();
 					if (name.endsWith(".jnilib")) //$NON-NLS-1$
-						addResource(new ResourceInfo(name), false); //$NON-NLS-1$
+						addResource(new ResourceInfo(name), false);
 				} catch (IOException e) {
 					// NeedWork Auto-generated catch block
 					e.printStackTrace();
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage1.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage1.java
index 7524aaf..8e6fd68 100644
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage1.java
+++ b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage1.java
@@ -126,7 +126,7 @@
 				hookField(fJVMVersion, JVMVERSION);
 				createLabel(c8, "      ", GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
 				createLabel(c8, Util.getString("page1.useSWT.label"), GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
-				fUseSWT= createButton(c8, SWT.CHECK, null); //$NON-NLS-1$
+				fUseSWT= createButton(c8, SWT.CHECK, null);
 				hookButton(fUseSWT, USES_SWT);
 			
 			createLabel(g6, Util.getString("page1.appIcon.label"), GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
@@ -159,7 +159,7 @@
 		if (fJVMVersion != null)
 			fJVMVersion.setText(fBundleDescription.get(JVMVERSION, "")); //$NON-NLS-1$
 		if (fUseSWT != null)
-			fUseSWT.setSelection(fBundleDescription.get(USES_SWT, false)); //$NON-NLS-1$
+			fUseSWT.setSelection(fBundleDescription.get(USES_SWT, false));
 	}
 	
 	public boolean isPageComplete() {