From aa65664d6329f06af60dad2d995057c72026dba9 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Tue, 22 Feb 2011 19:58:20 +0100
Subject: [PATCH] cleanup

---
 .../completion/JavaCompletionUtil.java        | 30 +++----------------
 1 file changed, 4 insertions(+), 26 deletions(-)

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 69bfd73409fe..a9eb9b56f2ae 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
@@ -105,23 +105,15 @@ public class JavaCompletionUtil {
   public static Set<PsiType> getExpectedTypes(final CompletionParameters parameters) {
     final PsiExpression expr = PsiTreeUtil.getContextOfType(parameters.getPosition(), PsiExpression.class, true);
     if (expr != null) {
-      final ExpectedTypeInfo[] expectedInfos = JavaSmartCompletionContributor.getExpectedTypes(parameters);
-      if(expectedInfos != null){
-        final Set<PsiType> set = new THashSet<PsiType>();
-        for (final ExpectedTypeInfo expectedInfo : expectedInfos) {
-          set.add(expectedInfo.getType());
-        }
-        return set;
+      final Set<PsiType> set = new THashSet<PsiType>();
+      for (final ExpectedTypeInfo expectedInfo : JavaSmartCompletionContributor.getExpectedTypes(parameters)) {
+        set.add(expectedInfo.getType());
       }
+      return set;
     }
     return null;
   }
 
-  static final NullableLazyKey<PsiMethod, CompletionLocation> POSITION_METHOD = NullableLazyKey.create("positionMethod", new NullableFunction<CompletionLocation, PsiMethod>() {
-    public PsiMethod fun(final CompletionLocation location) {
-      return PsiTreeUtil.getParentOfType(location.getCompletionParameters().getPosition(), PsiMethod.class, false);
-    }
-  });
   public static final Key<List<PsiMethod>> ALL_METHODS_ATTRIBUTE = Key.create("allMethods");
 
   public static PsiType getQualifierType(LookupItem item) {
@@ -323,26 +315,12 @@ public class JavaCompletionUtil {
 
     final PsiReference reference = file.findReferenceAt(selectionEndOffset);
     if(reference != null) {
-      /*
-      if(reference instanceof PsiJavaCodeReferenceElement){
-        offsetMap.addOffset(CompletionInitializationContext.IDENTIFIER_END_OFFSET, element.getParent().getTextRange().getEndOffset());
-      }
-      else{
-      }
-      */
       offsetMap.addOffset(CompletionInitializationContext.IDENTIFIER_END_OFFSET,
                           reference.getElement().getTextRange().getStartOffset() + reference.getRangeInElement().getEndOffset());
 
       element = file.findElementAt(offsetMap.getOffset(CompletionInitializationContext.IDENTIFIER_END_OFFSET));
     }
     else if (isWord(element)){
-      /*
-      if(element instanceof PsiIdentifier && element.getParent() instanceof PsiJavaCodeReferenceElement){
-        offsetMap.addOffset(CompletionInitializationContext.IDENTIFIER_END_OFFSET, element.getParent().getTextRange().getEndOffset());
-      }
-      else{
-      }
-      */
       offsetMap.addOffset(CompletionInitializationContext.IDENTIFIER_END_OFFSET, element.getTextRange().getEndOffset());
 
       element = file.findElementAt(offsetMap.getOffset(CompletionInitializationContext.IDENTIFIER_END_OFFSET));