Author: yradtsevich Date: 2011-11-17 14:18:12 -0500 (Thu, 17 Nov 2011) New Revision: 36411 Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/WebKitBrowserFactory.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/Messages.java workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/messages.properties Log: https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps - unsupported platform handling Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java 2011-11-17 19:13:02 UTC (rev 36410) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/BrowserSim.java 2011-11-17 19:18:12 UTC (rev 36411) @@ -131,11 +131,11 @@ try { browser = WebKitBrowserFactory.createWebKitBrowser(shell, SWT.NONE); } catch (SWTError e) { - System.out.println(Messages.BrowserSim_COULD_NOT_INSTANTIATE_BROWSER + e.getMessage()); + System.out.println(Messages.BrowserSim_COULD_NOT_INSTANTIATE_WEBKIT_BROWSER + e.getMessage()); MessageBox messageBox = new MessageBox(shell, SWT.OK | SWT.ICON_ERROR); messageBox.setText("Error"); - messageBox.setMessage(Messages.BrowserSim_COULD_NOT_INSTANTIATE_BROWSER + e.getMessage()); + messageBox.setMessage(Messages.BrowserSim_COULD_NOT_INSTANTIATE_WEBKIT_BROWSER + e.getMessage()); messageBox.open(); display.dispose(); Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/Messages.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/Messages.java 2011-11-17 19:13:02 UTC (rev 36410) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/Messages.java 2011-11-17 19:18:12 UTC (rev 36411) @@ -19,7 +19,7 @@ private static final String BUNDLE_NAME = Messages.class.getName().toString().toLowerCase(); public static String BrowserSim_ADDRESS; public static String BrowserSim_BROWSER_SIM; - public static String BrowserSim_COULD_NOT_INSTANTIATE_BROWSER; + public static String BrowserSim_COULD_NOT_INSTANTIATE_WEBKIT_BROWSER; public static String BrowserSim_DEVICES; public static String BrowserSim_ERROR; public static String BrowserSim_EXIT; @@ -47,6 +47,7 @@ public static String ManageDevicesDialog_LOAD_DEFAULTS; public static String ManageDevicesDialog_USER_AGENT; public static String ManageDevicesDialog_WIDTH; + static { NLS.initializeMessages(BUNDLE_NAME, Messages.class); } Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/messages.properties =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/messages.properties 2011-11-17 19:13:02 UTC (rev 36410) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim/src/org/jboss/tools/browsersim/ui/messages.properties 2011-11-17 19:18:12 UTC (rev 36411) @@ -1,6 +1,6 @@ BrowserSim_ADDRESS=Address BrowserSim_BROWSER_SIM=BrowserSim -BrowserSim_COULD_NOT_INSTANTIATE_BROWSER=Could not instantiate Browser: +BrowserSim_COULD_NOT_INSTANTIATE_WEBKIT_BROWSER=Could not instantiate WebKit Browser: BrowserSim_DEVICES=Devices BrowserSim_ERROR=Error BrowserSim_EXIT=Exit Modified: workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/WebKitBrowserFactory.java =================================================================== --- workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/WebKitBrowserFactory.java 2011-11-17 19:13:02 UTC (rev 36410) +++ workspace/yradtsevich/browsersim/swt-webkit-browsersim/org.jboss.tools.browsersim.webkit/src/org/jboss/tools/browsersim/webkit/WebKitBrowserFactory.java 2011-11-17 19:18:12 UTC (rev 36411) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.browsersim.webkit; +import org.eclipse.swt.SWTError; import org.eclipse.swt.widgets.Composite; import org.jboss.tools.browsersim.webkit.internal.WebKitBrowser_gtk_linux_x86; import org.jboss.tools.browsersim.webkit.internal.WebKitBrowser_gtk_linux_x86_64; @@ -30,7 +31,7 @@ } else if (PlatformUtil.CURRENT_PLATFORM.equals("win32.win32.x86")) { return new WebKitBrowser_win32_win32_x86(parent, style); } - //TODO: handle null properly in callers - return null; + + throw new SWTError("Unsupported Platform"); } }