Skip to content

8358813: JPasswordField identifies spaces in password via delete shortcuts #25688

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

Closed
mickleness wants to merge 10 commits into from
Closed

8358813: JPasswordField identifies spaces in password via delete shortcuts #25688

Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7d1c3e8
8358813: remove more bindings for JPasswordFields in Aqua
mickleness Jun 9, 2025
e5acb92
Update test/jdk/javax/swing/JPasswordField/PasswordFieldInputMapWordT…
mickleness Jun 11, 2025
f7efe89
Merge branch 'master' into JDK-8358813
mickleness Jul 12, 2025
53ebb03
8358813: make input map types a static constant
mickleness Jul 12, 2025
6b497a7
8358813: putting the actions in a TreeSet
mickleness Jul 12, 2025
486f575
Update test/jdk/javax/swing/JPasswordField/PasswordFieldInputMapWordT…
mickleness Aug 1, 2025
fa7514e
8358813: add trailing comma
mickleness Aug 5, 2025
3d20804
Merge branch 'master' into JDK-8358813
mickleness Aug 5, 2025
58f0178
8358813: use Set.of
mickleness Aug 6, 2025
e618df3
Update test/jdk/javax/swing/JPasswordField/PasswordFieldInputMapWordT…
mickleness Aug 6, 2025
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
44 changes: 28 additions & 16 deletions test/jdk/javax/swing/JPasswordField/PasswordFieldInputMapWordTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
* @run main PasswordFieldInputMapWordTest
*/

import java.util.Arrays;
import java.util.Collection;
import java.util.TreeSet;

import javax.swing.InputMap;
import javax.swing.JComponent;
import javax.swing.JPasswordField;
Expand Down Expand Up @@ -65,32 +69,40 @@ private static boolean setLookAndFeel(UIManager.LookAndFeelInfo laf) {
}
}

static int[] inputMapConditions = new int[] {
JComponent.WHEN_IN_FOCUSED_WINDOW,
JComponent.WHEN_FOCUSED,
JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT
};

/**
* These are all the actions with "word" in their field name.
*/
static Collection<String> wordActions = new TreeSet<>(Arrays.asList(
Copy link
Member

@aivanov-jdk aivanov-jdk Aug 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would Set.of do the job?

Perhaps, List.of would be as good.

Copy link
Contributor Author

@mickleness mickleness Aug 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, this is updated to Set.of

Copy link
Member

@aivanov-jdk aivanov-jdk Aug 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Using Set ensures there are no duplicates in the list.

DefaultEditorKit.deleteNextWordAction,
DefaultEditorKit.deletePrevWordAction,
DefaultEditorKit.beginWordAction,
DefaultEditorKit.endWordAction,
DefaultEditorKit.selectionBeginWordAction,
DefaultEditorKit.selectionEndWordAction,
DefaultEditorKit.previousWordAction,
DefaultEditorKit.nextWordAction,
DefaultEditorKit.selectionPreviousWordAction,
DefaultEditorKit.selectionNextWordAction
));

private static void runTest() {
JPasswordField field = new JPasswordField();

boolean testPassed = true;
for (int condition : new int[] {
JComponent.WHEN_IN_FOCUSED_WINDOW,
JComponent.WHEN_FOCUSED,
JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT
}) {
for (int condition : inputMapConditions) {
InputMap inputMap = field.getInputMap(condition);
if (inputMap.allKeys() == null) {
continue;
}
for (KeyStroke keyStroke : inputMap.allKeys()) {
Object actionBinding = inputMap.get(keyStroke);
// these are all the actions with "word" in the name:
if (actionBinding == DefaultEditorKit.deleteNextWordAction ||
actionBinding == DefaultEditorKit.deletePrevWordAction ||
actionBinding == DefaultEditorKit.beginWordAction ||
actionBinding == DefaultEditorKit.endWordAction ||
actionBinding == DefaultEditorKit.selectionBeginWordAction ||
actionBinding == DefaultEditorKit.selectionEndWordAction ||
actionBinding == DefaultEditorKit.previousWordAction ||
actionBinding == DefaultEditorKit.nextWordAction ||
actionBinding == DefaultEditorKit.selectionPreviousWordAction ||
actionBinding == DefaultEditorKit.selectionNextWordAction ) {
if (wordActions.contains(actionBinding)) {
if (testPassed) {
System.err.println("The following inputs/actions should not be available in a JPasswordField:");
}
Expand Down