Menu mnemonic bug fix

I just found out that jmi.getText() can be null, so I added null-checking.
This commit is contained in:
George Bateman
2014-04-13 11:42:36 +01:00
parent fff8d0e057
commit 1c591fe121

View File

@@ -220,6 +220,7 @@ public class Toolkit {
// METHOD 1: attempt to assign KDE defaults.
for (JMenuItem jmi : menu) {
if (jmi == null) continue;
if (jmi.getText() == null) continue;
jmi.setMnemonic(0); // Reset.
for (int i = 0; i < kdePreDefStrs.length; i++) {
String cleanName = nonAAlpha.matcher(jmi.getText()).replaceAll("").toLowerCase();
@@ -236,6 +237,7 @@ public class Toolkit {
algorithmicAssaignment:
for (JMenuItem jmi : menu) {
if (jmi == null) continue;
if (jmi.getText() == null) continue;
if (jmi.getMnemonic() != 0) continue; // Already assigned.
// The string can't be made lower-case as that would spoil