From 3fe4ae71604f095acafd521d91fd6dd04e866db3 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Sat, 23 Mar 2024 15:24:14 +0100 Subject: [PATCH] [vcs-log] cleanup: remove unnecessary qualifiers GitOrigin-RevId: 9e933ac940a43cae2eb66689baceca3377681825 --- .../src/com/intellij/vcs/log/ui/VcsLogColorManagerImpl.java | 4 ++-- .../intellij/vcs/log/ui/actions/HighlightersActionGroup.java | 2 +- .../vcs/log/ui/actions/ToggleLogColumnsActionGroup.java | 2 +- .../src/com/intellij/vcs/log/ui/frame/WrappedFlowLayout.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogColorManagerImpl.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogColorManagerImpl.java index f4e36021bff3..f0e0fdf14184 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogColorManagerImpl.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogColorManagerImpl.java @@ -31,11 +31,11 @@ public class VcsLogColorManagerImpl implements VcsLogColorManager { myPath2Palette = new HashMap<>(); defaultPalette = defaultPalette.isEmpty() ? List.of(getDefaultRootColor()) : new ArrayList<>(defaultPalette); - myPath2Palette.put(VcsLogColorManager.DEFAULT_COLOR_MODE, generateFromPalette(defaultPalette)); + myPath2Palette.put(DEFAULT_COLOR_MODE, generateFromPalette(defaultPalette)); for (AdditionalColorSpace colorSpace : additionalColorSpaces) { // do not allow to override default palette - if (colorSpace.colorMode.equals(VcsLogColorManager.DEFAULT_COLOR_MODE)) continue; + if (colorSpace.colorMode.equals(DEFAULT_COLOR_MODE)) continue; // allow additional palettes only the same size as the default if (colorSpace.palette.size() != defaultPalette.size()) continue; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/HighlightersActionGroup.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/HighlightersActionGroup.java index 4cfecbdd8068..ed6daab3e8cc 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/HighlightersActionGroup.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/HighlightersActionGroup.java @@ -32,7 +32,7 @@ public class HighlightersActionGroup extends ActionGroup implements DumbAware { } } - return actions.toArray(AnAction.EMPTY_ARRAY); + return actions.toArray(EMPTY_ARRAY); } @Override diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/ToggleLogColumnsActionGroup.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/ToggleLogColumnsActionGroup.java index 17d0de8f77e0..69a449b56938 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/ToggleLogColumnsActionGroup.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/ToggleLogColumnsActionGroup.java @@ -51,7 +51,7 @@ public class ToggleLogColumnsActionGroup extends ActionGroup implements DumbAwar actions.add(new ToggleColumnAction(column)); } - return actions.toArray(AnAction.EMPTY_ARRAY); + return actions.toArray(EMPTY_ARRAY); } @Override diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/WrappedFlowLayout.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/WrappedFlowLayout.java index 56994b7ea6fb..c65df6a5e54a 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/WrappedFlowLayout.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/WrappedFlowLayout.java @@ -21,7 +21,7 @@ import java.awt.*; public class WrappedFlowLayout extends FlowLayout { public WrappedFlowLayout(int hGap, int vGap) { - super(FlowLayout.LEADING, hGap, vGap); + super(LEADING, hGap, vGap); } @Override