MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-08-25 14:25:04 +07:00
Code Issues Packages Projects Releases Wiki Activity

Reduce number for toArray() calls

Browse Source
This commit is contained in:
Maxim Shafirov
2009-11-10 21:01:34 +03:00
parent 5820538701
commit 8a0cb242df
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/source/PsiTypeElementImpl.java
+9 -4
View File
@@ -78,7 +78,7 @@ public class PsiTypeElementImpl extends CompositePsiElement implements PsiTypeEl
IElementType elementType = element.getElementType();
if (element.getTreeNext() == null && ElementType.PRIMITIVE_TYPE_BIT_SET.contains(elementType)) {
addTypeUseAnnotationsFromModifierList(getParent(), typeAnnos);
PsiAnnotation[] array = typeAnnos.toArray(new PsiAnnotation[typeAnnos.size()]);
PsiAnnotation[] array = toAnnotationsArray(typeAnnos);
cachedType = JavaPsiFacade.getInstance(getProject()).getElementFactory().createPrimitiveType(element.getText(), array);
assert cachedType != null;
@@ -90,7 +90,7 @@ public class PsiTypeElementImpl extends CompositePsiElement implements PsiTypeEl
}
else if (elementType == JavaElementType.JAVA_CODE_REFERENCE) {
addTypeUseAnnotationsFromModifierList(getParent(), typeAnnos);
PsiAnnotation[] array = typeAnnos.toArray(new PsiAnnotation[typeAnnos.size()]);
PsiAnnotation[] array = toAnnotationsArray(typeAnnos);
cachedType = new PsiClassReferenceType((PsiJavaCodeReferenceElement)element.getPsi(), null,array);
}
else if (elementType == JavaTokenType.QUEST) {
@@ -118,6 +118,11 @@ public class PsiTypeElementImpl extends CompositePsiElement implements PsiTypeEl
return cachedType;
}
private static PsiAnnotation[] toAnnotationsArray(List<PsiAnnotation> typeAnnos) {
final int size = typeAnnos.size();
return size == 0 ? PsiAnnotation.EMPTY_ARRAY : typeAnnos.toArray(new PsiAnnotation[size]);
}
public static void addTypeUseAnnotationsFromModifierList(PsiElement member, List<PsiAnnotation> typeAnnos) {
if (!(member instanceof PsiModifierListOwner)) return;
PsiModifierList list = ((PsiModifierListOwner)member).getModifierList();
@@ -250,7 +255,7 @@ public class PsiTypeElementImpl extends CompositePsiElement implements PsiTypeEl
result.add((PsiAnnotation)element);
}
return result== null ? PsiAnnotation.EMPTY_ARRAY : result.toArray(new PsiAnnotation[result.size()]);
return result== null ? PsiAnnotation.EMPTY_ARRAY : toAnnotationsArray(result);
}
@NotNull
@@ -260,7 +265,7 @@ public class PsiTypeElementImpl extends CompositePsiElement implements PsiTypeEl
ArrayList<PsiAnnotation> list = new ArrayList<PsiAnnotation>(Arrays.asList(annotations));
addTypeUseAnnotationsFromModifierList(getParent(), list);
return list.toArray(new PsiAnnotation[list.size()]);
return toAnnotationsArray(list);
}
public PsiAnnotation findAnnotation(@NotNull @NonNls String qualifiedName) {