cleanup

java/java-impl/src/com/intellij/codeInsight/completion/StaticMemberProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,8 +32,6 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 
-import static com.intellij.util.containers.ContainerUtil.addIfNotNull;
-
 /**
 * @author peter
 */
@@ -53,7 +51,7 @@ public abstract class StaticMemberProcessor {
   }
 
   public void importMembersOf(@Nullable PsiClass psiClass) {
-    addIfNotNull(myStaticImportedClasses, psiClass);
+    ContainerUtil.addIfNotNull(myStaticImportedClasses, psiClass);
   }
 
   public void processStaticMethodsGlobally(final PrefixMatcher matcher, Consumer<LookupElement> consumer) {

platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -100,16 +100,16 @@ public class FileStructurePopup implements Disposable {
 
   @NonNls private static final String narrowDownPropertyKey = "FileStructurePopup.narrowDown";
   private boolean myShouldNarrowDown = true;
-  private FileStructureTree myTree;
+  private final FileStructureTree myTree;
   private final FilteringTreeBuilder myAbstractTreeBuilder;
   private String myTitle;
-  private TreeSpeedSearch mySpeedSearch;
-  private SmartTreeStructure myTreeStructure;
+  private final TreeSpeedSearch mySpeedSearch;
+  private final SmartTreeStructure myTreeStructure;
   private int myPreferredWidth;
   private final FilteringTreeStructure myFilteringStructure;
-  private PsiElement myInitialPsiElement;
-  private Map<Class, JCheckBox> myCheckBoxes = new HashMap<Class, JCheckBox>();
-  private List<JCheckBox> myAutoClicked = new ArrayList<JCheckBox>();
+  private final PsiElement myInitialPsiElement;
+  private final Map<Class, JCheckBox> myCheckBoxes = new HashMap<Class, JCheckBox>();
+  private final List<JCheckBox> myAutoClicked = new ArrayList<JCheckBox>();
   private String myTestSearchFilter;
   private final ActionCallback myTreeHasBuilt = new ActionCallback();
   private boolean myInitialNodeIsLeaf;
@@ -877,7 +877,7 @@ public class FileStructurePopup implements Disposable {
 
   private class FileStructurePopupFilter implements ElementFilter {
     private String myLastFilter = null;
-    private HashSet<Object> myVisibleParents = new HashSet<Object>();
+    private final Set<Object> myVisibleParents = new HashSet<Object>();
     private final boolean isUnitTest = ApplicationManager.getApplication().isUnitTestMode();
 
     @Override

platform/testFramework/src/com/intellij/ClassFinder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 package com.intellij;
 
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
@@ -33,7 +34,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import static com.intellij.util.containers.ContainerUtil.addIfNotNull;
 
 public class ClassFinder {
   private final List<String> classNameList = new ArrayList<String>();
@@ -61,7 +61,7 @@ public class ClassFinder {
       }
     }
     else {
-      addIfNotNull(classNameList, computeClassName(current));
+      ContainerUtil.addIfNotNull(classNameList, computeClassName(current));
     }
   }