Build: Reenable autostyle

3 years ago · 989854c9a4
73 changed files with 371 additions and 146 deletions
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -20,7 +20,7 @@ plugins {
 val skipJavadoc by props()
 val enableMavenLocal by props(false)
 val enableGradleMetadata by props()
-val skipAutostyle by props(true)
+val skipAutostyle by props(false)
 val isRelease = project.stringProperty("release").toBool()
 val snapshotName by props("")

--- a/core/src/main/java/com/github/weisj/darklaf/ui/text/dummy/DummyEditorPaneUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/text/dummy/DummyEditorPaneUI.java
@ -59,12 +59,12 @@ public class DummyEditorPaneUI extends BasicEditorPaneUI implements DummyTextUIM
    public void uninstallUI(final JTextComponent editor) {
        try {
            super.uninstallUI(editor);
-        } catch (UninstallBlockedException ignored) {}
+        } catch (UninstallBlockedException ignored) {
+        }
    }

    @Override
-    protected void uninstallKeyboardActions() {
-    }
+    protected void uninstallKeyboardActions() {}

    @Override
    protected void uninstallListeners() {
@ -72,5 +72,6 @@ public class DummyEditorPaneUI extends BasicEditorPaneUI implements DummyTextUIM
        throw new UninstallBlockedException();
    }

-    private static class UninstallBlockedException extends RuntimeException {}
+    private static class UninstallBlockedException extends RuntimeException {
+    }
 }
--- a/core/src/test/java/com/github/weisj/darklaf/core/test/DarklafOnly.java
+++ b/core/src/test/java/com/github/weisj/darklaf/core/test/DarklafOnly.java
@ -1,3 +1,24 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2021 Jannis Weis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+ * associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+ * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
 package com.github.weisj.darklaf.core.test;

 import java.lang.annotation.ElementType;
--- a/core/src/test/java/com/github/weisj/darklaf/core/test/DemoTest.java
+++ b/core/src/test/java/com/github/weisj/darklaf/core/test/DemoTest.java
@ -30,23 +30,22 @@ import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;

-import com.github.weisj.darklaf.ui.demo.ComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoSpec;
-import com.github.weisj.darklaf.util.Pair;
+import javax.swing.JComponent;
+import javax.swing.UIManager;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;

 import com.github.weisj.darklaf.LafManager;
 import com.github.weisj.darklaf.theme.Theme;
 import com.github.weisj.darklaf.ui.DemoLauncher;
+import com.github.weisj.darklaf.ui.demo.ComponentDemo;
+import com.github.weisj.darklaf.ui.demo.DemoSpec;
 import com.github.weisj.darklaf.util.Lambdas;
 import com.github.weisj.darklaf.util.LogUtil;
