From 617a35c51b411490dbe9bc63c0a74c5cb0eeab1d Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Fri, 12 Mar 2021 21:16:57 +0100 Subject: [PATCH] LoggingFacade: - make LoggingFacadeImpl classes package private - added missing @Override - minor formatting changes --- .../main/java/com/formdev/flatlaf/UIDefaultsLoader.java | 5 ++--- .../main/java/com/formdev/flatlaf/util/LoggingFacade.java | 3 +-- .../java/com/formdev/flatlaf/util/LoggingFacadeImpl.java | 7 +++++-- .../java9/com/formdev/flatlaf/util/LoggingFacadeImpl.java | 7 +++++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java index 209723e4..f490e6a3 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java @@ -253,11 +253,10 @@ class UIDefaultsLoader static void logParseError( String key, String value, RuntimeException ex, boolean severe ) { String message = "FlatLaf: Failed to parse: '" + key + '=' + value + '\''; - if (severe) { + if( severe ) LoggingFacade.INSTANCE.logSevere( message, ex ); - } else { + else LoggingFacade.INSTANCE.logConfig( message, ex ); - } } static String resolveValue( String value, Function propertiesGetter ) { diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/LoggingFacade.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/LoggingFacade.java index afdef194..ec0a933b 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/LoggingFacade.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/LoggingFacade.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 FormDev Software GmbH + * Copyright 2021 FormDev Software GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,5 @@ public interface LoggingFacade LoggingFacade INSTANCE = new LoggingFacadeImpl(); void logSevere( String message, Throwable t ); - void logConfig( String message, Throwable t ); } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/LoggingFacadeImpl.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/LoggingFacadeImpl.java index 5da1655a..433a0944 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/LoggingFacadeImpl.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/LoggingFacadeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 FormDev Software GmbH + * Copyright 2021 FormDev Software GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,14 +20,17 @@ import com.formdev.flatlaf.FlatLaf; import java.util.logging.Level; import java.util.logging.Logger; -public class LoggingFacadeImpl implements LoggingFacade +class LoggingFacadeImpl + implements LoggingFacade { private static final Logger LOG = Logger.getLogger( FlatLaf.class.getName() ); + @Override public void logSevere( String message, Throwable t ) { LOG.log( Level.SEVERE, message, t ); } + @Override public void logConfig( String message, Throwable t ) { LOG.log( Level.CONFIG, message, t ); } diff --git a/flatlaf-core/src/main/java9/com/formdev/flatlaf/util/LoggingFacadeImpl.java b/flatlaf-core/src/main/java9/com/formdev/flatlaf/util/LoggingFacadeImpl.java index d7e5902f..0f29120f 100644 --- a/flatlaf-core/src/main/java9/com/formdev/flatlaf/util/LoggingFacadeImpl.java +++ b/flatlaf-core/src/main/java9/com/formdev/flatlaf/util/LoggingFacadeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 FormDev Software GmbH + * Copyright 2021 FormDev Software GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,14 +18,17 @@ package com.formdev.flatlaf.util; import com.formdev.flatlaf.FlatLaf; -public class LoggingFacadeImpl implements LoggingFacade +class LoggingFacadeImpl + implements LoggingFacade { private static final System.Logger LOG = System.getLogger( FlatLaf.class.getName() ); + @Override public void logSevere( String message, Throwable t ) { LOG.log( System.Logger.Level.ERROR, message, t ); } + @Override public void logConfig( String message, Throwable t ) { LOG.log( System.Logger.Level.DEBUG, message, t ); }