Skip to content

Commit 3eeccc4

Browse files
HannesWellakurtakov
authored andcommitted
Avoid MacOSXLaunchingPlugin bundle activator
1 parent 3b6b490 commit 3eeccc4

3 files changed

Lines changed: 5 additions & 53 deletions

File tree

org.eclipse.jdt.launching.macosx/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.jdt.launching.macosx; singleton:=true
55
Bundle-Version: 3.6.300.qualifier
6-
Bundle-Activator: org.eclipse.jdt.internal.launching.macosx.MacOSXLaunchingPlugin
76
Bundle-Vendor: %providerName
87
Bundle-Localization: plugin
98
Require-Bundle: org.eclipse.debug.core;bundle-version="[3.12.0,4.0.0)",

org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java

Lines changed: 0 additions & 46 deletions
This file was deleted.

org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstallType.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.net.URL;
2222

2323
import org.eclipse.core.runtime.CoreException;
24+
import org.eclipse.core.runtime.ILog;
2425
import org.eclipse.core.runtime.IPath;
2526
import org.eclipse.core.runtime.IStatus;
2627
import org.eclipse.core.runtime.Path;
@@ -190,7 +191,7 @@ public File detectInstallLocation() {
190191
}
191192
return defaultLocation;
192193
} catch (CoreException e) {
193-
MacOSXLaunchingPlugin.getDefault().getLog().log(e.getStatus());
194+
ILog.get().log(e.getStatus());
194195
return detectInstallLocationOld();
195196
}
196197
}
@@ -376,13 +377,11 @@ File getSourceInParent(File parent) {
376377
*/
377378
@Override
378379
public IStatus validateInstallLocation(File javaHome) {
379-
String id= MacOSXLaunchingPlugin.getUniqueIdentifier();
380380
File java= new File(javaHome, "bin"+File.separator+"java"); //$NON-NLS-2$ //$NON-NLS-1$
381-
if (java.isFile())
382-
{
383-
return new Status(IStatus.OK, id, 0, "ok", null); //$NON-NLS-1$
381+
if (java.isFile()) {
382+
return Status.OK_STATUS;
384383
}
385-
return new Status(IStatus.ERROR, id, 0, Messages.MacOSXVMInstallType_2, null);
384+
return Status.error(Messages.MacOSXVMInstallType_2);
386385
}
387386

388387
/* (non-Javadoc)

0 commit comments

Comments
 (0)