MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-26 19:06:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

exclude container annotations from generated fields (IDEA-127721)

Browse Source
This commit is contained in:
Anna Kozlova
2014-07-23 19:19:14 +02:00
parent 502a3e9a65
commit a62e1ed96b
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java
+9 -2
View File
@@ -27,6 +27,7 @@ import com.intellij.psi.*;
import com.intellij.psi.util.TypeConversionUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -38,6 +39,8 @@ import java.util.*;
*/
public class NullableNotNullManager implements PersistentStateComponent<Element> {
private static final Logger LOG = Logger.getInstance("#" + NullableNotNullManager.class.getName());
@NonNls private static final String NULLABLE_CONTAINER_ANNOTATION = "javax.annotation.ParametersAreNullableByDefault";
@NonNls private static final String NONNULL_CONTAINER_ANNOTATION = "javax.annotation.ParametersAreNonnullByDefault";
public String myDefaultNullable = AnnotationUtil.NULLABLE;
public String myDefaultNotNull = AnnotationUtil.NOT_NULL;
@@ -103,6 +106,10 @@ public class NullableNotNullManager implements PersistentStateComponent<Element>
return findNullabilityAnnotation(owner, checkBases, true);
}
public boolean isContainerAnnotation(String anno) {
return NULLABLE_CONTAINER_ANNOTATION.equals(anno) || NONNULL_CONTAINER_ANNOTATION.equals(anno);
}
public void setDefaultNullable(@NotNull String defaultNullable) {
LOG.assertTrue(getNullables().contains(defaultNullable));
myDefaultNullable = defaultNullable;
@@ -144,8 +151,8 @@ public class NullableNotNullManager implements PersistentStateComponent<Element>
return null;
}
return findContainerAnnotation(owner, nullable
? "javax.annotation.ParametersAreNullableByDefault"
: "javax.annotation.ParametersAreNonnullByDefault");
? NULLABLE_CONTAINER_ANNOTATION
: NONNULL_CONTAINER_ANNOTATION);
}
return null;
}