[jbosstools-commits] JBoss Tools SVN: r30971 - in trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner: browser and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: dmaliarevich
Date: 2011-04-29 11:15:32 -0400 (Fri, 29 Apr 2011)
New Revision: 30971

Modified:
   trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/VpeXulrunnerMessages.java
   trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
   trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/messages.properties
Log:
https://issues.jboss.org/browse/JBIDE-7308, updated

Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/VpeXulrunnerMessages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/VpeXulrunnerMessages.java	2011-04-29 14:19:47 UTC (rev 30970)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/VpeXulrunnerMessages.java	2011-04-29 15:15:32 UTC (rev 30971)
@@ -9,6 +9,7 @@
 	public static String XulRunnerBrowser_cannotGetPathToXulrunner;
 	public static String XulRunnerBrowser_notAvailable;
 	public static String XulRunnerBrowser_wrongVersion;
+	public static String CURRENT_PLATFORM_IS_NOT_SUPPORTED;
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, VpeXulrunnerMessages.class);

Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java	2011-04-29 14:19:47 UTC (rev 30970)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java	2011-04-29 15:15:32 UTC (rev 30971)
@@ -228,7 +228,15 @@
 
 				Bundle xulRunnerBundle = Platform.getBundle(getXulRunnerBundle());
 				if (xulRunnerBundle == null) {
-					throw new XulRunnerException(MessageFormat.format(VpeXulrunnerMessages.XulRunnerBrowser_bundleNotFound,getXulRunnerBundle()));  //$NON-NLS-2$
+					if (!XulRunnerBrowser.isCurrentPlatformOfficiallySupported()) {
+						throw new XulRunnerException(MessageFormat.format(
+								VpeXulrunnerMessages.CURRENT_PLATFORM_IS_NOT_SUPPORTED,
+								XulRunnerBrowser.CURRENT_PLATFORM_ID));
+					} else {
+						throw new XulRunnerException(MessageFormat.format(
+								VpeXulrunnerMessages.XulRunnerBrowser_bundleNotFound,
+								getXulRunnerBundle()));
+					}
 				}
 
 				String xulRunnerVersion = (String) xulRunnerBundle.getHeaders().get("Bundle-Version"); //$NON-NLS-1$

Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/messages.properties	2011-04-29 14:19:47 UTC (rev 30970)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/messages.properties	2011-04-29 15:15:32 UTC (rev 30971)
@@ -3,3 +3,4 @@
 XulRunnerBrowser_cannotGetPathToXulrunner=Cannot get path to XULRunner from bundle {0}
 XulRunnerBrowser_notAvailable=nsIWebBrowser is not available
 XulRunnerBrowser_wrongVersion=the version of the bundled XULRunner {0} must be >= {1} and <= {2}
+CURRENT_PLATFORM_IS_NOT_SUPPORTED=Current platform ''{0}'' is not supported.