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

NPE

Browse Source
This commit is contained in:
Alexey Kudravtsev
2014-05-28 15:58:16 +04:00
parent 8f1d0110fa
commit 622c1df75a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java
+4 -5
View File
@@ -72,10 +72,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.PropertyKey;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.*;
public class PostHighlightingPass extends ProgressableTextEditorHighlightingPass {
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.PostHighlightingPass");
@@ -165,9 +162,11 @@ public class PostHighlightingPass extends ProgressableTextEditorHighlightingPass
}
}
@NotNull
@Override
public List<HighlightInfo> getInfos() {
return myHighlights == null ? null : new ArrayList<HighlightInfo>(myHighlights);
Collection<HighlightInfo> infos = myHighlights;
return infos == null ? Collections.<HighlightInfo>emptyList() : new ArrayList<HighlightInfo>(infos);
}
@Override
platform/analysis-impl/src/com/intellij/codeHighlighting/TextEditorHighlightingPass.java
+4 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
* Copyright 2000-2014 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.
@@ -30,6 +30,7 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collections;
import java.util.List;
public abstract class TextEditorHighlightingPass implements HighlightingPass {
@@ -113,9 +114,9 @@ public abstract class TextEditorHighlightingPass implements HighlightingPass {
myId = id;
}
@Nullable
@NotNull
public List<HighlightInfo> getInfos() {
return null;
return Collections.emptyList();
}
@NotNull