From 5e03eb9b5160f2146188b7c76840844bc3115e2a Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Thu, 28 Oct 2021 21:01:16 +0200 Subject: [PATCH] UIDefaultsDump: removed Java 8 patch version from dump file names --- .../{FlatDarculaLaf_1.8.0_202.txt => FlatDarculaLaf_1.8.0.txt} | 0 ...tDarkLaf_1.8.0_202-linux.txt => FlatDarkLaf_1.8.0-linux.txt} | 0 ...{FlatDarkLaf_1.8.0_202-mac.txt => FlatDarkLaf_1.8.0-mac.txt} | 0 .../{FlatDarkLaf_1.8.0_202.txt => FlatDarkLaf_1.8.0.txt} | 0 ...{FlatIntelliJLaf_1.8.0_202.txt => FlatIntelliJLaf_1.8.0.txt} | 0 ...ightLaf_1.8.0_202-linux.txt => FlatLightLaf_1.8.0-linux.txt} | 0 ...latLightLaf_1.8.0_202-mac.txt => FlatLightLaf_1.8.0-mac.txt} | 0 .../{FlatLightLaf_1.8.0_202.txt => FlatLightLaf_1.8.0.txt} | 0 ...ap_1.8.0_202-mac.txt => FlatLightLaf_InputMap_1.8.0-mac.txt} | 0 ...f_InputMap_1.8.0_202.txt => FlatLightLaf_InputMap_1.8.0.txt} | 0 .../{FlatTestLaf_1.8.0_202.txt => FlatTestLaf_1.8.0.txt} | 0 ...IDE-FlatDarkLaf_1.8.0_202.txt => JIDE-FlatDarkLaf_1.8.0.txt} | 0 ...E-FlatLightLaf_1.8.0_202.txt => JIDE-FlatLightLaf_1.8.0.txt} | 0 ...utMap_1.8.0_202.txt => JIDE-FlatLightLaf_InputMap_1.8.0.txt} | 0 .../com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java | 2 ++ 15 files changed, 2 insertions(+) rename flatlaf-testing/dumps/uidefaults/{FlatDarculaLaf_1.8.0_202.txt => FlatDarculaLaf_1.8.0.txt} (100%) rename flatlaf-testing/dumps/uidefaults/{FlatDarkLaf_1.8.0_202-linux.txt => FlatDarkLaf_1.8.0-linux.txt} (100%) rename flatlaf-testing/dumps/uidefaults/{FlatDarkLaf_1.8.0_202-mac.txt => FlatDarkLaf_1.8.0-mac.txt} (100%) rename flatlaf-testing/dumps/uidefaults/{FlatDarkLaf_1.8.0_202.txt => FlatDarkLaf_1.8.0.txt} (100%) rename flatlaf-testing/dumps/uidefaults/{FlatIntelliJLaf_1.8.0_202.txt => FlatIntelliJLaf_1.8.0.txt} (100%) rename flatlaf-testing/dumps/uidefaults/{FlatLightLaf_1.8.0_202-linux.txt => FlatLightLaf_1.8.0-linux.txt} (100%) rename flatlaf-testing/dumps/uidefaults/{FlatLightLaf_1.8.0_202-mac.txt => FlatLightLaf_1.8.0-mac.txt} (100%) rename flatlaf-testing/dumps/uidefaults/{FlatLightLaf_1.8.0_202.txt => FlatLightLaf_1.8.0.txt} (100%) rename flatlaf-testing/dumps/uidefaults/{FlatLightLaf_InputMap_1.8.0_202-mac.txt => FlatLightLaf_InputMap_1.8.0-mac.txt} (100%) rename flatlaf-testing/dumps/uidefaults/{FlatLightLaf_InputMap_1.8.0_202.txt => FlatLightLaf_InputMap_1.8.0.txt} (100%) rename flatlaf-testing/dumps/uidefaults/{FlatTestLaf_1.8.0_202.txt => FlatTestLaf_1.8.0.txt} (100%) rename flatlaf-testing/dumps/uidefaults/{JIDE-FlatDarkLaf_1.8.0_202.txt => JIDE-FlatDarkLaf_1.8.0.txt} (100%) rename flatlaf-testing/dumps/uidefaults/{JIDE-FlatLightLaf_1.8.0_202.txt => JIDE-FlatLightLaf_1.8.0.txt} (100%) rename flatlaf-testing/dumps/uidefaults/{JIDE-FlatLightLaf_InputMap_1.8.0_202.txt => JIDE-FlatLightLaf_InputMap_1.8.0.txt} (100%) diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0.txt similarity index 100% rename from flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0_202.txt rename to flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0.txt diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202-linux.txt b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0-linux.txt similarity index 100% rename from flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202-linux.txt rename to flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0-linux.txt diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0-mac.txt similarity index 100% rename from flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt rename to flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0-mac.txt diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt similarity index 100% rename from flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt rename to flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0.txt diff --git a/flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0.txt similarity index 100% rename from flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0_202.txt rename to flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0.txt diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202-linux.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0-linux.txt similarity index 100% rename from flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202-linux.txt rename to flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0-linux.txt diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202-mac.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0-mac.txt similarity index 100% rename from flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202-mac.txt rename to flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0-mac.txt diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt similarity index 100% rename from flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt rename to flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0.txt diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0_202-mac.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0-mac.txt similarity index 100% rename from flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0_202-mac.txt rename to flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0-mac.txt diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0.txt similarity index 100% rename from flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0_202.txt rename to flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0.txt diff --git a/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0.txt similarity index 100% rename from flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt rename to flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0.txt diff --git a/flatlaf-testing/dumps/uidefaults/JIDE-FlatDarkLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/JIDE-FlatDarkLaf_1.8.0.txt similarity index 100% rename from flatlaf-testing/dumps/uidefaults/JIDE-FlatDarkLaf_1.8.0_202.txt rename to flatlaf-testing/dumps/uidefaults/JIDE-FlatDarkLaf_1.8.0.txt diff --git a/flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_1.8.0.txt similarity index 100% rename from flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_1.8.0_202.txt rename to flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_1.8.0.txt diff --git a/flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_InputMap_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_InputMap_1.8.0.txt similarity index 100% rename from flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_InputMap_1.8.0_202.txt rename to flatlaf-testing/dumps/uidefaults/JIDE-FlatLightLaf_InputMap_1.8.0.txt diff --git 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 index 008a99d1..460df2f9 100644 --- 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 @@ -199,6 +199,8 @@ public class UIDefaultsDump ? "-linux" : ""); String javaVersion = System.getProperty( "java.version" ); + if( javaVersion.startsWith( "1.8.0_" ) && lookAndFeel instanceof FlatLaf ) + javaVersion = "1.8.0"; File file = new File( dir, name + nameSuffix + "_" + javaVersion + osSuffix + ".txt" );