From 2a91b3ac91f56bd24220ec341cffc89950540aa5 Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Tue, 31 Jan 2017 12:27:58 +0300 Subject: [PATCH] reduce memory consumption: return an empty list, not a new array list remove some yellow code --- .../ide/projectView/impl/nodes/PsiFileNode.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiFileNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiFileNode.java index b9f23f9910cc..4b31cb71dc39 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiFileNode.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiFileNode.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2017 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. @@ -39,10 +39,10 @@ import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; import com.intellij.util.PathUtil; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.ArrayList; import java.util.Collection; public class PsiFileNode extends BasePsiNode implements NavigatableWithText { @@ -61,7 +61,7 @@ public class PsiFileNode extends BasePsiNode implements NavigatableWith } } - return new ArrayList<>(); + return ContainerUtil.emptyList(); } private boolean isArchive() { @@ -102,7 +102,7 @@ public class PsiFileNode extends BasePsiNode implements NavigatableWith private boolean isNavigatableLibraryRoot() { VirtualFile jarRoot = getJarRoot(); final Project project = getProject(); - if (jarRoot != null && ProjectRootsUtil.isLibraryRoot(jarRoot, project)) { + if (jarRoot != null && project != null && ProjectRootsUtil.isLibraryRoot(jarRoot, project)) { final OrderEntry orderEntry = LibraryUtil.findLibraryEntry(jarRoot, project); return orderEntry != null && ProjectSettingsService.getInstance(project).canOpenLibraryOrSdkSettings(orderEntry); } @@ -122,7 +122,7 @@ public class PsiFileNode extends BasePsiNode implements NavigatableWith public void navigate(boolean requestFocus) { final VirtualFile jarRoot = getJarRoot(); final Project project = getProject(); - if (requestFocus && jarRoot != null && ProjectRootsUtil.isLibraryRoot(jarRoot, project)) { + if (requestFocus && jarRoot != null && project != null && ProjectRootsUtil.isLibraryRoot(jarRoot, project)) { final OrderEntry orderEntry = LibraryUtil.findLibraryEntry(jarRoot, project); if (orderEntry != null) { ProjectSettingsService.getInstance(project).openLibraryOrSdkSettings(orderEntry);