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

try to add @Nullable's to overridden methods (IDEA-89734)

Browse Source
This commit is contained in:
Anna Kozlova
2012-08-08 21:34:39 +04:00
parent 4bfa5c7dd6
commit 039edf0858
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementsAnnotationsHandlerImpl.java
+4 -1
View File
@@ -34,6 +34,7 @@ public class OverrideImplementsAnnotationsHandlerImpl implements OverrideImpleme
public String[] getAnnotations(Project project) {
final NullableNotNullManager manager = NullableNotNullManager.getInstance(project);
final Collection<String> anns = new ArrayList<String>(manager.getNotNulls());
anns.addAll(manager.getNullables());
anns.add(AnnotationUtil.NLS);
return ArrayUtil.toStringArray(anns);
}
@@ -44,7 +45,9 @@ public class OverrideImplementsAnnotationsHandlerImpl implements OverrideImpleme
if (manager.getNotNulls().contains(fqName)) {
return ArrayUtil.toStringArray(manager.getNullables());
}
if (manager.getNullables().contains(fqName)) {
return ArrayUtil.toStringArray(manager.getNotNulls());
}
if (Comparing.strEqual(fqName, AnnotationUtil.NLS)){
return new String[]{AnnotationUtil.NON_NLS};
}