MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

DevKit: use ContainerUtil instead of Guava

Browse Source
This commit is contained in:
Yann Cébron
2016-03-16 13:50:06 +01:00
parent 6704dceec7
commit 32135dcfb3
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/devkit/src/inspections/quickfix/PluginDescriptorChooser.java
+13 -12
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* 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.
@@ -15,7 +15,6 @@
*/
package org.jetbrains.idea.devkit.inspections.quickfix;
import com.google.common.collect.ImmutableMap;
import com.intellij.codeInsight.hint.HintManager;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.editor.Editor;
@@ -49,19 +48,21 @@ import javax.swing.*;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
public class PluginDescriptorChooser {
private static final ImmutableMap<String, String> INTELLIJ_MODULES = ImmutableMap.<String, String>builder()
.put("platform-api", "PlatformExtensions.xml")
.put("platform-impl", "PlatformExtensions.xml")
.put("lang-api", "LangExtensions.xml")
.put("lang-impl", "LangExtensions.xml")
.put("vcs-api", "VcsExtensions.xml")
.put("vcs-impl", "VcsExtensions.xml")
.put("openapi", "IdeaPlugin.xml")
.put("java-impl", "IdeaPlugin.xml")
.build();
private static final Map<String, String> INTELLIJ_MODULES =
ContainerUtil.<String, String>immutableMapBuilder()
.put("platform-api", "PlatformExtensions.xml")
.put("platform-impl", "PlatformExtensions.xml")
.put("lang-api", "LangExtensions.xml")
.put("lang-impl", "LangExtensions.xml")
.put("vcs-api", "VcsExtensions.xml")
.put("vcs-impl", "VcsExtensions.xml")
.put("openapi", "IdeaPlugin.xml")
.put("java-impl", "IdeaPlugin.xml")
.build();
public static void show(final Project project,
final Editor editor,
plugins/devkit/src/inspections/quickfix/RegisterExtensionFix.java
+4 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
* 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.
@@ -15,7 +15,6 @@
*/
package org.jetbrains.idea.devkit.inspections.quickfix;
import com.google.common.collect.ImmutableMap;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.lang.LanguageExtensionPoint;
import com.intellij.openapi.application.Result;
@@ -38,6 +37,7 @@ import com.intellij.util.Consumer;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.KeyedLazyInstanceEP;
import com.intellij.util.PsiNavigateUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.xml.DomFileElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.devkit.dom.Extension;
@@ -46,6 +46,7 @@ import org.jetbrains.idea.devkit.dom.IdeaPlugin;
import org.jetbrains.idea.devkit.util.ExtensionPointCandidate;
import java.util.List;
import java.util.Map;
/**
* @author yole
@@ -129,7 +130,7 @@ public class RegisterExtensionFix implements IntentionAction {
PsiNavigateUtil.navigate(navTarget);
}
private static final ImmutableMap<String, String> KEY_MAP = ImmutableMap.<String, String>builder()
private static final Map<String, String> KEY_MAP = ContainerUtil.<String, String>immutableMapBuilder()
.put(KeyedFactoryEPBean.class.getName(), "key")
.put(KeyedLazyInstanceEP.class.getName(), "key")
.put(FileTypeExtensionPoint.class.getName(), "filetype")