Updated code style

- Keep simple if in one line.
- Wrap enum declarations if necessary.

core/src/main/java/com/github/weisj/darklaf/DarkLaf.java

@@ -129,8 +129,7 @@ public class DarkLaf extends ThemedLookAndFeel {
             LafManager.setTheme(currentTheme);
         }
         for (DefaultsInitTask task : INIT_TASKS) {
-            if (task.onlyDuringInstallation() && !isInitialized)
+            if (task.onlyDuringInstallation() && !isInitialized) continue;
-                continue;
             task.run(currentTheme, defaults);
         }
         return defaults;

core/src/main/java/com/github/weisj/darklaf/LafManager.java

@@ -131,8 +131,7 @@ public final class LafManager {
      */
     public static void enabledPreferenceChangeReporting(final boolean enabled) {
         ThemePreferencesHandler.getSharedInstance().enablePreferenceChangeReporting(enabled);
-        if (ThemeSettings.isInitialized())
+        if (ThemeSettings.isInitialized()) ThemeSettings.getInstance().setSystemPreferencesEnabled(enabled);
-            ThemeSettings.getInstance().setSystemPreferencesEnabled(enabled);
     }
 
     /**
@@ -208,8 +207,7 @@ public final class LafManager {
      * @see PreferredThemeStyle
      */
     public static ThemeProvider getThemeProvider() {
-        if (themeProvider == null)
+        if (themeProvider == null) themeProvider = createDefaultThemeProvider();
-            themeProvider = createDefaultThemeProvider();
         return themeProvider;
     }
 
@@ -247,8 +245,7 @@ public final class LafManager {
      * @param themes the themes to register.
      */
     public static void registerTheme(final Theme... themes) {
-        if (themes == null)
+        if (themes == null) return;
-            return;
         for (Theme theme : themes) {
             registerTheme(theme);
         }
@@ -376,8 +373,7 @@ public final class LafManager {
             eventSupport.dispatchEvent(new ThemeChangeEvent(old, theme), ThemeChangeListener::themeChanged);
             LOGGER.fine(() -> "Setting theme to " + theme);
         }
-        if (ThemeSettings.isInitialized())
+        if (ThemeSettings.isInitialized()) ThemeSettings.getInstance().refresh();
-            ThemeSettings.getInstance().refresh();
     }
 
     /**
@@ -416,8 +412,7 @@ public final class LafManager {
      * @param theme the theme to install.
      */
     public static void installTheme(final Theme theme) {
-        if (theme == getTheme() && isInstalled())
+        if (theme == getTheme() && isInstalled()) return;
-            return;
         setTheme(theme);
         install();
     }
@@ -529,15 +524,12 @@ public final class LafManager {
      * @return the closes match. NonNull.
      */
     public static Theme getClosestMatchForTheme(final Theme theme) {
-        if (theme == null)
+        if (theme == null) return themeForPreferredStyle(null);
-            return themeForPreferredStyle(null);
         for (Theme registered : getRegisteredThemes()) {
-            if (registered.equals(theme))
+            if (registered.equals(theme)) return registered;
-                return registered;
         }
         for (Theme registered : getRegisteredThemes()) {
-            if (registered.getThemeClass().equals(theme.getThemeClass()))
+            if (registered.getThemeClass().equals(theme.getThemeClass())) return registered;
-                return registered;
         }
         return themeForPreferredStyle(null);
     }

core/src/main/java/com/github/weisj/darklaf/components/ClosableTabComponent.java

@@ -168,8 +168,7 @@ public class ClosableTabComponent extends JPanel {
                 int tabCount = tabComponent.pane.getTabCount();
                 for (int i = tabCount - 1; i >= 0; i--) {
                     Component tabComp = tabComponent.pane.getTabComponentAt(i);
-                    if (tabComp == tabComponent)
+                    if (tabComp == tabComponent) continue;
-                        continue;
                     if (tabComp instanceof ClosableTabComponent && ((ClosableTabComponent) tabComp).isClosable()) {
                         tabComponent.pane.removeTabAt(i);
                     }

core/src/main/java/com/github/weisj/darklaf/components/ClosableTabbedPane.java

@@ -85,8 +85,7 @@ public class ClosableTabbedPane extends JTabbedPane {
      */
     public void setTabClosable(final int index, final boolean closable) {
         ClosableTabComponent tab = getClosableTabComponent(index);
-        if (tab != null)
+        if (tab != null) tab.setClosable(closable);
-            tab.setClosable(closable);
     }
 
     /**

core/src/main/java/com/github/weisj/darklaf/components/ColorPipetteBase.java

@@ -145,8 +145,7 @@ public abstract class ColorPipetteBase implements ColorPipette, AWTEventListener
 
     protected Point updateLocation() {
         PointerInfo pointerInfo = MouseInfo.getPointerInfo();
-        if (pointerInfo == null)
+        if (pointerInfo == null) return null;
-            return null;
 
         Point mouseLocation = pointerInfo.getLocation();
         Window pickerWindow = getPickerWindow();
@@ -170,8 +169,7 @@ public abstract class ColorPipetteBase implements ColorPipette, AWTEventListener
 
     @Override
     public void eventDispatched(final AWTEvent event) {
-        if (pickerWindow == null || !pickerWindow.isVisible())
+        if (pickerWindow == null || !pickerWindow.isVisible()) return;
-            return;
         switch (event.getID()) {
             case MouseEvent.MOUSE_PRESSED:
                 ((MouseEvent) event).consume();

core/src/main/java/com/github/weisj/darklaf/components/ColoredRadioButton.java

@@ -82,8 +82,7 @@ public class ColoredRadioButton extends JRadioButton {
 
     private void updateColorUI() {
         ColoredRadioButtonUI ui = DarkUIUtil.getUIOfType(getUI(), ColoredRadioButtonUI.class);
-        if (ui != null)
+        if (ui != null) ui.setColors(color, focusColor);
-            ui.setColors(color, focusColor);
         repaint();
     }
 

core/src/main/java/com/github/weisj/darklaf/components/DefaultButton.java

@@ -40,8 +40,7 @@ public class DefaultButton extends JButton {
     @Override
     public void addNotify() {
         super.addNotify();
-        if (requestFocusOnDisplay)
+        if (requestFocusOnDisplay) requestFocusInWindow();
-            requestFocusInWindow();
         SwingUtilities.getRootPane(this).setDefaultButton(this);
     }
 }

core/src/main/java/com/github/weisj/darklaf/components/DefaultColorPipette.java

@@ -126,8 +126,7 @@ public class DefaultColorPipette extends ColorPipetteBase {
         Window pickerWindow = getPickerWindow();
         if (pickerWindow != null && pickerWindow.isShowing()) {
             Point mouseLoc = updateLocation();
-            if (mouseLoc == null)
+            if (mouseLoc == null) return;
-                return;
             final Color c = getPixelColor(mouseLoc);
             if (!c.equals(getColor()) || !mouseLoc.equals(previousLocation) || force) {
                 setColor(c);

core/src/main/java/com/github/weisj/darklaf/components/OverlayScrollPane.java

@@ -177,8 +177,7 @@ public class OverlayScrollPane extends JLayeredPane implements PropertyChangeLis
     }
 
     protected void updateScrollPaneUI() {
-        if (scrollPane == null)
+        if (scrollPane == null) return;
-            return;
         scrollPane.setLayout(new ScrollLayoutManagerDelegate((ScrollPaneLayout) scrollPane.getLayout()) {
 
             @Override

core/src/main/java/com/github/weisj/darklaf/components/RotatableIconAnimator.java

@@ -42,8 +42,7 @@ public class RotatableIconAnimator extends Timer {
 
     public RotatableIconAnimator(final int frames, final RotatableIcon icon, final JComponent parent) {
         super(100, null);
-        if (icon == null)
+        if (icon == null) throw new IllegalArgumentException("Icon is null");
-            throw new IllegalArgumentException("Icon is null");
         addActionListener(this::onAction);
         setRepeats(true);
         this.icon = icon;
@@ -52,8 +51,7 @@ public class RotatableIconAnimator extends Timer {
     }
 
     public void resume() {
-        if (!isRunning())
+        if (!isRunning()) start();
-            start();
     }
 
     public void onAction(final ActionEvent e) {
@@ -71,7 +69,6 @@ public class RotatableIconAnimator extends Timer {
     }
 
     public void suspend() {
-        if (isRunning())
+        if (isRunning()) stop();
-            stop();
     }
 }

core/src/main/java/com/github/weisj/darklaf/components/border/DarkBorders.java

@@ -36,33 +36,27 @@ public final class DarkBorders {
 
     public static Border createLineBorder(final int top, final int left, final int bottom, final int right) {
         if (top == 0 && left == 0 && bottom == 0 && right == 0) {
-            if (sharedBorderEmpty == null)
+            if (sharedBorderEmpty == null) sharedBorderEmpty = createDarkLineBorder(0, 0, 0, 0);
-                sharedBorderEmpty = createDarkLineBorder(0, 0, 0, 0);
             return sharedBorderEmpty;
         }
         if (top == 1 && left == 0 && bottom == 0 && right == 0) {
-            if (sharedBorderT == null)
+            if (sharedBorderT == null) sharedBorderT = createDarkLineBorder(1, 0, 0, 0);
-                sharedBorderT = createDarkLineBorder(1, 0, 0, 0);
             return sharedBorderT;
         }
         if (top == 0 && left == 1 && bottom == 0 && right == 0) {
-            if (sharedBorderL == null)
+            if (sharedBorderL == null) sharedBorderL = createDarkLineBorder(0, 1, 0, 0);
-                sharedBorderL = createDarkLineBorder(0, 1, 0, 0);
             return sharedBorderL;
         }
         if (top == 0 && left == 0 && bottom == 1 && right == 0) {
-            if (sharedBorderB == null)
+            if (sharedBorderB == null) sharedBorderB = createDarkLineBorder(0, 0, 1, 0);
-                sharedBorderB = createDarkLineBorder(0, 0, 1, 0);
             return sharedBorderB;
         }
         if (top == 0 && left == 0 && bottom == 0 && right == 1) {
-            if (sharedBorderR == null)
+            if (sharedBorderR == null) sharedBorderR = createDarkLineBorder(0, 0, 0, 1);
-                sharedBorderR = createDarkLineBorder(0, 0, 0, 1);
             return sharedBorderR;
         }
         if (top == 1 && left == 1 && bottom == 1 && right == 1) {
-            if (sharedBorderTLBR == null)
+            if (sharedBorderTLBR == null) sharedBorderTLBR = createDarkLineBorder(1, 1, 1, 1);
-                sharedBorderTLBR = createDarkLineBorder(1, 1, 1, 1);
             return sharedBorderTLBR;
         }
         return createDarkLineBorder(top, left, bottom, right);

core/src/main/java/com/github/weisj/darklaf/components/border/DropShadowBorder.java

@@ -197,8 +197,7 @@ public class DropShadowBorder implements Border, Serializable {
     }
 
     protected void drawImage(final Graphics g, final Image image, final Point p) {
-        if (p == null)
+        if (p == null) return;
-            return;
         g.drawImage(image, p.x, p.y, null);
     }
 
@@ -377,8 +376,7 @@ public class DropShadowBorder implements Border, Serializable {
 
     public DropShadowBorder setShadowColor(final Color shadowColor) {
         this.shadowColor = shadowColor;
-        if (shadowColor == null)
+        if (shadowColor == null) this.shadowColor = Color.BLACK;
-            this.shadowColor = Color.BLACK;
         return this;
     }
 

core/src/main/java/com/github/weisj/darklaf/components/color/PopupColorChooser.java

@@ -43,8 +43,7 @@ public class PopupColorChooser extends JToolTip {
     protected static ToolTipContext context;
 
     protected SmallColorChooser getChooser(final Color initial, final Consumer<Color> callback) {
-        if (chooser == null)
+        if (chooser == null) chooser = new SmallColorChooser(initial, callback);
-            chooser = new SmallColorChooser(initial, callback);
         SmallColorChooser smallColorChooser = chooser;
         if (chooser.getParent() != null) {
             // Already in use. Create new one.
@@ -56,8 +55,7 @@ public class PopupColorChooser extends JToolTip {
     }
 
     protected ToolTipContext getContext() {
-        if (context == null)
+        if (context == null) context = createToolTipContext();
-            context = createToolTipContext();
         return context;
     }
 
@@ -106,8 +104,7 @@ public class PopupColorChooser extends JToolTip {
         AWTEventListener listener = event -> {
             if (event instanceof MouseEvent) {
                 int id = event.getID();
-                if (id != MouseEvent.MOUSE_CLICKED && id != MouseEvent.MOUSE_PRESSED)
+                if (id != MouseEvent.MOUSE_CLICKED && id != MouseEvent.MOUSE_PRESSED) return;
-                    return;
             }
             boolean doClose = event instanceof FocusEvent && (!(DarkUIUtil.hasFocus(toolTip, (FocusEvent) event)
                     || DarkUIUtil.hasFocus(toolTip) || DarkUIUtil.hasFocus(parent, (FocusEvent) event)));
@@ -126,10 +123,8 @@ public class PopupColorChooser extends JToolTip {
         close.set(e -> {
             popup.hide();
             Toolkit.getDefaultToolkit().removeAWTEventListener(listener);
-            if (window != null)
+            if (window != null) window.removeComponentListener(windowListener);
-                window.removeComponentListener(windowListener);
+            if (onClose != null) onClose.accept(e);
-            if (onClose != null)
-                onClose.accept(e);
         });
         SwingUtilities.invokeLater(() -> {
             window.addComponentListener(windowListener);

core/src/main/java/com/github/weisj/darklaf/components/color/QuickColorChooser.java

@@ -83,8 +83,7 @@ public class QuickColorChooser extends JPanel {
             final Supplier<Color> supplier, final Supplier<Boolean> activationCheck) {
         AtomicBoolean isShowing = new AtomicBoolean(false);
         component.addMouseListener((MouseClickListener) e -> {
-            if (!component.isEnabled() || isShowing.get() || !activationCheck.get())
+            if (!component.isEnabled() || isShowing.get() || !activationCheck.get()) return;
-                return;
             isShowing.set(true);
             PopupColorChooser.showColorChooser(component, supplier.get(), c -> {
                 if (c != null) {
@@ -99,8 +98,7 @@ public class QuickColorChooser extends JPanel {
     }
 
     public void setSelected(final boolean selected) {
-        if (checkBox != null)
+        if (checkBox != null) checkBox.setSelected(selected);
-            checkBox.setSelected(selected);
     }
 
     public Color getColor() {

core/src/main/java/com/github/weisj/darklaf/components/color/SmallColorChooser.java

@@ -94,8 +94,7 @@ public class SmallColorChooser extends JPanel {
         colorTriangle.addListener((c, o) -> {
             previewComponent.setColor(c);
             for (DarkColorModel model : COLOR_MODELS) {
-                if (o != model)
+                if (o != model) updateMap.get(model).run();
-                    updateMap.get(model).run();
             }
             if (o != hexField) {
                 hexField.setText(ColorUtil.toHex(c));
@@ -117,14 +116,12 @@ public class SmallColorChooser extends JPanel {
     }
 
     protected void setColor(final Object source, final DarkColorModel model, final int... values) {
-        if (isValueChanging())
+        if (isValueChanging()) return;
-            return;
         setValueChanging(true);
         if (model != null) {
             colorTriangle.setColorFromModel(source, model, values);
         }
-        if (callback != null)
+        if (callback != null) callback.accept(colorTriangle.getColor());
-            callback.accept(colorTriangle.getColor());
         setValueChanging(false);
     }
 
@@ -259,8 +256,7 @@ public class SmallColorChooser extends JPanel {
 
             label.setValue(String.valueOf(slider.getValue()));
             slider.addChangeListener(e -> {
-                if (isValueChanging())
+                if (isValueChanging()) return;
-                    return;
                 int[] values = new int[count];
                 for (int j = 0; j < count; j++) {
                     values[j] = sliders[j].getValue();
@@ -318,8 +314,7 @@ public class SmallColorChooser extends JPanel {
 
         public void setValue(final String value) {
             this.value = value;
-            if (this.value == null)
+            if (this.value == null) this.value = "";
-                this.value = "";
             setText(before + ": " + value + after);
         }
     }

core/src/main/java/com/github/weisj/darklaf/components/filetree/FileTree.java

@@ -82,15 +82,13 @@ public class FileTree extends JTree {
 
     public Path getSelectedFile() {
         TreePath path = getSelectionPath();
-        if (path == null)
+        if (path == null) return null;
-            return null;
         return ((FileTreeNode) path.getLastPathComponent()).getFile();
     }
 
     public List<Path> getSelectedFiles() {
         TreePath[] paths = getSelectionPaths();
-        if (paths == null)
+        if (paths == null) return Collections.emptyList();
-            return Collections.emptyList();
         return Arrays.stream(getSelectionPaths()).map(TreePath::getLastPathComponent).map(FileTreeNode.class::cast)
                 .map(FileTreeNode::getFile).collect(Collectors.toList());
     }

core/src/main/java/com/github/weisj/darklaf/components/filetree/FileTreeModel.java

@@ -72,8 +72,7 @@ public class FileTreeModel extends DefaultTreeModel {
     }
 
     public void setShowHiddenFiles(final boolean showHiddenFiles) {
-        if (showHiddenFiles == this.showHiddenFiles)
+        if (showHiddenFiles == this.showHiddenFiles) return;
-            return;
         this.showHiddenFiles = showHiddenFiles;
         reload();
     }

core/src/main/java/com/github/weisj/darklaf/components/filetree/FileTreeNode.java

@@ -50,10 +50,8 @@ public class FileTreeNode implements TreeNode, Comparable<FileTreeNode> {
 
     @Override
     public boolean equals(final Object o) {
-        if (this == o)
+        if (this == o) return true;
-            return true;
+        if (o == null || getClass() != o.getClass()) return false;
-        if (o == null || getClass() != o.getClass())
-            return false;
         FileTreeNode that = (FileTreeNode) o;
         return Objects.equals(file, that.file);
     }
@@ -69,8 +67,7 @@ public class FileTreeNode implements TreeNode, Comparable<FileTreeNode> {
 
     private int addSorted(final List<FileTreeNode> nodes, final FileTreeNode node) {
         int index = Collections.binarySearch(nodes, node);
-        if (index < 0)
+        if (index < 0) index = ~index;
-            index = ~index;
         nodes.add(index, node);
         model.register(node);
         return index;
@@ -90,10 +87,8 @@ public class FileTreeNode implements TreeNode, Comparable<FileTreeNode> {
     }
 
     protected void reload(final int depth) {
-        if (depth < 0)
+        if (depth < 0) return;
-            return;
+        if (children.get() == null) return;
-        if (children.get() == null)
-            return;
         List<FileTreeNode> fileList = children.get();
         this.<ReloadOp>doInBackground(pub -> {
             taskCount.getAndIncrement();
@@ -131,8 +126,7 @@ public class FileTreeNode implements TreeNode, Comparable<FileTreeNode> {
                 }
             }
         }, () -> {
-            if (depth > 0)
+            if (depth > 0) fileList.forEach(n -> n.reload(depth - 1));
-                fileList.forEach(n -> n.reload(depth - 1));
             taskCount.getAndDecrement();
         });
     }
@@ -245,15 +239,13 @@ public class FileTreeNode implements TreeNode, Comparable<FileTreeNode> {
     }
 
     public boolean isNodeChild(final TreeNode aNode) {
-        if (aNode == null)
+        if (aNode == null) return false;
-            return false;
         return (aNode.getParent() == this);
     }
 
     @Override
     public int compareTo(final FileTreeNode o) {
-        if (o == null)
+        if (o == null) return -1;
-            return -1;
         boolean thisDir = Files.isDirectory(file);
         boolean oDir = Files.isDirectory(o.file);
         if (thisDir == oDir) {
@@ -289,8 +281,7 @@ public class FileTreeNode implements TreeNode, Comparable<FileTreeNode> {
 
         @Override
         protected void reload(final int depth) {
-            if (depth < 0)
+            if (depth < 0) return;
-                return;
             List<FileTreeNode> nodes = children.get();
             createInitialDirectories().forEach(p -> {
                 FileTreeNode node = model.createNode(this, p);
@@ -307,8 +298,7 @@ public class FileTreeNode implements TreeNode, Comparable<FileTreeNode> {
                 return false;
             });
 
-            if (depth > 0)
+            if (depth > 0) children.get().forEach(n -> n.reload(depth - 1));
-                children.get().forEach(n -> n.reload(depth - 1));
         }
 
         @Override

core/src/main/java/com/github/weisj/darklaf/components/filetree/WatchFileTree.java

@@ -48,8 +48,7 @@ public class WatchFileTree extends FileTree {
 
     @Override
     public void setFileTreeModel(final FileTreeModel fileTreeModel) {
-        if (getModel() == fileTreeModel)
+        if (getModel() == fileTreeModel) return;
-            return;
         if (getModel() instanceof WatchFileTreeModel) {
             ((WatchFileTreeModel) getModel()).stopWatching();
         }

core/src/main/java/com/github/weisj/darklaf/components/filetree/WatchFileTreeModel.java

@@ -101,8 +101,7 @@ public class WatchFileTreeModel extends FileTreeModel {
     }
 
     public void startWatching() {
-        if (watchTask != null)
+        if (watchTask != null) return;
-            return;
         isScheduled.set(true);
         watchTask = scheduler.schedule(this::watch, 0, TimeUnit.SECONDS);
     }
@@ -158,10 +157,8 @@ public class WatchFileTreeModel extends FileTreeModel {
     protected void register(final FileTreeNode node) {
         synchronized (getLock()) {
             WatchService ws = getWatchService();
-            if (ws == null || !Files.isDirectory(node.file))
+            if (ws == null || !Files.isDirectory(node.file)) return;
-                return;
+            if (getNodeMap().containsKey(node.file)) return;
-            if (getNodeMap().containsKey(node.file))
-                return;
             try {
                 LOGGER.finer(() -> "Register watch service for \"" + node.file + "\"");
                 node.watchKey = node.file.register(ws, StandardWatchEventKinds.ENTRY_CREATE,
@@ -174,8 +171,7 @@ public class WatchFileTreeModel extends FileTreeModel {
 
     protected void unregister(final FileTreeNode node) {
         synchronized (getLock()) {
-            if (node.watchKey == null)
+            if (node.watchKey == null) return;
-                return;
             LOGGER.finer(() -> "Unregister watch service for \"" + node.file + "\"");
             getNodeMap().remove(node.file);
             node.watchKey.cancel();

core/src/main/java/com/github/weisj/darklaf/components/loading/LoadingIndicator.java

@@ -79,8 +79,7 @@ public class LoadingIndicator extends JLabel {
     }
 
     private void setAnimatorState(final boolean running) {
-        if (running == animator.isRunning())
+        if (running == animator.isRunning()) return;
-            return;
         if (running) {
             animator.resume();
         } else {

core/src/main/java/com/github/weisj/darklaf/components/tabframe/JTabFrame.java

@@ -91,11 +91,9 @@ public class JTabFrame extends JComponent {
     protected void updatePopupUIs() {
         if (popupLists != null) {
             for (List<TabFramePopup> list : popupLists) {
-                if (list == null)
+                if (list == null) continue;
-                    continue;
                 for (TabFramePopup popup : list) {
-                    if (popup == null)
+                    if (popup == null) continue;
-                        continue;
                     popup.updateContentUI();
                 }
             }
@@ -551,11 +549,9 @@ public class JTabFrame extends JComponent {
      */
     public void toggleTab(final Alignment a, final int index, final boolean enabled) {
         int oldIndex = selectedIndices[a.getIndex()];
-        if (content.isEnabled(a) == enabled && oldIndex == index)
+        if (content.isEnabled(a) == enabled && oldIndex == index) return;
-            return;
         TabFrameTab compAtIndex = getTabComponentAt(a, index);
-        if (!compAtIndex.isEnabled())
+        if (!compAtIndex.isEnabled()) return;
-            return;
         compAtIndex.setSelected(enabled);
         notifySelectionChange(compAtIndex);
         setPopupVisibility(compAtIndex, enabled);
@@ -631,8 +627,7 @@ public class JTabFrame extends JComponent {
      * @param c the popup to close.
      */
     public void closeTab(final TabFramePopup c) {
-        if (c == null)
+        if (c == null) return;
-            return;
         closeTab(c.getAlignment(), c.getIndex());
     }
 
@@ -664,8 +659,7 @@ public class JTabFrame extends JComponent {
      * @param c the popup to open.
      */
     public void openTab(final TabFramePopup c) {
-        if (c == null)
+        if (c == null) return;
-            return;
         openTab(c.getAlignment(), c.getIndex());
     }
 
@@ -924,8 +918,7 @@ public class JTabFrame extends JComponent {
      * @return true if selected.
      */
     public boolean isSelected(final Alignment a, final int index) {
-        if (a == null)
+        if (a == null) return false;
-            return false;
         return selectedIndices[a.ordinal()] == index;
     }
 

core/src/main/java/com/github/weisj/darklaf/components/tabframe/TabFrameContentPane.java

@@ -181,8 +181,7 @@ public class TabFrameContentPane extends JPanel implements TabFrameContent {
      * @param force whether to force the layout process.
      */
     public void setEnabled(final Alignment a, final boolean enabled, final boolean force) {
-        if (enabled == isEnabled(a) && !force)
+        if (enabled == isEnabled(a) && !force) return;
-            return;
         switch (a) {
             case NORTH:
                 changeStatus(enabled, Alignment.NORTH_EAST, topSplit, topSplitter,

core/src/main/java/com/github/weisj/darklaf/components/tabframe/TabFrameTabContainer.java

@@ -106,8 +106,7 @@ public class TabFrameTabContainer extends JPanel implements TabFrameTab {
 
     @Override
     public void setOrientation(final Alignment a) {
-        if (this.orientation == a)
+        if (this.orientation == a) return;
-            return;
         Alignment oldOrientation = this.orientation;
         this.orientation = a;
         firePropertyChange(KEY_ORIENTATION, oldOrientation, orientation);
@@ -120,8 +119,7 @@ public class TabFrameTabContainer extends JPanel implements TabFrameTab {
 
     @Override
     public void setSelected(final boolean selected) {
-        if (selected == this.selected)
+        if (selected == this.selected) return;
-            return;
         boolean oldSelected = this.selected;
         this.selected = selected;
         firePropertyChange(KEY_SELECTED, oldSelected, selected);
@@ -134,8 +132,7 @@ public class TabFrameTabContainer extends JPanel implements TabFrameTab {
 
     @Override
     public void setAccelerator(final int accelerator) {
-        if (this.accelerator == accelerator)
+        if (this.accelerator == accelerator) return;
-            return;
         int oldAccelerator = this.accelerator;
         this.accelerator = accelerator;
         firePropertyChange(KEY_ACCELERATOR, oldAccelerator, accelerator);

core/src/main/java/com/github/weisj/darklaf/components/tabframe/TabFrameTabLabel.java

@@ -103,8 +103,7 @@ public class TabFrameTabLabel extends JLabel implements TabFrameTab {
 
     @Override
     public void setOrientation(final Alignment a) {
-        if (this.orientation == a)
+        if (this.orientation == a) return;
-            return;
         Alignment oldOrientation = this.orientation;
         this.orientation = a;
         firePropertyChange(KEY_ORIENTATION, oldOrientation, orientation);
@@ -117,8 +116,7 @@ public class TabFrameTabLabel extends JLabel implements TabFrameTab {
 
     @Override
     public void setSelected(final boolean selected) {
-        if (selected == this.selected)
+        if (selected == this.selected) return;
-            return;
         boolean oldSelected = this.selected;
         this.selected = selected;
         firePropertyChange(KEY_SELECTED, oldSelected, selected);
@@ -131,8 +129,7 @@ public class TabFrameTabLabel extends JLabel implements TabFrameTab {
 
     @Override
     public void setAccelerator(final int accelerator) {
-        if (this.accelerator == accelerator)
+        if (this.accelerator == accelerator) return;
-            return;
         int oldAccelerator = this.accelerator;
         this.accelerator = accelerator;
         firePropertyChange(KEY_ACCELERATOR, oldAccelerator, accelerator);
@@ -166,8 +163,7 @@ public class TabFrameTabLabel extends JLabel implements TabFrameTab {
      * @param title the title
      */
     public void setTitle(final String title) {
-        if (Objects.equals(title, this.title))
+        if (Objects.equals(title, this.title)) return;
-            return;
         String oldTitle = this.title;
         this.title = title;
         firePropertyChange(KEY_TITLE, oldTitle, selected);

core/src/main/java/com/github/weisj/darklaf/components/tabframe/TabbedPopup.java

@@ -138,8 +138,7 @@ public class TabbedPopup extends PanelPopup {
      * @param component the component to add.
      */
     public void setContentPane(final Component component) {
-        if (component == null)
+        if (component == null) return;
-            return;
         if (getContentPanes().contains(component)) {
             return;
         }

core/src/main/java/com/github/weisj/darklaf/components/tabframe/ToggleSplitPane.java

@@ -146,8 +146,7 @@ public class ToggleSplitPane extends JSplitPane {
 
     @Override
     public void setDividerLocation(final int location) {
-        if (isInLayout)
+        if (isInLayout) return;
-            return;
         isInLayout = true;
         if (resizable) {
             super.setDividerLocation(location);

core/src/main/java/com/github/weisj/darklaf/components/text/LineHighlighter.java

@@ -85,16 +85,13 @@ public class LineHighlighter implements Highlighter.HighlightPainter, ChangeList
     private void resetHighlight() {
         // Use invokeLater to make sure updates to the Document are completed,
         // otherwise Undo processing causes the modelToView method to loop.
-        if (component == null)
+        if (component == null) return;
-            return;
         SwingUtilities.invokeLater(() -> {
             try {
-                if (component == null)
+                if (component == null) return;
-                    return;
                 int offset = component.getCaretPosition();
                 Rectangle view = component.modelToView(offset);
-                if (view == null)
+                if (view == null) return;
-                    return;
                 Rectangle currentView = view.getBounds();
 
                 // Remove the highlighting from the previously highlighted line

core/src/main/java/com/github/weisj/darklaf/components/text/NumberingPane.java

@@ -101,8 +101,7 @@ public class NumberingPane extends JComponent {
     }
 
     public void addIconListener(final int offset, final IconListener listener) throws BadLocationException {
-        if (textComponent == null)
+        if (textComponent == null) return;
-            return;
         addIconListener(textComponent.getDocument().createPosition(offset), listener);
     }
 
@@ -117,8 +116,7 @@ public class NumberingPane extends JComponent {
     }
 
     public void removeIconListener(final int offset, final IconListener listener) throws BadLocationException {
-        if (textComponent == null)
+        if (textComponent == null) return;
-            return;
         removeIconListener(textComponent.getDocument().createPosition(offset), listener);
     }
 
@@ -138,8 +136,7 @@ public class NumberingPane extends JComponent {
     }
 
     public List<IconListener> getIconListeners(final int offset) throws BadLocationException {
-        if (textComponent == null)
+        if (textComponent == null) return new ArrayList<>();
-            return new ArrayList<>();
         return getIconListeners(textComponent.getDocument().createPosition(offset));
     }
 

core/src/main/java/com/github/weisj/darklaf/components/text/TextFieldHistoryPopup.java

@@ -84,8 +84,7 @@ public class TextFieldHistoryPopup extends ScrollPopupMenu implements SearchList
      * @throws IllegalArgumentException if capacity is negative
      */
     public void setCapacity(final int capacity) throws IllegalArgumentException {
-        if (capacity < 0)
+        if (capacity < 0) throw new IllegalArgumentException("Negative history size is not supported");
-            throw new IllegalArgumentException("Negative history size is not supported");
         this.capacity = capacity;
     }
 
@@ -122,8 +121,7 @@ public class TextFieldHistoryPopup extends ScrollPopupMenu implements SearchList
 
     @Override
     public void show(final Component invoker, final int x, final int y) {
-        if (history.size() == 0)
+        if (history.size() == 0) return;
-            return;
         super.show(invoker, x, y);
     }
 

core/src/main/java/com/github/weisj/darklaf/components/togglebuttonlist/JToggleButtonList.java

@@ -64,8 +64,7 @@ public class JToggleButtonList extends JList<JToggleButton> {
             @Override
             public void actionPerformed(final ActionEvent e) {
                 int leadIndex = getSelectionModel().getLeadSelectionIndex();
-                if (leadIndex >= 0)
+                if (leadIndex >= 0) setSelected(leadIndex, !JToggleButtonList.this.isSelected(leadIndex));
-                    setSelected(leadIndex, !JToggleButtonList.this.isSelected(leadIndex));
             }
         });
         super.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);

core/src/main/java/com/github/weisj/darklaf/components/tooltip/ToolTipContext.java

@@ -42,8 +42,7 @@ public class ToolTipContext {
     private static ToolTipContext defaultContext;
 
     public static ToolTipContext getDefaultContext() {
-        if (defaultContext == null)
+        if (defaultContext == null) defaultContext = createDefaultContext();
-            defaultContext = createDefaultContext();
         return defaultContext;
     }
 
@@ -66,14 +65,12 @@ public class ToolTipContext {
 
         @Override
         public void mouseMoved(final MouseEvent e) {
-            if (hotSpotArea == null)
+            if (hotSpotArea == null) return;
-                return;
             checkExit(e);
         }
 
         private void checkExit(final MouseEvent e) {
-            if (!hideOnExit)
+            if (!hideOnExit) return;
-                return;
             if (hotSpotArea != null) {
                 if (!hotSpotArea.contains(e.getPoint())) {
                     ToolTipManager.sharedInstance().mousePressed(null);
@@ -466,8 +463,7 @@ public class ToolTipContext {
      */
     public Point getToolTipLocation(final Point mp, final MouseEvent mouseEvent, final boolean centerHorizontally,
             final boolean centerVertically) {
-        if (target == null)
+        if (target == null) return null;
-            return null;
         updateToolTip();
         MouseEvent event = processEvent(mouseEvent, mp);
         Rectangle rect = getTargetRect(event, centerHorizontally, centerVertically);
@@ -515,8 +511,7 @@ public class ToolTipContext {
     }
 
     private MouseEvent processEvent(final MouseEvent mouseEvent, final Point mp) {
-        if (mouseEvent != null)
+        if (mouseEvent != null) return mouseEvent;
-            return mouseEvent;
         return new MouseEvent(target, MouseEvent.MOUSE_MOVED, System.currentTimeMillis(), 0, mp.x, mp.y, 0, false, 0);
     }
 
@@ -542,8 +537,7 @@ public class ToolTipContext {
     }
 
     public void updateToolTipUI() {
-        if (toolTip != null)
+        if (toolTip != null) toolTip.updateUI();
-            toolTip.updateUI();
     }
 
     private Dimension getContentSize() {
@@ -615,8 +609,7 @@ public class ToolTipContext {
     }
 
     public void setToolTip(final JToolTip toolTip) {
-        if (toolTip == null)
+        if (toolTip == null) return;
-            return;
         this.toolTip = toolTip;
         if (this.target != toolTip.getComponent()) {
             this.toolTip.setComponent(this.target);
@@ -629,8 +622,7 @@ public class ToolTipContext {
 
     public ToolTipContext setFallBackPositionProvider(final Function<ToolTipContext, Point> fallBackPositionProvider) {
         this.fallBackPositionProvider = fallBackPositionProvider;
-        if (fallBackPositionProvider == null)
+        if (fallBackPositionProvider == null) this.fallBackPositionProvider = c -> null;
-            this.fallBackPositionProvider = c -> null;
         return this;
     }
 }

core/src/main/java/com/github/weisj/darklaf/components/tooltip/ToolTipStyle.java

@@ -35,10 +35,8 @@ public enum ToolTipStyle implements ToolTipConstants {
     }
 
     public static ToolTipStyle parse(final Object style) {
-        if (style instanceof ToolTipStyle)
+        if (style instanceof ToolTipStyle) return (ToolTipStyle) style;
-            return (ToolTipStyle) style;
+        if (style == null) return null;
-        if (style == null)
-            return null;
         String name = style.toString();
         if (VARIANT_PLAIN_BALLOON.equalsIgnoreCase(name) || ToolTipStyle.PLAIN_BALLOON.name().equalsIgnoreCase(name)) {
             return ToolTipStyle.PLAIN_BALLOON;

core/src/main/java/com/github/weisj/darklaf/components/tree/TristateTreeNode.java

@@ -112,8 +112,7 @@ public class TristateTreeNode extends DefaultMutableTreeNode implements LabeledT
         for (Object node : children) {
             if (node instanceof TristateTreeNode) {
                 TristateState nodeState = ((TristateTreeNode) node).getUserObject();
-                if (state == null)
+                if (state == null) state = nodeState;
-                    state = nodeState;
                 if (state != nodeState) {
                     state = TristateState.INDETERMINATE_SEL;
                     break;

core/src/main/java/com/github/weisj/darklaf/components/treetable/JTreeTable.java

@@ -73,8 +73,7 @@ public class JTreeTable extends JTable implements TreeSelectionListener {
             DarkTreeUI ui = DarkUIUtil.getUIOfType(tree.getUI(), DarkTreeUI.class);
             if (ui != null) {
                 CellHintPopupListener<JTree, ?> listener = ui.getPopupListener();
-                if (listener != null)
+                if (listener != null) listener.repaint();
-                    listener.repaint();
             }
         });
     }
@@ -93,8 +92,7 @@ public class JTreeTable extends JTable implements TreeSelectionListener {
                     tree.processEvent(e);
                 }
             }
-            if (((InputEvent) e).isConsumed())
+            if (((InputEvent) e).isConsumed()) return;
-                return;
         }
         super.processEvent(e);
     }

core/src/main/java/com/github/weisj/darklaf/components/treetable/model/DefaultTreeTableModel.java

@@ -61,8 +61,7 @@ public class DefaultTreeTableModel extends AbstractTreeTableModel {
     @Override
     public Object getValueAt(final Object node, final int column) {
         TreeTableNode treeTableNode = DarkUIUtil.nullableCast(TreeTableNode.class, node);
-        if (treeTableNode == null)
+        if (treeTableNode == null) return null;
-            return null;
         return treeTableNode.getValueAt(column);
     }
 

core/src/main/java/com/github/weisj/darklaf/components/treetable/model/TreeTableNode.java

@@ -41,8 +41,7 @@ public interface TreeTableNode extends TreeNode {
 
     @Override
     default int getIndex(final TreeNode node) {
-        if (!(node instanceof TreeTableNode))
+        if (!(node instanceof TreeTableNode)) return -1;
-            return -1;
         return getIndex((TreeTableNode) node);
     }
 
@@ -57,8 +56,7 @@ public interface TreeTableNode extends TreeNode {
 
     @Override
     default TreeTableNode getChildAt(final int index) {
-        if (index < 0 || index >= getChildCount())
+        if (index < 0 || index >= getChildCount()) return null;
-            return null;
         return getChildren().get(index);
     }
 

core/src/main/java/com/github/weisj/darklaf/components/tristate/TristateButtonModel.java

@@ -42,8 +42,7 @@ public class TristateButtonModel extends JToggleButton.ToggleButtonModel {
     }
 
     public void setIndeterminate() {
-        if (!allowsIndeterminate || isIndeterminate())
+        if (!allowsIndeterminate || isIndeterminate()) return;
-            return;
         setState(isSelected() ? TristateState.INDETERMINATE_DES : TristateState.INDETERMINATE_SEL);
     }
 
@@ -79,8 +78,7 @@ public class TristateButtonModel extends JToggleButton.ToggleButtonModel {
     }
 
     public void setState(final TristateState state) {
-        if (this.state == state)
+        if (this.state == state) return;
-            return;
         if (!allowsIndeterminate && state.isIndeterminate()) {
             return;
         }

core/src/main/java/com/github/weisj/darklaf/components/tristate/TristateCheckBox.java

@@ -47,8 +47,7 @@ public class TristateCheckBox extends JCheckBox {
     }
 
     private void iterateState() {
-        if (!getModel().isEnabled())
+        if (!getModel().isEnabled()) return;
-            return;
         getTristateModel().iterateState();
     }
 

core/src/main/java/com/github/weisj/darklaf/components/tristate/TristateCheckBoxMenuItem.java

@@ -115,8 +115,7 @@ public class TristateCheckBoxMenuItem extends JCheckBoxMenuItem {
     }
 
     private void iterateState() {
-        if (!getModel().isEnabled())
+        if (!getModel().isEnabled()) return;
-            return;
 
         grabFocus();
         getTristateModel().iterateState();

core/src/main/java/com/github/weisj/darklaf/graphics/Animator.java

@@ -65,8 +65,7 @@ public abstract class Animator {
 
     public void reset() {
         currentFrame %= totalFrames;
-        if (!forward)
+        if (!forward) currentFrame = totalFrames - currentFrame;
-            currentFrame = totalFrames - currentFrame;
     }
 
     private static ScheduledExecutorService createScheduler() {
@@ -139,8 +138,7 @@ public abstract class Animator {
     }
 
     private void onTick() {
-        if (isDisposed() || ticker == null)
+        if (isDisposed() || ticker == null) return;
-            return;
 
         if (startTime == -1) {
             startTime = System.currentTimeMillis();
@@ -151,8 +149,7 @@ public abstract class Animator {
         final double totalTime = stopTime - startTime;
 
         final int newFrame = (int) (passedTime * totalFrames / totalTime) + startFrame;
-        if (currentFrame > 0 && newFrame == currentFrame)
+        if (currentFrame > 0 && newFrame == currentFrame) return;
-            return;
         currentFrame = newFrame;
 
         if (currentFrame >= totalFrames) {

core/src/main/java/com/github/weisj/darklaf/graphics/GraphicsUtil.java

@@ -41,13 +41,11 @@ public final class GraphicsUtil {
     private GraphicsUtil() {}
 
     public static void setOpaqueBuffered(final JComponent c, final boolean opaqueBuffered) {
-        if (c != null)
+        if (c != null) c.putClientProperty(KEY_OPAQUE_BUFFERED, opaqueBuffered);
-            c.putClientProperty(KEY_OPAQUE_BUFFERED, opaqueBuffered);
     }
 
     public static boolean isOpaqueBuffered(final JComponent c) {
-        if (!SystemInfo.isWindows)
+        if (!SystemInfo.isWindows) return false;
-            return false;
         return PropertyUtil.getBooleanProperty(c, KEY_OPAQUE_BUFFERED);
     }
 

core/src/main/java/com/github/weisj/darklaf/graphics/StringPainter.java

@@ -103,8 +103,7 @@ public class StringPainter {
     public static <T extends JComponent> void drawStringImpl(final Graphics g, final T c, final View view,
             final String text, final Rectangle textRect, final Font font, final FontMetrics fm, final int mnemIndex,
             final Color background) {
-        if (text == null || text.equals(""))
+        if (text == null || text.equals("")) return;
-            return;
 
         GraphicsContext context = GraphicsUtil.setupAntialiasing(g);
 
@@ -212,8 +211,7 @@ public class StringPainter {
         try {
             Field surfaceField = graphics2D.getClass().getField("surfaceData");
             Object surfaceDataValue = surfaceField.get(graphics2D);
-            if (surfaceDataValue == null)
+            if (surfaceDataValue == null) return null;
-                return null;
 
             Field imgField;
             try {

core/src/main/java/com/github/weisj/darklaf/listener/UIUpdater.java

@@ -45,8 +45,7 @@ public class UIUpdater implements ThemeChangeListener {
      * @param component the component.
      */
     public static void registerComponent(final JComponent component) {
-        if (component == null)
+        if (component == null) return;
-            return;
         removeComponent(component);
         UIUpdater updater = new UIUpdater(component);
         component.putClientProperty(KEY_UPDATER, updater);
@@ -90,7 +89,6 @@ public class UIUpdater implements ThemeChangeListener {
 
     @Override
     public void themeInstalled(final ThemeChangeEvent e) {
-        if (component != null)
+        if (component != null) SwingUtilities.updateComponentTreeUI(component);
-            SwingUtilities.updateComponentTreeUI(component);
     }
 }

core/src/main/java/com/github/weisj/darklaf/platform/DecorationsHandler.java

@@ -43,8 +43,7 @@ public class DecorationsHandler {
     private boolean decorationsEnabled = true;
 
     public static DecorationsHandler getSharedInstance() {
-        if (sharedInstance == null)
+        if (sharedInstance == null) setSharedInstance(new DecorationsHandler());
-            setSharedInstance(new DecorationsHandler());
         return sharedInstance;
     }
 

core/src/main/java/com/github/weisj/darklaf/platform/ThemePreferencesHandler.java

@@ -44,8 +44,7 @@ public class ThemePreferencesHandler {
     private ThemePreferenceProvider preferenceProvider;
 
     public static ThemePreferencesHandler getSharedInstance() {
-        if (sharedInstance == null)
+        if (sharedInstance == null) setSharedInstance(new ThemePreferencesHandler());
-            setSharedInstance(new ThemePreferencesHandler());
         return sharedInstance;
     }
 

core/src/main/java/com/github/weisj/darklaf/settings/ThemeSettings.java

@@ -432,8 +432,7 @@ public class ThemeSettings implements ThemePreferenceListener {
 
     private Theme getEffectiveTheme(final PreferredThemeStyle themeStyle) {
         Theme baseTheme = getEffectiveBaseTheme(themeStyle);
-        if (baseTheme == null)
+        if (baseTheme == null) return null;
-            return null;
         FontSizeRule fontSizeRule = getEffectiveFontSizeRule(baseTheme, themeStyle);
         AccentColorRule accentColorRule = getEffectiveAccentColorRule(baseTheme);
         return baseTheme.derive(fontSizeRule, accentColorRule);
@@ -444,14 +443,12 @@ public class ThemeSettings implements ThemePreferenceListener {
     }
 
     private FontSizeRule getEffectiveFontSizeRule(final Theme theme, final PreferredThemeStyle preferredThemeStyle) {
-        if (theme == null)
+        if (theme == null) return FontSizeRule.getDefault();
-            return FontSizeRule.getDefault();
         return isFontSizeFollowsSystem() ? preferredThemeStyle.getFontSizeRule() : getFontSizeRule();
     }
 
     private AccentColorRule getEffectiveAccentColorRule(final Theme theme) {
-        if (theme == null)
+        if (theme == null) return AccentColorRule.getDefault();
-            return AccentColorRule.getDefault();
         return currentConfiguration.getAccentColorRule();
     }
 
@@ -466,10 +463,8 @@ public class ThemeSettings implements ThemePreferenceListener {
     }
 
     protected void applyTheme(final Theme theme) {
-        if (theme == null)
+        if (theme == null) return;
-            return;
+        if (LafManager.getTheme().appearsEqualTo(theme)) return;
-        if (LafManager.getTheme().appearsEqualTo(theme))
-            return;
         SwingUtilities.invokeLater(() -> {
             LafManager.installTheme(theme);
             refresh();

core/src/main/java/com/github/weisj/darklaf/settings/ThemeSettingsPanel.java

@@ -126,8 +126,7 @@ public class ThemeSettingsPanel extends JPanel {
             boolean selected = Objects.equals(radioButton.getColor(), currentColor)
                     || (radioButton == defaultButton && Objects.equals(defaultColor, currentColor));
             bg.setSelected(radioButton.getModel(), selected);
-            if (selected)
+            if (selected) return true;
-                return true;
         }
         return false;
     }
@@ -257,8 +256,7 @@ public class ThemeSettingsPanel extends JPanel {
         }
         if (!updateButtonGroup(bg, color, defaultButton, defaultColor)) {
             customButton.setSelected(true);
-            if (customButton.getColor() == null)
+            if (customButton.getColor() == null) customButton.setColor(color);
-                customButton.setColor(color);
         }
     }
 
@@ -371,14 +369,10 @@ public class ThemeSettingsPanel extends JPanel {
             if (!enabledSystemPreferences.getTristateModel().isIndeterminate()) {
                 boolean selected = enabledSystemPreferences.getTristateModel().isSelected();
 
-                if (themeFollowsSystem.isEnabled())
+                if (themeFollowsSystem.isEnabled()) themeFollowsSystem.setSelected(selected);
-                    themeFollowsSystem.setSelected(selected);
+                if (accentColorFollowsSystem.isEnabled()) accentColorFollowsSystem.setSelected(selected);
-                if (accentColorFollowsSystem.isEnabled())
+                if (selectionColorFollowsSystem.isEnabled()) selectionColorFollowsSystem.setSelected(selected);
-                    accentColorFollowsSystem.setSelected(selected);
+                if (fontSizeFollowsSystem.isEnabled()) fontSizeFollowsSystem.setSelected(selected);
-                if (selectionColorFollowsSystem.isEnabled())
-                    selectionColorFollowsSystem.setSelected(selected);
-                if (fontSizeFollowsSystem.isEnabled())
-                    fontSizeFollowsSystem.setSelected(selected);
             }
             update();
         });
@@ -564,8 +558,7 @@ public class ThemeSettingsPanel extends JPanel {
         }
 
         private AccentColorRule getAccentColorRule(final Theme theme) {
-            if (theme == null)
+            if (theme == null) return AccentColorRule.getDefault();
-                return AccentColorRule.getDefault();
             Color accentColor = getAccentColor(theme, isAccentColorFollowsSystem());
             Color selectionColor = getSelectionColor(theme, isSelectionColorFollowsSystem());
             return AccentColorRule.fromColor(accentColor, selectionColor);
@@ -592,8 +585,7 @@ public class ThemeSettingsPanel extends JPanel {
         }
 
         private FontSizeRule getFontSizeRule(final Theme theme, final PreferredThemeStyle preferredThemeStyle) {
-            if (theme == null)
+            if (theme == null) return FontSizeRule.getDefault();
-                return FontSizeRule.getDefault();
             return isFontSizeFollowsSystem() ? preferredThemeStyle.getFontSizeRule()
                     : FontSizeRule.relativeAdjustment(fontSlider.getValue()); // Todo
         }

core/src/main/java/com/github/weisj/darklaf/task/AccentColorAdjustmentTask.java

@@ -56,8 +56,7 @@ public class AccentColorAdjustmentTask extends ColorAdjustmentTask {
             return;
         }
         Properties props = currentTheme.loadAccentProperties();
-        if (props == null || props.isEmpty())
+        if (props == null || props.isEmpty()) return;
-            return;
         if (accentColor != null) {
             adjustColors(MAIN_ACCENT_LIST_KEY, accentColor, props, properties);
         }
@@ -78,8 +77,7 @@ public class AccentColorAdjustmentTask extends ColorAdjustmentTask {
         ColorInfo info = new ColorInfo();
         for (Object o : list) {
             setColorInfo(o, info);
-            if (info.key == null)
+            if (info.key == null) continue;
-                continue;
             Object c = mapColor(info, hsb, properties);
             if (c instanceof Color) {
                 properties.put(info.key, c);
@@ -99,10 +97,8 @@ public class AccentColorAdjustmentTask extends ColorAdjustmentTask {
         if (o instanceof Pair<?, ?>) {
             Object first = ((Pair<?, ?>) o).getFirst();
             Object second = ((Pair<?, ?>) o).getSecond();
-            if (!(first instanceof String))
+            if (!(first instanceof String)) return;
-                return;
+            if (!(second instanceof List<?>)) return;
-            if (!(second instanceof List<?>))
-                return;
             String key = first.toString();
             List<?> list = (List<?>) second;
             if (list.size() != 3 || !(list.get(0) instanceof Integer) || !(list.get(1) instanceof Integer)

core/src/main/java/com/github/weisj/darklaf/task/FontDefaultsInitTask.java

@@ -103,10 +103,8 @@ public class FontDefaultsInitTask implements DefaultsInitTask {
     }
 
     private boolean systemKerningEnabled() {
-        if (SystemInfo.isMac)
+        if (SystemInfo.isMac) return SystemInfo.isMacOSMojave;
-            return SystemInfo.isMacOSMojave;
+        if (SystemInfo.isWindows) return SystemInfo.isWindowsVista;
-        if (SystemInfo.isWindows)
-            return SystemInfo.isWindowsVista;
         return false;
     }
 
@@ -144,8 +142,7 @@ public class FontDefaultsInitTask implements DefaultsInitTask {
         Font font = entry.getValue();
         String fontName = SystemInfo.isMacOSCatalina ? MAC_OS_CATALINA_FONT_NAME_FALLBACK : MAC_OS_FONT_NAME;
         Font macFont = FontUtil.createFont(fontName, font.getStyle(), font.getSize());
-        if (SystemInfo.isMacOSMojave)
+        if (SystemInfo.isMacOSMojave) macFont = macFont.deriveFont(ENABLE_KERNING);
-            macFont = macFont.deriveFont(ENABLE_KERNING);
         if (font instanceof UIResource) {
             macFont = new DarkFontUIResource(macFont);
         }
@@ -154,8 +151,7 @@ public class FontDefaultsInitTask implements DefaultsInitTask {
 
     private Font mapWindowsFont(final Map.Entry<Object, Font> entry) {
         Font font = entry.getValue();
-        if (!SystemInfo.isWindowsVista)
+        if (!SystemInfo.isWindowsVista) return font;
-            return font;
         Font windowsFont = FontUtil.createFont(WINDOWS_10_FONT_NAME, font.getStyle(), font.getSize());
         if (font instanceof UIResource) {
             windowsFont = new DarkFontUIResource(windowsFont);
@@ -167,26 +163,22 @@ public class FontDefaultsInitTask implements DefaultsInitTask {
         PropertyLoader.replacePropertiesOfType(Font.class, defaults, e -> kerningPredicate.test(e.getKey().toString()),
                 f -> {
                     Font font = f.deriveFont(ENABLE_KERNING);
-                    if (f instanceof UIResource)
+                    if (f instanceof UIResource) font = new DarkFontUIResource(font);
-                        font = new DarkFontUIResource(font);
                     return font;
                 });
     }
 
     private void applyFontRule(final Theme currentTheme, final UIDefaults defaults) {
         FontSizeRule rule = currentTheme.getFontSizeRule();
-        if (rule == null || rule.getType() == FontSizeRule.AdjustmentType.NO_ADJUSTMENT)
+        if (rule == null || rule.getType() == FontSizeRule.AdjustmentType.NO_ADJUSTMENT) return;
-            return;
         PropertyLoader.replacePropertiesOfType(Font.class, defaults, f -> fontWithRule(f, rule));
     }
 
     private Font fontWithRule(final Font font, final FontSizeRule rule) {
-        if (font == null)
+        if (font == null) return null;
-            return null;
         float size = font.getSize2D();
         float newSize = rule.adjustFontSize(size);
-        if (newSize == size)
+        if (newSize == size) return font;
-            return font;
         if (newSize <= 0) {
             LOGGER.warning("Font " + font + " would be invisible after applying " + rule + ". Font won't be changed!");
             return font;

core/src/main/java/com/github/weisj/darklaf/task/UserPreferenceAdjustmentTask.java

@@ -31,8 +31,7 @@ public abstract class UserPreferenceAdjustmentTask implements DefaultsAdjustment
     @Override
     public void run(final Theme currentTheme, final Properties properties) {
         for (DefaultsAdjustmentTask task : getTasks()) {
-            if (task != null)
+            if (task != null) task.run(currentTheme, properties);
-                task.run(currentTheme, properties);
         }
     }
 

core/src/main/java/com/github/weisj/darklaf/ui/DarkPopupFactory.java

@@ -89,10 +89,8 @@ public class DarkPopupFactory extends PopupFactory {
 
     public static PopupType getPopupType(final Popup popup) {
         String popupClassName = popup.getClass().getSimpleName();
-        if (popupClassName.endsWith("LightWeightPopup"))
+        if (popupClassName.endsWith("LightWeightPopup")) return PopupType.LIGHT_WEIGHT;
-            return PopupType.LIGHT_WEIGHT;
+        if (popupClassName.endsWith("MediumWeightPopup")) return PopupType.MEDIUM_WEIGHT;
-        if (popupClassName.endsWith("MediumWeightPopup"))
-            return PopupType.MEDIUM_WEIGHT;
         return PopupType.HEAVY_WEIGHT;
     }
 
@@ -100,8 +98,7 @@ public class DarkPopupFactory extends PopupFactory {
         if (type == PopupType.MEDIUM_WEIGHT) {
             JRootPane rootPane = SwingUtilities.getRootPane(contents);
             // Prevents decorations from being reinstalled.
-            if (rootPane != null)
+            if (rootPane != null) rootPane.putClientProperty(DarkRootPaneUI.KEY_NO_DECORATIONS_UPDATE, true);
-                rootPane.putClientProperty(DarkRootPaneUI.KEY_NO_DECORATIONS_UPDATE, true);
         } else if (type == PopupType.HEAVY_WEIGHT) {
             Window window = SwingUtilities.getWindowAncestor(contents);
             if (window != null) {
@@ -131,8 +128,7 @@ public class DarkPopupFactory extends PopupFactory {
          * that is repainted with the proper popup background later. That is why we set window background
          * explicitly.
          */
-        if (rootPane == null)
+        if (rootPane == null) return;
-            return;
         rootPane.setOpaque(opaque);
         if (opaque) {
             Color bg = ColorUtil.toAlpha(rootPane.getBackground(), 255);
@@ -188,8 +184,7 @@ public class DarkPopupFactory extends PopupFactory {
 
     protected Color getTranslucentPopupBackground(final boolean decorated) {
         Color c = UIManager.getColor("PopupMenu.translucentBackground");
-        if (!decorated)
+        if (!decorated) c = new DarkColorUIResource(ColorUtil.toAlpha(c, 0));
-            c = new DarkColorUIResource(ColorUtil.toAlpha(c, 0));
         return c;
     }
 

core/src/main/java/com/github/weisj/darklaf/ui/button/ButtonConstants.java

@@ -63,10 +63,8 @@ public interface ButtonConstants {
     }
 
     static int chooseArc(final Component c, final int arc, final int minimum, final int altArc, final int roundedArc) {
-        if (ButtonConstants.isNoArc(c))
+        if (ButtonConstants.isNoArc(c)) return minimum;
-            return minimum;
+        if (ButtonConstants.isRound(c)) return roundedArc;
-        if (ButtonConstants.isRound(c))
-            return roundedArc;
         boolean alt = ButtonConstants.chooseAlternativeArc(c);
         return alt ? altArc : arc;
     }
@@ -89,8 +87,7 @@ public interface ButtonConstants {
     }
 
     static boolean isBorderlessVariant(final Component c) {
-        if (isBorderlessRectangular(c))
+        if (isBorderlessRectangular(c)) return true;
-            return true;
         if (c instanceof JButton || c instanceof JToggleButton) {
             return isBorderless(c) || doConvertToBorderless((AbstractButton) c);
         }

core/src/main/java/com/github/weisj/darklaf/ui/button/DarkButtonBorder.java

@@ -153,8 +153,7 @@ public class DarkButtonBorder implements Border, UIResource {
         if (paintLeft) {
             AlignmentExt corner = getCornerFlag(left);
             Insets ins = new Insets(0, 0, 0, 0);
-            if (corner != null)
+            if (corner != null) ins = corner.maskInsets(ins, borderSize);
-                ins = corner.maskInsets(ins, borderSize);
 
             int h = height - Math.max(0, getShadowSize(left) - borderSize);
             g2.translate(-3 * borderSize + 1, -ins.top);
@@ -166,8 +165,7 @@ public class DarkButtonBorder implements Border, UIResource {
         if (paintRight) {
             AlignmentExt corner = getCornerFlag(right);
             Insets ins = new Insets(0, 0, 0, 0);
-            if (corner != null)
+            if (corner != null) ins = corner.maskInsets(ins, borderSize);
-                ins = corner.maskInsets(ins, borderSize);
 
             int h = height - Math.max(0, getShadowSize(right) - borderSize);
             g2.translate(width - borderSize - 1, -ins.top);
@@ -180,8 +178,7 @@ public class DarkButtonBorder implements Border, UIResource {
         if (paintTop) {
             AlignmentExt corner = getCornerFlag(top);
             Insets ins = new Insets(0, 0, 0, 0);
-            if (corner != null)
+            if (corner != null) ins = corner.maskInsets(ins, borderSize);
-                ins = corner.maskInsets(ins, borderSize);
 
             g2.translate(-ins.left, -3 * borderSize + 1);
             PaintUtil.paintFocusBorder(g2, width + ins.right + ins.left, 4 * borderSize, getFocusArc(top), borderSize);
@@ -209,8 +206,7 @@ public class DarkButtonBorder implements Border, UIResource {
         if (paintBottom) {
             AlignmentExt corner = getCornerFlag(bottom);
             Insets ins = new Insets(0, 0, 0, 0);
-            if (corner != null)
+            if (corner != null) ins = corner.maskInsets(ins, borderSize);
-                ins = corner.maskInsets(ins, borderSize);
 
             g2.translate(-ins.left, height - borderSize - 1);
             PaintUtil.paintFocusBorder(g2, width + ins.left + ins.right, 4 * borderSize, getFocusArc(bottom),
@@ -270,8 +266,7 @@ public class DarkButtonBorder implements Border, UIResource {
 
     protected Insets maskInsets(final Insets ins, final Component c, final int shadow) {
         AlignmentExt alignment = getCornerFlag(c);
-        if (alignment == null)
+        if (alignment == null) return ins;
-            return ins;
         Insets insetMask = new Insets(borderSize, borderSize, Math.max(borderSize, shadow), borderSize);
         insetMask = alignment.maskInsetsInverted(insetMask);
         ins.top -= insetMask.top;

core/src/main/java/com/github/weisj/darklaf/ui/button/DarkButtonUI.java

@@ -121,16 +121,11 @@ public class DarkButtonUI extends BasicButtonUI implements ButtonConstants {
         squareInsets = UIManager.getInsets("Button.squareBorderInsets");
         squareThinInsets = UIManager.getInsets("Button.squareThinBorderInsets");
         borderlessRectangularInsets = UIManager.getInsets("Button.borderlessRectangularInsets");
-        if (insets == null)
+        if (insets == null) insets = new Insets(0, 0, 0, 0);
-            insets = new Insets(0, 0, 0, 0);
+        if (thinInsets == null) thinInsets = new Insets(0, 0, 0, 0);
-        if (thinInsets == null)
+        if (squareThinInsets == null) squareThinInsets = new Insets(0, 0, 0, 0);
-            thinInsets = new Insets(0, 0, 0, 0);
+        if (squareInsets == null) squareInsets = new Insets(0, 0, 0, 0);
-        if (squareThinInsets == null)
+        if (borderlessRectangularInsets == null) borderlessRectangularInsets = new Insets(0, 0, 0, 0);
-            squareThinInsets = new Insets(0, 0, 0, 0);
-        if (squareInsets == null)
-            squareInsets = new Insets(0, 0, 0, 0);
-        if (borderlessRectangularInsets == null)
-            borderlessRectangularInsets = new Insets(0, 0, 0, 0);
         updateMargins(b);
     }
 
@@ -439,15 +434,13 @@ public class DarkButtonUI extends BasicButtonUI implements ButtonConstants {
 
     protected void updateMargins(final AbstractButton b) {
         Insets margin = b.getMargin();
-        if (margin != null && !(margin instanceof UIResource))
+        if (margin != null && !(margin instanceof UIResource)) return;
-            return;
         Insets m = getMargins(b);
         b.setMargin(new InsetsUIResource(m.top, m.left, m.bottom, m.right));
     }
 
     private Insets getMargins(final AbstractButton b) {
-        if (ButtonConstants.isBorderlessRectangular(b))
+        if (ButtonConstants.isBorderlessRectangular(b)) return borderlessRectangularInsets;
-            return borderlessRectangularInsets;
         boolean square = ButtonConstants.isSquare(b);
         return ButtonConstants.isThin(b) ? square ? squareThinInsets : thinInsets : square ? squareInsets : insets;
     }
@@ -457,8 +450,7 @@ public class DarkButtonUI extends BasicButtonUI implements ButtonConstants {
         if (ButtonConstants.isBorderlessRectangular(c)) {
             return super.contains(c, x, y);
         }
-        if (!(x >= 0 && x <= c.getWidth() && y >= 0 && y <= c.getHeight()))
+        if (!(x >= 0 && x <= c.getWidth() && y >= 0 && y <= c.getHeight())) return false;
-            return false;
         int bs = c.getBorder() instanceof DarkButtonBorder && !ButtonConstants.isBorderless(c) ? borderSize : 0;
         int arc = getArc(c);
         hitArea.setRoundRect(bs, bs, c.getWidth() - 2 * bs, c.getHeight() - 2 * bs, arc, arc);

core/src/main/java/com/github/weisj/darklaf/ui/cell/CellUtil.java

@@ -473,8 +473,7 @@ public class CellUtil {
         int row = table.getEditingRow();
         int col = table.getEditingColumn();
         if (!table.getShowHorizontalLines()) {
-            if (row > CellUtil.getMinRowIndex(table))
+            if (row > CellUtil.getMinRowIndex(table)) g.fillRect(0, 0, width, 1);
-                g.fillRect(0, 0, width, 1);
             g.fillRect(0, height - 1, width, 1);
         }
         boolean isWrapper = isInWrapper(c);
@@ -529,8 +528,7 @@ public class CellUtil {
         if (table != null && !table.getShowVerticalLines()) {
             int cMin = getMinColumnIndex(table);
             int column = table.getEditingColumn();
-            if (column > cMin)
+            if (column > cMin) ins.left++;
-                ins.left++;
         }
         return ins;
     }

core/src/main/java/com/github/weisj/darklaf/ui/cell/hint/CellHintPopupListener.java

@@ -85,8 +85,7 @@ public class CellHintPopupListener<T extends JComponent, I> extends MouseInputAd
     }
 
     private void updatePopup(final I index, final Point p) {
-        if (cellContainer.getComponent() == null || index == null)
+        if (cellContainer.getComponent() == null || index == null) return;
-            return;
         final boolean isEditing = cellContainer.isEditingCell(index);
         final Rectangle allocation = cellContainer.getAllocation();
         final Rectangle cellBounds = cellContainer.getCellBoundsAt(index, isEditing);
@@ -140,10 +139,8 @@ public class CellHintPopupListener<T extends JComponent, I> extends MouseInputAd
             } else {
                 int upperDiff = Math.max(cellBounds.x + cellBounds.width - visibleBounds.x - visibleBounds.width, 0);
                 int lowerDiff = Math.max(visibleBounds.x - cellBounds.x, 0);
-                if (ltr && upperDiff > 0)
+                if (ltr && upperDiff > 0) lowerDiff = 0;
-                    lowerDiff = 0;
+                if (!ltr && lowerDiff > 0) upperDiff = 0;
-                if (!ltr && lowerDiff > 0)
-                    upperDiff = 0;
                 if (upperDiff >= lowerDiff) {
                     rect.x = visibleBounds.x + visibleBounds.width;
                     rect.width = upperDiff;
@@ -163,8 +160,7 @@ public class CellHintPopupListener<T extends JComponent, I> extends MouseInputAd
             } else {
                 int upperDiff = Math.max(cellBounds.y + cellBounds.height - visibleBounds.y - visibleBounds.height, 0);
                 int lowerDiff = Math.max(visibleBounds.y - cellBounds.y, 0);
-                if (upperDiff > 0)
+                if (upperDiff > 0) lowerDiff = 0;
-                    lowerDiff = 0;
                 if (upperDiff >= lowerDiff) {
                     rect.y = visibleBounds.y + visibleBounds.height;
                     rect.height = upperDiff;
@@ -206,10 +202,8 @@ public class CellHintPopupListener<T extends JComponent, I> extends MouseInputAd
     }
 
     public void repaint() {
-        if (!cellContainer.getComponent().isShowing())
+        if (!cellContainer.getComponent().isShowing()) return;
-            return;
+        if (popup != null) popupComponent.repaint();
-        if (popup != null)
-            popupComponent.repaint();
         if (lastIndex != null) {
             Point p = MouseInfo.getPointerInfo().getLocation();
             SwingUtilities.convertPointFromScreen(p, cellContainer.getComponent());
@@ -246,8 +240,7 @@ public class CellHintPopupListener<T extends JComponent, I> extends MouseInputAd
     }
 
     private void movePopup(final Rectangle bounds) {
-        if (popup == null)
+        if (popup == null) return;
-            return;
         DarkPopupFactory.PopupType popupType = DarkPopupFactory.getPopupType(popup);
         Window w = DarkUIUtil.getWindow(popupComponent);
         if (popupType == DarkPopupFactory.PopupType.HEAVY_WEIGHT) {
@@ -369,10 +362,8 @@ public class CellHintPopupListener<T extends JComponent, I> extends MouseInputAd
             Component renderer = cellHintPopupListener.getRenderer();
             if (rendererBounds != null && renderer != null) {
                 Color bg = cellHintPopupListener.getBackground(renderer);
-                if (bg == null)
+                if (bg == null) bg = cellHintPopupListener.cellContainer.getComponent().getBackground();
-                    bg = cellHintPopupListener.cellContainer.getComponent().getBackground();
+                if (bg == null) bg = getBackground();
-                if (bg == null)
-                    bg = getBackground();
                 if (bg != null) {
                     g.setColor(bg);
                     g.fillRect(0, 0, getWidth(), getHeight());

core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/ColorTriangle.java

@@ -176,14 +176,12 @@ public class ColorTriangle extends JComponent {
 
     protected void setHSBHue(final double hue) {
         hueHSB = hue;
-        if (hueHSB < 0)
+        if (hueHSB < 0) hueHSB += 1.0;
-            hueHSB += 1.0;
     }
 
     protected void setHSLHue(final double hue) {
         hueHSL = hue;
-        if (hueHSL < 0)
+        if (hueHSL < 0) hueHSL += 1.0;
-            hueHSL += 1.0;
     }
 
     protected void setValue(final double value) {
@@ -310,8 +308,7 @@ public class ColorTriangle extends JComponent {
     }
 
     protected void setColorFromRGB(final Object source, final int r, final int g, final int b) {
-        if (isMessaging)
+        if (isMessaging) return;
-            return;
         this.color = new Color(r, g, b);
         double[] hsb = DarkColorModelHSB.RGBtoHSBValues(r, g, b);
         double[] hsl = DarkColorModelHSL.RGBtoHSLValues(r, g, b);
@@ -327,8 +324,7 @@ public class ColorTriangle extends JComponent {
     }
 
     protected void setColorFromHSL(final Object source, final double h, final double s, final double l) {
-        if (isMessaging)
+        if (isMessaging) return;
-            return;
         setHSL(h, s, l);
         color = DarkColorModelHSL.getColorFromHSLValues(h, s, l);
         setHSB(DarkColorModelHSB.RGBtoHSBValues(color.getRed(), color.getGreen(), color.getBlue()));
@@ -339,8 +335,7 @@ public class ColorTriangle extends JComponent {
     }
 
     protected void setColorFromHSB(final Object source, final double h, final double s, final double b) {
-        if (isMessaging)
+        if (isMessaging) return;
-            return;
         setHSB(h, s, b);
         color = DarkColorModelHSB.getColorFromHSBValues(h, s, b);
         setHSL(DarkColorModelHSL.RGBtoHSLValues(color.getRed(), color.getGreen(), color.getBlue()));
@@ -516,8 +511,7 @@ public class ColorTriangle extends JComponent {
     protected Shape calculateCircleShape(final double x, final double y, final int size, final int outerSize) {
         outerRadius = size / 2.0;
         innerRadius = outerRadius - outerSize;
-        if (!circleInfo.update(x, y, size, outerSize) && circleShape != null)
+        if (!circleInfo.update(x, y, size, outerSize) && circleShape != null) return circleShape;
-            return circleShape;
 
         Area outer = new Area(new Ellipse2D.Double(x, y, size, size));
         Area inner = new Area(

core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/DarkColorChooserPanel.java

@@ -146,24 +146,20 @@ public class DarkColorChooserPanel extends AbstractColorChooserPanel implements
 
     @Override
     public void colorChanged(final Color color, final Object source) {
-        if (isChanging || color == null)
+        if (isChanging || color == null) return;
-            return;
         isChanging = true;
         currentColor = color;
         ColorSelectionModel model = getColorSelectionModel();
-        if (model != null)
+        if (model != null) model.setSelectedColor(currentColor);
-            model.setSelectedColor(currentColor);
         applyColorToFields(color);
-        if (source != textHex)
+        if (source != textHex) textHex.setValue(color);
-            textHex.setValue(color);
         previewComponent.setColor(color);
         colorWheelPanel.setColor(color, this);
         isChanging = false;
     }
 
     protected void onModelChange() {
-        if (isChanging)
+        if (isChanging) return;
-            return;
         isChanging = true;
         colorWheelPanel.setModel(getDarkColorModel());
         updateDescriptors();

core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/DarkPreviewPanel.java

@@ -44,8 +44,7 @@ public class DarkPreviewPanel extends JPanel {
     private Color oldColor = null;
 
     public void paintComponent(final Graphics g) {
-        if (oldColor == null)
+        if (oldColor == null) oldColor = getForeground();
-            oldColor = getForeground();
 
         g.setColor(getBackground());
         g.fillRect(0, 0, getWidth(), getHeight());

core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/RecentSwatchPanel.java

@@ -50,14 +50,12 @@ class RecentSwatchPanel extends SwatchPanel {
     @Override
     public String getToolTipText(final MouseEvent e) {
         Color color = getColorForLocation(e.getX(), e.getY());
-        if (color == defaultRecentColor || color == null)
+        if (color == defaultRecentColor || color == null) return null;
-            return null;
         return color.getRed() + ", " + color.getGreen() + ", " + color.getBlue();
     }
 
     public void setMostRecentColor(final Color c) {
-        if (Objects.equals(colors[0], c))
+        if (Objects.equals(colors[0], c)) return;
-            return;
         System.arraycopy(colors, 0, colors, 1, colors.length - 1);
         colors[0] = c;
         repaint();

core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/SlideComponent.java

@@ -86,8 +86,7 @@ class SlideComponent extends JComponent implements ColorListener {
 
         addMouseWheelListener(event -> {
             int units = event.getUnitsToScroll();
-            if (units == 0)
+            if (units == 0) return;
-                return;
             int pointerValue = this.pointerValue + units;
             pointerValue = Math.max(pointerValue, OFFSET);
             int size = this.vertical ? getHeight() : getWidth();
@@ -183,8 +182,7 @@ class SlideComponent extends JComponent implements ColorListener {
         borderColor = UIManager.getColor("ColorChooser.sliderBorderColor");
         shadowColor = UIManager.getColor("ColorChooser.sliderShadow");
         knobFill = UIManager.getColor("ColorChooser.sliderKnobColor");
-        if (toolTipContext != null)
+        if (toolTipContext != null) toolTipContext.updateToolTipUI();
-            toolTipContext.updateToolTipUI();
     }
 
     @Override

core/src/main/java/com/github/weisj/darklaf/ui/colorchooser/SwatchPanel.java

@@ -114,8 +114,7 @@ abstract class SwatchPanel extends JPanel {
     @Override
     public void updateUI() {
         super.updateUI();
-        if (toolTipContext != null)
+        if (toolTipContext != null) toolTipContext.updateToolTipUI();
-            toolTipContext.updateToolTipUI();
     }
 
     protected void initValues() {}
@@ -128,8 +127,7 @@ abstract class SwatchPanel extends JPanel {
 
     private Color getColorForCell(final int column, final int row) {
         int index = (row * numSwatches.width) + column;
-        if (index >= colors.length)
+        if (index >= colors.length) return null;
-            return null;
         return colors[(row * numSwatches.width) + column];
     }
 
@@ -178,8 +176,7 @@ abstract class SwatchPanel extends JPanel {
 
     public String getToolTipText(final MouseEvent e) {
         Color color = getColorForLocation(e.getX(), e.getY());
-        if (color == null)
+        if (color == null) return null;
-            return null;
         return color.getRed() + ", " + color.getGreen() + ", " + color.getBlue();
     }
 

core/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboBoxBorder.java

@@ -51,10 +51,8 @@ public class DarkComboBoxBorder implements Border, UIResource {
         borderColor = UIManager.getColor("ComboBox.activeBorderColor");
         inactiveBorderColor = UIManager.getColor("ComboBox.inactiveBorderColor");
         cellPadding = UIManager.getInsets("ComboBox.cellEditorInsets");
-        if (boxPadding == null)
+        if (boxPadding == null) boxPadding = new Insets(0, 0, 0, 0);
-            boxPadding = new Insets(0, 0, 0, 0);
+        if (cellPadding == null) cellPadding = new Insets(0, 0, 0, 0);
-        if (cellPadding == null)
-            cellPadding = new Insets(0, 0, 0, 0);
     }
 
     @Override

core/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboBoxUI.java

@@ -75,8 +75,7 @@ public class DarkComboBoxUI extends BasicComboBoxUI implements ComboBoxConstants
         inactiveBackground = UIManager.getColor("ComboBox.inactiveBackground");
         inactiveForeground = UIManager.getColor("ComboBox.disabledForeground");
         arrowBackground = UIManager.getColor("ComboBox.arrowBackground");
-        if (boxPadding == null)
+        if (boxPadding == null) boxPadding = new Insets(0, 0, 0, 0);
-            boxPadding = new Insets(0, 0, 0, 0);
     }
 
     protected void installBorder(final JComponent c) {
@@ -248,18 +247,14 @@ public class DarkComboBoxUI extends BasicComboBoxUI implements ComboBoxConstants
     }
 
     protected Color getBackground(final JComboBox<?> c) {
-        if (!c.isEnabled())
+        if (!c.isEnabled()) return inactiveBackground;
-            return inactiveBackground;
+        if (c.isEditable()) return editBackground;
-        if (c.isEditable())
-            return editBackground;
         return background;
     }
 
     protected Color getArrowBackground(final JComboBox<?> c) {
-        if (!c.isEnabled())
+        if (!c.isEnabled()) return inactiveBackground;
-            return inactiveBackground;
+        if (c.isEditable()) return arrowBackground;
-        if (c.isEditable())
-            return arrowBackground;
         return background;
     }
 
@@ -272,8 +267,7 @@ public class DarkComboBoxUI extends BasicComboBoxUI implements ComboBoxConstants
                 super.layoutContainer(parent);
                 if (ComboBoxConstants.isTreeOrTableCellEditor(comboBox)) {
                     int adj = borderSize / 2;
-                    if (!comboBox.getComponentOrientation().isLeftToRight())
+                    if (!comboBox.getComponentOrientation().isLeftToRight()) adj *= -1;
-                        adj *= -1;
                     Rectangle bounds = arrowButton.getBounds();
                     bounds.x += adj;
                     arrowButton.setBounds(bounds);

core/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboPopup.java

@@ -180,8 +180,7 @@ public class DarkComboPopup extends BasicComboPopup {
 
     @Override
     protected void togglePopup() {
-        if (comboBox.getItemCount() == 0)
+        if (comboBox.getItemCount() == 0) return;
-            return;
         if (visible) {
             visible = false;
             hide();

core/src/main/java/com/github/weisj/darklaf/ui/filechooser/DarkFileChooserUI.java

@@ -117,8 +117,7 @@ public class DarkFileChooserUI extends DarkFileChooserUIBridge {
     protected JComponent createControlPanel(final JFileChooser fileChooser) {
         JComponent accessoryPanel = getAccessoryPanel();
         JComponent accessory = fileChooser.getAccessory();
-        if (accessory != null)
+        if (accessory != null) accessoryPanel.add(accessory);
-            accessoryPanel.add(accessory);
         return accessoryPanel;
     }
 
@@ -366,8 +365,7 @@ public class DarkFileChooserUI extends DarkFileChooserUIBridge {
     }
 
     public BasicFileView getFileView() {
-        if (fileView == null)
+        if (fileView == null) fileView = createFileView();
-            fileView = createFileView();
         return fileView;
     }
 
@@ -402,8 +400,7 @@ public class DarkFileChooserUI extends DarkFileChooserUIBridge {
                 } else {
                     try {
                         String mimeType = Files.probeContentType(f.toPath());
-                        if (mimeType == null)
+                        if (mimeType == null) mimeType = "";
-                            mimeType = "";
                         if (mimeType.startsWith(MIME_IMAGE)) {
                             icon = imageFileIcon;
                         } else if (mimeType.startsWith(MIME_TEXT)) {

core/src/main/java/com/github/weisj/darklaf/ui/internalframe/DarkInternalFrameUI.java

@@ -116,8 +116,7 @@ public class DarkInternalFrameUI extends BasicInternalFrameUI implements Propert
     }
 
     protected boolean shouldShowMenuBar(final JInternalFrame internalFrame) {
-        if (internalFrame == null)
+        if (internalFrame == null) return false;
-            return false;
         return internalFrame.isSelected() && !internalFrame.isClosed() && !internalFrame.isIcon();
     }
 }

core/src/main/java/com/github/weisj/darklaf/ui/label/DarkLabelUI.java

@@ -51,15 +51,13 @@ public class DarkLabelUI extends BasicLabelUI implements PropertyChangeListener
     }
 
     public static ComponentUI createUI(final JComponent c) {
-        if (darkLabelUI == null)
+        if (darkLabelUI == null) darkLabelUI = new DarkLabelUI();
-            darkLabelUI = new DarkLabelUI();
         return darkLabelUI;
     }
 
     @Override
     public void installUI(final JComponent c) {
-        if (c != null)
+        if (c != null) super.installUI(c);
-            super.installUI(c);
     }
 
     @Override

core/src/main/java/com/github/weisj/darklaf/ui/list/DarkListUI.java

@@ -150,8 +150,7 @@ public class DarkListUI extends DarkListUIBridge implements CellConstants {
                 for (int column = colCounter - 1; rowBounds.height <= 0 && column >= 0; column--) {
                     rowBounds.height = getHeight(colCounter - 1, row);
                 }
-                if (rowBounds.height <= 0)
+                if (rowBounds.height <= 0) rowBounds.height = getHeight(0, 0);
-                    rowBounds.height = getHeight(0, 0);
 
                 g.setClip(rowBounds.x, rowBounds.y, bgWidth > 0 ? bgWidth : rowBounds.width, rowBounds.height);
                 g.clipRect(paintBounds.x, paintBounds.y, paintBounds.width, paintBounds.height);

core/src/main/java/com/github/weisj/darklaf/ui/menu/DarkMenuItemUIBase.java

@@ -77,8 +77,7 @@ public class DarkMenuItemUIBase extends BasicMenuItemUI {
     }
 
     protected boolean isSelected(final JComponent menuItem) {
-        if (!(menuItem instanceof JMenuItem))
+        if (!(menuItem instanceof JMenuItem)) return false;
-            return false;
         return menuItem.isEnabled() && ((JMenuItem) menuItem).isArmed();
     }
 
@@ -162,8 +161,7 @@ public class DarkMenuItemUIBase extends BasicMenuItemUI {
 
     protected Color getAcceleratorForeground(final AbstractButton b) {
         ButtonModel model = b.getModel();
-        if (!model.isEnabled())
+        if (!model.isEnabled()) return disabledForeground;
-            return disabledForeground;
         if (model.isArmed() || (b instanceof JMenu && model.isSelected())) {
             return acceleratorSelectionForeground;
         } else {

core/src/main/java/com/github/weisj/darklaf/ui/menu/DarkMenuUI.java

@@ -77,8 +77,7 @@ public class DarkMenuUI extends BasicMenuUI {
 
             @Override
             public void mouseReleased(final MouseEvent e) {
-                if (!menu.isEnabled())
+                if (!menu.isEnabled()) return;
-                    return;
                 if (pressed && wasEnabled) {
                     pressed = false;
                     return;
@@ -117,8 +116,7 @@ public class DarkMenuUI extends BasicMenuUI {
     }
 
     protected boolean isSelected(final JComponent menuItem) {
-        if (!(menuItem instanceof JMenuItem))
+        if (!(menuItem instanceof JMenuItem)) return false;
-            return false;
         return menuItem.isEnabled() && ((JMenuItem) menuItem).isArmed();
     }
 }

core/src/main/java/com/github/weisj/darklaf/ui/menu/MenuItemLayoutDelegate.java

@@ -45,92 +45,79 @@ public class MenuItemLayoutDelegate extends JMenuItem {
 
     @Override
     public Insets getInsets(final Insets insets) {
-        if (delegate != null)
+        if (delegate != null) return delegate.getInsets(insets);
-            return delegate.getInsets(insets);
         return super.getInsets(insets);
     }
 
     @Override
     public Insets getInsets() {
-        if (delegate != null)
+        if (delegate != null) return delegate.getInsets();
-            return delegate.getInsets();
         return super.getInsets();
     }
 
     @Override
     public Font getFont() {
-        if (delegate != null)
+        if (delegate != null) return delegate.getFont();
-            return delegate.getFont();
         return super.getFont();
     }
 
     @Override
     public ComponentOrientation getComponentOrientation() {
-        if (delegate != null)
+        if (delegate != null) return delegate.getComponentOrientation();
-            return delegate.getComponentOrientation();
         return super.getComponentOrientation();
     }
 
     @Override
     public Container getParent() {
-        if (delegate != null)
+        if (delegate != null) return delegate.getParent();
-            return delegate.getParent();
         return super.getParent();
     }
 
     @Override
     public KeyStroke getAccelerator() {
-        if (delegate != null)
+        if (delegate != null) return delegate.getAccelerator();
-            return delegate.getAccelerator();
         return super.getAccelerator();
     }
 
     @Override
     public int getVerticalAlignment() {
-        if (delegate != null)
+        if (delegate != null) return delegate.getVerticalAlignment();
-            return delegate.getVerticalAlignment();
         return super.getVerticalAlignment();
     }
 
     @Override
     public int getHorizontalAlignment() {
-        if (delegate != null)
+        if (delegate != null) return delegate.getHorizontalAlignment();
-            return delegate.getHorizontalAlignment();
         return super.getHorizontalAlignment();
     }
 
     @Override
     public int getVerticalTextPosition() {
-        if (delegate != null)
+        if (delegate != null) return delegate.getVerticalTextPosition();
-            return delegate.getVerticalTextPosition();
         return super.getVerticalTextPosition();
     }
 
     @Override
     public int getHorizontalTextPosition() {
-        if (delegate != null)
+        if (delegate != null) return delegate.getHorizontalTextPosition();
-            return delegate.getHorizontalTextPosition();
         return super.getHorizontalTextPosition();
     }
 
     @Override
     public FontMetrics getFontMetrics(final Font font) {
-        if (delegate != null)
+        if (delegate != null) return delegate.getFontMetrics(font);
-            return delegate.getFontMetrics(font);
         return super.getFontMetrics(font);
     }
 
     @Override
     public Icon getIcon() {
-        if (delegate != null)
+        if (delegate != null) return delegate.getIcon();
-            return delegate.getIcon();
         return super.getIcon();
     }
 
     @Override
     public String getText() {
-        if (delegate != null)
+        if (delegate != null) return delegate.getText();
-            return delegate.getText();
         return super.getText();
     }
 }

core/src/main/java/com/github/weisj/darklaf/ui/numberingpane/DarkNumberingPaneUI.java

@@ -141,8 +141,7 @@ public class DarkNumberingPaneUI extends ComponentUI {
             g.setColor(c.getBackground());
             g.fillRect(0, 0, c.getWidth(), c.getHeight());
         }
-        if (textComponent == null || viewport == null)
+        if (textComponent == null || viewport == null) return;
-            return;
         FontMetrics metrics = textComponent.getFontMetrics(textComponent.getFont());
         int descent = metrics.getDescent();
 
@@ -165,12 +164,10 @@ public class DarkNumberingPaneUI extends ComponentUI {
 
     @Override
     public Dimension getPreferredSize(final JComponent c) {
-        if (textComponent == null || viewport == null)
+        if (textComponent == null || viewport == null) return super.getPreferredSize(c);
-            return super.getPreferredSize(c);
         int lines = textComponent.getDocument().getDefaultRootElement().getElementCount();
         int pad = 2 * OUTER_PAD;
-        if (maxIconWidth > 0)
+        if (maxIconWidth > 0) pad += PAD;
-            pad += PAD;
         textWidth = numberingPane.getFontMetrics(numberingPane.getFont()).stringWidth(String.valueOf(lines));
         return new Dimension(maxIconWidth + pad + textWidth, viewport.getView().getHeight());
     }
@@ -253,8 +250,7 @@ public class DarkNumberingPaneUI extends ComponentUI {
 
         @Override
         public void mouseClicked(final MouseEvent e) {
-            if (textComponent == null)
+            if (textComponent == null) return;
-                return;
             Point p = e.getPoint();
             int width = numberingPane.getWidth();
             if (p.x > PAD + OUTER_PAD + textWidth && p.x <= width - PAD) {
@@ -290,8 +286,7 @@ public class DarkNumberingPaneUI extends ComponentUI {
 
         @Override
         public void mousePressed(final MouseEvent e) {
-            if (textComponent == null)
+            if (textComponent == null) return;
-                return;
             Point p = e.getPoint();
             selectionLineStart = textComponent.viewToModel(new Point(0, p.y));
             selectionLineEnd = textComponent.viewToModel(new Point(textComponent.getWidth(), p.y));
@@ -309,8 +304,7 @@ public class DarkNumberingPaneUI extends ComponentUI {
 
         @Override
         public void mouseDragged(final MouseEvent e) {
-            if (numberingPane.getTextComponent() == null)
+            if (numberingPane.getTextComponent() == null) return;
-                return;
             JTextComponent textPane = numberingPane.getTextComponent();
             Point p = e.getPoint();
             if (selectionLineEnd >= 0 && selectionLineStart >= 0) {

core/src/main/java/com/github/weisj/darklaf/ui/optionpane/DarkOptionPaneBorder.java

@@ -31,8 +31,7 @@ public class DarkOptionPaneBorder extends EmptyBorder {
     public DarkOptionPaneBorder() {
         super(0, 0, 0, 0);
         Insets insets = UIManager.getInsets("OptionPane.borderInsets");
-        if (insets == null)
+        if (insets == null) insets = new Insets(0, 0, 0, 0);
-            insets = new Insets(0, 0, 0, 0);
         left = insets.left;
         right = insets.right;
         top = insets.top;

core/src/main/java/com/github/weisj/darklaf/ui/panel/DarkPanelUI.java

@@ -32,8 +32,7 @@ public class DarkPanelUI extends BasicPanelUI {
     private static PanelUI darkPanelUI;
 
     public static ComponentUI createUI(final JComponent c) {
-        if (darkPanelUI == null)
+        if (darkPanelUI == null) darkPanelUI = new DarkPanelUI();
-            darkPanelUI = new DarkPanelUI();
         return darkPanelUI;
     }
 }

core/src/main/java/com/github/weisj/darklaf/ui/popupmenu/DarkPopupMenuUI.java

@@ -101,8 +101,7 @@ public class DarkPopupMenuUI extends BasicPopupMenuUI {
     @Override
     public Popup getPopup(final JPopupMenu popup, final int x, final int y) {
         PopupMenuContainer container = getPopupMenuContainer();
-        if (container == null)
+        if (container == null) return super.getPopup(popup, x, y);
-            return super.getPopup(popup, x, y);
         int maxHeight = DarkUIUtil.getScreenBounds(popup, x, y, false).height;
         return container.createPopup(popup, x, y, maxHeight);
     }

core/src/main/java/com/github/weisj/darklaf/ui/popupmenu/EventHelperUtil.java

@@ -28,8 +28,7 @@ public class EventHelperUtil {
     private static boolean eventHelperInstallerFlagSet;
 
     public static void installEventHelper() {
-        if (eventHelperInstallerFlagSet)
+        if (eventHelperInstallerFlagSet) return;
-            return;
         eventHelperInstallerFlagSet = true;
         new DummyBasicLookAndFeel().initialize();
     }

core/src/main/java/com/github/weisj/darklaf/ui/popupmenu/MouseGrabberUtil.java

@@ -56,14 +56,11 @@ public class MouseGrabberUtil {
     private static ChangeListener getOldMouseGrabber() {
         MenuSelectionManager menuSelectionManager = MenuSelectionManager.defaultManager();
         for (ChangeListener listener : menuSelectionManager.getChangeListeners()) {
-            if (listener == null)
+            if (listener == null) continue;
-                continue;
             Class<?> listenerClass = listener.getClass();
-            if (listenerClass == null)
+            if (listenerClass == null) continue;
-                continue;
             Class<?> enclosingClass = listenerClass.getEnclosingClass();
-            if (enclosingClass == null)
+            if (enclosingClass == null) continue;
-                continue;
             if (listenerClass.getName().endsWith("MouseGrabber")
                     && enclosingClass.getName().endsWith("BasicPopupMenuUI")) {
                 return listener;
@@ -77,8 +74,7 @@ public class MouseGrabberUtil {
      * add our own implementation for it that is a bit more generous with closing the popup.
      */
     private static void uninstallOldMouseGrabber(final ChangeListener oldMouseGrabber) {
-        if (oldMouseGrabber == null)
+        if (oldMouseGrabber == null) return;
-            return;
         MenuSelectionManager menuSelectionManager = MenuSelectionManager.defaultManager();
         menuSelectionManager.removeChangeListener(oldMouseGrabber);
         if (oldMouseGrabber instanceof AWTEventListener) {

core/src/main/java/com/github/weisj/darklaf/ui/popupmenu/PopupMenuContainer.java

@@ -65,8 +65,7 @@ public class PopupMenuContainer extends JPanel {
                 @Override
                 public void menuKeyPressed(final MenuKeyEvent e) {
                     SwingUtilities.invokeLater(() -> {
-                        if (popupMenu == null)
+                        if (popupMenu == null) return;
-                            return;
                         MenuElement[] path = e.getMenuSelectionManager().getSelectedPath();
                         if (path.length == 0) {
                             return;
@@ -98,8 +97,7 @@ public class PopupMenuContainer extends JPanel {
                 }
 
                 private void onHide() {
-                    if (popupMenu == null)
+                    if (popupMenu == null) return;
-                        return;
                     popupMenu.removePopupMenuListener(this);
                     popupMenu.removeMenuKeyListener(menuKeyListener);
                 }

core/src/main/java/com/github/weisj/darklaf/ui/rootpane/DarkRootPaneUI.java

@@ -79,8 +79,7 @@ public class DarkRootPaneUI extends BasicRootPaneUI implements HierarchyListener
     }
 
     protected void installBorder(final JRootPane root) {
-        if (root == null)
+        if (root == null) return;
-            return;
         LookAndFeel.installBorder(root, borderKeys[windowDecorationsStyle]);
     }
 
@@ -110,12 +109,9 @@ public class DarkRootPaneUI extends BasicRootPaneUI implements HierarchyListener
     protected int decorationsStyleFromWindow(final Window window, final int windowDecorationsStyle) {
         if (DarkUIUtil.isUndecorated(window) || PropertyUtil.getBooleanProperty(rootPane, KEY_NO_DECORATIONS))
             return JRootPane.NONE;
-        if (windowDecorationsStyle != JRootPane.NONE)
+        if (windowDecorationsStyle != JRootPane.NONE) return windowDecorationsStyle;
-            return windowDecorationsStyle;
+        if (window instanceof JFrame) return JRootPane.FRAME;
-        if (window instanceof JFrame)
+        if (window instanceof JDialog) return JRootPane.PLAIN_DIALOG;
-            return JRootPane.FRAME;
-        if (window instanceof JDialog)
-            return JRootPane.PLAIN_DIALOG;
         return windowDecorationsStyle;
     }
 
@@ -155,8 +151,7 @@ public class DarkRootPaneUI extends BasicRootPaneUI implements HierarchyListener
         CustomTitlePane titlePane = DecorationsHandler.getSharedInstance().createTitlePane(root, style, window);
         installLayout(root);
         setTitlePane(root, titlePane);
-        if (titlePane != null)
+        if (titlePane != null) titlePane.setDecorationsStyle(windowDecorationsStyle);
-            titlePane.setDecorationsStyle(windowDecorationsStyle);
     }
 
     @Override
@@ -188,8 +183,7 @@ public class DarkRootPaneUI extends BasicRootPaneUI implements HierarchyListener
     private void updateWindow(final Component parent) {
         window = DarkUIUtil.getWindow(parent);
         windowDecorationsStyle = decorationsStyleFromWindow(window, windowDecorationsStyle);
-        if (titlePane != null)
+        if (titlePane != null) titlePane.setDecorationsStyle(windowDecorationsStyle);
-            titlePane.setDecorationsStyle(windowDecorationsStyle);
         installBorder(rootPane);
     }
 
@@ -211,8 +205,7 @@ public class DarkRootPaneUI extends BasicRootPaneUI implements HierarchyListener
 
     @Override
     public void hierarchyChanged(final HierarchyEvent e) {
-        if (rootPane == null)
+        if (rootPane == null) return;
-            return;
         Component parent = rootPane.getParent();
         if (parent == null) {
             return;

core/src/main/java/com/github/weisj/darklaf/ui/scrollpane/DarkScrollBarListener.java

@@ -151,14 +151,12 @@ public class DarkScrollBarListener extends MouseAdapter implements AdjustmentLis
 
     @Override
     public void adjustmentValueChanged(final AdjustmentEvent e) {
-        if (!e.getValueIsAdjusting())
+        if (!e.getValueIsAdjusting()) return;
-            return;
 
         JScrollBar scrollBar = (JScrollBar) e.getAdjustable();
         int extent = scrollBar.getModel().getExtent();
         int value = scrollBar.getValue() + extent;
-        if (value == extent || value == scrollBar.getMaximum())
+        if (value == extent || value == scrollBar.getMaximum()) return;
-            return;
 
         Point p = MouseInfo.getPointerInfo().getLocation();
         SwingUtilities.convertPointFromScreen(p, scrollbar);

core/src/main/java/com/github/weisj/darklaf/ui/scrollpane/DarkScrollBarUI.java

@@ -131,8 +131,7 @@ public class DarkScrollBarUI extends BasicScrollBarUI implements ScrollBarConsta
             g.fillRect(bounds.x, bounds.y, bounds.width, bounds.height);
         }
         float trackAlpha = scrollBarListener.getTrackAlpha();
-        if (trackAlpha == 0)
+        if (trackAlpha == 0) return;
-            return;
         g.setColor(getTrackColor());
         ((Graphics2D) g).setComposite(COMPOSITE.derive(trackAlpha));
         g.fillRect(bounds.x, bounds.y, bounds.width, bounds.height);

core/src/main/java/com/github/weisj/darklaf/ui/separator/DarkSeparatorUI.java

@@ -46,13 +46,11 @@ public class DarkSeparatorUI extends BasicSeparatorUI {
         color = UIManager.getColor("Separator.foreground");
         size = UIManager.getDimension("Separator.size");
         insets = UIManager.getInsets("Separator.insets");
-        if (insets == null)
+        if (insets == null) insets = new Insets(0, 0, 0, 0);
-            insets = new Insets(0, 0, 0, 0);
     }
 
     public void paint(final Graphics g, final JComponent c) {
-        if (!(c instanceof JSeparator))
+        if (!(c instanceof JSeparator)) return;
-            return;
         checkSize(c);
         g.setColor(color);
         if (((JSeparator) c).getOrientation() == JSeparator.VERTICAL) {
@@ -77,31 +75,25 @@ public class DarkSeparatorUI extends BasicSeparatorUI {
     }
 
     private void checkSize(final JComponent c) {
-        if (resizeLock)
+        if (resizeLock) return;
-            return;
         Container parent = c.getParent();
-        if (parent == null)
+        if (parent == null) return;
-            return;
         LayoutManager lm = parent.getLayout();
-        if (!(lm instanceof BoxLayout || parent instanceof JToolBar))
+        if (!(lm instanceof BoxLayout || parent instanceof JToolBar)) return;
-            return;
         resizeLock = true;
         Dimension dim = parent.getSize();
         Rectangle bounds = c.getBounds();
         if (((JSeparator) c).getOrientation() == JSeparator.VERTICAL) {
-            if (bounds.height != dim.height)
+            if (bounds.height != dim.height) c.setBounds(bounds.x, 0, bounds.width, dim.height);
-                c.setBounds(bounds.x, 0, bounds.width, dim.height);
         } else {
-            if (bounds.width != dim.width)
+            if (bounds.width != dim.width) c.setBounds(0, bounds.y, dim.width, bounds.height);
-                c.setBounds(0, bounds.y, dim.width, bounds.height);
         }
         resizeLock = false;
     }
 
     @SuppressWarnings("SuspiciousNameCombination")
     public Dimension getPreferredSize(final JComponent c) {
-        if (c == null)
+        if (c == null) return new Dimension(size);
-            return new Dimension(size);
         if (((JSeparator) c).getOrientation() == JSeparator.VERTICAL) {
             return new Dimension(size.width, size.height);
         } else {

core/src/main/java/com/github/weisj/darklaf/ui/slider/DarkSliderUI.java

@@ -781,8 +781,7 @@ public class DarkSliderUI extends BasicSliderUI implements PropertyChangeListene
             int pos = isHorizontal() ? evt.getX() : evt.getY();
             int loc = getLocationForValue(getSnappedValue(evt));
             offset = (loc < 0) ? 0 : pos - loc;
-            if (iconRect.contains(evt.getPoint()))
+            if (iconRect.contains(evt.getPoint())) return;
-                return;
             super.mousePressed(evt);
         }
 

core/src/main/java/com/github/weisj/darklaf/ui/spinner/DarkSpinnerBorder.java

@@ -55,10 +55,8 @@ public class DarkSpinnerBorder implements Border, UIResource {
         borderSize = UIManager.getInt("Spinner.borderThickness");
         cellInsets = UIManager.getInsets("Spinner.cellEditorInsets");
         insets = UIManager.getInsets("Spinner.insets");
-        if (insets == null)
+        if (insets == null) insets = new Insets(0, 0, 0, 0);
-            insets = new Insets(0, 0, 0, 0);
+        if (cellInsets == null) cellInsets = new Insets(0, 0, 0, 0);
-        if (cellInsets == null)
-            cellInsets = new Insets(0, 0, 0, 0);
     }
 
     @Override

core/src/main/java/com/github/weisj/darklaf/ui/spinner/DarkSpinnerUI.java

@@ -133,8 +133,7 @@ public class DarkSpinnerUI extends BasicSpinnerUI implements SpinnerConstants {
                 super.layoutContainer(parent);
                 if (SpinnerConstants.isTreeOrTableCellEditor(spinner)) {
                     int adj = borderSize / 2;
-                    if (!spinner.getComponentOrientation().isLeftToRight())
+                    if (!spinner.getComponentOrientation().isLeftToRight()) adj *= -1;
-                        adj *= -1;
                     adjustButton(prevButton, adj);
                     adjustButton(nextButton, adj);
                 }

core/src/main/java/com/github/weisj/darklaf/ui/splitpane/DividerStyle.java

@@ -22,9 +22,9 @@
 package com.github.weisj.darklaf.ui.splitpane;
 
 public enum DividerStyle {
-    GRIP(SplitPaneConstants.STYLE_GRIP, false, true), GRIP_BORDERLESS(SplitPaneConstants.STYLE_GRIP_BORDERLESS, false,
+    GRIP(SplitPaneConstants.STYLE_GRIP, false, true),
-            false), LINE(SplitPaneConstants.STYLE_LINE, true,
+    GRIP_BORDERLESS(SplitPaneConstants.STYLE_GRIP_BORDERLESS, false, false),
-                    true), INVISIBLE(SplitPaneConstants.STYLE_INVISIBLE, true, false);
+    LINE(SplitPaneConstants.STYLE_LINE, true, true), INVISIBLE(SplitPaneConstants.STYLE_INVISIBLE, true, false);
 
     private final String name;
     private final boolean isThin;
@@ -42,8 +42,7 @@ public enum DividerStyle {
 
     public static DividerStyle get(final Object style, final DividerStyle fallback) {
         DividerStyle s = getNullableStyle(style);
-        if (s == null)
+        if (s == null) return fallback;
-            return fallback;
         return s;
     }
 
@@ -65,17 +64,14 @@ public enum DividerStyle {
     }
 
     static DividerStyle getNullableStyle(final Object obj) {
-        if (obj == null)
+        if (obj == null) return null;
-            return null;
+        if (obj instanceof DividerStyle) return (DividerStyle) obj;
-        if (obj instanceof DividerStyle)
-            return (DividerStyle) obj;
         try {
             return valueOf(obj.toString());
         } catch (IllegalArgumentException ignored) {
         }
         for (DividerStyle s : values()) {
-            if (s.name.equalsIgnoreCase(obj.toString()))
+            if (s.name.equalsIgnoreCase(obj.toString())) return s;
-                return s;
         }
         return null;
     }

core/src/main/java/com/github/weisj/darklaf/ui/splitpane/ThinSplitPaneDivider.java

@@ -55,8 +55,7 @@ final class ThinSplitPaneDivider extends BasicSplitPaneDivider {
 
     @Override
     public boolean contains(final Point p) {
-        if (!isEnabled())
+        if (!isEnabled()) return false;
-            return false;
         return super.contains(p);
     }
 

core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/DarkScrollableTabSupport.java

@@ -96,8 +96,7 @@ public class DarkScrollableTabSupport extends ScrollableTabSupport implements Mo
         if (scrollPopupMenu.isVisible()) {
             scrollPopupMenu.setVisible(false);
         } else {
-            if (!ui.tabPane.isEnabled())
+            if (!ui.tabPane.isEnabled()) return;
-                return;
             if (lastClickEvent == 0 || (System.currentTimeMillis() - lastClickEvent) > 250) {
                 Dimension pref = scrollPopupMenu.getPreferredSize();
                 boolean leftToRight = ui.tabPane.getComponentOrientation().isLeftToRight();
@@ -135,19 +134,16 @@ public class DarkScrollableTabSupport extends ScrollableTabSupport implements Mo
 
     @Override
     public void mouseWheelMoved(final MouseWheelEvent e) {
-        if (!ui.tabPane.isEnabled() || ui.tabPane.getTabCount() == 0)
+        if (!ui.tabPane.isEnabled() || ui.tabPane.getTabCount() == 0) return;
-            return;
         int tabPosition = ui.tabPane.getTabPlacement();
         int scrollAmount = -1 * e.getUnitsToScroll() * e.getScrollAmount();
         int scrolled;
         if (tabPosition == SwingConstants.LEFT || tabPosition == SwingConstants.RIGHT) {
-            if (e.isShiftDown() || !moreTabsButton.isVisible())
+            if (e.isShiftDown() || !moreTabsButton.isVisible()) return;
-                return;
             timer.stop();
             scrolled = scroll(scrollAmount, false);
         } else {
-            if (!e.isShiftDown() || !moreTabsButton.isVisible())
+            if (!e.isShiftDown() || !moreTabsButton.isVisible()) return;
-                return;
             timer.stop();
             scrolled = scroll(scrollAmount, true);
         }

core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/DarkTabbedPaneHandler.java

@@ -108,8 +108,7 @@ public class DarkTabbedPaneHandler extends TabbedPaneHandler {
         } else if (DarkTabbedPaneUI.KEY_DND.equals(key)) {
             ui.dndEnabled = PropertyUtil.getBooleanProperty(ui.tabPane, DarkTabbedPaneUI.KEY_DND);
             DropTarget dropTarget = ui.tabPane.getDropTarget();
-            if (dropTarget != null)
+            if (dropTarget != null) dropTarget.setActive(ui.dndEnabled);
-                dropTarget.setActive(ui.dndEnabled);
         } else if (PropertyKey.COMPONENT_ORIENTATION.equals(key)) {
             ui.tabPane.doLayout();
             ui.tabPane.repaint();
@@ -183,8 +182,7 @@ public class DarkTabbedPaneHandler extends TabbedPaneHandler {
     @Override
     public void mouseDragged(final MouseEvent e) {
         super.mouseDragged(e);
-        if (!ui.dndEnabled)
+        if (!ui.dndEnabled) return;
-            return;
         if (origin == null) {
             origin = e.getPoint();
             pressedIndex = ui.tabForCoordinate(ui.tabPane, e.getX(), e.getY());

core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/DarkTabbedPaneScrollLayout.java

@@ -292,8 +292,7 @@ public class DarkTabbedPaneScrollLayout extends TabbedPaneScrollLayout {
         ui.runCount = 0;
         ui.selectedRun = -1;
 
-        if (tabCount == 0)
+        if (tabCount == 0) return;
-            return;
 
         ui.selectedRun = 0;
         ui.runCount = 1;
@@ -475,8 +474,7 @@ public class DarkTabbedPaneScrollLayout extends TabbedPaneScrollLayout {
         if (horizontal) {
             if (leftToRight) {
                 if (ui.rects[tabCount - 1].x + ui.rects[tabCount - 1].width + buttonBounds.width > maxVal) {
-                    if (button.getParent() != ui.tabPane)
+                    if (button.getParent() != ui.tabPane) ui.tabPane.add(button);
-                        ui.tabPane.add(button);
                 } else {
                     if (button.getParent() != ui.scrollableTabSupport.tabPanel) {
                         ui.scrollableTabSupport.tabPanel.add(button);
@@ -485,8 +483,7 @@ public class DarkTabbedPaneScrollLayout extends TabbedPaneScrollLayout {
             } else {
                 int x = ui.rects[tabCount - 1].x;
                 if (x - buttonBounds.width < minVal) {
-                    if (button.getParent() != ui.tabPane)
+                    if (button.getParent() != ui.tabPane) ui.tabPane.add(button);
-                        ui.tabPane.add(button);
                 } else {
                     if (button.getParent() != ui.scrollableTabSupport.tabPanel) {
                         ui.scrollableTabSupport.tabPanel.add(button);
@@ -495,8 +492,7 @@ public class DarkTabbedPaneScrollLayout extends TabbedPaneScrollLayout {
             }
         } else {
             if (ui.rects[tabCount - 1].y + ui.rects[tabCount - 1].height + buttonBounds.height > maxVal) {
-                if (button.getParent() != ui.tabPane)
+                if (button.getParent() != ui.tabPane) ui.tabPane.add(button);
-                    ui.tabPane.add(button);
             } else {
                 if (button.getParent() != ui.scrollableTabSupport.tabPanel) {
                     ui.scrollableTabSupport.tabPanel.add(button);
@@ -581,16 +577,14 @@ public class DarkTabbedPaneScrollLayout extends TabbedPaneScrollLayout {
     }
 
     protected void restoreHiddenTabsX(final int minX, final int maxX, final int tabCount) {
-        if (ui.maxVisible < 0 || ui.maxVisible >= tabCount)
+        if (ui.maxVisible < 0 || ui.maxVisible >= tabCount) return;
-            return;
         int space = Math.max(maxX - ui.rects[ui.maxVisible].x - ui.rects[ui.maxVisible].width - ui.currentShiftXTmp, 0);
         int shift = Math.min(minX - ui.rects[0].x - ui.currentShiftXTmp, space);
         shiftTabsX(shift, minX, maxX, tabCount, true);
     }
 
     protected void restoreHiddenTabsY(final int minY, final int maxY, final int tabCount) {
-        if (ui.maxVisible < 0 || ui.maxVisible >= tabCount)
+        if (ui.maxVisible < 0 || ui.maxVisible >= tabCount) return;
-            return;
         int space =
                 Math.max(maxY - ui.rects[ui.maxVisible].y - ui.rects[ui.maxVisible].height - ui.currentShiftYTmp, 0);
         int shift = Math.min(minY - ui.rects[0].y - ui.currentShiftYTmp, space);

core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/DarkTabbedPaneUI.java

@@ -242,8 +242,7 @@ public class DarkTabbedPaneUI extends DarkTabbedPaneUIBridge {
     protected void paintFocusIndicator(final Graphics g, final int tabPlacement, final Rectangle r, final int tabIndex,
             final Rectangle iconRect, final Rectangle textRect, final boolean isSelected) {
         if (isSelected) {
-            if (!drawFocusBar())
+            if (!drawFocusBar()) return;
-                return;
             g.setColor(getAccentColor());
             switch (tabPlacement) {
                 case LEFT:
@@ -355,8 +354,7 @@ public class DarkTabbedPaneUI extends DarkTabbedPaneUIBridge {
 
     @Override
     public void setRolloverTab(final int index) {
-        if (dragging)
+        if (dragging) return;
-            return;
         int oldRollover = rolloverTabIndex;
         super.setRolloverTab(index);
         if (oldRollover != getRolloverTab()) {
@@ -413,10 +411,8 @@ public class DarkTabbedPaneUI extends DarkTabbedPaneUIBridge {
         int height =
                 Math.max(super.calculateTabAreaHeight(tabPlacement, horizRunCount, maxTabHeight), getFallBackSize());
         if (isHorizontalTabPlacement()) {
-            if (leadingComp != null)
+            if (leadingComp != null) height = Math.max(height, leadingComp.getPreferredSize().height);
-                height = Math.max(height, leadingComp.getPreferredSize().height);
+            if (trailingComp != null) height = Math.max(height, trailingComp.getPreferredSize().height);
-            if (trailingComp != null)
-                height = Math.max(height, trailingComp.getPreferredSize().height);
         }
         return height;
     }
@@ -425,10 +421,8 @@ public class DarkTabbedPaneUI extends DarkTabbedPaneUIBridge {
     protected int calculateTabAreaWidth(final int tabPlacement, final int vertRunCount, final int maxTabWidth) {
         int width = Math.max(super.calculateTabAreaWidth(tabPlacement, vertRunCount, maxTabWidth), getFallBackSize());
         if (!isHorizontalTabPlacement()) {
-            if (leadingComp != null)
+            if (leadingComp != null) width = Math.max(width, leadingComp.getPreferredSize().width);
-                width = Math.max(width, leadingComp.getPreferredSize().width);
+            if (trailingComp != null) width = Math.max(width, trailingComp.getPreferredSize().width);
-            if (trailingComp != null)
-                width = Math.max(width, trailingComp.getPreferredSize().width);
         }
         return width;
     }
@@ -646,8 +640,7 @@ public class DarkTabbedPaneUI extends DarkTabbedPaneUIBridge {
     }
 
     protected Icon getMoreTabsIcon() {
-        if (moreTabsIcon == null)
+        if (moreTabsIcon == null) moreTabsIcon = UIManager.getIcon("TabbedPane.moreTabs.icon");
-            moreTabsIcon = UIManager.getIcon("TabbedPane.moreTabs.icon");
         return moreTabsIcon;
     }
 
@@ -812,8 +805,7 @@ public class DarkTabbedPaneUI extends DarkTabbedPaneUIBridge {
     }
 
     public Icon getNewTabIcon() {
-        if (newTabIcon == null)
+        if (newTabIcon == null) newTabIcon = UIManager.getIcon("TabbedPane.newTab.icon");
-            newTabIcon = UIManager.getIcon("TabbedPane.newTab.icon");
         return newTabIcon;
     }
 

core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/DarkTabbedPaneUIBridge.java

@@ -747,14 +747,10 @@ public abstract class DarkTabbedPaneUIBridge extends TabbedPaneUI implements Swi
         // Fix for 6711145 BasicTabbedPanuUI should not throw a NPE if these
         // keys are missing. So we are setting them to there default values here
         // if the keys are missing.
-        if (tabInsets == null)
+        if (tabInsets == null) tabInsets = new Insets(0, 4, 1, 4);
-            tabInsets = new Insets(0, 4, 1, 4);
+        if (selectedTabPadInsets == null) selectedTabPadInsets = new Insets(2, 2, 2, 1);
-        if (selectedTabPadInsets == null)
+        if (tabAreaInsets == null) tabAreaInsets = new Insets(3, 2, 0, 2);
-            selectedTabPadInsets = new Insets(2, 2, 2, 1);
+        if (contentBorderInsets == null) contentBorderInsets = new Insets(2, 2, 3, 3);
-        if (tabAreaInsets == null)
-            tabAreaInsets = new Insets(3, 2, 0, 2);
-        if (contentBorderInsets == null)
-            contentBorderInsets = new Insets(2, 2, 3, 3);
     }
 
     // UI Rendering

core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/TabbedPaneLayout.java

@@ -448,8 +448,7 @@ public abstract class TabbedPaneLayout implements LayoutManager {
     protected void rotateTabRuns(final int tabPlacement, final int selectedRun) {
         for (int i = 0; i < selectedRun; i++) {
             int save = ui.tabRuns[0];
-            if (ui.runCount - 1 >= 0)
+            if (ui.runCount - 1 >= 0) System.arraycopy(ui.tabRuns, 1, ui.tabRuns, 0, ui.runCount - 1);
-                System.arraycopy(ui.tabRuns, 1, ui.tabRuns, 0, ui.runCount - 1);
             ui.tabRuns[ui.runCount - 1] = save;
         }
     }

core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/TabbedPaneTransferHandler.java

@@ -291,8 +291,7 @@ public class TabbedPaneTransferHandler extends TransferHandler implements DropTa
 
         @Override
         public DataFlavor[] getTransferDataFlavors() {
-            if (tabFlavor == null)
+            if (tabFlavor == null) return new DataFlavor[0];
-                return new DataFlavor[0];
             return new DataFlavor[] {tabFlavor};
         }
 

core/src/main/java/com/github/weisj/darklaf/ui/tabbedpane/TabbedPaneUtil.java

@@ -109,8 +109,7 @@ public class TabbedPaneUtil implements SwingConstants {
     public static Rectangle getDropRect(final DarkTabbedPaneUI ui, final JTabbedPane destTabbedPane,
             final JTabbedPane source, final Point mouseLocation, final Rectangle tabBounds, final int tab,
             final int sourceIndex, final int lastTab) {
-        if (destTabbedPane.getTabCount() == 0)
+        if (destTabbedPane.getTabCount() == 0) return new Rectangle(0, 0, 0, 0);
-            return new Rectangle(0, 0, 0, 0);
         int tabPlacement = destTabbedPane.getTabPlacement();
         Rectangle destRect = destTabbedPane.getBoundsAt(Math.min(tab, destTabbedPane.getTabCount() - 1));
 
@@ -233,14 +232,12 @@ public class TabbedPaneUtil implements SwingConstants {
         if (tabbedPane == sourcePane && sourceIndex == tab) {
             // Nothing to do. Just select the tab to be sure.
             Component comp = sourcePane.getTabComponentAt(tab);
-            if (comp != null)
+            if (comp != null) comp.setVisible(true);
-                comp.setVisible(true);
             selectTab(sourcePane, sourceIndex);
             return false;
         }
         int destIndex = tab;
-        if (tabbedPane.getTabCount() == 0)
+        if (tabbedPane.getTabCount() == 0) destIndex = 0;
-            destIndex = 0;
         if (destIndex < 0 || destIndex > tabbedPane.getTabCount()) {
             return false;
         }
@@ -256,8 +253,7 @@ public class TabbedPaneUtil implements SwingConstants {
 
         int index = destIndex;
         if (tabbedPane == sourcePane) {
-            if (sourceIndex < index)
+            if (sourceIndex < index) index--;
-                index--;
         }
 
         tabbedPane.insertTab(tabName, icon, comp, toolTip, index);

core/src/main/java/com/github/weisj/darklaf/ui/tabframe/DarkPanelPopupUI.java

@@ -234,18 +234,15 @@ public class DarkPanelPopupUI extends DarkPanelUI implements PropertyChangeListe
                 setHeaderBackground(true);
             }
         } else if (TabFramePopup.KEY_CONTENT.equals(key)) {
-            if (content == null)
+            if (content == null) return;
-                return;
             content.add((Component) evt.getNewValue(), BorderLayout.CENTER);
             content.invalidate();
         } else if (TabFramePopup.KEY_TITLE.equals(key)) {
-            if (label == null)
+            if (label == null) return;
-                return;
             label.setText(evt.getNewValue().toString());
             label.repaint();
         } else if (TabFramePopup.KEY_ICON.equals(key)) {
-            if (label == null)
+            if (label == null) return;
-                return;
             label.setIcon((Icon) evt.getNewValue());
             label.repaint();
         } else if (TabFramePopup.KEY_VISIBLE_TAB.equals(key)) {
@@ -358,10 +355,8 @@ public class DarkPanelPopupUI extends DarkPanelUI implements PropertyChangeListe
     public void eventDispatched(final AWTEvent event) {
         if (event.getID() == FocusEvent.FOCUS_GAINED) {
             Component focusOwner = FocusManager.getCurrentManager().getFocusOwner();
-            if (focusOwner instanceof JTabFrame)
+            if (focusOwner instanceof JTabFrame) return;
-                return;
+            if (focusOwner instanceof JRootPane) return;
-            if (focusOwner instanceof JRootPane)
-                return;
             boolean focus = DarkUIUtil.hasFocus(popupComponent);
             if (popupComponent.getTabFrame() != null) {
                 Container container =

core/src/main/java/com/github/weisj/darklaf/ui/tabframe/DarkTabFrameTabContainerUI.java

@@ -91,11 +91,9 @@ public class DarkTabFrameTabContainerUI extends DarkPanelUI implements PropertyC
     }
 
     protected void installAccelerator(final JTabFrame tabFrame) {
-        if (tabFrame == null)
+        if (tabFrame == null) return;
-            return;
         int acc = tabContainer.getAccelerator();
-        if (acc < 0)
+        if (acc < 0) return;
-            return;
         tabFrame.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
                 KeyStroke.getKeyStroke(UIManager.getString("TabFrame.acceleratorKeyCode") + " " + acc),
                 ACCELERATOR_PREFIX + acc);
@@ -148,8 +146,7 @@ public class DarkTabFrameTabContainerUI extends DarkPanelUI implements PropertyC
     }
 
     protected void uninstallAccelerator(final JTabFrame tabFrame) {
-        if (tabFrame == null)
+        if (tabFrame == null) return;
-            return;
         int acc = tabContainer.getAccelerator();
         String accAction = ACCELERATOR_PREFIX + acc;
         tabFrame.getActionMap().remove(accAction);
@@ -181,12 +178,10 @@ public class DarkTabFrameTabContainerUI extends DarkPanelUI implements PropertyC
                 ((Component) newVal).addMouseMotionListener(dragListener);
             }
         } else if (TabFrameTab.KEY_SELECTED.equals(key)) {
-            if (tabContainer == null)
+            if (tabContainer == null) return;
-                return;
             tabContainer.repaint();
         } else if (TabFrameTab.KEY_ACCELERATOR.equals(key)) {
-            if (tabContainer == null)
+            if (tabContainer == null) return;
-                return;
             uninstallAccelerator(tabContainer.getTabFrame());
             installAccelerator(tabContainer.getTabFrame());
         } else if (TabFrameTab.KEY_TAB_FRAME_PARENT.equals(key)) {
@@ -209,8 +204,7 @@ public class DarkTabFrameTabContainerUI extends DarkPanelUI implements PropertyC
     }
 
     public Color getBackground(final TabFrameTabContainer tab) {
-        if (printing)
+        if (printing) return tab.getBackground();
-            return tab.getBackground();
         return tab.isSelected() ? selectedColor
                 : hoverListener.isHover() && !tab.getTabFrame().isInTransfer() ? hoverColor : tab.getBackground();
     }

core/src/main/java/com/github/weisj/darklaf/ui/tabframe/DarkTabFrameTabLabelUI.java

@@ -50,8 +50,7 @@ public class DarkTabFrameTabLabelUI extends DarkLabelUI implements PropertyChang
     private final MouseListener mouseListener = new MouseAdapter() {
         @Override
         public void mouseClicked(final MouseEvent e) {
-            if (!tabComponent.isEnabled())
+            if (!tabComponent.isEnabled()) return;
-                return;
             if (SwingUtilities.isLeftMouseButton(e)) {
                 tabComponent.getTabFrame().toggleTab(tabComponent.getOrientation(), tabComponent.getIndex(),
                         !tabComponent.isSelected());
@@ -143,8 +142,7 @@ public class DarkTabFrameTabLabelUI extends DarkLabelUI implements PropertyChang
             updateText();
         } else if (TabFrameTab.KEY_ACCELERATOR.equals(key)) {
             updateText();
-            if (tabComponent == null)
+            if (tabComponent == null) return;
-                return;
             uninstallAccelerator(tabComponent.getTabFrame());
             installAccelerator(tabComponent.getTabFrame());
         } else if (TabFrameTab.KEY_ORIENTATION.equals(key)) {
@@ -175,11 +173,9 @@ public class DarkTabFrameTabLabelUI extends DarkLabelUI implements PropertyChang
     }
 
     protected void installAccelerator(final JTabFrame tabFrame) {
-        if (tabFrame == null)
+        if (tabFrame == null) return;
-            return;
         int acc = tabComponent.getAccelerator();
-        if (acc < 0)
+        if (acc < 0) return;
-            return;
         tabFrame.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
                 KeyStroke.getKeyStroke(UIManager.getString("TabFrame.acceleratorKeyCode") + " " + acc),
                 ACCELERATOR_PREFIX + acc);
@@ -207,16 +203,14 @@ public class DarkTabFrameTabLabelUI extends DarkLabelUI implements PropertyChang
     }
 
     protected void uninstallAccelerator(final JTabFrame tabFrame) {
-        if (tabFrame == null)
+        if (tabFrame == null) return;
-            return;
         int acc = tabComponent.getAccelerator();
         String accAction = ACCELERATOR_PREFIX + acc;
         tabFrame.getActionMap().remove(accAction);
     }
 
     public Color getBackground(final TabFrameTabLabel tab) {
-        if (printing || !tab.isEnabled())
+        if (printing || !tab.isEnabled()) return tab.getBackground();
-            return tab.getBackground();
         return tab.isSelected() ? selectedColor
                 : hoverListener.isHover() && !tab.getTabFrame().isInTransfer() ? hoverColor : tab.getBackground();
     }
@@ -227,8 +221,7 @@ public class DarkTabFrameTabLabelUI extends DarkLabelUI implements PropertyChang
     }
 
     public Color getTabForeground(final TabFrameTabLabel tab) {
-        if (printing)
+        if (printing) return tab.getForeground();
-            return tab.getForeground();
         return tab.isSelected() ? selectedFontColor
                 : hoverListener.isHover() && !tab.getTabFrame().isInTransfer() ? fontHoverColor : tab.getForeground();
     }