UI defaults: changed dump format of characters and updated dumps on Windows

2026-02-11 06:27:13 -06:00 · 2020-02-12 18:36:37 +01:00
parent 34834917b0
commit 78e3d781fc
21 changed files with 26 additions and 21 deletions
--- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java
+++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java
@@ -155,10 +155,15 @@ public class UIDefaultsDump
 		if( value == null ||
 			value instanceof String ||
 			value instanceof Number ||
-			value instanceof Character ||
 			value instanceof Boolean )
 		{
 			out.print( value );
+		} else if( value instanceof Character ) {
+			char ch = ((Character)value).charValue();
+			if( ch >= ' ' && ch <= '~' )
+				out.printf( "'%c'", value );
+			else
+				out.printf( "'\\u%h'", (int) ch );
 		} else if( value.getClass().isArray() )
 			dumpArray( out, value );
 		else if( value instanceof List )
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/BasicLookAndFeel_1.8.0_202.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/BasicLookAndFeel_1.8.0_202.txt
@@ -537,7 +537,7 @@ PasswordField.background       #ffffff    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.border           [lazy] 2,2,2,2  false    javax.swing.plaf.basic.BasicBorders$FieldBorder [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #000000    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         *
+PasswordField.echoChar         '*'
 PasswordField.font             [lazy] Monospaced plain 12    javax.swing.plaf.FontUIResource [UI]
 PasswordField.foreground       #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.inactiveBackground #c0c0c0    javax.swing.plaf.ColorUIResource [UI]
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/BasicLookAndFeel_10.0.2.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/BasicLookAndFeel_10.0.2.txt
@@ -537,7 +537,7 @@ PasswordField.background       #ffffff    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.border           [lazy] 2,2,2,2  false    javax.swing.plaf.basic.BasicBorders$FieldBorder [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #000000    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         *
+PasswordField.echoChar         '*'
 PasswordField.font             [lazy] Monospaced plain 12    javax.swing.plaf.FontUIResource [UI]
 PasswordField.foreground       #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.inactiveBackground #c0c0c0    javax.swing.plaf.ColorUIResource [UI]
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/BasicLookAndFeel_11.0.2.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/BasicLookAndFeel_11.0.2.txt
@@ -538,7 +538,7 @@ PasswordField.background       #ffffff    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.border           [lazy] 2,2,2,2  false    javax.swing.plaf.basic.BasicBorders$FieldBorder [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #000000    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         *
+PasswordField.echoChar         '*'
 PasswordField.font             [lazy] Monospaced plain 12    javax.swing.plaf.FontUIResource [UI]
 PasswordField.foreground       #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.inactiveBackground #c0c0c0    javax.swing.plaf.ColorUIResource [UI]
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/BasicLookAndFeel_12.0.2.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/BasicLookAndFeel_12.0.2.txt
@@ -538,7 +538,7 @@ PasswordField.background       #ffffff    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.border           [lazy] 2,2,2,2  false    javax.swing.plaf.basic.BasicBorders$FieldBorder [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #000000    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         *
+PasswordField.echoChar         '*'
 PasswordField.font             [lazy] Monospaced plain 12    javax.swing.plaf.FontUIResource [UI]
 PasswordField.foreground       #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.inactiveBackground #c0c0c0    javax.swing.plaf.ColorUIResource [UI]
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/BasicLookAndFeel_13.0.2.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/BasicLookAndFeel_13.0.2.txt
@@ -538,7 +538,7 @@ PasswordField.background       #ffffff    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.border           [lazy] 2,2,2,2  false    javax.swing.plaf.basic.BasicBorders$FieldBorder [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #000000    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         *
+PasswordField.echoChar         '*'
 PasswordField.font             [lazy] Monospaced plain 12    javax.swing.plaf.FontUIResource [UI]
 PasswordField.foreground       #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.inactiveBackground #c0c0c0    javax.swing.plaf.ColorUIResource [UI]
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/BasicLookAndFeel_9.0.4.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/BasicLookAndFeel_9.0.4.txt
@@ -537,7 +537,7 @@ PasswordField.background       #ffffff    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.border           [lazy] 2,2,2,2  false    javax.swing.plaf.basic.BasicBorders$FieldBorder [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #000000    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         *
+PasswordField.echoChar         '*'
 PasswordField.font             [lazy] Monospaced plain 12    javax.swing.plaf.FontUIResource [UI]
 PasswordField.foreground       #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.inactiveBackground #c0c0c0    javax.swing.plaf.ColorUIResource [UI]
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt
@@ -923,7 +923,7 @@ PasswordField.border           [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.F
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #bbbbbb    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.disabledBackground #3c3f41    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         •
+PasswordField.echoChar         '\u2022'
 PasswordField.focusInputMap    [lazy] 37    javax.swing.plaf.InputMapUIResource [UI]
    ctrl pressed A                  select-all
    ctrl pressed BACK_SLASH         unselect
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt
@@ -925,7 +925,7 @@ PasswordField.border           [lazy] 1,1,1,1  false    com.formdev.flatlaf.ui.F
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.disabledBackground #f2f2f2    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         •
+PasswordField.echoChar         '\u2022'
 PasswordField.focusInputMap    [lazy] 37    javax.swing.plaf.InputMapUIResource [UI]
    ctrl pressed A                  select-all
    ctrl pressed BACK_SLASH         unselect
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/MetalLookAndFeel_1.8.0_202.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/MetalLookAndFeel_1.8.0_202.txt
@@ -696,7 +696,7 @@ PasswordField.border           [lazy] javax.swing.plaf.BorderUIResource$Compound
    0,0,0,0  false    javax.swing.plaf.basic.BasicBorders$MarginBorder [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #333333    sun.swing.PrintColorUIResource [UI]
-PasswordField.echoChar         •
+PasswordField.echoChar         '\u2022'
 PasswordField.focusInputMap    [lazy] 37    javax.swing.plaf.InputMapUIResource [UI]
    ctrl pressed A                  select-all
    ctrl pressed BACK_SLASH         unselect
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/MetalLookAndFeel_10.0.2.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/MetalLookAndFeel_10.0.2.txt
@@ -691,7 +691,7 @@ PasswordField.border           [lazy] javax.swing.plaf.BorderUIResource$Compound
    0,0,0,0  false    javax.swing.plaf.basic.BasicBorders$MarginBorder [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #333333    sun.swing.PrintColorUIResource [UI]
-PasswordField.echoChar         •
+PasswordField.echoChar         '\u2022'
 PasswordField.focusInputMap    [lazy] 37    javax.swing.plaf.InputMapUIResource [UI]
    ctrl pressed A                  select-all
    ctrl pressed BACK_SLASH         unselect
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/MetalLookAndFeel_11.0.2.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/MetalLookAndFeel_11.0.2.txt
@@ -692,7 +692,7 @@ PasswordField.border           [lazy] javax.swing.plaf.BorderUIResource$Compound
    0,0,0,0  false    javax.swing.plaf.basic.BasicBorders$MarginBorder [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #333333    sun.swing.PrintColorUIResource [UI]
-PasswordField.echoChar         •
+PasswordField.echoChar         '\u2022'
 PasswordField.focusInputMap    [lazy] 37    javax.swing.plaf.InputMapUIResource [UI]
    ctrl pressed A                  select-all
    ctrl pressed BACK_SLASH         unselect
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/MetalLookAndFeel_12.0.2.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/MetalLookAndFeel_12.0.2.txt
@@ -692,7 +692,7 @@ PasswordField.border           [lazy] javax.swing.plaf.BorderUIResource$Compound
    0,0,0,0  false    javax.swing.plaf.basic.BasicBorders$MarginBorder [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #333333    sun.swing.PrintColorUIResource [UI]
-PasswordField.echoChar         •
+PasswordField.echoChar         '\u2022'
 PasswordField.focusInputMap    [lazy] 37    javax.swing.plaf.InputMapUIResource [UI]
    ctrl pressed A                  select-all
    ctrl pressed BACK_SLASH         unselect
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/MetalLookAndFeel_13.0.2.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/MetalLookAndFeel_13.0.2.txt
@@ -692,7 +692,7 @@ PasswordField.border           [lazy] javax.swing.plaf.BorderUIResource$Compound
    0,0,0,0  false    javax.swing.plaf.basic.BasicBorders$MarginBorder [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #333333    sun.swing.PrintColorUIResource [UI]
-PasswordField.echoChar         •
+PasswordField.echoChar         '\u2022'
 PasswordField.focusInputMap    [lazy] 37    javax.swing.plaf.InputMapUIResource [UI]
    ctrl pressed A                  select-all
    ctrl pressed BACK_SLASH         unselect
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/MetalLookAndFeel_9.0.4.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/MetalLookAndFeel_9.0.4.txt
@@ -691,7 +691,7 @@ PasswordField.border           [lazy] javax.swing.plaf.BorderUIResource$Compound
    0,0,0,0  false    javax.swing.plaf.basic.BasicBorders$MarginBorder [UI]
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  #333333    sun.swing.PrintColorUIResource [UI]
-PasswordField.echoChar         •
+PasswordField.echoChar         '\u2022'
 PasswordField.focusInputMap    [lazy] 37    javax.swing.plaf.InputMapUIResource [UI]
    ctrl pressed A                  select-all
    ctrl pressed BACK_SLASH         unselect
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/WindowsLookAndFeel_1.8.0_202.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/WindowsLookAndFeel_1.8.0_202.txt
@@ -682,7 +682,7 @@ PasswordField.border           [active] line: #abadb3    javax.swing.plaf.ColorU
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  [active] #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.disabledBackground [active] #f0f0f0    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         [active] ?
+PasswordField.echoChar         [active] '\u25cf'
 PasswordField.focusInputMap    [lazy] 31    javax.swing.plaf.InputMapUIResource [UI]
    ctrl pressed A                  select-all
    ctrl pressed BACK_SLASH         unselect
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/WindowsLookAndFeel_10.0.2.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/WindowsLookAndFeel_10.0.2.txt
@@ -674,7 +674,7 @@ PasswordField.border           [active] line: #abadb3    javax.swing.plaf.ColorU
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  [active] #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.disabledBackground [active] #f0f0f0    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         [active] ?
+PasswordField.echoChar         [active] '\u25cf'
 PasswordField.focusInputMap    [lazy] 31    javax.swing.plaf.InputMapUIResource [UI]
    ctrl pressed A                  select-all
    ctrl pressed BACK_SLASH         unselect
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/WindowsLookAndFeel_11.0.2.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/WindowsLookAndFeel_11.0.2.txt
@@ -675,7 +675,7 @@ PasswordField.border           [active] line: #abadb3    javax.swing.plaf.ColorU
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  [active] #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.disabledBackground [active] #f0f0f0    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         [active] ?
+PasswordField.echoChar         [active] '\u25cf'
 PasswordField.focusInputMap    [lazy] 31    javax.swing.plaf.InputMapUIResource [UI]
    ctrl pressed A                  select-all
    ctrl pressed BACK_SLASH         unselect
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/WindowsLookAndFeel_12.0.2.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/WindowsLookAndFeel_12.0.2.txt
@@ -675,7 +675,7 @@ PasswordField.border           [active] line: #abadb3    javax.swing.plaf.ColorU
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  [active] #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.disabledBackground [active] #f0f0f0    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         [active] ?
+PasswordField.echoChar         [active] '\u25cf'
 PasswordField.focusInputMap    [lazy] 31    javax.swing.plaf.InputMapUIResource [UI]
    ctrl pressed A                  select-all
    ctrl pressed BACK_SLASH         unselect
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/WindowsLookAndFeel_13.0.2.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/WindowsLookAndFeel_13.0.2.txt
@@ -675,7 +675,7 @@ PasswordField.border           [active] line: #abadb3    javax.swing.plaf.ColorU
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  [active] #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.disabledBackground [active] #f0f0f0    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         [active] ?
+PasswordField.echoChar         [active] '\u25cf'
 PasswordField.focusInputMap    [lazy] 31    javax.swing.plaf.InputMapUIResource [UI]
    ctrl pressed A                  select-all
    ctrl pressed BACK_SLASH         unselect
--- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/WindowsLookAndFeel_9.0.4.txt
+++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/WindowsLookAndFeel_9.0.4.txt
@@ -674,7 +674,7 @@ PasswordField.border           [active] line: #abadb3    javax.swing.plaf.ColorU
 PasswordField.caretBlinkRate   500
 PasswordField.caretForeground  [active] #000000    javax.swing.plaf.ColorUIResource [UI]
 PasswordField.disabledBackground [active] #f0f0f0    javax.swing.plaf.ColorUIResource [UI]
-PasswordField.echoChar         [active] ?
+PasswordField.echoChar         [active] '\u25cf'
 PasswordField.focusInputMap    [lazy] 31    javax.swing.plaf.InputMapUIResource [UI]
    ctrl pressed A                  select-all
    ctrl pressed BACK_SLASH         unselect