From ad0fc8a3eca79bc3918c8aaa0a1b06aa992ceb44 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 26 Sep 2018 16:23:51 +0200 Subject: [PATCH] move to resources root --- plugins/git4idea/gen/icons/Git4ideaIcons.java | 38 +++---------------- .../{src => resources}/META-INF/git.svg | 0 .../{src => resources}/META-INF/plugin.xml | 0 .../git4idea/resources/icons/icon-robots.txt | 1 - 4 files changed, 5 insertions(+), 34 deletions(-) rename plugins/git4idea/{src => resources}/META-INF/git.svg (100%) rename plugins/git4idea/{src => resources}/META-INF/plugin.xml (100%) delete mode 100644 plugins/git4idea/resources/icons/icon-robots.txt diff --git a/plugins/git4idea/gen/icons/Git4ideaIcons.java b/plugins/git4idea/gen/icons/Git4ideaIcons.java index 6c447c5b1c03..f6889eb26f02 100644 --- a/plugins/git4idea/gen/icons/Git4ideaIcons.java +++ b/plugins/git4idea/gen/icons/Git4ideaIcons.java @@ -1,40 +1,12 @@ -/* - * Copyright 2000-2016 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 icons; +import com.intellij.icons.AllIcons; import com.intellij.openapi.util.IconLoader; import javax.swing.*; -/** - * NOTE THIS FILE IS AUTO-GENERATED - * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead - */ -public class Git4ideaIcons { - private static Icon load(String path) { - return IconLoader.getIcon(path, Git4ideaIcons.class); - } - - private static Icon load(String path, Class clazz) { - return IconLoader.getIcon(path, clazz); - } - - - /** @deprecated to be removed in IDEA 2020 - use AllIcons.Nodes.Favorite */ - @SuppressWarnings("unused") - @Deprecated - public static final Icon Star = load("/nodes/favorite.svg", com.intellij.icons.AllIcons.class); +@Deprecated +public final class Git4ideaIcons { + public static final Icon Star = AllIcons.Nodes.Favorite; } diff --git a/plugins/git4idea/src/META-INF/git.svg b/plugins/git4idea/resources/META-INF/git.svg similarity index 100% rename from plugins/git4idea/src/META-INF/git.svg rename to plugins/git4idea/resources/META-INF/git.svg diff --git a/plugins/git4idea/src/META-INF/plugin.xml b/plugins/git4idea/resources/META-INF/plugin.xml similarity index 100% rename from plugins/git4idea/src/META-INF/plugin.xml rename to plugins/git4idea/resources/META-INF/plugin.xml diff --git a/plugins/git4idea/resources/icons/icon-robots.txt b/plugins/git4idea/resources/icons/icon-robots.txt deleted file mode 100644 index fc63f1d19fd0..000000000000 --- a/plugins/git4idea/resources/icons/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -deprecated: star.png -> com.intellij.icons.AllIcons@/nodes/favorite.svg; to be removed in IDEA 2020 - use AllIcons.Nodes.Favorite