azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

introduce constants for cases when annotations not present

Browse Source
This commit is contained in:
Alex Tkachman
2012-09-23 13:04:48 +02:00
parent edc0bf0b15
commit b70cc84764
5 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetClassAnnotation.java
+3 -1
View File
@@ -28,6 +28,7 @@ import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
*/ */
public class JetClassAnnotation extends PsiAnnotationWithFlags { public class JetClassAnnotation extends PsiAnnotationWithFlags {
public static final JetClassAnnotation NULL_ANNOTATION = new JetClassAnnotation(null);
private String signature; private String signature;
public JetClassAnnotation(@Nullable PsiAnnotation psiAnnotation) { public JetClassAnnotation(@Nullable PsiAnnotation psiAnnotation) {
@@ -47,6 +48,7 @@ public class JetClassAnnotation extends PsiAnnotationWithFlags {
@NotNull @NotNull
public static JetClassAnnotation get(PsiClass psiClass) { public static JetClassAnnotation get(PsiClass psiClass) {
return new JetClassAnnotation(JavaDescriptorResolver.findAnnotation(psiClass, JvmStdlibNames.JET_CLASS.getFqName().getFqName())); final PsiAnnotation annotation = JavaDescriptorResolver.findAnnotation(psiClass, JvmStdlibNames.JET_CLASS.getFqName().getFqName());
return annotation != null ? new JetClassAnnotation(annotation) : NULL_ANNOTATION;
} }
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetConstructorAnnotation.java
+5 -1
View File
@@ -27,6 +27,8 @@ import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
*/ */
public class JetConstructorAnnotation extends PsiAnnotationWithFlags { public class JetConstructorAnnotation extends PsiAnnotationWithFlags {
public static final JetConstructorAnnotation NULL_ANNOTATION = new JetConstructorAnnotation(null);
public JetConstructorAnnotation(@Nullable PsiAnnotation psiAnnotation) { public JetConstructorAnnotation(@Nullable PsiAnnotation psiAnnotation) {
super(psiAnnotation); super(psiAnnotation);
} }
@@ -46,6 +48,8 @@ public class JetConstructorAnnotation extends PsiAnnotationWithFlags {
} }
public static JetConstructorAnnotation get(PsiMethod constructor) { public static JetConstructorAnnotation get(PsiMethod constructor) {
return new JetConstructorAnnotation(JavaDescriptorResolver.findAnnotation(constructor, JvmStdlibNames.JET_CONSTRUCTOR.getFqName().getFqName())); final PsiAnnotation annotation =
JavaDescriptorResolver.findAnnotation(constructor, JvmStdlibNames.JET_CONSTRUCTOR.getFqName().getFqName());
return annotation != null ? new JetConstructorAnnotation(annotation) : NULL_ANNOTATION;
} }
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetMethodAnnotation.java
+4 -1
View File
@@ -29,6 +29,7 @@ import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
*/ */
public class JetMethodAnnotation extends PsiAnnotationWithFlags { public class JetMethodAnnotation extends PsiAnnotationWithFlags {
public static final JetMethodAnnotation NULL_ANNOTATION = new JetMethodAnnotation(null);
private String typeParameters; private String typeParameters;
private String returnType; private String returnType;
private String propertyType; private String propertyType;
@@ -68,6 +69,8 @@ public class JetMethodAnnotation extends PsiAnnotationWithFlags {
} }
public static JetMethodAnnotation get(PsiMethod psiMethod) { public static JetMethodAnnotation get(PsiMethod psiMethod) {
return new JetMethodAnnotation(JavaDescriptorResolver.findAnnotation(psiMethod, JvmStdlibNames.JET_METHOD.getFqName().getFqName())); final PsiAnnotation annotation =
JavaDescriptorResolver.findAnnotation(psiMethod, JvmStdlibNames.JET_METHOD.getFqName().getFqName());
return annotation != null ? new JetMethodAnnotation(annotation) : NULL_ANNOTATION;
} }
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetTypeParameterAnnotation.java
+6 -3
View File
@@ -27,7 +27,9 @@ import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
* @author Stepan Koltsov * @author Stepan Koltsov
*/ */
public class JetTypeParameterAnnotation extends PsiAnnotationWrapper { public class JetTypeParameterAnnotation extends PsiAnnotationWrapper {
public static final JetTypeParameterAnnotation NULL_ANNOTATION = new JetTypeParameterAnnotation(null);
protected JetTypeParameterAnnotation(@Nullable PsiAnnotation psiAnnotation) { protected JetTypeParameterAnnotation(@Nullable PsiAnnotation psiAnnotation) {
super(psiAnnotation); super(psiAnnotation);
} }
@@ -38,7 +40,8 @@ public class JetTypeParameterAnnotation extends PsiAnnotationWrapper {
@NotNull @NotNull
public static JetTypeParameterAnnotation get(@NotNull PsiParameter psiParameter) { public static JetTypeParameterAnnotation get(@NotNull PsiParameter psiParameter) {
return new JetTypeParameterAnnotation( final PsiAnnotation annotation =
JavaDescriptorResolver.findAnnotation(psiParameter, JvmStdlibNames.JET_TYPE_PARAMETER.getFqName().getFqName())); JavaDescriptorResolver.findAnnotation(psiParameter, JvmStdlibNames.JET_TYPE_PARAMETER.getFqName().getFqName());
return annotation != null ? new JetTypeParameterAnnotation(annotation) : NULL_ANNOTATION;
} }
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java
+6 -3
View File
@@ -28,7 +28,9 @@ import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
* @author alex.tkachman * @author alex.tkachman
*/ */
public class JetValueParameterAnnotation extends PsiAnnotationWrapper { public class JetValueParameterAnnotation extends PsiAnnotationWrapper {
public static final JetValueParameterAnnotation NULL_ANNOTATION = new JetValueParameterAnnotation(null);
public JetValueParameterAnnotation(@Nullable PsiAnnotation psiAnnotation) { public JetValueParameterAnnotation(@Nullable PsiAnnotation psiAnnotation) {
super(psiAnnotation); super(psiAnnotation);
} }
@@ -76,7 +78,8 @@ public class JetValueParameterAnnotation extends PsiAnnotationWrapper {
} }
public static JetValueParameterAnnotation get(PsiParameter psiParameter) { public static JetValueParameterAnnotation get(PsiParameter psiParameter) {
return new JetValueParameterAnnotation( final PsiAnnotation annotation =
JavaDescriptorResolver.findAnnotation(psiParameter, JvmStdlibNames.JET_VALUE_PARAMETER.getFqName().getFqName())); JavaDescriptorResolver.findAnnotation(psiParameter, JvmStdlibNames.JET_VALUE_PARAMETER.getFqName().getFqName());
return annotation != null ? new JetValueParameterAnnotation(annotation) : NULL_ANNOTATION;
} }
} }