From d068d956751af059b2f7d3669ead8b93964146bc Mon Sep 17 00:00:00 2001 From: Jannis Weis <31143295+weisJ@users.noreply.github.com> Date: Fri, 7 Jan 2022 23:18:57 +0100 Subject: [PATCH] Demo: Rename AllIcons to AllUIconsDemo This avoids confusion with the AllIcons accessor class. --- .../darklaf/icon/{AllIcons.java => AllIconsDemo.java} | 8 ++++---- .../com/github/weisj/darklaf/icon/IconEditorDemo.java | 4 ++-- .../com/github/weisj/darklaf/icon/RotatableIconDemo.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) rename core/src/test/java/com/github/weisj/darklaf/icon/{AllIcons.java => AllIconsDemo.java} (96%) diff --git a/core/src/test/java/com/github/weisj/darklaf/icon/AllIcons.java b/core/src/test/java/com/github/weisj/darklaf/icon/AllIconsDemo.java similarity index 96% rename from core/src/test/java/com/github/weisj/darklaf/icon/AllIcons.java rename to core/src/test/java/com/github/weisj/darklaf/icon/AllIconsDemo.java index 9efd3807..30ece345 100644 --- a/core/src/test/java/com/github/weisj/darklaf/icon/AllIcons.java +++ b/core/src/test/java/com/github/weisj/darklaf/icon/AllIconsDemo.java @@ -43,15 +43,15 @@ import com.github.weisj.darklaf.ui.demo.DemoExecutor; import com.github.weisj.darklaf.util.Lambdas; import com.github.weisj.darklaf.util.Pair; -public class AllIcons extends BaseComponentDemo { +public class AllIconsDemo extends BaseComponentDemo { private static final int ICON_SIZE = 50; public static void main(final String[] args) { - DemoExecutor.showDemo(new AllIcons()); + DemoExecutor.showDemo(new AllIconsDemo()); } - public AllIcons() { + public AllIconsDemo() { List decorationsProviders = ClassFinder.getInstancesOfType(DecorationsProvider.class, "com.github.weisj.darklaf") .stream() @@ -106,7 +106,7 @@ public class AllIcons extends BaseComponentDemo { .values().stream() .peek(list -> makeUnique(list, 1)) .flatMap(List::stream) - .sorted(Pair.compareFirst(AllIcons::pathToIconName)).collect(Collectors.toList()); + .sorted(Pair.compareFirst(AllIconsDemo::pathToIconName)).collect(Collectors.toList()); } } diff --git a/core/src/test/java/com/github/weisj/darklaf/icon/IconEditorDemo.java b/core/src/test/java/com/github/weisj/darklaf/icon/IconEditorDemo.java index d37b3568..c5eaed12 100644 --- a/core/src/test/java/com/github/weisj/darklaf/icon/IconEditorDemo.java +++ b/core/src/test/java/com/github/weisj/darklaf/icon/IconEditorDemo.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2019-2021 Jannis Weis + * Copyright (c) 2019-2022 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, @@ -42,7 +42,7 @@ public class IconEditorDemo extends BaseComponentDemo { @Override public JComponent createComponent() { IconEditor editor = new IconEditor( - AllIcons.loadIcons(16, false) + AllIconsDemo.loadIcons(16, false) .stream() .map(p -> new Pair<>(p.getFirst(), p.getSecond())) .collect(Collectors.toList())); diff --git a/core/src/test/java/com/github/weisj/darklaf/icon/RotatableIconDemo.java b/core/src/test/java/com/github/weisj/darklaf/icon/RotatableIconDemo.java index 46966473..240a8ee5 100644 --- a/core/src/test/java/com/github/weisj/darklaf/icon/RotatableIconDemo.java +++ b/core/src/test/java/com/github/weisj/darklaf/icon/RotatableIconDemo.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2019-2021 Jannis Weis + * Copyright (c) 2019-2022 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, @@ -95,7 +95,7 @@ public class RotatableIconDemo extends BaseComponentDemo { controls = panel.addControls(new BorderLayout()); AtomicReference nextIcon = new AtomicReference<>(rotateIcon.getIcon()); - JList> list = AllIcons.createIconJList(size); + JList> list = AllIconsDemo.createIconJList(size); list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); list.addListSelectionListener(e -> nextIcon.set(list.getSelectedValue().getSecond())); controls.add(new OverlayScrollPane(list));