From: <jde...@us...> - 2013-10-28 11:49:00
|
Revision: 21985 http://sourceforge.net/p/pcgen/code/21985 Author: jdempsey Date: 2013-10-28 11:48:56 +0000 (Mon, 28 Oct 2013) Log Message: ----------- Fix bug: Clicking links in source selection screen gives SEVERE warning on Mac Issue#: CODE-2324 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/tools/BrowserLauncher.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tools/BrowserLauncher.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tools/BrowserLauncher.java 2013-10-28 11:29:36 UTC (rev 21984) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tools/BrowserLauncher.java 2013-10-28 11:48:56 UTC (rev 21985) @@ -222,49 +222,58 @@ if (osName.startsWith("Mac OS")) { String mrjVersion = System.getProperty("mrj.version"); - Logging.log(Logging.WARNING, "Checking for mac version in " + mrjVersion); - String majorMRJVersion = mrjVersion.substring(0, 3); - - try + //Logging.log(Logging.WARNING, "Checking for mac version in " + mrjVersion); + if (mrjVersion == null) { - double version = Double.valueOf(majorMRJVersion).doubleValue(); - - if (version < 2.1) + jvm = MRJ_3_1; + } + else + { + String majorMRJVersion = + mrjVersion.length() < 3 ? mrjVersion : mrjVersion + .substring(0, 3); + + try { - jvm = MRJ_2_0; + double version = Double.valueOf(majorMRJVersion).doubleValue(); + + if (version < 2.1) + { + jvm = MRJ_2_0; + } + else if ((version >= 2.1) && (version < 3)) + { + // Assume that all 2.x versions of MRJ work the + // same. MRJ 2.1 actually works via Runtime.exec() + // and 2.2 supports that but has an openURL() method as + // well that we currently ignore. + jvm = MRJ_2_1; + } + else if (version == 3.0) + { + jvm = MRJ_3_0; + } + else if (version >= 3.1) + { + // Assume that all 3.1 and later versions of MRJ work the same. + jvm = MRJ_3_1; + } + else + { + loadedWithoutErrors = false; + errorMessage = + LanguageBundle.getFormattedString("in_BLEr1", + String.valueOf(version)); + } } - else if ((version >= 2.1) && (version < 3)) + catch (NumberFormatException nfe) { - // Assume that all 2.x versions of MRJ work the - // same. MRJ 2.1 actually works via Runtime.exec() - // and 2.2 supports that but has an openURL() method as - // well that we currently ignore. - jvm = MRJ_2_1; - } - else if (version == 3.0) - { - jvm = MRJ_3_0; - } - else if (version >= 3.1) - { - // Assume that all 3.1 and later versions of MRJ work the same. - jvm = MRJ_3_1; - } - else - { loadedWithoutErrors = false; errorMessage = - LanguageBundle.getFormattedString("in_BLEr1", - String.valueOf(version)); + LanguageBundle.getFormattedString("in_BLEr2", + String.valueOf(mrjVersion)); } } - catch (NumberFormatException nfe) - { - loadedWithoutErrors = false; - errorMessage = - LanguageBundle.getFormattedString("in_BLEr2", - String.valueOf(mrjVersion)); - } } else if (osName.startsWith("Windows")) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |