From 7edbf97d273db35a24c6a4212dc3b8931fa61d9d Mon Sep 17 00:00:00 2001 From: Peter Gromov Date: Tue, 8 Sep 2009 11:24:53 +0400 Subject: [PATCH] next portion of LookupItem usage removal: LookupItemUtil.addLookupItem --- .../BasicExpressionCompletionContributor.java | 9 ++++---- .../completion/JavaAwareCompletionData.java | 5 ++-- .../completion/JavaCompletionData.java | 2 +- .../completion/JavaCompletionUtil.java | 23 +++++++++++-------- .../JavaDocCompletionContributor.java | 9 +++----- .../JavaMemberNameCompletionContributor.java | 20 +++++++++------- .../NullSmartCompletionContributor.java | 2 +- .../impl/quickfix/CreateFromUsageUtils.java | 2 +- .../codeInsight/lookup/LookupItemUtil.java | 18 +++++++-------- .../template/impl/JavaTemplateUtil.java | 13 ++++++----- .../template/macro/ExpectedTypeMacro.java | 3 +-- .../template/macro/GuessElementTypeMacro.java | 3 +-- .../template/macro/SubtypesMacro.java | 3 +-- .../template/macro/VariableOfTypeMacro.java | 3 +-- .../template/macro/VariableTypeMacroBase.java | 3 +-- .../psi/filters/getters/MembersGetter.java | 2 +- .../ChangeSignatureDialog.java | 12 ++++++---- .../rename/JavaNameSuggestionProvider.java | 7 +++--- 18 files changed, 70 insertions(+), 69 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/BasicExpressionCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/BasicExpressionCompletionContributor.java index 5ebec88da19d..b429e76e8231 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/BasicExpressionCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/BasicExpressionCompletionContributor.java @@ -38,12 +38,12 @@ public class BasicExpressionCompletionContributor extends ExpressionSmartComplet result.addElement(createKeywordLookupItem(element, s)); } - public static LookupItem createKeywordLookupItem(final PsiElement element, final String s) { + public static LookupElement createKeywordLookupItem(final PsiElement element, final String s) { return ApplicationManager.getApplication().runReadAction(new Computable() { public LookupItem compute() { try { final PsiKeyword keyword = JavaPsiFacade.getInstance(element.getProject()).getElementFactory().createKeyword(s); - return LookupItemUtil.objectToLookupItem(keyword).setAutoCompletionPolicy(AutoCompletionPolicy.GIVE_CHANCE_TO_OVERWRITE); + return ((LookupItem)LookupItemUtil.objectToLookupItem(keyword)).setAutoCompletionPolicy(AutoCompletionPolicy.GIVE_CHANCE_TO_OVERWRITE); } catch (IncorrectOperationException e) { throw new RuntimeException(e); @@ -96,8 +96,7 @@ public class BasicExpressionCompletionContributor extends ExpressionSmartComplet isClassType(defaultType, baseClassName) || isClassType(defaultType, CommonClassNames.JAVA_UTIL_COLLECTION)) { final PsiMethod[] methods = collectionsClass.findMethodsByName(method, false); if (methods.length != 0) { - result.addElement(JavaCompletionUtil.qualify( - LookupItemUtil.objectToLookupItem(methods[0]).setAutoCompletionPolicy(AutoCompletionPolicy.NEVER_AUTOCOMPLETE).setTailType( + result.addElement(JavaCompletionUtil.qualify(((LookupItem)LookupItemUtil.objectToLookupItem(methods[0])).setAutoCompletionPolicy(AutoCompletionPolicy.NEVER_AUTOCOMPLETE).setTailType( TailType.NONE))); } } @@ -175,7 +174,7 @@ public class BasicExpressionCompletionContributor extends ExpressionSmartComplet if (!refExpr.isQualified()) { final PsiElement target = refExpr.resolve(); if (target instanceof PsiVariable) { - final LookupItem item = LookupItemUtil.objectToLookupItem(target); + final LookupItem item = (LookupItem)LookupItemUtil.objectToLookupItem(target); item.setAttribute(LookupItem.SUBSTITUTOR, PsiSubstitutor.EMPTY); return item; } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaAwareCompletionData.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaAwareCompletionData.java index fd164cdd8358..7c97c1252a17 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaAwareCompletionData.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaAwareCompletionData.java @@ -27,9 +27,10 @@ public class JavaAwareCompletionData extends CompletionData{ return; } - LookupItem ret = LookupItemUtil.objectToLookupItem(completion); - if(ret == null) return; + LookupElement _ret = LookupItemUtil.objectToLookupItem(completion); + if(_ret == null || !(_ret instanceof LookupItem)) return; + LookupItem ret = (LookupItem)_ret; final InsertHandler insertHandler = variant.getInsertHandler(); if(insertHandler != null && ret.getInsertHandler() == null) { ret.setInsertHandler(insertHandler); diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java index cc9ff6ece5be..29faf64444f1 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java @@ -546,7 +546,7 @@ public class JavaCompletionData extends JavaAwareCompletionData{ result.addElement(BasicExpressionCompletionContributor.createKeywordLookupItem(position, PsiKeyword.THIS)); - final LookupItem superItem = BasicExpressionCompletionContributor.createKeywordLookupItem(position, PsiKeyword.SUPER); + final LookupItem superItem = (LookupItem)BasicExpressionCompletionContributor.createKeywordLookupItem(position, PsiKeyword.SUPER); if (psiElement().afterLeaf(psiElement().withText("{").withSuperParent(2, psiMethod().constructor(true))).accepts(position)) { final PsiMethod method = PsiTreeUtil.getParentOfType(position, PsiMethod.class, false, PsiClass.class); assert method != null; diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java index 220e60136b94..7591bf758df6 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java @@ -89,7 +89,7 @@ public class JavaCompletionUtil { }); public static final Key> ALL_METHODS_ATTRIBUTE = Key.create("allMethods"); - public static void completeLocalVariableName(Set set, PrefixMatcher matcher, PsiVariable var){ + public static void completeLocalVariableName(Set set, PrefixMatcher matcher, PsiVariable var){ FeatureUsageTracker.getInstance().triggerFeatureUsed("editing.completion.variable.name"); final JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(var.getProject()); final VariableKind variableKind = codeStyleManager.getVariableKind(var); @@ -129,7 +129,7 @@ public class JavaCompletionUtil { tunePreferencePolicy(LookupItemUtil.addLookupItems(set, nameSuggestions, matcher), suggestedNameInfo); } - public static void completeFieldName(Set set, PsiVariable var, final PrefixMatcher matcher){ + public static void completeFieldName(Set set, PsiVariable var, final PrefixMatcher matcher){ FeatureUsageTracker.getInstance().triggerFeatureUsed("editing.completion.variable.name"); JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(var.getProject()); @@ -169,7 +169,7 @@ public class JavaCompletionUtil { matcher), suggestedNameInfo); } - public static void completeMethodName(Set set, PsiElement element, final PrefixMatcher matcher){ + public static void completeMethodName(Set set, PsiElement element, final PrefixMatcher matcher){ if(element instanceof PsiMethod) { final PsiMethod method = (PsiMethod)element; if (method.isConstructor()) { @@ -202,11 +202,11 @@ public class JavaCompletionUtil { return item.getUserData(QUALIFIER_TYPE_ATTR); } - public static void completeVariableNameForRefactoring(Project project, Set set, String prefix, PsiType varType, VariableKind varKind) { + public static void completeVariableNameForRefactoring(Project project, Set set, String prefix, PsiType varType, VariableKind varKind) { completeVariableNameForRefactoring(project, set, new CamelHumpMatcher(prefix), varType, varKind); } - public static void completeVariableNameForRefactoring(Project project, Set set, PrefixMatcher matcher, PsiType varType, VariableKind varKind) { + public static void completeVariableNameForRefactoring(Project project, Set set, PrefixMatcher matcher, PsiType varType, VariableKind varKind) { JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(project); SuggestedNameInfo suggestedNameInfo = codeStyleManager.suggestVariableName(varKind, null, null, varType); final String[] strings = completeVariableNameForRefactoring(codeStyleManager, matcher, varType, varKind, suggestedNameInfo); @@ -248,7 +248,7 @@ public class JavaCompletionUtil { return result.toArray(new String[result.size()]); } - private static void tunePreferencePolicy(final List list, final SuggestedNameInfo suggestedNameInfo) { + private static void tunePreferencePolicy(final List list, final SuggestedNameInfo suggestedNameInfo) { final InsertHandler insertHandler = new InsertHandler() { public void handleInsert(final InsertionContext context, final LookupElement item) { suggestedNameInfo.nameChoosen(item.getLookupString()); @@ -256,8 +256,10 @@ public class JavaCompletionUtil { }; for (int i = 0; i < list.size(); i++) { - LookupItem item = list.get(i); - item.setPriority(list.size() - i).setInsertHandler(insertHandler); + LookupElement item = list.get(i); + if (item instanceof LookupItem) { + ((LookupItem)item).setPriority(list.size() - i).setInsertHandler(insertHandler); + } } } @@ -948,9 +950,10 @@ public class JavaCompletionUtil { assert !(completion instanceof LookupElement); - LookupItem ret = LookupItemUtil.objectToLookupItem(completion); - if (ret == null) return null; + LookupElement _ret = LookupItemUtil.objectToLookupItem(completion); + if (_ret == null || !(_ret instanceof LookupItem)) return null; + LookupItem ret = (LookupItem)_ret; final PsiSubstitutor substitutor = completionElement.getSubstitutor(); if (substitutor != null) { ret.setAttribute(LookupItem.SUBSTITUTOR, substitutor); diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java index c75cbace21f2..f270e416c60b 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java @@ -2,10 +2,7 @@ package com.intellij.codeInsight.completion; import com.intellij.codeInsight.completion.scope.CompletionElement; import com.intellij.codeInsight.completion.scope.JavaCompletionProcessor; -import com.intellij.codeInsight.lookup.AutoCompletionPolicy; -import com.intellij.codeInsight.lookup.Lookup; -import com.intellij.codeInsight.lookup.LookupItem; -import com.intellij.codeInsight.lookup.LookupItemUtil; +import com.intellij.codeInsight.lookup.*; import com.intellij.codeInspection.InspectionProfile; import com.intellij.codeInspection.InspectionProfileEntry; import com.intellij.codeInspection.SuppressionUtil; @@ -69,7 +66,7 @@ public class JavaDocCompletionContributor extends CompletionContributor { ((PsiJavaReference) ref).processVariants(processor); for (final CompletionElement _item : processor.getResults()) { - LookupItem item = LookupItemUtil.objectToLookupItem(_item.getElement()); + LookupItem item = (LookupItem)LookupItemUtil.objectToLookupItem(_item.getElement()); if (onlyConstants) { Object o = item.getObject(); if (!(o instanceof PsiField)) continue; @@ -123,7 +120,7 @@ public class JavaDocCompletionContributor extends CompletionContributor { ret.add(tokenizer.nextToken()); } for (final String s : ret) { - final LookupItem item = LookupItemUtil.objectToLookupItem(s); + final LookupItem item = (LookupItem)LookupItemUtil.objectToLookupItem(s); if (isInline) { item.setInsertHandler(new InlineInsertHandler()); } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java index 70c972880984..9eab788ab9e3 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java @@ -4,8 +4,9 @@ */ package com.intellij.codeInsight.completion; -import com.intellij.codeInsight.lookup.LookupItem; import com.intellij.codeInsight.lookup.AutoCompletionPolicy; +import com.intellij.codeInsight.lookup.LookupElement; +import com.intellij.codeInsight.lookup.LookupItem; import com.intellij.openapi.application.ApplicationManager; import com.intellij.patterns.ElementPattern; import static com.intellij.patterns.PlatformPatterns.psiElement; @@ -32,14 +33,17 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor { or(psiElement(PsiLocalVariable.class), psiElement(PsiParameter.class))), new CompletionProvider() { public void addCompletions(@NotNull final CompletionParameters parameters, final ProcessingContext matchingContext, @NotNull final CompletionResultSet result) { - final Set lookupSet = new THashSet(); + final Set lookupSet = new THashSet(); ApplicationManager.getApplication().runReadAction(new Runnable() { public void run() { JavaCompletionUtil.completeLocalVariableName(lookupSet, result.getPrefixMatcher(), (PsiVariable)parameters.getPosition().getParent()); } }); - for (final LookupItem item : lookupSet) { - result.addElement(item.setAutoCompletionPolicy(AutoCompletionPolicy.GIVE_CHANCE_TO_OVERWRITE)); + for (final LookupElement item : lookupSet) { + if (item instanceof LookupItem) { + ((LookupItem)item).setAutoCompletionPolicy(AutoCompletionPolicy.GIVE_CHANCE_TO_OVERWRITE); + } + result.addElement(item); } } }); @@ -48,7 +52,7 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor { psiElement(PsiIdentifier.class).withParent(PsiField.class).andNot(INSIDE_TYPE_PARAMS_PATTERN), new CompletionProvider() { public void addCompletions(@NotNull final CompletionParameters parameters, final ProcessingContext matchingContext, @NotNull final CompletionResultSet result) { - final Set lookupSet = new THashSet(); + final Set lookupSet = new THashSet(); ApplicationManager.getApplication().runReadAction(new Runnable() { public void run() { final PsiVariable variable = (PsiVariable)parameters.getPosition().getParent(); @@ -56,7 +60,7 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor { JavaCompletionUtil.completeMethodName(lookupSet, variable, result.getPrefixMatcher()); } }); - for (final LookupItem item : lookupSet) { + for (final LookupElement item : lookupSet) { result.addElement(item); } } @@ -65,13 +69,13 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor { CompletionType.BASIC, PsiJavaPatterns.psiElement().nameIdentifierOf(PsiJavaPatterns.psiMethod().withParent(PsiClass.class)), new CompletionProvider() { public void addCompletions(@NotNull final CompletionParameters parameters, final ProcessingContext matchingContext, @NotNull final CompletionResultSet result) { - final Set lookupSet = new THashSet(); + final Set lookupSet = new THashSet(); ApplicationManager.getApplication().runReadAction(new Runnable() { public void run() { JavaCompletionUtil.completeMethodName(lookupSet, parameters.getPosition().getParent(), result.getPrefixMatcher()); } }); - for (final LookupItem item : lookupSet) { + for (final LookupElement item : lookupSet) { result.addElement(item); } } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/NullSmartCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/NullSmartCompletionContributor.java index f4bd662e484d..b00c0694f957 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/NullSmartCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/NullSmartCompletionContributor.java @@ -40,7 +40,7 @@ public class NullSmartCompletionContributor extends CompletionContributor{ if (empty.get().booleanValue() && prefix.startsWith("n")) { for (final ExpectedTypeInfo info : infos) { if (!(info.getType() instanceof PsiPrimitiveType)) { - final LookupItem item = BasicExpressionCompletionContributor.createKeywordLookupItem(parameters.getPosition(), PsiKeyword.NULL); + final LookupItem item = (LookupItem)BasicExpressionCompletionContributor.createKeywordLookupItem(parameters.getPosition(), PsiKeyword.NULL); item.setAttribute(LookupItem.TYPE, PsiType.NULL); result.addElement(JavaSmartCompletionContributor.decorate(item, infos)); return; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java index d918fbc6f099..55b4fcd35ec4 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java @@ -899,7 +899,7 @@ public class CreateFromUsageUtils { } HashSet names = new HashSet(); - Set set = new LinkedHashSet(); + Set set = new LinkedHashSet(); for (String name : myNames) { if (parameterNames.contains(name)) { diff --git a/java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java b/java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java index f5e35cad186b..7d049464f2cd 100644 --- a/java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java @@ -35,15 +35,15 @@ public class LookupItemUtil{ } @Nullable - public static LookupItem addLookupItem(Collection set, @NotNull Object object) { + public static LookupElement addLookupItem(Collection set, @NotNull Object object) { return addLookupItem(set, object, new CamelHumpMatcher("")); } @Nullable - public static LookupItem addLookupItem(Collection set, @NotNull Object object, PrefixMatcher matcher) { + public static LookupElement addLookupItem(Collection set, @NotNull Object object, PrefixMatcher matcher) { if (object instanceof PsiType) { PsiType psiType = (PsiType)object; - for (final LookupItem lookupItem : set) { + for (final LookupElement lookupItem : set) { Object o = lookupItem.getObject(); if (o.equals(psiType)) { return lookupItem; @@ -51,18 +51,18 @@ public class LookupItemUtil{ } } - for (LookupItem lookupItem : set) { + for (LookupElement lookupItem : set) { if(lookupItem.getObject().equals(lookupItem)) return null; } - LookupItem item = objectToLookupItem(object); + LookupElement item = objectToLookupItem(object); if (matcher.prefixMatches(item)) { return set.add(item) ? item : null; } return null; } - public static List addLookupItems(Set set, Object[] objects, PrefixMatcher matcher) { - final ArrayList list = new ArrayList(objects.length); + public static List addLookupItems(Set set, Object[] objects, PrefixMatcher matcher) { + final ArrayList list = new ArrayList(objects.length); for (Object object : objects) { LOG.assertTrue(object != null, "Lookup item can't be null!"); ContainerUtil.addIfNotNull(addLookupItem(set, object, matcher), list); @@ -74,8 +74,8 @@ public class LookupItemUtil{ * @deprecated * @see LookupElementBuilder */ - public static LookupItem objectToLookupItem(Object object) { - if (object instanceof LookupItem) return (LookupItem)object; + public static LookupElement objectToLookupItem(Object object) { + if (object instanceof LookupElement) return (LookupElement)object; if (object instanceof PsiClass) { return new JavaPsiClassReferenceElement((PsiClass)object).setTailType(TailType.NONE); } diff --git a/java/java-impl/src/com/intellij/codeInsight/template/impl/JavaTemplateUtil.java b/java/java-impl/src/com/intellij/codeInsight/template/impl/JavaTemplateUtil.java index 60b418628d5d..be5d41c0d1af 100644 --- a/java/java-impl/src/com/intellij/codeInsight/template/impl/JavaTemplateUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/template/impl/JavaTemplateUtil.java @@ -2,6 +2,7 @@ package com.intellij.codeInsight.template.impl; import com.intellij.codeInsight.lookup.LookupItem; import com.intellij.codeInsight.lookup.LookupItemUtil; +import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.template.TemplateLookupSelectionHandler; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; @@ -95,18 +96,18 @@ public class JavaTemplateUtil { } } - public static LookupItem addElementLookupItem(Set items, PsiElement element) { + public static LookupElement addElementLookupItem(Set items, PsiElement element) { return addJavaLookupItem(items, element); } - public static LookupItem addTypeLookupItem(Set items, PsiType type) { + public static LookupElement addTypeLookupItem(Set items, PsiType type) { return addJavaLookupItem(items, type); } - private static LookupItem addJavaLookupItem(final Set items, final Object element) { - final LookupItem item = LookupItemUtil.addLookupItem(items, element); - if (item != null) { - item.setAttribute(TemplateLookupSelectionHandler.KEY_IN_LOOKUP_ITEM, new JavaTemplateLookupSelectionHandler()); + private static LookupElement addJavaLookupItem(final Set items, final Object element) { + final LookupElement item = LookupItemUtil.addLookupItem(items, element); + if (item instanceof LookupItem) { + ((LookupItem)item).setAttribute(TemplateLookupSelectionHandler.KEY_IN_LOOKUP_ITEM, new JavaTemplateLookupSelectionHandler()); } return item; } diff --git a/java/java-impl/src/com/intellij/codeInsight/template/macro/ExpectedTypeMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/ExpectedTypeMacro.java index 1e6124bb3586..589c8db5331a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/template/macro/ExpectedTypeMacro.java +++ b/java/java-impl/src/com/intellij/codeInsight/template/macro/ExpectedTypeMacro.java @@ -5,7 +5,6 @@ import com.intellij.codeInsight.ExpectedTypeInfo; import com.intellij.codeInsight.ExpectedTypesProvider; import com.intellij.codeInsight.completion.CompletionUtil; import com.intellij.codeInsight.lookup.LookupElement; -import com.intellij.codeInsight.lookup.LookupItem; import com.intellij.codeInsight.template.*; import com.intellij.codeInsight.template.impl.JavaTemplateUtil; import com.intellij.openapi.command.WriteCommandAction; @@ -46,7 +45,7 @@ public class ExpectedTypeMacro implements Macro{ public LookupElement[] calculateLookupItems(@NotNull Expression[] params, ExpressionContext context) { PsiType[] types = getExpectedTypes(params, context); if (types == null || types.length < 2) return null; - Set set = new LinkedHashSet(); + Set set = new LinkedHashSet(); for (PsiType type : types) { JavaTemplateUtil.addTypeLookupItem(set, type); } diff --git a/java/java-impl/src/com/intellij/codeInsight/template/macro/GuessElementTypeMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/GuessElementTypeMacro.java index 56bfcf66e5b9..07f14d28856a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/template/macro/GuessElementTypeMacro.java +++ b/java/java-impl/src/com/intellij/codeInsight/template/macro/GuessElementTypeMacro.java @@ -3,7 +3,6 @@ package com.intellij.codeInsight.template.macro; import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.guess.GuessManager; -import com.intellij.codeInsight.lookup.LookupItem; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.template.*; import com.intellij.codeInsight.template.impl.JavaTemplateUtil; @@ -45,7 +44,7 @@ public class GuessElementTypeMacro implements Macro { public LookupElement[] calculateLookupItems(@NotNull Expression[] params, ExpressionContext context) { PsiType[] types = guessTypes(params, context); if (types == null || types.length < 2) return null; - Set set = new LinkedHashSet(); + Set set = new LinkedHashSet(); for (PsiType type : types) { JavaTemplateUtil.addTypeLookupItem(set, type); } diff --git a/java/java-impl/src/com/intellij/codeInsight/template/macro/SubtypesMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/SubtypesMacro.java index 83c998c8848f..45e1c477d285 100644 --- a/java/java-impl/src/com/intellij/codeInsight/template/macro/SubtypesMacro.java +++ b/java/java-impl/src/com/intellij/codeInsight/template/macro/SubtypesMacro.java @@ -2,7 +2,6 @@ package com.intellij.codeInsight.template.macro; import com.intellij.codeInsight.CodeInsightUtil; import com.intellij.codeInsight.lookup.LookupElement; -import com.intellij.codeInsight.lookup.LookupItem; import com.intellij.codeInsight.template.*; import com.intellij.codeInsight.template.impl.JavaTemplateUtil; import com.intellij.openapi.util.Condition; @@ -48,7 +47,7 @@ public class SubtypesMacro implements Macro { final PsiFile file = PsiDocumentManager.getInstance(context.getProject()).getPsiFile(context.getEditor().getDocument()); final PsiElement element = file.findElementAt(context.getStartOffset()); types.addAll(CodeInsightUtil.addSubtypes(type, element, false, Condition.TRUE)); - final Set set = new LinkedHashSet(); + final Set set = new LinkedHashSet(); for (PsiType t: types) { JavaTemplateUtil.addTypeLookupItem(set, t); } diff --git a/java/java-impl/src/com/intellij/codeInsight/template/macro/VariableOfTypeMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/VariableOfTypeMacro.java index e1c0f0e2a77a..9c25a06093df 100644 --- a/java/java-impl/src/com/intellij/codeInsight/template/macro/VariableOfTypeMacro.java +++ b/java/java-impl/src/com/intellij/codeInsight/template/macro/VariableOfTypeMacro.java @@ -1,7 +1,6 @@ package com.intellij.codeInsight.template.macro; import com.intellij.codeInsight.CodeInsightBundle; -import com.intellij.codeInsight.lookup.LookupItem; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.template.*; import com.intellij.codeInsight.template.impl.JavaTemplateUtil; @@ -44,7 +43,7 @@ public class VariableOfTypeMacro implements Macro { public LookupElement[] calculateLookupItems(@NotNull Expression[] params, final ExpressionContext context) { final PsiElement[] vars = getVariables(params, context); if (vars == null || vars.length < 2) return null; - final Set set = new LinkedHashSet(); + final Set set = new LinkedHashSet(); for (PsiElement var : vars) { JavaTemplateUtil.addElementLookupItem(set, var); } diff --git a/java/java-impl/src/com/intellij/codeInsight/template/macro/VariableTypeMacroBase.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/VariableTypeMacroBase.java index 76111e874774..468f118871bb 100644 --- a/java/java-impl/src/com/intellij/codeInsight/template/macro/VariableTypeMacroBase.java +++ b/java/java-impl/src/com/intellij/codeInsight/template/macro/VariableTypeMacroBase.java @@ -1,6 +1,5 @@ package com.intellij.codeInsight.template.macro; -import com.intellij.codeInsight.lookup.LookupItem; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.template.*; import com.intellij.codeInsight.template.impl.JavaTemplateUtil; @@ -21,7 +20,7 @@ public abstract class VariableTypeMacroBase implements Macro { public LookupElement[] calculateLookupItems(@NotNull Expression[] params, final ExpressionContext context) { final PsiElement[] vars = getVariables(params, context); if (vars == null || vars.length < 2) return null; - Set set = new LinkedHashSet(); + Set set = new LinkedHashSet(); for (PsiElement element : vars) { JavaTemplateUtil.addElementLookupItem(set, element); } diff --git a/java/java-impl/src/com/intellij/psi/filters/getters/MembersGetter.java b/java/java-impl/src/com/intellij/psi/filters/getters/MembersGetter.java index 603786e8887e..d723201a7fd3 100644 --- a/java/java-impl/src/com/intellij/psi/filters/getters/MembersGetter.java +++ b/java/java-impl/src/com/intellij/psi/filters/getters/MembersGetter.java @@ -93,7 +93,7 @@ public class MembersGetter { resolveHelper.isAccessible(member, context, null)) { if (result instanceof PsiField && !member.hasModifierProperty(PsiModifier.FINAL)) continue; if (result instanceof PsiMethod && acceptMethods) continue; - final LookupItem item = LookupItemUtil.objectToLookupItem(result); + final LookupItem item = (LookupItem)LookupItemUtil.objectToLookupItem(result); item.setAutoCompletionPolicy(AutoCompletionPolicy.NEVER_AUTOCOMPLETE); JavaCompletionUtil.qualify(item); if (member instanceof PsiMethod) { diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java index 6032a7e3efba..43596847d8cd 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java @@ -1,9 +1,8 @@ package com.intellij.refactoring.changeSignature; import com.intellij.codeInsight.completion.JavaCompletionUtil; -import com.intellij.codeInsight.lookup.LookupItem; -import com.intellij.codeInsight.lookup.LookupManager; import com.intellij.codeInsight.lookup.LookupElement; +import com.intellij.codeInsight.lookup.LookupManager; import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.diagnostic.Logger; @@ -24,13 +23,16 @@ import com.intellij.refactoring.HelpID; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.changeSignature.inCallers.CallerChooser; import com.intellij.refactoring.ui.*; -import com.intellij.refactoring.util.*; +import com.intellij.refactoring.util.CanonicalTypes; +import com.intellij.refactoring.util.CommonRefactoringUtil; +import com.intellij.refactoring.util.RefactoringMessageUtil; +import com.intellij.refactoring.util.RefactoringUtil; import com.intellij.ui.*; +import com.intellij.ui.treeStructure.Tree; import com.intellij.util.Alarm; import com.intellij.util.IncorrectOperationException; import com.intellij.util.VisibilityUtil; import com.intellij.util.ui.Table; -import com.intellij.ui.treeStructure.Tree; import org.jetbrains.annotations.NonNls; import javax.swing.*; @@ -366,7 +368,7 @@ public class ChangeSignatureDialog extends RefactoringDialog { Editor editor = editorTextField.getEditor(); String prefix = editorTextField.getText(); if (prefix == null) prefix = ""; - Set set = new LinkedHashSet(); + Set set = new LinkedHashSet(); JavaCompletionUtil.completeVariableNameForRefactoring(myProject, set, prefix, type, VariableKind.PARAMETER); LookupElement[] lookupItems = set.toArray(new LookupElement[set.size()]); diff --git a/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java b/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java index 8df662e4091b..9cbf14dac31f 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java @@ -1,16 +1,15 @@ package com.intellij.refactoring.rename; import com.intellij.codeInsight.completion.JavaCompletionUtil; -import com.intellij.codeInsight.lookup.LookupItem; -import com.intellij.codeInsight.lookup.LookupItemUtil; import com.intellij.codeInsight.lookup.LookupElement; +import com.intellij.codeInsight.lookup.LookupItemUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; -import com.intellij.psi.util.PropertyUtil; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.codeStyle.NameUtil; import com.intellij.psi.codeStyle.SuggestedNameInfo; import com.intellij.psi.codeStyle.VariableKind; +import com.intellij.psi.util.PropertyUtil; import com.intellij.usageView.UsageViewUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; @@ -107,7 +106,7 @@ public class JavaNameSuggestionProvider implements NameSuggestionProvider { if (element instanceof PsiVariable) { PsiVariable var = (PsiVariable)element; VariableKind kind = JavaCodeStyleManager.getInstance(element.getProject()).getVariableKind(var); - Set set = new LinkedHashSet(); + Set set = new LinkedHashSet(); JavaCompletionUtil.completeVariableNameForRefactoring(element.getProject(), set, prefix, var.getType(), kind); if (prefix.length() == 0) {