diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ControlBar.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ControlBar.java index 534c5570..0c2addd7 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ControlBar.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ControlBar.java @@ -28,6 +28,7 @@ import javax.swing.plaf.metal.MetalLookAndFeel; import javax.swing.plaf.nimbus.NimbusLookAndFeel; import com.formdev.flatlaf.*; import com.formdev.flatlaf.extras.FlatAnimatedLafChange; +import com.formdev.flatlaf.util.LoggingFacade; import com.formdev.flatlaf.util.SystemInfo; import com.formdev.flatlaf.util.UIScale; import net.miginfocom.layout.ConstraintParser; @@ -240,7 +241,7 @@ class ControlBar frame.setSize( Math.max( prefSize.width, width ), Math.max( prefSize.height, height ) ); } catch( Exception ex ) { - ex.printStackTrace(); + LoggingFacade.INSTANCE.logSevere( null, ex ); } } ); } diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoPrefs.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoPrefs.java index 893cb429..52626d16 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoPrefs.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoPrefs.java @@ -25,6 +25,7 @@ import com.formdev.flatlaf.FlatLightLaf; import com.formdev.flatlaf.FlatPropertiesLaf; import com.formdev.flatlaf.IntelliJTheme; import com.formdev.flatlaf.demo.intellijthemes.IJThemesPanel; +import com.formdev.flatlaf.util.LoggingFacade; import com.formdev.flatlaf.util.StringUtils; /** @@ -83,7 +84,7 @@ public class DemoPrefs UIManager.setLookAndFeel( lafClassName ); } } catch( Throwable ex ) { - ex.printStackTrace(); + LoggingFacade.INSTANCE.logSevere( null, ex ); // fallback FlatLightLaf.setup(); diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesClassGenerator.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesClassGenerator.java index e3cdc006..f523e4e6 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesClassGenerator.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesClassGenerator.java @@ -22,6 +22,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardOpenOption; +import com.formdev.flatlaf.util.LoggingFacade; /** * This tool creates look and feel classes for all themes listed in themes.json. @@ -120,7 +121,7 @@ public class IJThemesClassGenerator Files.write( out, content.getBytes( StandardCharsets.ISO_8859_1 ), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING ); } catch( IOException ex ) { - ex.printStackTrace(); + LoggingFacade.INSTANCE.logSevere( null, ex ); } } diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesManager.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesManager.java index 07142025..ece63854 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesManager.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesManager.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import com.formdev.flatlaf.json.Json; +import com.formdev.flatlaf.util.LoggingFacade; import com.formdev.flatlaf.util.StringUtils; /** @@ -46,7 +47,7 @@ class IJThemesManager try( Reader reader = new InputStreamReader( getClass().getResourceAsStream( "themes.json" ), StandardCharsets.UTF_8 ) ) { json = (Map) Json.parse( reader ); } catch( IOException ex ) { - ex.printStackTrace(); + LoggingFacade.INSTANCE.logSevere( null, ex ); return; } diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java index 9ea545ee..ee89f571 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java @@ -52,6 +52,7 @@ import com.formdev.flatlaf.IntelliJTheme; import com.formdev.flatlaf.demo.DemoPrefs; import com.formdev.flatlaf.extras.FlatAnimatedLafChange; import com.formdev.flatlaf.extras.FlatSVGIcon; +import com.formdev.flatlaf.util.LoggingFacade; import com.formdev.flatlaf.util.StringUtils; import net.miginfocom.swing.*; @@ -259,7 +260,7 @@ public class IJThemesPanel try { UIManager.setLookAndFeel( themeInfo.lafClassName ); } catch( Exception ex ) { - ex.printStackTrace(); + LoggingFacade.INSTANCE.logSevere( null, ex ); showInformationDialog( "Failed to create '" + themeInfo.lafClassName + "'.", ex ); } } else if( themeInfo.themeFile != null ) { @@ -273,7 +274,7 @@ public class IJThemesPanel DemoPrefs.getState().put( DemoPrefs.KEY_LAF_THEME, DemoPrefs.FILE_PREFIX + themeInfo.themeFile ); } catch( Exception ex ) { - ex.printStackTrace(); + LoggingFacade.INSTANCE.logSevere( null, ex ); showInformationDialog( "Failed to load '" + themeInfo.themeFile + "'.", ex ); } } else { diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesUpdater.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesUpdater.java index bad7a17a..ac6f2cc1 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesUpdater.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesUpdater.java @@ -23,6 +23,7 @@ import java.net.URLConnection; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; +import com.formdev.flatlaf.util.LoggingFacade; /** * This tool updates all IntelliJ themes listed in themes.json by downloading @@ -61,7 +62,7 @@ public class IJThemesUpdater URLConnection con = url.openConnection(); Files.copy( con.getInputStream(), out, StandardCopyOption.REPLACE_EXISTING ); } catch( IOException ex ) { - ex.printStackTrace(); + LoggingFacade.INSTANCE.logSevere( null, ex ); } } } diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java index 04297140..84ac540f 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java @@ -42,6 +42,7 @@ import com.formdev.flatlaf.FlatLaf.DisabledIconProvider; import com.formdev.flatlaf.ui.FlatUIUtils; import com.formdev.flatlaf.util.Graphics2DProxy; import com.formdev.flatlaf.util.GrayFilter; +import com.formdev.flatlaf.util.LoggingFacade; import com.formdev.flatlaf.util.MultiResolutionImageSupport; import com.formdev.flatlaf.util.UIScale; import com.kitfox.svg.SVGDiagram; @@ -335,7 +336,7 @@ public class FlatSVGIcon try { diagram = svgUniverse.getDiagram( url.toURI() ); } catch( URISyntaxException ex ) { - ex.printStackTrace(); + LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to load SVG icon '" + url + "'.", ex ); } } diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.java index 8457216d..6a49e7c8 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatUIDefaultsInspector.java @@ -52,6 +52,7 @@ import com.formdev.flatlaf.ui.FlatUIUtils; import com.formdev.flatlaf.util.DerivedColor; import com.formdev.flatlaf.util.GrayFilter; import com.formdev.flatlaf.util.HSLColor; +import com.formdev.flatlaf.util.LoggingFacade; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.UIScale; @@ -377,11 +378,12 @@ public class FlatUIDefaultsInspector } private Properties loadDerivedColorKeys() { + String name = "/com/formdev/flatlaf/extras/resources/DerivedColorKeys.properties"; Properties properties = new Properties(); - try( InputStream in = getClass().getResourceAsStream( "/com/formdev/flatlaf/extras/resources/DerivedColorKeys.properties" ) ) { + try( InputStream in = getClass().getResourceAsStream( name ) ) { properties.load( in ); } catch( IOException ex ) { - ex.printStackTrace(); + LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to load '" + name + "'.", ex ); } return properties; } diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatComponentExtension.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatComponentExtension.java index 29f753c3..b9caa3a4 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatComponentExtension.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/components/FlatComponentExtension.java @@ -20,6 +20,7 @@ import java.awt.Color; import java.awt.Insets; import javax.swing.JComponent; import javax.swing.UIManager; +import com.formdev.flatlaf.util.LoggingFacade; /** * Base interface for all FlatLaf component extensions. @@ -87,7 +88,7 @@ public interface FlatComponentExtension try { return Enum.valueOf( enumType, (String) value ); } catch( IllegalArgumentException ex ) { - ex.printStackTrace(); + LoggingFacade.INSTANCE.logSevere( "FlatLaf: Unknown enum value '" + value + "' in enum '" + enumType.getName() + "'.", ex ); } } return defaultValue;