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:
anna
2011-02-18 10:33:09 +01:00
parent b460488395
commit fa74132af1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
+2 -1
View File
@@ -37,6 +37,7 @@ import com.intellij.util.containers.HashMap;
import com.intellij.util.containers.HashSet;
import gnu.trove.THashMap;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.*;
@@ -703,7 +704,7 @@ public class GenericsHighlightUtil {
}
@Nullable
public static PsiType getCollectionItemType(PsiExpression expression) {
public static PsiType getCollectionItemType(@NotNull PsiExpression expression) {
final PsiType type = expression.getType();
if (type == null) return null;
if (type instanceof PsiArrayType) {
java/java-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspection.java
+3 -1
View File
@@ -184,7 +184,9 @@ public class UncheckedWarningLocalInspection extends BaseJavaLocalInspectionTool
if (!PsiUtil.isLanguageLevel5OrHigher(statement)) return;
final PsiParameter parameter = statement.getIterationParameter();
final PsiType parameterType = parameter.getType();
final PsiType itemType = GenericsHighlightUtil.getCollectionItemType(statement.getIteratedValue());
final PsiExpression iteratedValue = statement.getIteratedValue();
if (iteratedValue == null) return;
final PsiType itemType = GenericsHighlightUtil.getCollectionItemType(iteratedValue);
if (!PsiUtil.isLanguageLevel5OrHigher(statement)) return;
checkRawToGenericsAssignment(parameter, parameterType, itemType, true, myOnTheFly ? getChangeVariableTypeFixes(parameter, itemType) : null);
}