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

(no message)

Browse Source
This commit is contained in:
Eugene Vigdorchik
2005-03-02 19:35:30 +03:00
parent a1b63fe5fa
commit 8b99017a64
4 changed files with 8 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openapi/src/com/intellij/psi/PsiType.java
-35
View File
@@ -58,57 +58,22 @@ public abstract class PsiType {
public abstract boolean equalsToText(String text);
/**
* @deprecated use {@link #getJavaLangObject(PsiManager, GlobalSearchScope)}
*/
public static PsiClassType getJavaLangObject(PsiManager manager) {
return getJavaLangObject(manager, GlobalSearchScope.allScope(manager.getProject()));
}
public static PsiClassType getJavaLangObject(PsiManager manager, GlobalSearchScope resolveScope) {
return manager.getElementFactory().createTypeByFQClassName("java.lang.Object", resolveScope);
}
/**
* @deprecated use {@link #getJavaLangClass(PsiManager, GlobalSearchScope)}
*/
public static PsiType getJavaLangClass(PsiManager manager) {
return getJavaLangClass(manager, GlobalSearchScope.allScope(manager.getProject()));
}
public static PsiType getJavaLangClass(PsiManager manager, GlobalSearchScope resolveScope) {
return manager.getElementFactory().createTypeByFQClassName("java.lang.Class", resolveScope);
}
/**
* @deprecated use {@link #getJavaLangString(PsiManager, GlobalSearchScope)}
*/
public static PsiType getJavaLangString(PsiManager manager) {
return getJavaLangString(manager, GlobalSearchScope.allScope(manager.getProject()));
}
public static PsiType getJavaLangString(PsiManager manager, GlobalSearchScope resolveScope) {
return manager.getElementFactory().createTypeByFQClassName("java.lang.String", resolveScope);
}
/**
* @deprecated use {@link #getJavaLangError(PsiManager, GlobalSearchScope)}
*/
public static PsiType getJavaLangError(PsiManager manager) {
return getJavaLangError(manager, GlobalSearchScope.allScope(manager.getProject()));
}
public static PsiType getJavaLangError(PsiManager manager, GlobalSearchScope resolveScope) {
return manager.getElementFactory().createTypeByFQClassName("java.lang.Error", resolveScope);
}
/**
* @deprecated use {@link #getJavaLangRuntimeException(PsiManager, GlobalSearchScope)}
*/
public static PsiType getJavaLangRuntimeException(PsiManager manager) {
return getJavaLangRuntimeException(manager, GlobalSearchScope.allScope(manager.getProject()));
}
public static PsiType getJavaLangRuntimeException(PsiManager manager, GlobalSearchScope resolveScope) {
return manager.getElementFactory().createTypeByFQClassName("java.lang.RuntimeException", resolveScope);
}
source/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java
+2 -3
View File
@@ -3,9 +3,8 @@ package com.intellij.psi.impl.source.tree.java;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.impl.source.tree.CompositePsiElement;
import com.intellij.lang.ASTNode;
import com.intellij.psi.tree.IElementType;
public class PsiLiteralExpressionImpl extends CompositePsiElement implements PsiLiteralExpression {
private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiLiteralExpressionImpl");
@@ -33,7 +32,7 @@ public class PsiLiteralExpressionImpl extends CompositePsiElement implements Psi
return PsiType.CHAR;
}
else if (i == STRING_LITERAL) {
return PsiType.getJavaLangString(getManager());
return PsiType.getJavaLangString(getManager(), getResolveScope());
}
else if (i == TRUE_KEYWORD || i == FALSE_KEYWORD) {
return PsiType.BOOLEAN;
source/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java
+1 -1
View File
@@ -166,7 +166,7 @@ public class IntroduceConstantHandler extends BaseExpressionToFieldHandler {
if (type != null && PsiUtil.isConstantExpression(initializerExpression)) {
if (type instanceof PsiPrimitiveType ||
PsiType.getJavaLangString(initializerExpression.getManager()).equals(type)) {
PsiType.getJavaLangString(initializerExpression.getManager(), initializerExpression.getResolveScope()).equals(type)) {
return super.getParentClass(initializerExpression);
}
}
source/com/intellij/refactoring/typeCook/Util.java
+5 -9
View File
@@ -3,15 +3,11 @@ package com.intellij.refactoring.typeCook;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.InheritanceUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.TypeConversionUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.refactoring.typeCook.deductive.PsiTypeVariable;
import com.intellij.refactoring.typeCook.deductive.PsiTypeIntersection;
import com.intellij.refactoring.typeCook.deductive.PsiTypeVariable;
import com.intellij.refactoring.typeCook.deductive.PsiTypeVariableFactory;
import com.intellij.util.IncorrectOperationException;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -399,7 +395,7 @@ public class Util {
if (aClass instanceof PsiTypeParameter) {
final PsiType sType = subst.substitute(((PsiTypeParameter)aClass));
return createArrayType(sType == null ? PsiType.getJavaLangObject(manager) : sType, level);
return createArrayType(sType == null ? PsiType.getJavaLangObject(manager, aClass.getResolveScope()) : sType, level);
}
final PsiTypeParameter[] aParms = getTypeParametersList(aClass);
@@ -487,7 +483,7 @@ public class Util {
if (parms.length > 0 && subst.substitute(parms[0]) != null) {
PsiJavaCodeReferenceElement classReference = newx.getClassReference();
PsiReferenceParameterList list = null;
PsiReferenceParameterList list;
if (classReference == null) {
list = newx.getAnonymousClass().getBaseClassReference().getParameterList();
@@ -514,7 +510,7 @@ public class Util {
aType = ((PsiWildcardType)aType).getBound();
}
list.add(factory.createTypeElement(aType == null ? PsiType.getJavaLangObject(list.getManager()) : aType));
list.add(factory.createTypeElement(aType == null ? PsiType.getJavaLangObject(list.getManager(), list.getResolveScope()) : aType));
}
}
}