Skip to content

8389970: StringIndexOutOfBoundsException when a text containing a mnemonic is removed #2253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eduardsdv wants to merge 1 commit into
base: master
Choose a base branch
from
+59 −1
Open

8389970: StringIndexOutOfBoundsException when a text containing a mnemonic is removed #2253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion modules/javafx.controls/src/main/java/javafx/scene/control/skin/LabeledSkinBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,11 +548,15 @@ protected void layoutLabelInArea(double x, double y, double w, double h, Pos ali
graphicHeight = graphic.getLayoutBounds().getHeight();
}

// Have to do this just in case it needs to be recomputed
// This is especially important because it also recomputes the 'containsMnemonic' value,
// which is used by this method later on.
updateDisplayedText(w, h);

if (ignoreText) {
textWidth = textHeight = 0;
text.setText("");
} else {
updateDisplayedText(w, h); // Have to do this just in case it needs to be recomputed
textWidth = snapSizeX(Math.min(text.getLayoutBounds().getWidth(), wrapWidth));
textHeight = snapSizeY(Math.min(text.getLayoutBounds().getHeight(), wrapHeight));
}
Expand Down
54 changes: 54 additions & 0 deletions modules/javafx.controls/src/test/java/test/javafx/scene/control/skin/LabelSkinTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2092,6 +2092,60 @@ public void testEscapedMnemonicSymbolIsNotProcessedWhenParsingIsDisabled() {
assertEquals("foo __bar", LabelSkinBaseShim.getText(label).getText());
}

@Test
public void testMnemonics_whenTextNotEmpty_noExceptionIsThrown() {
Toolkit tk = Toolkit.getToolkit();
StageLoader sl = new StageLoader(label);
tk.firePulse();

label.setMnemonicParsing(true);

label.setText("foo_bar");
tk.firePulse();
label.setText("xxx");
tk.firePulse();
label.setText("foo_bar");
tk.firePulse();

sl.dispose();
}

@Test
public void testMnemonics_whenTextIsEmpty_noExceptionIsThrown() {
Toolkit tk = Toolkit.getToolkit();
StageLoader sl = new StageLoader(label);
tk.firePulse();

label.setMnemonicParsing(true);

label.setText("foo_bar");
tk.firePulse();
label.setText("");
tk.firePulse();
label.setText("foo_bar");
tk.firePulse();

sl.dispose();
}

@Test
public void testMnemonics_whenTextIsNull_noExceptionIsThrown() {
Toolkit tk = Toolkit.getToolkit();
StageLoader sl = new StageLoader(label);
tk.firePulse();

label.setMnemonicParsing(true);

label.setText("foo_bar");
tk.firePulse();
label.setText(null);
tk.firePulse();
label.setText("foo_bar");
tk.firePulse();

sl.dispose();
}

/*********************************************************************
*
* Tests for bug reports *
Expand Down