Bug 520176: [10.13] Menu Bar Disabled From Use Completely
On macOS 10.13, DefaultApp.nib file is missing from all the locale's
lproj folders and is available only in en.lproj folder. Added fallback
code that will look in en.lproj as well.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
index 584a180..598a85f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
@@ -5335,6 +5335,7 @@
* /System/Library/..../Resources/<language>.lproj/DefaultApp.nib
* /System/Library/..../Resources/<user's default language>.lproj/DefaultApp.nib
* /System/Library/..../Resources/English.lproj/DefaultApp.nib.
+ * /System/Library/..../Resources/en.lproj/DefaultApp.nib.
*/
NSBundle bundle = NSBundle.bundleWithIdentifier(NSString.stringWith("com.apple.JavaVM"));
NSDictionary dict = NSDictionary.dictionaryWithObject(applicationDelegate, NSString.stringWith("NSOwner"));
@@ -5343,8 +5344,8 @@
if (path == null) path = bundle.pathForResource(NSString.stringWith("DefaultApp"), NSString.stringWith("nib"));
if (!loaded) loaded = path != null && NSBundle.loadNibFile(path, dict, 0);
if (!loaded) {
- NSString resourcePath = bundle.resourcePath();
- path = resourcePath != null ? resourcePath.stringByAppendingString(NSString.stringWith("/English.lproj/DefaultApp.nib")) : null;
+ path = bundle.pathForResource(NSString.stringWith("DefaultApp"), NSString.stringWith("nib"), null, NSString.stringWith("English"));
+ if (path == null) path = bundle.pathForResource(NSString.stringWith("DefaultApp"), NSString.stringWith("nib"), null, NSString.stringWith("en"));
loaded = path != null && NSBundle.loadNibFile(path, dict, 0);
}
if (!loaded) {
