This commit is contained in:
Roman Shevchenko
2011-02-17 17:19:04 +01:00
parent 3818bf5234
commit 3407acd7c9
4 changed files with 14 additions and 14 deletions
@@ -40,7 +40,7 @@ import java.util.*;
public class TypeSelectorManagerImpl implements TypeSelectorManager {
private SmartTypePointer myPointer;
private PsiType myDefaultType;
private final PsiExpression myMainOccurence;
private final PsiExpression myMainOccurrence;
private final PsiExpression[] myOccurrences;
private final PsiType[] myTypesForMain;
private final PsiType[] myTypesForAll;
@@ -51,8 +51,8 @@ public class TypeSelectorManagerImpl implements TypeSelectorManager {
private ExpectedTypesProvider.ExpectedClassProvider myOccurrenceClassProvider;
private ExpectedTypesProvider myExpectedTypesProvider;
public TypeSelectorManagerImpl(Project project, PsiType type, PsiExpression mainOccurence, PsiExpression[] occurrences) {
this(project, type, null, mainOccurence, occurrences);
public TypeSelectorManagerImpl(Project project, PsiType type, PsiExpression mainOccurrence, PsiExpression[] occurrences) {
this(project, type, null, mainOccurrence, occurrences);
}
public TypeSelectorManagerImpl(Project project, PsiType type, PsiExpression[] occurrences) {
@@ -63,7 +63,7 @@ public class TypeSelectorManagerImpl implements TypeSelectorManager {
myFactory = JavaPsiFacade.getInstance(project).getElementFactory();
mySmartTypePointerManager = SmartTypePointerManager.getInstance(project);
setDefaultType(type);
myMainOccurence = null;
myMainOccurrence = null;
myOccurrences = occurrences;
myExpectedTypesProvider = ExpectedTypesProvider.getInstance(project);
myOccurrenceClassProvider = createOccurrenceClassProvider();
@@ -83,12 +83,12 @@ public class TypeSelectorManagerImpl implements TypeSelectorManager {
public TypeSelectorManagerImpl(Project project,
PsiType type,
PsiMethod containingMethod,
PsiExpression mainOccurence,
PsiExpression mainOccurrence,
PsiExpression[] occurrences) {
myFactory = JavaPsiFacade.getInstance(project).getElementFactory();
mySmartTypePointerManager = SmartTypePointerManager.getInstance(project);
setDefaultType(type);
myMainOccurence = mainOccurence;
myMainOccurrence = mainOccurrence;
myOccurrences = occurrences;
myExpectedTypesProvider = ExpectedTypesProvider.getInstance(project);
@@ -160,7 +160,7 @@ public class TypeSelectorManagerImpl implements TypeSelectorManager {
}
private PsiType[] getTypesForMain() {
final ExpectedTypeInfo[] expectedTypes = ExpectedTypesProvider.getExpectedTypes(myMainOccurence, false, myOccurrenceClassProvider,
final ExpectedTypeInfo[] expectedTypes = ExpectedTypesProvider.getExpectedTypes(myMainOccurrence, false, myOccurrenceClassProvider,
false);
final ArrayList<PsiType> allowedTypes = new ArrayList<PsiType>();
RefactoringHierarchyUtil.processSuperTypes(getDefaultType(), new RefactoringHierarchyUtil.SuperTypeVisitor() {
@@ -259,8 +259,8 @@ public class TypeSelectorManagerImpl implements TypeSelectorManager {
result.add(0, unboxedType);
}
if (defaultType instanceof PsiPrimitiveType && myMainOccurence != null) {
final PsiClassType boxedType = ((PsiPrimitiveType)defaultType).getBoxedType(myMainOccurence);
if (defaultType instanceof PsiPrimitiveType && myMainOccurrence != null) {
final PsiClassType boxedType = ((PsiPrimitiveType)defaultType).getBoxedType(myMainOccurrence);
if (boxedType != null) {
result.remove(boxedType);
result.add(0, boxedType);
@@ -45,7 +45,7 @@ public interface PsiParameter extends PsiVariable {
/**
* Checks if the parameter accepts a variable number of arguments.
*
* @return true if the parameter is varargs, false otherwise
* @return true if the parameter is a vararg, false otherwise
*/
boolean isVarArgs();
@@ -38,7 +38,7 @@ public interface PsiSubstitutor {
/**
* Empty, or natural, substitutor. For any type parameter <code>T</code>,
* substitues type <code>T</code>.
* substitutes type <code>T</code>.
* <b>Example:</b> consider class <code>List&lt;E&gt;</code>. <code>this</code>
* inside class <code>List</code> has type List with EMPTY substitutor.
*/
@@ -56,7 +56,7 @@ public interface PsiSubstitutor {
PsiType substitute(@NotNull PsiTypeParameter typeParameter);
/**
* Substitutes type parameters occuring in <code>type</code> with their values.
* Substitutes type parameters occurring in <code>type</code> with their values.
* If value for type parameter is <code>null<code>, appropriate erasure is returned.
*
* @param type the type to substitute the type parameters for.
@@ -98,7 +98,7 @@ public interface PsiSubstitutor {
PsiSubstitutor putAll(PsiSubstitutor another);
/**
* Returns the map from type parameters to types used for substution by this substitutor.
* Returns the map from type parameters to types used for substitution by this substitutor.
*
* @return the substitution map instance.
*/
@@ -40,7 +40,7 @@ public interface PsiTryStatement extends PsiStatement {
PsiCodeBlock[] getCatchBlocks();
/**
* Returns the array of parametets for <code>catch</code> sections.
* Returns the array of parameters for <code>catch</code> sections.
*
* @return the array of parameters, or an empty array if the statement has no catch sections.
*/