Author: yradtsevich Date: 2012-02-24 10:22:54 -0500 (Fri, 24 Feb 2012) New Revision: 39118 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/PlatformUtil.java trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java Log: https://issues.jboss.org/browse/JBIDE-11048 : BrowserSim: wrong application name in the Mac OS X menu-bar: 'SWT' instead of 'BrowserSim' Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-02-24 15:12:29 UTC (rev 39117) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-02-24 15:22:54 UTC (rev 39118) @@ -45,6 +45,7 @@ import org.eclipse.swt.widgets.Monitor; import org.eclipse.swt.widgets.Shell; import org.jboss.tools.vpe.browsersim.browser.BrowserSimBrowser; +import org.jboss.tools.vpe.browsersim.browser.PlatformUtil; import org.jboss.tools.vpe.browsersim.browser.WebKitBrowserFactory; import org.jboss.tools.vpe.browsersim.model.Device; import org.jboss.tools.vpe.browsersim.model.DeviceOrientation; @@ -70,6 +71,10 @@ private Image[] icons; public static void main(String[] args) { + if (PlatformUtil.OS_MACOSX.equals(PlatformUtil.getOs())) { + // set application name for Mac OS X menu-bar https://issues.jboss.org/browse/JBIDE-11048 + System.setProperty("com.apple.mrj.application.apple.menu.about.name", Messages.BrowserSim_BROWSER_SIM);//$NON-NLS-1$ + } String homeUrl; if (args.length > 0) { String lastArg = args[args.length - 1]; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/PlatformUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/PlatformUtil.java 2012-02-24 15:12:29 UTC (rev 39117) +++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/src/org/jboss/tools/vpe/browsersim/browser/PlatformUtil.java 2012-02-24 15:22:54 UTC (rev 39118) @@ -17,13 +17,14 @@ */ public class PlatformUtil { + public static final String OS_MACOSX = "macosx"; public static final String CURRENT_PLATFORM; static { String os = getOs(); String ws = getWs(); String arch = getArch(); - if ("macosx".equals(os) && "x86".equals(arch)) { + if (OS_MACOSX.equals(os) && "x86".equals(arch)) { CURRENT_PLATFORM = ws + '.' + os; // special case for MacOSX x86 (its SWT bundle has name org.eclipse.swt.cocoa.macosx) } else { CURRENT_PLATFORM = ws + '.' + os + '.' + arch; @@ -45,13 +46,13 @@ /* * Copy of org.eclipse.swt.internal.Library.os() */ - private static String getOs() { + public static String getOs() { String osName = System.getProperty("os.name"); //$NON-NLS-1$ if (osName.equals ("Linux")) return "linux"; //$NON-NLS-1$ $NON-NLS-2$ if (osName.equals ("AIX")) return "aix"; //$NON-NLS-1$ $NON-NLS-2$ if (osName.equals ("Solaris") || osName.equals ("SunOS")) return "solaris"; //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$ if (osName.equals ("HP-UX")) return "hpux"; //$NON-NLS-1$ $NON-NLS-2$ - if (osName.equals ("Mac OS X")) return "macosx"; //$NON-NLS-1$ $NON-NLS-2$ + if (osName.equals ("Mac OS X")) return OS_MACOSX; //$NON-NLS-1$ $NON-NLS-2$ if (osName.startsWith ("Win")) return "win32"; //$NON-NLS-1$ $NON-NLS-2$ return osName; }