Merge branch 'master' into goetz_backport_8322135

Author: GoeLin

src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java

@@ -1181,6 +1181,9 @@ public Component getTableCellRendererComponent(final JTable list,
             setText(fc.getName(file));
             setIcon(fc.getIcon(file));
             setEnabled(isSelectableInList(file));
+
+            putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return this;
         }
     }
@@ -1246,6 +1249,9 @@ public Component getListCellRendererComponent(final JList<? extends File> list,
                 final JFileChooser chooser = getFileChooser();
                 setText(chooser.getName(directory));
                 setIcon(chooser.getIcon(directory));
+
+                putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
                 return this;
             }
         };

src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java

@@ -1082,6 +1082,9 @@ public Component getListCellRendererComponent(JList<?> list, Object value, int i
             if (showFileIcons) {
                 setIcon(getFileChooser().getIcon((File)value));
             }
+
+            putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return this;
         }
     }
@@ -1099,6 +1102,9 @@ public Component getListCellRendererComponent(JList<?> list, Object value, int i
             } else {
                 setText(getFileChooser().getName((File)value) + "/");
             }
+
+            putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return this;
         }
     }

src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java

@@ -664,6 +664,9 @@ public Component getListCellRendererComponent(JList<?> list, Object value, int i
             super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
             setText(getFileChooser().getName((File) value));
             setInheritsPopupMenu(true);
+
+            putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return this;
         }
     }
@@ -676,6 +679,9 @@ public Component getListCellRendererComponent(JList<?> list, Object value, int i
             super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
             setText(getFileChooser().getName((File) value));
             setInheritsPopupMenu(true);
+
+            putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return this;
         }
     }

src/java.desktop/share/classes/javax/swing/JFileChooser.java

@@ -398,6 +398,7 @@ protected void setup(FileSystemView view) {
             setFileFilter(getAcceptAllFileFilter());
         }
         enableEvents(AWTEvent.MOUSE_EVENT_MASK);
+        putClientProperty("html.disable", true);
     }
 
     private void installHierarchyListener() {

src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPasswordFieldUI.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, 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
@@ -91,23 +91,4 @@ protected void installDefaults() {
     public View create(Element elem) {
         return new PasswordView(elem);
     }
-
-    /**
-     * Create the action map for Password Field.  This map provides
-     * same actions for double mouse click and
-     * and for triple mouse click (see bug 4231444).
-     */
-
-    ActionMap createActionMap() {
-        ActionMap map = super.createActionMap();
-        if (map.get(DefaultEditorKit.selectWordAction) != null) {
-            Action a = map.get(DefaultEditorKit.selectLineAction);
-            if (a != null) {
-                map.remove(DefaultEditorKit.selectWordAction);
-                map.put(DefaultEditorKit.selectWordAction, a);
-            }
-        }
-        return map;
-    }
-
 }

src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, 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
@@ -650,6 +650,22 @@ ActionMap createActionMap() {
                 TransferHandler.getCopyAction());
         map.put(TransferHandler.getPasteAction().getValue(Action.NAME),
                 TransferHandler.getPasteAction());
+
+        if (getComponent() instanceof JPasswordField) {
+            // Edit the action map for Password Field.  This map provides
+            // same actions for double mouse click and
+            // and for triple mouse click (see bugs 4231444, 8354646).
+
+            if (map.get(DefaultEditorKit.selectWordAction) != null) {
+                map.remove(DefaultEditorKit.selectWordAction);
+
+                Action a = map.get(DefaultEditorKit.selectLineAction);
+                if (a != null) {
+                    map.put(DefaultEditorKit.selectWordAction, a);
+                }
+            }
+        }
+
         return map;
     }
 

src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java

@@ -953,6 +953,8 @@ public Component getListCellRendererComponent(JList<?> list, Object value,
             ii.depth = directoryComboBoxModel.getDepth(index);
             setIcon(ii);
 
+            putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return this;
         }
     }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, 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
@@ -95,19 +95,4 @@ public void paintBorder(SynthContext context, Graphics g, int x,
                             int y, int w, int h) {
         context.getPainter().paintPasswordFieldBorder(context, g, x, y, w, h);
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void installKeyboardActions() {
-        super.installKeyboardActions();
-        ActionMap map = SwingUtilities.getUIActionMap(getComponent());
-        if (map != null && map.get(DefaultEditorKit.selectWordAction) != null) {
-            Action a = map.get(DefaultEditorKit.selectLineAction);
-            if (a != null) {
-                map.put(DefaultEditorKit.selectWordAction, a);
-            }
-        }
-    }
 }

src/java.desktop/share/classes/sun/swing/FilePane.java

@@ -1214,6 +1214,8 @@ public Component getTableCellRendererComponent(JTable table, Object value,
 
             setText(text);
 
+            putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return this;
         }
     }
@@ -1602,6 +1604,8 @@ public Component getListCellRendererComponent(JList<?> list, Object value,
                 }
             }
 
+            putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return this;
         }
     }

src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java

@@ -692,6 +692,8 @@ public Component getListCellRendererComponent(JList<? extends File> list, File v
             ii.depth = directoryComboBoxModel.getDepth(index);
             label.setIcon(ii);
 
+            label.putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return label;
         }
     }