Fix a case of non-mnemonics

Signed-off-by: Hiroshi Miura <[email protected]>
omegat-org · Mar 15, 2024 · 9c1c434 · 9c1c434
1 parent c8c20aa
commit 9c1c434
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/org/openide/awt/AbstractMnemonicsAction.java b/src/org/openide/awt/AbstractMnemonicsAction.java
@@ -13,6 +13,7 @@ public void setText(String text, Locale locale) {
         int i = Mnemonics.findMnemonicAmpersand(text);
         if (i < 0) {
             putValue(Action.NAME, text);
+            putValue(Action.DISPLAYED_MNEMONIC_INDEX_KEY, -1);
         } else {
             putValue(Action.NAME, text.substring(0, i) + text.substring(i + 1));
             Mnemonics.setMnemonicAndIndex(this, text.charAt(i + 1), i, locale);

diff --git a/test/src/org/openide/awt/MnemonicsTest.java b/test/src/org/openide/awt/MnemonicsTest.java
@@ -57,11 +57,11 @@ public void testSetLocalizedTextAction() {
         AbstractMnemonicsAction item = new MyAbstractMnemonicsAction();
 
         Assert.assertEquals("Simple Text", item.getValue(Action.NAME));
-        Assert.assertEquals(0, item.getValue(Action.DISPLAYED_MNEMONIC_INDEX_KEY));
+        Assert.assertEquals(isMacOS()? -1: 0, item.getValue(Action.DISPLAYED_MNEMONIC_INDEX_KEY));
         //
         item.setText("Rock & Roll", new Locale("en"));
         Assert.assertEquals("Rock & Roll", item.getValue(Action.NAME));
-        Assert.assertEquals(0, item.getValue(Action.DISPLAYED_MNEMONIC_INDEX_KEY)); // default: 0
+        Assert.assertEquals(-1, item.getValue(Action.DISPLAYED_MNEMONIC_INDEX_KEY));
         //
         item.setText("&\u041F\u043E\u0438\u0441\u043A", new Locale("ru"));
         Assert.assertEquals("\u041F\u043E\u0438\u0441\u043A", item.getValue(Action.NAME));