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

cleanup

Browse Source
This commit is contained in:
Sergey Ignatov
2014-10-07 18:13:04 +02:00
parent 8864e87030
commit a5ac8ea1d2
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/scratch/NewScratchFileAction.java
+5 -14
View File
@@ -44,7 +44,6 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
@@ -65,25 +64,17 @@ public class NewScratchFileAction extends AnAction implements DumbAware {
public static List<String> getLastUsedLanguagesIds(Project project) {
String[] values = PropertiesComponent.getInstance(project).getValues(ScratchpadManager.class.getName());
if (values == null) {
return ContainerUtil.emptyList();
}
return ContainerUtil.list(values);
return values == null ? ContainerUtil.<String>emptyList() : ContainerUtil.list(values);
}
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
final Project project = e.getProject();
if (project == null) return;
Language context = null;
PsiFile file = e.getData(CommonDataKeys.PSI_FILE);
if (file != null) {
context = file.getLanguage();
}
Language context = file != null ? file.getLanguage() : null;
ListPopup popup = buildLanguagePopup(project, context, new Consumer<Language>() {
@Override
public void consume(Language language) {
@@ -98,7 +89,7 @@ public class NewScratchFileAction extends AnAction implements DumbAware {
@NotNull
static ListPopup buildLanguagePopup(@NotNull Project project, @Nullable Language context, final Consumer<Language> onChoosen) {
List<Language> languages = LanguageUtil.getFileLanguages();
final List<String> ids = new ArrayList<String>(getLastUsedLanguagesIds(project));
final List<String> ids = ContainerUtil.newArrayList(getLastUsedLanguagesIds(project));
if (context != null) {
ids.add(context.getID());
}
@@ -108,7 +99,7 @@ public class NewScratchFileAction extends AnAction implements DumbAware {
ContainerUtil.sort(languages, new Comparator<Language>() {
@Override
public int compare(Language o1, Language o2) {
public int compare(@NotNull Language o1, @NotNull Language o2) {
int ind1 = ids.indexOf(o1.getID());
int ind2 = ids.indexOf(o2.getID());
if (ind1 == -1) ind1 = 666;
platform/lang-impl/src/com/intellij/ide/scratch/ScratchpadManagerImpl.java
+3 -2
View File
@@ -26,9 +26,10 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.wm.StatusBar;
import com.intellij.openapi.wm.WindowManager;
import com.intellij.util.ArrayUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
public class ScratchpadManagerImpl extends ScratchpadManager implements Disposable {
private final Project myProject;
@@ -61,7 +62,7 @@ public class ScratchpadManagerImpl extends ScratchpadManager implements Disposab
private static void updateHistory(Project project, Language language) {
String[] values = PropertiesComponent.getInstance(project).getValues(ScratchpadManager.class.getName());
ArrayList<String> lastUsed = new ArrayList<String>(5);
List<String> lastUsed = ContainerUtil.newArrayListWithCapacity(5);
lastUsed.add(language.getID());
if (values != null) {
for (String value : values) {