diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java b/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java index d77648af38e0..8adcfdb2bb53 100644 --- a/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java +++ b/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java @@ -45,8 +45,6 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import java.util.*; -import static com.intellij.openapi.application.Experiments.isFeatureEnabled; - public class PackageViewPane extends AbstractProjectViewPSIPane { @NonNls public static final String ID = "PackagesPane"; private final MyDeletePSIElementProvider myDeletePSIElementProvider = new MyDeletePSIElementProvider(); @@ -62,7 +60,7 @@ public class PackageViewPane extends AbstractProjectViewPSIPane { @Override public Icon getIcon() { - return AllIcons.General.PackagesTab; + return AllIcons.Nodes.CopyOfFolder; } @Override diff --git a/java/java-impl/src/com/intellij/packageDependencies/ui/PackagePatternProvider.java b/java/java-impl/src/com/intellij/packageDependencies/ui/PackagePatternProvider.java index 1a24d7e79cd6..25c833ce2562 100644 --- a/java/java-impl/src/com/intellij/packageDependencies/ui/PackagePatternProvider.java +++ b/java/java-impl/src/com/intellij/packageDependencies/ui/PackagePatternProvider.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2009 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2018 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.packageDependencies.ui; @@ -108,7 +94,7 @@ public class PackagePatternProvider extends PatternDialectProvider { } public Icon getIcon() { - return AllIcons.General.PackagesTab; + return AllIcons.Nodes.CopyOfFolder; } public TreeModel createTreeModel(final Project project, final Marker marker) { diff --git a/platform/icons/src/general/icon-robots.txt b/platform/icons/src/general/icon-robots.txt index 7228eeff4bfb..31108ea46bd9 100644 --- a/platform/icons/src/general/icon-robots.txt +++ b/platform/icons/src/general/icon-robots.txt @@ -1,3 +1,4 @@ deprecated: debug.png -> /actions/startDebugger.png +deprecated: packagesTab.png -> /nodes/copyOfFolder.png deprecated: projectSettings.png -> /general/gearPlain.png deprecated: secondaryGroup.png -> /general/gearPlain.png diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index 088640c11a03..3745807a6bc6 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -562,7 +562,10 @@ public class AllIcons { public static final Icon OpenProject = IconLoader.getIcon("/general/openProject.png"); // 32x32 public static final Icon OverridenMethod = IconLoader.getIcon("/general/overridenMethod.png"); // 10x14 public static final Icon OverridingMethod = IconLoader.getIcon("/general/overridingMethod.png"); // 10x14 - public static final Icon PackagesTab = IconLoader.getIcon("/general/packagesTab.png"); // 16x16 + + @SuppressWarnings("unused") + @Deprecated + public static final Icon PackagesTab = IconLoader.getIcon("/nodes/copyOfFolder.png"); // 16x16 public static final Icon PasswordLock = IconLoader.getIcon("/general/passwordLock.png"); // 64x64 public static final Icon PathVariables = IconLoader.getIcon("/general/pathVariables.png"); // 32x32 public static final Icon Pin_tab = IconLoader.getIcon("/general/pin_tab.png"); // 16x16 @@ -1281,7 +1284,7 @@ public class AllIcons { public static final Icon WithCoverageLayer = IconLoader.getIcon("/runConfigurations/withCoverageLayer.png"); // 16x16 } - + public static class Toolbar { public static final Icon Filterdups = IconLoader.getIcon("/toolbar/filterdups.png"); // 16x16 public static final Icon Folders = IconLoader.getIcon("/toolbar/folders.png"); // 16x16 diff --git a/platform/util/src/com/intellij/openapi/util/DeprecatedDuplicatesIconPathPatcher.java b/platform/util/src/com/intellij/openapi/util/DeprecatedDuplicatesIconPathPatcher.java index 6c1bf6be6cc3..4eac94f6d82e 100644 --- a/platform/util/src/com/intellij/openapi/util/DeprecatedDuplicatesIconPathPatcher.java +++ b/platform/util/src/com/intellij/openapi/util/DeprecatedDuplicatesIconPathPatcher.java @@ -92,6 +92,9 @@ public class DeprecatedDuplicatesIconPathPatcher extends IconPathPatcher { ourDeprecatedIconsReplacements.put("/compiler/warning.svg", "AllIcons.General.Warning"); + ourDeprecatedIconsReplacements.put("/general/packagesTab.png", "AllIcons.Nodes.CopyOfFolder"); + ourDeprecatedIconsReplacements.put("/general/packagesTab.svg", "AllIcons.Nodes.CopyOfFolder"); + ourDeprecatedIconsReplacements.put("/nodes/treeClosed.png", "AllIcons.Nodes.Folder"); ourDeprecatedIconsReplacements.put("/nodes/treeClosed.svg", "AllIcons.Nodes.Folder"); ourDeprecatedIconsReplacements.put("/nodes/treeOpen.png", "AllIcons.Nodes.Folder");