6852577: Only for Nimbus LAF UIManager.get("PasswordField.echoChar") …

…is null

Reviewed-by: tr, aivanov

src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java

@@ -728,6 +728,8 @@ public UIDefaults getDefaults() {
                              SwingUtilities2.getSystemMnemonicKeyMask())
                   });
 
+        table.put("PasswordField.echoChar", '*');
+
         // enabled antialiasing depending on desktop settings
         flushUnreferenced();
         SwingUtilities2.putAATextInfo(useLAFConditions(), table);

src/java.desktop/share/classes/javax/swing/plaf/synth/SynthPasswordFieldUI.java

@@ -67,6 +67,19 @@ protected String getPropertyPrefix() {
         return "PasswordField";
     }
 
+    /**
+     * Installs the necessary properties on the JPasswordField.
+     */
+    @Override
+    protected void installDefaults() {
+        super.installDefaults();
+        String prefix = getPropertyPrefix();
+        Character echoChar = (Character)UIManager.getDefaults().get(prefix + ".echoChar");
+        if (echoChar != null) {
+            LookAndFeel.installProperty(getComponent(), "echoChar", echoChar);
+        }
+    }
+
     /**
      * Creates a view (PasswordView) for an element.
      *

test/jdk/javax/swing/plaf/nimbus/PasswordFieldTest.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/*
+ * @test
+ * @bug 6852577
+ * @summary  Verifies PasswordField.echoChar is not null for Nimbus L&F
+ * @run main PasswordFieldTest
+ */
+
+import javax.swing.UIManager;
+import javax.swing.SwingUtilities;
+import javax.swing.UnsupportedLookAndFeelException;
+
+public class PasswordFieldTest {
+    private static void setLookAndFeel(UIManager.LookAndFeelInfo laf) {
+        try {
+            UIManager.setLookAndFeel(laf.getClassName());
+        } catch (UnsupportedLookAndFeelException ignored) {
+            System.out.println("Unsupported L&F: " + laf.getClassName());
+        } catch (ClassNotFoundException | InstantiationException
+                 | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            for (UIManager.LookAndFeelInfo laf :
+                                UIManager.getInstalledLookAndFeels()) {
+                System.out.println("Testing L&F: " + laf.getClassName());
+                setLookAndFeel(laf);
+
+                System.out.println("Echo char: " +
+                                UIManager.get("PasswordField.echoChar"));
+                if (UIManager.get("PasswordField.echoChar") == null) {
+                    throw new RuntimeException(
+                        "PasswordField.echoChar returns null for " +
+                            laf.getClassName());
+                }
+            }
+        });
+    }
+}