yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 12:00:04 +02:00
Code Issues Releases Wiki Activity

Fixed errant underscore in program options menu item

Browse source
This commit is contained in:
dragonmacher 2020-09-22 16:04:54 -04:00
parent 3e57a90f05
commit e05b45b841
2 changed files with 28 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Framework/Docking/src/main/java/docking/action/MenuData.java
View file

@ -218,10 +218,7 @@ public class MenuData {
} }
MenuData oldData = cloneData(); MenuData oldData = cloneData();
menuPath = processMenuPath(newPath); menuPath = processMenuPath(newPath);
int newMnemonic = getMnemonic(newPath); mnemonic = getMnemonic(newPath);
if (newMnemonic != NO_MNEMONIC) {
mnemonic = newMnemonic;
}
firePropertyChanged(oldData); firePropertyChanged(oldData);
} }
@ -239,10 +236,7 @@ public class MenuData {
MenuData oldData = cloneData(); MenuData oldData = cloneData();
menuPath = menuPath.clone(); menuPath = menuPath.clone();
menuPath[menuPath.length - 1] = processedMenuItemName; menuPath[menuPath.length - 1] = processedMenuItemName;
int newMnemonic = getMnemonic(newMenuItemName); mnemonic = getMnemonic(newMenuItemName);
if (newMnemonic != NO_MNEMONIC) {
mnemonic = newMnemonic;
}
firePropertyChanged(oldData); firePropertyChanged(oldData);
} }

27
Ghidra/Framework/Docking/src/test/java/docking/action/MenuDataTest.java
View file

@ -59,6 +59,31 @@ public class MenuDataTest {
*/ */
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testBreakMenuPath2() { public void testBreakMenuPath2() {
MenuData menuData = new MenuData(new String[] {}); new MenuData(new String[] {});
}
@Test
public void testSetMenuItemName() {
MenuData menuData = new MenuData(new String[] { "One", "Two", "T&hree" });
assertEquals("Three", menuData.getMenuItemName());
assertEquals(menuData.getMnemonic(), 'h');
String newName = "Completely New Name";
menuData.setMenuItemName(newName);
assertEquals(menuData.getMnemonic(), MenuData.NO_MNEMONIC);
}
@Test
public void testSetMenuPath() {
MenuData menuData = new MenuData(new String[] { "One", "Two", "T&hree" });
assertEquals("Three", menuData.getMenuItemName());
assertEquals(menuData.getMnemonic(), 'h');
String newName = "Completely New Name";
String[] newPath = { "Four", newName };
menuData.setMenuPath(newPath);
assertEquals(menuData.getMnemonic(), MenuData.NO_MNEMONIC);
} }
} }