From bc643fd373fa73fd5d7bdf2398d110f8cb0110f4 Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Wed, 20 Nov 2019 17:28:56 +0300 Subject: [PATCH] get rid of dead code GitOrigin-RevId: 16bc993d3c3c2759ac6ce7a3fbbb1bb82026de66 --- .../favoritesTreeView/FavoritesManager.java | 7 ++--- .../intellij/openapi/ui/InvariantIcon.java | 29 ------------------- .../openapi/ui/NullableComponent.java | 7 ----- .../com/intellij/openapi/util/IdRunnable.java | 15 ---------- 4 files changed, 3 insertions(+), 55 deletions(-) delete mode 100644 platform/util/ui/src/com/intellij/openapi/ui/InvariantIcon.java delete mode 100644 platform/util/ui/src/com/intellij/openapi/util/IdRunnable.java diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesManager.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesManager.java index 77de128b0590..5af810b2cee2 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesManager.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesManager.java @@ -164,12 +164,11 @@ public final class FavoritesManager implements ProjectComponent, JDOMExternaliza return myViewSettings; } - public synchronized boolean removeFavoritesList(@NotNull String name) { - boolean result = myName2FavoritesRoots.remove(name) != null; + public synchronized void removeFavoritesList(@NotNull String name) { + myName2FavoritesRoots.remove(name); myFavoritesRootsOrder.remove(name); myDescriptions.remove(name); listRemoved(name); - return result; } @NotNull @@ -467,7 +466,7 @@ public final class FavoritesManager implements ProjectComponent, JDOMExternaliza final ProjectFileIndex projectFileIndex = ProjectRootManager.getInstance(myProject).getFileIndex(); final Set find = new HashSet<>(); final ContentIterator contentIterator = fileOrDir -> { - if (fileOrDir != null && fileOrDir.getPath().equals(vFile.getPath())) { + if (fileOrDir.getPath().equals(vFile.getPath())) { find.add(Boolean.TRUE); } return true; diff --git a/platform/util/ui/src/com/intellij/openapi/ui/InvariantIcon.java b/platform/util/ui/src/com/intellij/openapi/ui/InvariantIcon.java deleted file mode 100644 index 098b1929b850..000000000000 --- a/platform/util/ui/src/com/intellij/openapi/ui/InvariantIcon.java +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.openapi.ui; - -import com.intellij.openapi.util.Condition; - -import javax.swing.*; -import java.awt.*; - -/** - * @author Konstantin Bulenkov - */ -public class InvariantIcon implements Icon { - public InvariantIcon(Icon base, Icon optional, Condition condition) { - } - - @Override - public void paintIcon(Component c, Graphics g, int x, int y) { - } - - @Override - public int getIconWidth() { - return 0; - } - - @Override - public int getIconHeight() { - return 0; - } -} diff --git a/platform/util/ui/src/com/intellij/openapi/ui/NullableComponent.java b/platform/util/ui/src/com/intellij/openapi/ui/NullableComponent.java index fd31009c1758..8845353fedcb 100644 --- a/platform/util/ui/src/com/intellij/openapi/ui/NullableComponent.java +++ b/platform/util/ui/src/com/intellij/openapi/ui/NullableComponent.java @@ -9,9 +9,6 @@ public interface NullableComponent { boolean isNull(); class Check { - private Check() { - } - public static boolean isNull(Component c) { return c == null || c instanceof NullableComponent && ((NullableComponent)c).isNull(); } @@ -19,9 +16,5 @@ public interface NullableComponent { public static boolean isNullOrHidden(Component c) { return c != null && !c.isShowing() || isNull(c); } - - public static boolean isNotNullAndVisible(Component c) { - return !isNull(c) && c.isVisible(); - } } } diff --git a/platform/util/ui/src/com/intellij/openapi/util/IdRunnable.java b/platform/util/ui/src/com/intellij/openapi/util/IdRunnable.java deleted file mode 100644 index 0e1a8a4a2220..000000000000 --- a/platform/util/ui/src/com/intellij/openapi/util/IdRunnable.java +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package com.intellij.openapi.util; - -import com.intellij.util.ui.update.ComparableObject; - -public abstract class IdRunnable extends ComparableObject.Impl implements Runnable { - - public IdRunnable(Object object) { - super(object); - } - - public IdRunnable(Object[] objects) { - super(objects); - } -}