From 280df748e1ac29b4e34986662008178fe1a6b189 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 14 Dec 2010 22:50:15 +0300 Subject: [PATCH] Primitive type constants type fixed --- .../util/RefactoringHierarchyUtil.java | 3 ++- .../openapi/src/com/intellij/psi/PsiType.java | 21 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/util/RefactoringHierarchyUtil.java b/java/java-impl/src/com/intellij/refactoring/util/RefactoringHierarchyUtil.java index 573eeffbc369..257f978adc0a 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringHierarchyUtil.java +++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringHierarchyUtil.java @@ -38,7 +38,8 @@ import java.util.*; public class RefactoringHierarchyUtil { private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.util.RefactoringHierarchyUtil"); - private static final List PRIMITIVE_TYPES = Arrays.asList( + + private static final List PRIMITIVE_TYPES = Arrays.asList( PsiType.BYTE, PsiType.CHAR, PsiType.SHORT, PsiType.INT, PsiType.LONG, PsiType.FLOAT, PsiType.DOUBLE ); diff --git a/java/openapi/src/com/intellij/psi/PsiType.java b/java/openapi/src/com/intellij/psi/PsiType.java index 7d62a6f7ca91..5c70c8a21576 100644 --- a/java/openapi/src/com/intellij/psi/PsiType.java +++ b/java/openapi/src/com/intellij/psi/PsiType.java @@ -27,16 +27,17 @@ import org.jetbrains.annotations.Nullable; * Representation of Java type (primitive type, array or class type). */ public abstract class PsiType implements PsiAnnotationOwner { - public static final PsiType BYTE = new PsiPrimitiveType("byte", "java.lang.Byte"); - public static final PsiType CHAR = new PsiPrimitiveType("char", "java.lang.Character"); - public static final PsiType DOUBLE = new PsiPrimitiveType("double", "java.lang.Double"); - public static final PsiType FLOAT = new PsiPrimitiveType("float", "java.lang.Float"); - public static final PsiType INT = new PsiPrimitiveType("int", "java.lang.Integer"); - public static final PsiType LONG = new PsiPrimitiveType("long", "java.lang.Long"); - public static final PsiType SHORT = new PsiPrimitiveType("short", "java.lang.Short"); - public static final PsiType BOOLEAN = new PsiPrimitiveType("boolean", "java.lang.Boolean"); - public static final PsiType VOID = new PsiPrimitiveType("void", "java.lang.Void"); - public static final PsiType NULL = new PsiPrimitiveType("null", (String)null); + public static final PsiPrimitiveType BYTE = new PsiPrimitiveType("byte", "java.lang.Byte"); + public static final PsiPrimitiveType CHAR = new PsiPrimitiveType("char", "java.lang.Character"); + public static final PsiPrimitiveType DOUBLE = new PsiPrimitiveType("double", "java.lang.Double"); + public static final PsiPrimitiveType FLOAT = new PsiPrimitiveType("float", "java.lang.Float"); + public static final PsiPrimitiveType INT = new PsiPrimitiveType("int", "java.lang.Integer"); + public static final PsiPrimitiveType LONG = new PsiPrimitiveType("long", "java.lang.Long"); + public static final PsiPrimitiveType SHORT = new PsiPrimitiveType("short", "java.lang.Short"); + public static final PsiPrimitiveType BOOLEAN = new PsiPrimitiveType("boolean", "java.lang.Boolean"); + public static final PsiPrimitiveType VOID = new PsiPrimitiveType("void", "java.lang.Void"); + public static final PsiPrimitiveType NULL = new PsiPrimitiveType("null", (String)null); + public static final PsiType[] EMPTY_ARRAY = new PsiType[0]; private final PsiAnnotation[] myAnnotations;