MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-01 19:02:13 +07:00
Code Issues Packages Projects Releases Wiki Activity

DeclareCollectionAsInterfaceInspection: don't pass null to quick fix to avoid NPE

Browse Source
This commit is contained in:
peter
2018-08-17 15:14:47 +02:00
parent 0c86afaca4
commit 044585698b
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/DeclareCollectionAsInterfaceInspection.java
+4 -12
View File
@@ -92,7 +92,7 @@ public class DeclareCollectionAsInterfaceInspection extends BaseInspection {
private final String typeString;
DeclareCollectionAsInterfaceFix(String typeString) {
DeclareCollectionAsInterfaceFix(@NotNull String typeString) {
this.typeString = typeString;
}
@@ -215,17 +215,9 @@ public class DeclareCollectionAsInterfaceInspection extends BaseInspection {
final List<PsiClass> weaklingList = new ArrayList<>(weaklings);
final PsiClass objectClass = javaLangObject.resolve();
weaklingList.remove(objectClass);
if (weaklingList.isEmpty()) {
final String typeText = type.getCanonicalText();
final String interfaceText = CollectionUtils.getInterfaceForClass(typeText);
if (interfaceText == null) {
return;
}
registerError(nameElement, interfaceText);
}
else {
final PsiClass weakling = weaklingList.get(0);
final String qualifiedName = weakling.getQualifiedName();
String qualifiedName = weaklingList.isEmpty() ? CollectionUtils.getInterfaceForClass(type.getCanonicalText())
: weaklingList.get(0).getQualifiedName();
if (qualifiedName != null) {
registerError(nameElement, qualifiedName);
}
}
plugins/InspectionGadgets/test/com/siyeh/igtest/abstraction/declare_collection_as_interface/DeclareCollectionAsInterface.java
+8
View File
@@ -80,3 +80,11 @@ public class DeclareCollectionAsInterface
}
}
}
class Labeling<T> {
private Map<T, HashSet<Integer>> myLabels;
void addLabel(T node, HashSet<Integer> label){ // no warning on 'HashSet'
myLabels.put<error descr="'put(T, java.util.HashSet<java.lang.Integer>)' in 'java.util.Map' cannot be applied to '(java.util.HashSet<java.lang.Integer>, T)'">(label, node)</error>;
}
}