-
-import javax.swing.JComponent;
-import javax.swing.UIManager;
+import com.github.weisj.darklaf.util.Pair;

 class DemoTest implements NonThreadSafeTest {

--- a/core/src/test/java/com/github/weisj/darklaf/core/test/NativeLibraryTest.java
+++ b/core/src/test/java/com/github/weisj/darklaf/core/test/NativeLibraryTest.java
@ -21,17 +21,17 @@
 */
 package com.github.weisj.darklaf.core.test;

-import com.github.weisj.darklaf.nativeutil.NativeUtil;
+import java.util.List;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledOnOs;
 import org.junit.jupiter.api.condition.OS;

+import com.github.weisj.darklaf.nativeutil.NativeUtil;
 import com.github.weisj.darklaf.platform.macos.MacOSLibrary;
 import com.github.weisj.darklaf.platform.windows.WindowsLibrary;

-import java.util.List;
-
 /**
 * Note: These test aren't located in their respective subprojects to ensure they are run using the
 * packaged jar and not the resource path on disc.
--- a/core/src/test/java/com/github/weisj/darklaf/core/test/TestUtils.java
+++ b/core/src/test/java/com/github/weisj/darklaf/core/test/TestUtils.java
@ -28,12 +28,12 @@ import java.util.concurrent.atomic.AtomicReference;

 import javax.swing.SwingUtilities;

-import com.github.weisj.darklaf.util.Lambdas;
 import org.junit.jupiter.api.Assertions;

 import com.github.weisj.darklaf.LafManager;
 import com.github.weisj.darklaf.theme.IntelliJTheme;
 import com.github.weisj.darklaf.theme.Theme;
+import com.github.weisj.darklaf.util.Lambdas;

 final class TestUtils {

--- a/core/src/test/java/com/github/weisj/darklaf/core/theme/ThemeEditor.java
+++ b/core/src/test/java/com/github/weisj/darklaf/core/theme/ThemeEditor.java
@ -72,10 +72,8 @@ import com.github.weisj.darklaf.theme.info.AccentColorRule;
 import com.github.weisj.darklaf.theme.info.ColorToneRule;
 import com.github.weisj.darklaf.theme.info.ContrastRule;
 import com.github.weisj.darklaf.theme.info.FontSizeRule;
-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoExecutionSpec;
-import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.button.ButtonConstants;
+import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.table.TableConstants;
 import com.github.weisj.darklaf.ui.togglebutton.ToggleButtonConstants;
 import com.github.weisj.darklaf.ui.util.DarkUIUtil;
--- a/core/src/test/java/com/github/weisj/darklaf/icon/IconDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/icon/IconDemo.java
@ -32,9 +32,9 @@ import com.github.weisj.darklaf.properties.icons.IconLoader;
 import com.github.weisj.darklaf.properties.icons.UIAwareIcon;
 import com.github.weisj.darklaf.theme.Theme;
 import com.github.weisj.darklaf.theme.event.ThemeInstalledListener;
+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.util.DarkUIUtil;

 public class IconDemo extends BaseComponentDemo {
--- a/core/src/test/java/com/github/weisj/darklaf/icon/IconEditorDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/icon/IconEditorDemo.java
@ -28,9 +28,9 @@ import javax.swing.*;

 import com.github.weisj.darklaf.components.iconeditor.IconEditor;
 import com.github.weisj.darklaf.core.test.DarklafOnly;
+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.util.Pair;

@DarklafOnly
--- a/core/src/test/java/com/github/weisj/darklaf/icon/RotatableIconDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/icon/RotatableIconDemo.java
@ -29,10 +29,10 @@ import javax.swing.*;
 import com.github.weisj.darklaf.components.OverlayScrollPane;
 import com.github.weisj.darklaf.properties.icons.DarkSVGIcon;
 import com.github.weisj.darklaf.properties.icons.RotatableIcon;
-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.DemoResources;
+import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
+import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.util.Alignment;

 public class RotatableIconDemo extends BaseComponentDemo {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/DemoLauncher.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/DemoLauncher.java
@ -36,7 +36,6 @@ import com.github.weisj.darklaf.core.test.util.Instantiable;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.ComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.util.LazyValue;
 import com.github.weisj.darklaf.util.Pair;

 public class DemoLauncher extends BaseComponentDemo {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/PreferenceChangeDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/PreferenceChangeDemo.java
@ -24,7 +24,6 @@ package com.github.weisj.darklaf.ui;
 import java.awt.*;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;

 import javax.swing.*;

--- a/core/src/test/java/com/github/weisj/darklaf/ui/button/GridButtonsDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/button/GridButtonsDemo.java
@ -26,9 +26,9 @@ import java.util.Optional;

 import javax.swing.*;

+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.util.AlignmentExt;

 public class GridButtonsDemo extends BaseComponentDemo {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/button/GroupedButtonDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/button/GroupedButtonDemo.java
@ -23,9 +23,9 @@ package com.github.weisj.darklaf.ui.button;

 import javax.swing.*;

+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.AlignmentExt;

--- a/core/src/test/java/com/github/weisj/darklaf/ui/button/HelpButtonDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/button/HelpButtonDemo.java
@ -21,17 +21,15 @@
 */
 package com.github.weisj.darklaf.ui.button;

+import java.util.Collections;
+import java.util.List;
+
 import javax.swing.*;

 import com.github.weisj.darklaf.components.help.HelpButton;
 import com.github.weisj.darklaf.components.help.HelpMenuItem;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;
-
-import java.awt.ComponentOrientation;
-import java.util.Collections;
-import java.util.List;

 public class HelpButtonDemo extends BaseComponentDemo {

--- a/core/src/test/java/com/github/weisj/darklaf/ui/button/SplitButtonDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/button/SplitButtonDemo.java
@ -28,11 +28,8 @@ import javax.swing.*;

 import com.github.weisj.darklaf.components.button.JSplitButton;
 import com.github.weisj.darklaf.core.test.DarklafOnly;
-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.DemoResources;
-import com.github.weisj.darklaf.ui.demo.DemoSpec;
-import com.kitfox.svg.A;
+import com.github.weisj.darklaf.ui.demo.DemoExecutor;

@DarklafOnly
 public class SplitButtonDemo extends ButtonDemo {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/button/ToggleButtonDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/button/ToggleButtonDemo.java
@ -21,16 +21,14 @@
 */
 package com.github.weisj.darklaf.ui.button;

+import java.util.Arrays;
+
 import javax.swing.*;

-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.DemoResources;
+import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.togglebutton.ToggleButtonConstants;

-import java.util.Arrays;
-
 public class ToggleButtonDemo extends AbstractButtonDemo<JToggleButton> {

    public static void main(final String[] args) {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/checkBox/CheckBoxDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/checkBox/CheckBoxDemo.java
@ -27,9 +27,9 @@ import java.util.List;

 import javax.swing.*;

+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.togglebutton.DarkToggleButtonUI;

 public class CheckBoxDemo extends BaseComponentDemo {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/checkBox/TriCheckBoxDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/checkBox/TriCheckBoxDemo.java
@ -29,9 +29,9 @@ import javax.swing.*;

 import com.github.weisj.darklaf.components.tristate.TristateCheckBox;
 import com.github.weisj.darklaf.components.tristate.TristateCheckBoxMenuItem;
+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.togglebutton.DarkToggleButtonUI;

 public class TriCheckBoxDemo extends BaseComponentDemo {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/colorChooser/ColorChooserDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/colorChooser/ColorChooserDemo.java
@ -26,8 +26,6 @@ import java.awt.*;
 import javax.swing.*;

 import com.github.weisj.darklaf.LafManager;
-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoExecutionSpec;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;

 public final class ColorChooserDemo {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/comboBox/ComboBoxDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/comboBox/ComboBoxDemo.java
@ -25,10 +25,10 @@ import java.awt.*;

 import javax.swing.*;

-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.combobox.ComboBoxConstants;
+import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
+import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.util.PropertyKey;

 public class ComboBoxDemo extends BaseComponentDemo {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/demo/BaseComponentDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/demo/BaseComponentDemo.java
@ -1,14 +1,26 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2021 Jannis Weis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+ * associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+ * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
 package com.github.weisj.darklaf.ui.demo;

-import com.github.weisj.darklaf.ui.DemoPanel;
-import com.github.weisj.darklaf.util.LazyValue;
-import sun.java2d.loops.CustomComponent;
-
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
 import java.awt.Component;
 import java.awt.Container;
 import java.util.ArrayList;
@ -21,6 +33,14 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;

+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+
+import com.github.weisj.darklaf.ui.DemoPanel;
+import com.github.weisj.darklaf.util.LazyValue;
+
 public abstract class BaseComponentDemo implements ComponentDemo, DemoExecutionSpec {

    private static final boolean DEBUG = false;
--- a/core/src/test/java/com/github/weisj/darklaf/ui/demo/BooleanDemoSpec.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/demo/BooleanDemoSpec.java
@ -1,3 +1,24 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2021 Jannis Weis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+ * associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+ * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
 package com.github.weisj.darklaf.ui.demo;

 import java.util.Arrays;
--- a/core/src/test/java/com/github/weisj/darklaf/ui/demo/ClientPropertySpecBinding.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/demo/ClientPropertySpecBinding.java
@ -1,3 +1,24 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2021 Jannis Weis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+ * associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+ * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
 package com.github.weisj.darklaf.ui.demo;

 import javax.swing.JComponent;
--- a/core/src/test/java/com/github/weisj/darklaf/ui/demo/ComponentDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/demo/ComponentDemo.java
@ -1,9 +1,31 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2021 Jannis Weis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+ * associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+ * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
 package com.github.weisj.darklaf.ui.demo;

-import javax.swing.JComponent;
 import java.util.Collections;
 import java.util.List;

+import javax.swing.JComponent;
+
 public interface ComponentDemo {

    String getName();
--- a/core/src/test/java/com/github/weisj/darklaf/ui/demo/DemoExecutionSpec.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/demo/DemoExecutionSpec.java
@ -1,3 +1,24 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2021 Jannis Weis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+ * associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+ * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
 package com.github.weisj.darklaf.ui.demo;

 import java.awt.Dimension;
--- a/core/src/test/java/com/github/weisj/darklaf/ui/demo/DemoExecutor.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/demo/DemoExecutor.java
@ -1,10 +1,32 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2021 Jannis Weis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+ * associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+ * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
 package com.github.weisj.darklaf.ui.demo;

-import com.github.weisj.darklaf.LafManager;
-import com.github.weisj.darklaf.properties.icons.IconLoader;
-import com.github.weisj.darklaf.theme.Theme;
-import com.github.weisj.darklaf.theme.info.PreferredThemeStyle;
-import org.jetbrains.annotations.NotNull;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.logging.Level;

 import javax.swing.Icon;
 import javax.swing.JDialog;
@ -13,12 +35,13 @@ import javax.swing.JMenuBar;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
-import java.awt.Dialog;
-import java.awt.Dimension;
-import java.awt.Toolkit;
-import java.awt.Window;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.logging.Level;
+
+import org.jetbrains.annotations.NotNull;
+
+import com.github.weisj.darklaf.LafManager;
+import com.github.weisj.darklaf.properties.icons.IconLoader;
+import com.github.weisj.darklaf.theme.Theme;
+import com.github.weisj.darklaf.theme.info.PreferredThemeStyle;

 public final class DemoExecutor {

@ -41,7 +64,6 @@ public final class DemoExecutor {
    public static AtomicReference<Window> showDemo(final ComponentDemo demo, final boolean asDialog) {
        LafManager.enabledPreferenceChangeReporting(false);
        LafManager.addThemePreferenceChangeListener(LafManager::installTheme);
-        LafManager.setDecorationsEnabled(true);
        AtomicReference<Window> windowRef = new AtomicReference<>();
        DemoExecutionSpec executionSpec = demo.getExecutionSpec();

--- a/core/src/test/java/com/github/weisj/darklaf/ui/demo/DemoMenuBar.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/demo/DemoMenuBar.java
@ -1,14 +1,30 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2021 Jannis Weis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+ * associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+ * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
 package com.github.weisj.darklaf.ui.demo;

-import com.github.weisj.darklaf.LafManager;
-import com.github.weisj.darklaf.graphics.StringPainter;
-import com.github.weisj.darklaf.settings.ThemeSettingsMenuItem;
-import com.github.weisj.darklaf.theme.event.ThemeInstalledListener;
-import com.github.weisj.darklaf.ui.rootpane.DarkRootPaneUI;
-import com.github.weisj.darklaf.util.Lambdas;
-import com.github.weisj.darklaf.util.PropertyUtil;
-import com.github.weisj.darklaf.util.SystemInfo;
-import org.jetbrains.annotations.NotNull;
+import java.util.Enumeration;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.logging.Level;

 import javax.swing.AbstractButton;
 import javax.swing.ButtonGroup;
@ -22,10 +38,17 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.event.MenuEvent;
 import javax.swing.event.MenuListener;
-import java.util.Enumeration;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.logging.Level;
+
+import org.jetbrains.annotations.NotNull;
+
+import com.github.weisj.darklaf.LafManager;
+import com.github.weisj.darklaf.graphics.StringPainter;
+import com.github.weisj.darklaf.settings.ThemeSettingsMenuItem;
+import com.github.weisj.darklaf.theme.event.ThemeInstalledListener;
+import com.github.weisj.darklaf.ui.rootpane.DarkRootPaneUI;
+import com.github.weisj.darklaf.util.Lambdas;
+import com.github.weisj.darklaf.util.PropertyUtil;
+import com.github.weisj.darklaf.util.SystemInfo;

 public class DemoMenuBar extends JMenuBar {

--- a/core/src/test/java/com/github/weisj/darklaf/ui/demo/DemoSpec.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/demo/DemoSpec.java
@ -1,8 +1,30 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2021 Jannis Weis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+ * associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+ * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
 package com.github.weisj.darklaf.ui.demo;

-import javax.swing.JComponent;
 import java.util.List;

+import javax.swing.JComponent;
+
 public class DemoSpec<T> {
    private final String name;
    private final List<T> values;
--- a/core/src/test/java/com/github/weisj/darklaf/ui/demo/EnumDemoSpec.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/demo/EnumDemoSpec.java
@ -1,3 +1,24 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2021 Jannis Weis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+ * associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+ * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
 package com.github.weisj.darklaf.ui.demo;

 import java.util.Arrays;
--- a/core/src/test/java/com/github/weisj/darklaf/ui/demo/SpacerSpec.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/demo/SpacerSpec.java
@ -1,8 +1,30 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2021 Jannis Weis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+ * associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+ * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
 package com.github.weisj.darklaf.ui.demo;

-import javax.swing.JComponent;
 import java.util.Collections;

+import javax.swing.JComponent;
+
 public final class SpacerSpec extends DemoSpec<Void> {

    public SpacerSpec() {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/demo/SpecBinding.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/demo/SpecBinding.java
@ -1,3 +1,24 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2021 Jannis Weis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+ * associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+ * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
 package com.github.weisj.darklaf.ui.demo;

 import javax.swing.JComponent;
--- a/core/src/test/java/com/github/weisj/darklaf/ui/dialog/DialogDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/dialog/DialogDemo.java
@ -30,7 +30,6 @@ import javax.swing.*;
 import javax.swing.border.Border;

 import com.github.weisj.darklaf.LafManager;
-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;

 /*
--- a/core/src/test/java/com/github/weisj/darklaf/ui/fileChooser/FileChooserDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/fileChooser/FileChooserDemo.java
@ -26,7 +26,6 @@ import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;

 import com.github.weisj.darklaf.LafManager;
-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.util.DarkUIUtil;

--- a/core/src/test/java/com/github/weisj/darklaf/ui/font/FallbackFontDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/font/FallbackFontDemo.java
@ -23,9 +23,9 @@ package com.github.weisj.darklaf.ui.font;

 import javax.swing.*;

+import com.github.weisj.darklaf.ui.DemoResources;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoResources;

 public class FallbackFontDemo extends BaseComponentDemo {

--- a/core/src/test/java/com/github/weisj/darklaf/ui/font/KerningDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/font/KerningDemo.java
@ -26,9 +26,9 @@ import java.util.Collections;

 import javax.swing.*;

+import com.github.weisj.darklaf.ui.DemoResources;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoResources;

 public class KerningDemo extends BaseComponentDemo {

--- a/core/src/test/java/com/github/weisj/darklaf/ui/internalFrame/InternalFrameDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/internalFrame/InternalFrameDemo.java
@ -27,8 +27,6 @@ import java.awt.event.ActionListener;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.beans.PropertyVetoException;
-import java.lang.reflect.Array;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

@ -37,9 +35,9 @@ import javax.swing.border.CompoundBorder;
 import javax.swing.border.EmptyBorder;

 import com.github.weisj.darklaf.components.border.DarkBorders;
+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;

 public class InternalFrameDemo extends BaseComponentDemo implements ActionListener {

--- a/core/src/test/java/com/github/weisj/darklaf/ui/label/LabelDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/label/LabelDemo.java
@ -23,9 +23,8 @@ package com.github.weisj.darklaf.ui.label;

 import javax.swing.*;

-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.DemoResources;
+import com.github.weisj.darklaf.ui.demo.DemoExecutor;

 public class LabelDemo extends LabelDemoBase<JLabel> {

--- a/core/src/test/java/com/github/weisj/darklaf/ui/label/LabelDemoBase.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/label/LabelDemoBase.java
@ -25,9 +25,8 @@ import java.awt.*;

 import javax.swing.*;

-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.DemoPanel;
+import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;

 public abstract class LabelDemoBase<T extends JLabel> extends BaseComponentDemo {

--- a/core/src/test/java/com/github/weisj/darklaf/ui/label/LoadIndicatorDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/label/LoadIndicatorDemo.java
@ -24,10 +24,9 @@ package com.github.weisj.darklaf.ui.label;
 import javax.swing.*;

 import com.github.weisj.darklaf.components.loading.LoadingIndicator;
-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.DemoResources;
+import com.github.weisj.darklaf.ui.demo.DemoExecutor;

 public class LoadIndicatorDemo extends LabelDemoBase<LoadingIndicator> {

--- a/core/src/test/java/com/github/weisj/darklaf/ui/list/ListDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/list/ListDemo.java
@ -27,9 +27,9 @@ import java.util.Map;

 import javax.swing.*;

+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.util.PropertyUtil;

 public final class ListDemo extends BaseComponentDemo {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/list/ToggleButtonListDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/list/ToggleButtonListDemo.java
@ -27,9 +27,9 @@ import javax.swing.*;

 import com.github.weisj.darklaf.components.OverlayScrollPane;
 import com.github.weisj.darklaf.components.togglebuttonlist.JToggleButtonList;
+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.togglebutton.DarkToggleButtonUI;
 import com.github.weisj.darklaf.ui.togglebutton.ToggleButtonConstants;

--- a/core/src/test/java/com/github/weisj/darklaf/ui/popupMenu/PopupMenuDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/popupMenu/PopupMenuDemo.java
@ -27,9 +27,9 @@ import java.util.List;

 import javax.swing.*;

+import com.github.weisj.darklaf.ui.DemoResources;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoResources;

 public class PopupMenuDemo extends BaseComponentDemo {

--- a/core/src/test/java/com/github/weisj/darklaf/ui/progressBar/ProgressBarDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/progressBar/ProgressBarDemo.java
@ -27,9 +27,9 @@ import java.util.Map;

 import javax.swing.*;

+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;

 public class ProgressBarDemo extends BaseComponentDemo {

--- a/core/src/test/java/com/github/weisj/darklaf/ui/radioButton/RadioButtonDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/radioButton/RadioButtonDemo.java
@ -27,9 +27,9 @@ import java.util.List;

 import javax.swing.*;

+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.togglebutton.DarkToggleButtonUI;

 public class RadioButtonDemo extends BaseComponentDemo {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/scrollPane/OverlayRSyntaxScrollPane.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/scrollPane/OverlayRSyntaxScrollPane.java
@ -29,10 +29,10 @@ import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rtextarea.RTextScrollPane;

 import com.github.weisj.darklaf.components.OverlayScrollPane;
-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.DemoResources;
+import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
+import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.util.StringUtil;

 public class OverlayRSyntaxScrollPane extends BaseComponentDemo {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/scrollPane/OverlayScrollPaneDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/scrollPane/OverlayScrollPaneDemo.java
@ -27,9 +27,9 @@ import java.util.Random;
 import javax.swing.*;

 import com.github.weisj.darklaf.components.OverlayScrollPane;
+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;

 public class OverlayScrollPaneDemo extends BaseComponentDemo {

--- a/core/src/test/java/com/github/weisj/darklaf/ui/scrollPane/OverlayScrollPaneTextDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/scrollPane/OverlayScrollPaneTextDemo.java
@ -26,10 +26,10 @@ import java.awt.*;
 import javax.swing.*;

 import com.github.weisj.darklaf.components.OverlayScrollPane;
-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.DemoResources;
+import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
+import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.util.StringUtil;

 public class OverlayScrollPaneTextDemo extends BaseComponentDemo {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/scrollPane/ScrollPaneDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/scrollPane/ScrollPaneDemo.java
@ -25,11 +25,11 @@ import java.awt.*;

 import javax.swing.*;

-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.DemoResources;
 import com.github.weisj.darklaf.ui.SolidColorComponent;
+import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
+import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.util.StringUtil;

 /**
--- a/core/src/test/java/com/github/weisj/darklaf/ui/slider/SliderDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/slider/SliderDemo.java
@ -25,9 +25,9 @@ import java.awt.*;

 import javax.swing.*;

+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;

 public class SliderDemo extends BaseComponentDemo {

--- a/core/src/test/java/com/github/weisj/darklaf/ui/spinner/SpinnerDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/spinner/SpinnerDemo.java
@ -25,9 +25,9 @@ import java.awt.*;

 import javax.swing.*;

+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;

 public class SpinnerDemo extends BaseComponentDemo {

--- a/core/src/test/java/com/github/weisj/darklaf/ui/splitPane/SplitPaneDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/splitPane/SplitPaneDemo.java
@ -30,9 +30,9 @@ import javax.swing.*;
 import com.github.weisj.darklaf.LafManager;
 import com.github.weisj.darklaf.graphics.ThemedColor;
 import com.github.weisj.darklaf.theme.event.ThemeInstalledListener;
+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.splitpane.DividerStyle;
 import com.github.weisj.darklaf.ui.splitpane.SplitPaneConstants;

--- a/core/src/test/java/com/github/weisj/darklaf/ui/tabFrame/TabFrameDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/tabFrame/TabFrameDemo.java
@ -26,7 +26,6 @@ import java.awt.*;
 import javax.swing.*;
 import javax.swing.text.BadLocationException;

-import com.github.weisj.darklaf.core.test.DarklafOnly;
 import org.pbjar.jxlayer.plaf.ext.TransformUI;

 import com.github.weisj.darklaf.components.tabframe.JTabFrame;
@ -34,9 +33,10 @@ import com.github.weisj.darklaf.components.tabframe.TabbedPopup;
 import com.github.weisj.darklaf.components.text.NonWrappingTextPane;
 import com.github.weisj.darklaf.components.text.NumberedTextComponent;
 import com.github.weisj.darklaf.components.text.NumberingPane;
+import com.github.weisj.darklaf.core.test.DarklafOnly;
+import com.github.weisj.darklaf.ui.DemoResources;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoResources;
 import com.github.weisj.darklaf.ui.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.Alignment;
 import com.github.weisj.darklaf.util.PropertyValue;
--- a/core/src/test/java/com/github/weisj/darklaf/ui/tabbedPane/AbstractTabbedPaneDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/tabbedPane/AbstractTabbedPaneDemo.java
@ -32,9 +32,8 @@ import javax.swing.border.EmptyBorder;
 import javax.swing.border.LineBorder;
 import javax.swing.plaf.UIResource;

-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.DemoPanel;
+import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.tabbedpane.DarkTabbedPaneUI;
 import com.github.weisj.darklaf.util.StringUtil;

--- a/core/src/test/java/com/github/weisj/darklaf/ui/tabbedPane/ClosableTabbedPaneDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/tabbedPane/ClosableTabbedPaneDemo.java
@ -26,7 +26,6 @@ import java.util.logging.Logger;
 import com.github.weisj.darklaf.components.ClosableTabbedPane;
 import com.github.weisj.darklaf.components.TabEvent;
 import com.github.weisj.darklaf.components.TabListener;
-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.util.LogUtil;

--- a/core/src/test/java/com/github/weisj/darklaf/ui/tabbedPane/TabbedPaneDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/tabbedPane/TabbedPaneDemo.java
@ -23,7 +23,6 @@ package com.github.weisj.darklaf.ui.tabbedPane;

 import javax.swing.*;

-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;

 public class TabbedPaneDemo extends AbstractTabbedPaneDemo<JTabbedPane> {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/table/TableDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/table/TableDemo.java
@ -31,9 +31,9 @@ import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableModel;

 import com.github.weisj.darklaf.components.OverlayScrollPane;
+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.table.renderer.DarkTableCellEditor;
 import com.github.weisj.darklaf.util.PropertyKey;
 import com.github.weisj.darklaf.util.PropertyUtil;
--- a/core/src/test/java/com/github/weisj/darklaf/ui/text/ColoredTextDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/text/ColoredTextDemo.java
@ -32,7 +32,6 @@ import javax.swing.text.StyledDocument;

 import com.github.weisj.darklaf.listener.InsertDocumentListener;
 import com.github.weisj.darklaf.properties.color.DarkColorModelHSB;
-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;

 public class ColoredTextDemo extends TextPaneDemo {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/text/EditorPaneDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/text/EditorPaneDemo.java
@ -23,9 +23,8 @@ package com.github.weisj.darklaf.ui.text;

 import javax.swing.*;

-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.DemoResources;
+import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.util.StringUtil;

 public class EditorPaneDemo extends TextComponentDemo<JEditorPane> {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/text/FormattedTextFieldDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/text/FormattedTextFieldDemo.java
@ -25,7 +25,6 @@ import java.text.NumberFormat;

 import javax.swing.*;

-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;

 public class FormattedTextFieldDemo extends TextFieldDemo {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/text/HTMLPaneDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/text/HTMLPaneDemo.java
@ -23,9 +23,8 @@ package com.github.weisj.darklaf.ui.text;

 import javax.swing.*;

-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.DemoResources;
+import com.github.weisj.darklaf.ui.demo.DemoExecutor;

 public class HTMLPaneDemo extends TextPaneDemo {

--- a/core/src/test/java/com/github/weisj/darklaf/ui/text/PasswordFieldDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/text/PasswordFieldDemo.java
@ -25,9 +25,9 @@ import java.awt.*;

 import javax.swing.*;

+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.util.PropertyKey;

 public class PasswordFieldDemo extends BaseComponentDemo {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/text/TextAreaDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/text/TextAreaDemo.java
@ -25,7 +25,6 @@ import java.awt.*;

 import javax.swing.*;

-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;

 public class TextAreaDemo extends TextComponentDemo<JTextArea> {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/text/TextComponentDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/text/TextComponentDemo.java
@ -27,9 +27,8 @@ import javax.swing.*;
 import javax.swing.border.Border;
 import javax.swing.text.JTextComponent;

-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.DemoPanel;
+import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.util.PropertyKey;
 import com.github.weisj.darklaf.util.PropertyUtil;
 import com.github.weisj.darklaf.util.StringUtil;
--- a/core/src/test/java/com/github/weisj/darklaf/ui/text/TextFieldDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/text/TextFieldDemo.java
@ -25,9 +25,9 @@ import java.awt.*;

 import javax.swing.*;

+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.util.PropertyKey;
 import com.github.weisj.darklaf.util.PropertyUtil;

--- a/core/src/test/java/com/github/weisj/darklaf/ui/text/TextPaneDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/text/TextPaneDemo.java
@ -23,7 +23,6 @@ package com.github.weisj.darklaf.ui.text;

 import javax.swing.*;

-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;

 public class TextPaneDemo extends TextComponentDemo<JTextPane> {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/toolTip/ToolTipDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/toolTip/ToolTipDemo.java
@ -26,10 +26,10 @@ import javax.swing.*;
 import com.github.weisj.darklaf.components.alignment.AlignmentStrategy;
 import com.github.weisj.darklaf.components.tooltip.ToolTipContext;
 import com.github.weisj.darklaf.components.tooltip.ToolTipStyle;
-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.DemoResources;
+import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
+import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.tooltip.DarkToolTipUI;
 import com.github.weisj.darklaf.util.Alignment;
 import com.github.weisj.darklaf.util.StringUtil;
--- a/core/src/test/java/com/github/weisj/darklaf/ui/tree/CheckBoxTreeDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/tree/CheckBoxTreeDemo.java
@ -28,9 +28,9 @@ import javax.swing.*;
 import com.github.weisj.darklaf.components.OverlayScrollPane;
 import com.github.weisj.darklaf.components.tree.TristateTreeNode;
 import com.github.weisj.darklaf.components.tristate.TristateState;
+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.util.StringUtil;

 public class CheckBoxTreeDemo extends BaseComponentDemo {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/tree/FileTreeDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/tree/FileTreeDemo.java
@ -30,10 +30,10 @@ import javax.swing.filechooser.FileSystemView;
 import com.github.weisj.darklaf.components.OverlayScrollPane;
 import com.github.weisj.darklaf.components.filetree.FileTree;
 import com.github.weisj.darklaf.core.test.DelicateDemo;
-import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
-import com.github.weisj.darklaf.ui.demo.DemoExecutor;
 import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.button.ButtonConstants;
+import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
+import com.github.weisj.darklaf.ui.demo.DemoExecutor;

@DelicateDemo(reason = "Deprecated")
 public class FileTreeDemo extends BaseComponentDemo {
--- a/core/src/test/java/com/github/weisj/darklaf/ui/tree/TreeDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/tree/TreeDemo.java
@ -31,9 +31,9 @@ import net.miginfocom.swing.MigLayout;

 import com.github.weisj.darklaf.components.OverlayScrollPane;
 import com.github.weisj.darklaf.components.SelectableTreeNode;
+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.util.PropertyKey;
 import com.github.weisj.darklaf.util.PropertyUtil;

--- a/core/src/test/java/com/github/weisj/darklaf/ui/treetable/TreeTableDemo.java
+++ b/core/src/test/java/com/github/weisj/darklaf/ui/treetable/TreeTableDemo.java
@ -30,9 +30,9 @@ import javax.swing.*;
 import com.github.weisj.darklaf.components.treetable.JTreeTable;
 import com.github.weisj.darklaf.components.treetable.model.*;
 import com.github.weisj.darklaf.core.test.DelicateDemo;
+import com.github.weisj.darklaf.ui.DemoPanel;
 import com.github.weisj.darklaf.ui.demo.BaseComponentDemo;
 import com.github.weisj.darklaf.ui.demo.DemoExecutor;
-import com.github.weisj.darklaf.ui.DemoPanel;

@DelicateDemo
 public class TreeTableDemo extends BaseComponentDemo {
--- a/utils/src/main/java/com/github/weisj/darklaf/util/ColorUtil.java
+++ b/utils/src/main/java/com/github/weisj/darklaf/util/ColorUtil.java
@ -25,8 +25,6 @@ import java.awt.*;

 import javax.swing.plaf.UIResource;

-import com.github.weisj.darklaf.util.ColorWrapper;
-import com.github.weisj.darklaf.util.PropertyUtil;

 /** @author Jannis Weis */
 public final class ColorUtil {