diff --git a/plugins/eclipse/gen/icons/EclipseIcons.java b/plugins/eclipse/gen/icons/EclipseIcons.java deleted file mode 100644 index ed5862b26d75..000000000000 --- a/plugins/eclipse/gen/icons/EclipseIcons.java +++ /dev/null @@ -1,26 +0,0 @@ -// 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.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 final class EclipseIcons { - private static Icon load(String path) { - return IconLoader.getIcon(path, EclipseIcons.class); - } - - private static Icon load(String path, Class clazz) { - return IconLoader.getIcon(path, clazz); - } - - - /** @deprecated to be removed in IDEA 2020 - use AllIcons.Providers.Eclipse */ - @SuppressWarnings("unused") - @Deprecated - public static final Icon Eclipse = load("/providers/eclipse.svg", com.intellij.icons.AllIcons.class); -} diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileType.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileType.java index 08aa02f11fc1..9f8af1affdba 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileType.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileType.java @@ -1,10 +1,10 @@ -// 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. +// 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 org.jetbrains.idea.eclipse.config; +import com.intellij.icons.AllIcons; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.VirtualFile; -import icons.EclipseIcons; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -39,7 +39,7 @@ public class EclipseFileType implements FileType { @Override @Nullable public Icon getIcon() { - return EclipseIcons.Eclipse; + return AllIcons.Providers.Eclipse; } @Override diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java index b6b6bb312d86..a6c318df9734 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java @@ -1,21 +1,8 @@ -/* - * 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-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 org.jetbrains.idea.eclipse.importWizard; import com.intellij.application.options.CodeStyle; +import com.intellij.icons.AllIcons; import com.intellij.notification.Notification; import com.intellij.notification.NotificationType; import com.intellij.notification.Notifications; @@ -59,7 +46,6 @@ import com.intellij.projectImport.ProjectImportBuilder; import com.intellij.psi.codeStyle.CodeStyleSettings; import gnu.trove.THashMap; import gnu.trove.THashSet; -import icons.EclipseIcons; import org.jdom.Element; import org.jdom.JDOMException; import org.jetbrains.annotations.NotNull; @@ -103,7 +89,7 @@ public class EclipseImportBuilder extends ProjectImportBuilder implement @Override public Icon getIcon() { - return EclipseIcons.Eclipse; + return AllIcons.Providers.Eclipse; } @Override @@ -445,7 +431,7 @@ public class EclipseImportBuilder extends ProjectImportBuilder implement final FileChooserDescriptor fileChooserDescriptor = new FileChooserDescriptor(false, true, false, false, false, false) { @Override public Icon getIcon(final VirtualFile file) { - return looksLikeEclipse(file) ? dressIcon(file, EclipseIcons.Eclipse) : super.getIcon(file); + return looksLikeEclipse(file) ? dressIcon(file, AllIcons.Providers.Eclipse) : super.getIcon(file); } private boolean looksLikeEclipse(final VirtualFile file) {