diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/JarInfo.java b/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/JarInfo.java
index 1948cc05980a..7626ca13469b 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/JarInfo.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/JarInfo.java
@@ -27,9 +27,9 @@ import java.util.List;
  * @author nik
  */
 public class JarInfo {
-  private List<Pair<String, VirtualFile>> myPackedFiles;
-  private LinkedHashSet<Pair<String, JarInfo>> myPackedJars;
-  private List<DestinationInfo> myDestinations;
+  private final List<Pair<String, VirtualFile>> myPackedFiles;
+  private final LinkedHashSet<Pair<String, JarInfo>> myPackedJars;
+  private final List<DestinationInfo> myDestinations;
 
   public JarInfo() {
     myDestinations = new ArrayList<DestinationInfo>();
diff --git a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
index 370c5325d61b..da8876b181cf 100644
--- a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
+++ b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
@@ -66,7 +66,7 @@ public class JavaExecutionUtil {
     private final String myContentName;
     private final Filter[] myFilters;
     private final Project myProject;
-    private Icon myIcon;
+    private final Icon myIcon;
 
     public DefaultRunProfile(final Project project, final JavaParameters parameters, final String contentName, final Icon icon, Filter[] filters) {
       myProject = project;
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/HideContentAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/HideContentAction.java
index 5fa1a9b9b381..3d023cd216cb 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/HideContentAction.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/HideContentAction.java
@@ -28,7 +28,7 @@ import java.util.Collection;
  * @author nik
  */
 public class HideContentAction extends DumbAwareAction {
-  private ArtifactEditorEx myArtifactEditor;
+  private final ArtifactEditorEx myArtifactEditor;
 
   public HideContentAction(ArtifactEditorEx artifactEditor) {
     super("Hide Content");
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkConfigurable.java
index 4f2ff5c95c4b..eab16fa91cd7 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkConfigurable.java
@@ -40,7 +40,7 @@ import javax.swing.*;
 public class JdkConfigurable extends ProjectStructureElementConfigurable<Sdk> implements Place.Navigator {
   private final ProjectJdkImpl myProjectJdk;
   private final SdkEditor mySdkEditor;
-  private SdkProjectStructureElement myProjectStructureElement;
+  private final SdkProjectStructureElement myProjectStructureElement;
 
   public JdkConfigurable(final ProjectJdkImpl projectJdk,
                          final ProjectJdksModel configurable,
diff --git a/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/InstanceofInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/InstanceofInstruction.java
index 6adc4f357b94..1f3e65810772 100644
--- a/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/InstanceofInstruction.java
+++ b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/InstanceofInstruction.java
@@ -30,8 +30,8 @@ import org.jetbrains.annotations.NotNull;
  * @author peter
  */
 public class InstanceofInstruction extends BinopInstruction {
-  @NotNull private PsiExpression myLeft;
-  @NotNull private PsiType myCastType;
+  @NotNull private final PsiExpression myLeft;
+  @NotNull private final PsiType myCastType;
 
   public InstanceofInstruction(PsiElement psiAnchor, @NotNull Project project, PsiExpression left, PsiType castType) {
     super(PsiKeyword.INSTANCEOF, psiAnchor, project);
diff --git a/java/java-impl/src/com/intellij/codeInspection/inconsistentLanguageLevel/InconsistentLanguageLevelInspection.java b/java/java-impl/src/com/intellij/codeInspection/inconsistentLanguageLevel/InconsistentLanguageLevelInspection.java
index cbbc5269887f..4070cd6daf44 100644
--- a/java/java-impl/src/com/intellij/codeInspection/inconsistentLanguageLevel/InconsistentLanguageLevelInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/inconsistentLanguageLevel/InconsistentLanguageLevelInspection.java
@@ -125,7 +125,7 @@ public class InconsistentLanguageLevelInspection extends DescriptorProviderInspe
   }
 
   private static class OpenModuleSettingsFix implements QuickFix {
-    private Module myModule;
+    private final Module myModule;
 
     private OpenModuleSettingsFix(Module module) {
       myModule = module;
@@ -147,4 +147,4 @@ public class InconsistentLanguageLevelInspection extends DescriptorProviderInspe
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java
index a360bedfcbf5..19ab41026c2c 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java
@@ -51,7 +51,7 @@ public class InlineParameterExpressionProcessor extends BaseRefactoringProcessor
   private PsiExpression myInitializer;
   private final boolean mySameClass;
   private final PsiMethod myCallingMethod;
-  private boolean myCreateLocal;
+  private final boolean myCreateLocal;
 
   public InlineParameterExpressionProcessor(final PsiCallExpression methodCall,
                                             final PsiMethod method,
@@ -394,4 +394,4 @@ public class InlineParameterExpressionProcessor extends BaseRefactoringProcessor
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java
index deebd88901e7..e7d458f4c93a 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java
@@ -92,7 +92,7 @@ class IntroduceConstantDialog extends DialogWrapper {
   private JLabel myTargetClassNameLabel;
   private JCheckBox myCbNonNls;
   private JPanel myVisibilityPanel;
-  private VisibilityPanel myVPanel;
+  private final VisibilityPanel myVPanel;
   private final JCheckBox myIntroduceEnumConstantCb = new JCheckBox(RefactoringBundle.message("introduce.constant.enum.cb"), true);
 
   IntroduceConstantDialog(Project project,
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java
index c0c15e3e251d..c50008889609 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java
@@ -416,7 +416,7 @@ public class IntroduceParameterObjectProcessor extends FixableUsagesRefactoringP
   }
 
   public static class ParameterChunk {
-    private ParameterTablePanel.VariableData parameter;
+    private final ParameterTablePanel.VariableData parameter;
     private PsiField field;
     private String getter;
     private String setter;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java
index b1eacc72e434..7a545f68a9a7 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java
@@ -267,7 +267,7 @@ public class FilePathCompletionContributor extends CompletionContributor {
     private final String myInfo;
     private final Icon myIcon;
     private final PsiFile myFile;
-    private FileReferenceHelper myReferenceHelper;
+    private final FileReferenceHelper myReferenceHelper;
 
     public FilePathLookupItem(@NotNull final PsiFile file, @NotNull final FileReferenceHelper referenceHelper) {
       myName = file.getName();
diff --git a/platform/lang-impl/src/com/intellij/formatting/FormatTextRanges.java b/platform/lang-impl/src/com/intellij/formatting/FormatTextRanges.java
index 24cc37c1fa55..6de8b0935ef7 100644
--- a/platform/lang-impl/src/com/intellij/formatting/FormatTextRanges.java
+++ b/platform/lang-impl/src/com/intellij/formatting/FormatTextRanges.java
@@ -31,7 +31,7 @@ import java.util.List;
 public class FormatTextRanges {
   public static class FormatTextRange {
     private TextRange myRange;
-    private boolean myProcessHeadingWhitespace;
+    private final boolean myProcessHeadingWhitespace;
 
     public FormatTextRange(TextRange range, boolean processHeadingWhitespace) {
       myRange = range;
@@ -80,7 +80,7 @@ public class FormatTextRanges {
     }
   }
 
-  private List<FormatTextRange> myRanges = new ArrayList<FormatTextRange>();
+  private final List<FormatTextRange> myRanges = new ArrayList<FormatTextRange>();
 
   public FormatTextRanges() {
   }
diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/GoToMnemonicBookmarkActionBase.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/GoToMnemonicBookmarkActionBase.java
index a2aa879e66c8..9215538ab930 100644
--- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/GoToMnemonicBookmarkActionBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/GoToMnemonicBookmarkActionBase.java
@@ -29,7 +29,7 @@ import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 
 public abstract class GoToMnemonicBookmarkActionBase extends AnAction implements DumbAware {
-  private int myNumber;
+  private final int myNumber;
 
   public GoToMnemonicBookmarkActionBase(int n) {
     myNumber = n;
diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java
index 0253dcdb93c6..5b7b206b05f7 100644
--- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java
@@ -78,7 +78,7 @@ public class FavoritesTreeViewPanel extends JPanel implements DataProvider {
   private final FavoritesTreeStructure myFavoritesTreeStructure;
   private FavoritesViewTreeBuilder myBuilder;
   private final CopyPasteDelegator myCopyPasteDelegator;
-  private MouseListener myTreePopupHandler;
+  private final MouseListener myTreePopupHandler;
 
   public static final DataKey<FavoritesTreeNodeDescriptor[]> CONTEXT_FAVORITES_ROOTS_DATA_KEY = DataKey.create("FavoritesRoot");
   @Deprecated public static final String CONTEXT_FAVORITES_ROOTS = CONTEXT_FAVORITES_ROOTS_DATA_KEY.getName();
diff --git a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/http/JumpFromRemoteFileToLocalAction.java b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/http/JumpFromRemoteFileToLocalAction.java
index 70bc7c9d5f2d..2b329f3c77d4 100644
--- a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/http/JumpFromRemoteFileToLocalAction.java
+++ b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/http/JumpFromRemoteFileToLocalAction.java
@@ -41,7 +41,7 @@ import java.util.Collections;
  * @author nik
  */
 public class JumpFromRemoteFileToLocalAction extends AnAction {
-  private HttpVirtualFile myFile;
+  private final HttpVirtualFile myFile;
   private final Project myProject;
 
   public JumpFromRemoteFileToLocalAction(HttpVirtualFile file, Project project) {
diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java
index 38429a53f21f..2ea356c31e75 100644
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java
@@ -64,14 +64,14 @@ import java.io.IOException;
 import java.util.*;
 
 public abstract class InspectionToolsConfigurable extends BaseConfigurable implements ErrorsConfigurable, SearchableConfigurable {
-  private CardLayout myLayout = new CardLayout();
+  private final CardLayout myLayout = new CardLayout();
   private JPanel myPanel;
 
   public static final String ID = "Errors";
   public static final String DISPLAY_NAME = "Inspections";
 
   protected JComboBox myProfiles;
-  private Map<String, SingleInspectionProfilePanel> myPanels = new HashMap<String, SingleInspectionProfilePanel>();
+  private final Map<String, SingleInspectionProfilePanel> myPanels = new HashMap<String, SingleInspectionProfilePanel>();
 
   private JPanel myWholePanel;
   private JButton myAddButton;
@@ -81,7 +81,7 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable imple
   private JCheckBox myShareProfileCheckBox;
   private JButton myCopyButton;
 
-  private ArrayList<String> myDeletedProfiles = new ArrayList<String>();
+  private final ArrayList<String> myDeletedProfiles = new ArrayList<String>();
   protected final InspectionProfileManager myProfileManager;
   protected final InspectionProjectProfileManager myProjectProfileManager;
   private static final Logger LOG = Logger.getInstance("#" + InspectionToolsConfigurable.class.getName());
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeManagerImpl.java
index dee1f00968fe..ab190374b613 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeManagerImpl.java
@@ -201,7 +201,7 @@ public class FileIncludeManagerImpl extends FileIncludeManager {
   }
 
   private abstract static class IncludedFilesProvider implements ParameterizedCachedValueProvider<VirtualFile[], PsiFile> {
-    private boolean myRuntimeOnly;
+    private final boolean myRuntimeOnly;
 
     public IncludedFilesProvider(boolean runtimeOnly) {
       myRuntimeOnly = runtimeOnly;
diff --git a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java
index 23be09bb445d..9b3ce47095df 100644
--- a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java
+++ b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java
@@ -174,8 +174,8 @@ public class FocusDebugger implements UiDebuggerExtension, PropertyChangeListene
   }
 
   class FocusElement {
-    private SimpleColoredText myText;
-    private Throwable myAllocation;
+    private final SimpleColoredText myText;
+    private final Throwable myAllocation;
 
     FocusElement(SimpleColoredText text, Throwable allocation) {
       myText = text;
@@ -200,4 +200,4 @@ public class FocusDebugger implements UiDebuggerExtension, PropertyChangeListene
     myComponent = null;
     KeyboardFocusManager.getCurrentKeyboardFocusManager().removePropertyChangeListener(this);
   }
-}
\ No newline at end of file
+}
diff --git a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorConfigurationEditDialog.java b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorConfigurationEditDialog.java
index 27c596f0a4a7..3744fc255bda 100644
--- a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorConfigurationEditDialog.java
+++ b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorConfigurationEditDialog.java
@@ -42,7 +42,7 @@ import java.util.List;
 public class FileColorConfigurationEditDialog extends DialogWrapper {
   private FileColorConfiguration myConfiguration;
   private JComboBox myScopeComboBox;
-  private FileColorManagerImpl myManager;
+  private final FileColorManagerImpl myManager;
   private HashMap<String,AbstractButton> myColorToButtonMap;
 
   public FileColorConfigurationEditDialog(@NotNull final FileColorManagerImpl manager, @Nullable final FileColorConfiguration configuration) {
@@ -200,7 +200,7 @@ public class FileColorConfigurationEditDialog extends DialogWrapper {
   }
 
   private class ColorButton extends StickyButton {
-    private Color myColor;
+    private final Color myColor;
 
     private ColorButton(final String text, final Color color) {
       super(text);
diff --git a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorManagerImpl.java b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorManagerImpl.java
index 8b26ee0c648f..a926ed2170a9 100644
--- a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorManagerImpl.java
@@ -47,14 +47,14 @@ import java.util.List;
 public class FileColorManagerImpl extends FileColorManager implements PersistentStateComponent<Element> {
   private boolean myEnabled = true;
 
-  private FileColorsModel myModel;
+  private final FileColorsModel myModel;
 
   private FileColorSharedConfigurationManager mySharedConfigurationManager;
 
-  private Project myProject;
+  private final Project myProject;
   private boolean myEnabledForTabs = true;
 
-  private static Map<String, Color> ourDefaultColors;
+  private static final Map<String, Color> ourDefaultColors;
 
   static {
     ourDefaultColors = new LinkedHashMap<String, Color>();
diff --git a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorSettingsTable.java b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorSettingsTable.java
index a60a68cfa796..4cdd634f9ebd 100644
--- a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorSettingsTable.java
+++ b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorSettingsTable.java
@@ -38,7 +38,7 @@ public abstract class FileColorSettingsTable extends StripeTable {
   private static final int NAME_COLUMN = 0;
   private static final int COLOR_COLUMN = 1;
 
-  private List<FileColorConfiguration> myOriginal;
+  private final List<FileColorConfiguration> myOriginal;
 
   public FileColorSettingsTable(@NotNull final FileColorManager manager, @NotNull final List<FileColorConfiguration> configurations) {
     super(new ModelAdapter(copy(configurations)));
@@ -250,7 +250,7 @@ public abstract class FileColorSettingsTable extends StripeTable {
 
   private static class ColorCellRenderer extends ScopeNameRenderer {
     private Color myColor;
-    private FileColorManager myManager;
+    private final FileColorManager myManager;
 
     private ColorCellRenderer(final FileColorManager manager) {
       setOpaque(true);
diff --git a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorSharedConfigurationManager.java b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorSharedConfigurationManager.java
index e3ed6a4ab779..b988be5e504a 100644
--- a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorSharedConfigurationManager.java
+++ b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorSharedConfigurationManager.java
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.NotNull;
   }
 )
 public class FileColorSharedConfigurationManager implements PersistentStateComponent<Element> {
-  private Project myProject;
+  private final Project myProject;
 
   public FileColorSharedConfigurationManager(@NotNull final Project project) {
     myProject = project;
diff --git a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurable.java b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurable.java
index 6b94efcf1721..48908ea98913 100644
--- a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurable.java
@@ -31,7 +31,7 @@ import javax.swing.*;
  * @author spleaner
  */
 public class FileColorsConfigurable implements Configurable, NonDefaultProjectConfigurable {
-  private Project myProject;
+  private final Project myProject;
   private FileColorsConfigurablePanel myPanel;
 
   public FileColorsConfigurable(@NotNull final Project project) {
diff --git a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurablePanel.java b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurablePanel.java
index 9aa1827a4f92..aa15cd6347c4 100644
--- a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurablePanel.java
+++ b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurablePanel.java
@@ -35,10 +35,10 @@ import java.util.List;
  */
 public class FileColorsConfigurablePanel extends JPanel implements Disposable {
   private FileColorManagerImpl myManager;
-  private JCheckBox myEnabledCheckBox;
-  private JCheckBox myTabsEnabledCheckBox;
-  private FileColorSettingsTable myLocalTable;
-  private FileColorSettingsTable mySharedTable;
+  private final JCheckBox myEnabledCheckBox;
+  private final JCheckBox myTabsEnabledCheckBox;
+  private final FileColorSettingsTable myLocalTable;
+  private final FileColorSettingsTable mySharedTable;
 
   public FileColorsConfigurablePanel(@NotNull final FileColorManagerImpl manager) {
     setLayout(new BorderLayout());
diff --git a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsModel.java b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsModel.java
index b9d434ec07be..51da4e225235 100644
--- a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsModel.java
+++ b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsModel.java
@@ -38,7 +38,7 @@ public class FileColorsModel implements Cloneable {
   private final List<FileColorConfiguration> myConfigurations;
   private final List<FileColorConfiguration> mySharedConfigurations;
 
-  private Project myProject;
+  private final Project myProject;
 
   FileColorsModel(@NotNull final Project project) {
     myProject = project;
diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java
index 36dda12944db..488e71c30672 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java
@@ -123,8 +123,8 @@ public class FileBasedIndex implements ApplicationComponent {
   private final Map<Document, PsiFile> myTransactionMap = new HashMap<Document, PsiFile>();
 
   private static final int ALREADY_PROCESSED = 0x02;
-  private @Nullable String myConfigPath;
-  private @Nullable String mySystemPath;
+  private @Nullable final String myConfigPath;
+  private @Nullable final String mySystemPath;
   private final boolean myIsUnitTestMode;
   private ScheduledFuture<?> myFlushingFuture;
   private volatile int myLocalModCount;
@@ -533,7 +533,7 @@ public class FileBasedIndex implements ApplicationComponent {
     performShutdown();
   }
 
-  private AtomicBoolean myShutdownPerformed = new AtomicBoolean(false);
+  private final AtomicBoolean myShutdownPerformed = new AtomicBoolean(false);
 
   private void performShutdown() {
     if (!myShutdownPerformed.compareAndSet(false, true)) {
diff --git a/platform/platform-api/src/com/intellij/util/InstanceofCheckerGenerator.java b/platform/platform-api/src/com/intellij/util/InstanceofCheckerGenerator.java
index 564e7833383d..554caf72b00c 100644
--- a/platform/platform-api/src/com/intellij/util/InstanceofCheckerGenerator.java
+++ b/platform/platform-api/src/com/intellij/util/InstanceofCheckerGenerator.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
  * @author peter
  */
 public abstract class InstanceofCheckerGenerator {
-  private static InstanceofCheckerGenerator ourInstance;
+  private static final InstanceofCheckerGenerator ourInstance;
 
   static {
     try {
diff --git a/platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java b/platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java
index 62e98c9b7041..b217777b66ce 100644
--- a/platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java
+++ b/platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java
@@ -31,7 +31,7 @@ import javax.swing.*;
  * @author spleaner
  */
 public class IdeNotificationArea implements StatusBarPatch {
-  private NotificationComponent myNotificationComponent;
+  private final NotificationComponent myNotificationComponent;
 
   public IdeNotificationArea(final StatusBarImpl statusBar) {
     myNotificationComponent = new NotificationComponent(this);
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/IndentsModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/IndentsModelImpl.java
index 59527d4d3734..375a13ac39a6 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/IndentsModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/IndentsModelImpl.java
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class IndentsModelImpl implements IndentsModel {
-  private EditorImpl myEditor;
+  private final EditorImpl myEditor;
   private List<IndentGuideDescriptor> myIndents = new ArrayList<IndentGuideDescriptor>();
 
   public IndentsModelImpl(EditorImpl editor) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java
index b16fcdb916de..825781475128 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java
@@ -89,10 +89,10 @@ public final class IdeKeyEventDispatcher implements Disposable {
   private final KeyboardGestureProcessor myKeyGestureProcessor = new KeyboardGestureProcessor(this);
 
   private final KeyProcessorContext myContext = new KeyProcessorContext();
-  private IdeEventQueue myQueue;
+  private final IdeEventQueue myQueue;
 
-  private Alarm mySecondStrokeTimeout = new Alarm();
-  private Runnable mySecondStrokeTimeoutRunnable = new Runnable() {
+  private final Alarm mySecondStrokeTimeout = new Alarm();
+  private final Runnable mySecondStrokeTimeoutRunnable = new Runnable() {
     public void run() {
       if (myState == KeyState.STATE_WAIT_FOR_SECOND_KEYSTROKE) {
         resetState();
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java
index 0aa2e367c1e5..d2d4ba84134f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java
@@ -65,7 +65,7 @@ public class FileWatcher {
   private List<String> myDirtyRecursivePaths = new ArrayList<String>();
   private List<String> myDirtyDirs = new ArrayList<String>();
   private List<String> myManualWatchRoots = new ArrayList<String>();
-  private List<Pair<String, String>> myMapping = new ArrayList<Pair<String, String>>();
+  private final List<Pair<String, String>> myMapping = new ArrayList<Pair<String, String>>();
 
   private List<String> myRecursiveWatchRoots = new ArrayList<String>();
   private List<String> myFlatWatchRoots = new ArrayList<String>();
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java
index 5fc4b609b2e6..e2c76720bad8 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java
@@ -46,7 +46,7 @@ import java.util.Set;
 
 public class FocusManagerImpl extends IdeFocusManager implements Disposable {
 
-  private Application myApp;
+  private final Application myApp;
 
   private FocusCommand myRequestFocusCmd;
   private final ArrayList<FocusCommand> myFocusRequests = new ArrayList<FocusCommand>();
@@ -81,10 +81,10 @@ public class FocusManagerImpl extends IdeFocusManager implements Disposable {
     }
   };
 
-  private WindowManager myWindowManager;
+  private final WindowManager myWindowManager;
 
-  private Map<IdeFrame, Component> myLastFocused = new WeakHashMap<IdeFrame, Component>();
-  private Map<IdeFrame, Component> myLastFocusedAtDeactivation = new WeakHashMap<IdeFrame, Component>();
+  private final Map<IdeFrame, Component> myLastFocused = new WeakHashMap<IdeFrame, Component>();
+  private final Map<IdeFrame, Component> myLastFocusedAtDeactivation = new WeakHashMap<IdeFrame, Component>();
 
   public FocusManagerImpl(WindowManager wm) {
     myApp = ApplicationManager.getApplication();
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFocusManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFocusManagerImpl.java
index a094ca15537e..162f7737cddf 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFocusManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFocusManagerImpl.java
@@ -27,7 +27,7 @@ import java.awt.*;
 import java.awt.event.KeyEvent;
 
 public class IdeFocusManagerImpl extends IdeFocusManager {
-  private ToolWindowManagerImpl myToolWindowManager;
+  private final ToolWindowManagerImpl myToolWindowManager;
 
   public IdeFocusManagerImpl(ToolWindowManagerImpl twManager) {
     myToolWindowManager = twManager;
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java
index 46ab77865013..d117e027b65d 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java
@@ -66,7 +66,7 @@ public class IdeFrameImpl extends JFrame implements IdeFrame, DataProvider {
   private final LayoutFocusTraversalPolicyExt myLayoutFocusTraversalPolicy;
 
   private IdeRootPane myRootPane;
-  private BalloonLayout myBalloonLayout;
+  private final BalloonLayout myBalloonLayout;
 
   public IdeFrameImpl(ApplicationInfoEx applicationInfoEx, ActionManager actionManager, UISettings uiSettings, DataManager dataManager,
                       KeymapManager keymapManager, final Application application, final String[] commandLineArgs) {
diff --git a/platform/util/src/com/intellij/util/io/zip/JBZipFile.java b/platform/util/src/com/intellij/util/io/zip/JBZipFile.java
index 2ce37c4672aa..5ed90438ba5d 100644
--- a/platform/util/src/com/intellij/util/io/zip/JBZipFile.java
+++ b/platform/util/src/com/intellij/util/io/zip/JBZipFile.java
@@ -72,12 +72,12 @@ public class JBZipFile {
    * Maps ZipEntrys to Longs, recording the offsets of the local
    * file headers.
    */
-  private List<JBZipEntry> entries = new ArrayList<JBZipEntry>(HASH_SIZE);
+  private final List<JBZipEntry> entries = new ArrayList<JBZipEntry>(HASH_SIZE);
 
   /**
    * Maps String to ZipEntrys, name -> actual entry.
    */
-  private Map<String, JBZipEntry> nameMap = new HashMap<String, JBZipEntry>(HASH_SIZE);
+  private final Map<String, JBZipEntry> nameMap = new HashMap<String, JBZipEntry>(HASH_SIZE);
 
   /**
    * The encoding to use for filenames and the file comment.
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/GenericNotifierImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/GenericNotifierImpl.java
index 49c7be92abe3..245e377bc1ff 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/GenericNotifierImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/GenericNotifierImpl.java
@@ -157,7 +157,7 @@ public abstract class GenericNotifierImpl<T, Key> {
   }
 
   protected static class MyNotification<T> extends Notification {
-    private T myObj;
+    private final T myObj;
     private final String myStringPresentation;
 
     protected MyNotification(@NotNull String groupId, @NotNull String title, @NotNull String content, @NotNull NotificationType type, @Nullable NotificationListener listener,
diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java
index 4758c661c1a8..38c2ffaf7d78 100644
--- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java
+++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java
@@ -68,8 +68,8 @@ public class InjectionsSettingsUI implements Configurable {
 
   private final Project myProject;
   private final Configuration myConfiguration;
-  private List<BaseInjection> myInjections;
-  private List<BaseInjection> myOriginalInjections;
+  private final List<BaseInjection> myInjections;
+  private final List<BaseInjection> myOriginalInjections;
 
 
   private final JPanel myRoot;
@@ -77,8 +77,8 @@ public class InjectionsSettingsUI implements Configurable {
   private final Map<String, LanguageInjectionSupport> mySupports = new THashMap<String, LanguageInjectionSupport>();
   private final Map<String, AnAction> myEditActions = new THashMap<String, AnAction>();
   private final List<AnAction> myAddActions = new ArrayList<AnAction>();
-  private ActionToolbar myToolbar;
-  private JLabel myCountLabel;
+  private final ActionToolbar myToolbar;
+  private final JLabel myCountLabel;
 
   public InjectionsSettingsUI(final Project project, final Configuration configuration) {
     myProject = project;
diff --git a/plugins/devkit/src/projectRoots/IdeaJdk.java b/plugins/devkit/src/projectRoots/IdeaJdk.java
index 85ae47525e6f..9df3fae0cb88 100644
--- a/plugins/devkit/src/projectRoots/IdeaJdk.java
+++ b/plugins/devkit/src/projectRoots/IdeaJdk.java
@@ -507,7 +507,7 @@ public class IdeaJdk extends SdkType implements JavaSdkType {
 
     V1_4("1.4"), V1_5("1.5"), V1_6("1.6");
 
-    private String myPresentation;
+    private final String myPresentation;
 
     JDKVersion(String presentation) {
       myPresentation = presentation;
diff --git a/plugins/git4idea/src/git4idea/GitBranchesSearcher.java b/plugins/git4idea/src/git4idea/GitBranchesSearcher.java
index 8b14e51e5cc4..adc38b506115 100644
--- a/plugins/git4idea/src/git4idea/GitBranchesSearcher.java
+++ b/plugins/git4idea/src/git4idea/GitBranchesSearcher.java
@@ -26,7 +26,7 @@ import java.util.Set;
 
 public class GitBranchesSearcher {
   private final static Logger LOG = Logger.getInstance("#git4idea.GitBranchesSearcher");
-  private GitBranch myLocal;
+  private final GitBranch myLocal;
   private GitBranch myRemote;
 
   public GitBranchesSearcher(final Project project, final VirtualFile root, final boolean findRemote) throws VcsException {
diff --git a/plugins/git4idea/src/git4idea/GitVcs.java b/plugins/git4idea/src/git4idea/GitVcs.java
index b807f0dab4d4..4989f8661272 100644
--- a/plugins/git4idea/src/git4idea/GitVcs.java
+++ b/plugins/git4idea/src/git4idea/GitVcs.java
@@ -158,7 +158,7 @@ public class GitVcs extends AbstractVcs {
   /**
    * The changelist provider
    */
-  private GitCommittedChangeListProvider myCommittedChangeListProvider;
+  private final GitCommittedChangeListProvider myCommittedChangeListProvider;
   /**
    * The tracker that checks validity of git roots
    */
@@ -190,7 +190,7 @@ public class GitVcs extends AbstractVcs {
 
   private final TreeDiffProvider myTreeDiffProvider;
 
-  private GitCommitAndPushExecutor myCommitAndPushExecutor;
+  private final GitCommitAndPushExecutor myCommitAndPushExecutor;
 
   public static GitVcs getInstance(@NotNull Project project) {
     return (GitVcs)ProjectLevelVcsManager.getInstance(project).findVcsByName(NAME);
diff --git a/plugins/git4idea/src/git4idea/changes/GitCommittedChangeListProvider.java b/plugins/git4idea/src/git4idea/changes/GitCommittedChangeListProvider.java
index ac9c428f7eff..e4db51461b12 100644
--- a/plugins/git4idea/src/git4idea/changes/GitCommittedChangeListProvider.java
+++ b/plugins/git4idea/src/git4idea/changes/GitCommittedChangeListProvider.java
@@ -59,7 +59,7 @@ public class GitCommittedChangeListProvider implements CachingCommittedChangesPr
   /**
    * The project for the service
    */
-  private Project myProject;
+  private final Project myProject;
 
   /**
    * The constructor
diff --git a/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java b/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java
index 2610acf4422c..347548974138 100644
--- a/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java
+++ b/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java
@@ -92,11 +92,11 @@ public class GitPushActiveBranchesDialog extends DialogWrapper {
   /**
    * The context project
    */
-  private Project myProject;
+  private final Project myProject;
   /**
    * The vcs roots for the project
    */
-  private List<VirtualFile> myVcsRoots;
+  private final List<VirtualFile> myVcsRoots;
 
   /**
    * The constructor
diff --git a/plugins/git4idea/src/git4idea/checkin/GitPushRebaseProcess.java b/plugins/git4idea/src/git4idea/checkin/GitPushRebaseProcess.java
index b2c5e204174f..64fd596d0fc4 100644
--- a/plugins/git4idea/src/git4idea/checkin/GitPushRebaseProcess.java
+++ b/plugins/git4idea/src/git4idea/checkin/GitPushRebaseProcess.java
@@ -59,7 +59,7 @@ public class GitPushRebaseProcess extends GitBaseRebaseProcess {
   /**
    * A set of roots that have non-pushed merges
    */
-  private Set<VirtualFile> myRootsWithMerges;
+  private final Set<VirtualFile> myRootsWithMerges;
   /**
    * The registration number for the rebase editor
    */
@@ -163,11 +163,11 @@ public class GitPushRebaseProcess extends GitBaseRebaseProcess {
     /**
      * The reordered commits
      */
-    private List<String> myCommits;
+    private final List<String> myCommits;
     /**
      * The true means that the root has merges
      */
-    private boolean myHasMerges;
+    private final boolean myHasMerges;
 
     /**
      * The constructor from fields that is expected to be
@@ -228,4 +228,4 @@ public class GitPushRebaseProcess extends GitBaseRebaseProcess {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java b/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java
index 37507cc16c61..67cf1a7b37bf 100644
--- a/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java
+++ b/plugins/git4idea/src/git4idea/rebase/GitInteractiveRebaseEditorHandler.java
@@ -50,11 +50,11 @@ public class GitInteractiveRebaseEditorHandler implements Closeable, GitRebaseEd
   /**
    * The handler that specified this editor
    */
-  private GitHandler myHandler;
+  private final GitHandler myHandler;
   /**
    * The handler number
    */
-  private int myHandlerNo;
+  private final int myHandlerNo;
   /**
    * If true, the handler has been closed
    */
diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateEnvironment.java b/plugins/git4idea/src/git4idea/update/GitUpdateEnvironment.java
index 5e7a4eeb11a4..fd142647fe27 100644
--- a/plugins/git4idea/src/git4idea/update/GitUpdateEnvironment.java
+++ b/plugins/git4idea/src/git4idea/update/GitUpdateEnvironment.java
@@ -44,7 +44,7 @@ public class GitUpdateEnvironment implements UpdateEnvironment {
   /**
    * The vcs instance
    */
-  private GitVcs myVcs;
+  private final GitVcs myVcs;
   /**
    * The context project
    */
diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.java b/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.java
index c750d8a06995..1011024f8b90 100644
--- a/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.java
+++ b/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.java
@@ -61,7 +61,7 @@ public class GitUpdateLocallyModifiedDialog extends DialogWrapper {
   /**
    * The collection with locally modified files
    */
-  private List<String> myLocallyModifiedFiles;
+  private final List<String> myLocallyModifiedFiles;
 
   /**
    * The constructor
diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java b/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java
index b8f047569a1e..a9aca13a2572 100644
--- a/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java
+++ b/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java
@@ -39,11 +39,11 @@ public class GitUpdateProcess extends GitBaseRebaseProcess {
   /**
    * The settings to use
    */
-  private GitVcsSettings mySettings;
+  private final GitVcsSettings mySettings;
   /**
    * The updated files
    */
-  private UpdatedFiles myUpdatedFiles;
+  private final UpdatedFiles myUpdatedFiles;
   /**
    * The revision that was before update
    */
diff --git a/plugins/git4idea/src/git4idea/vfs/GitConfigTracker.java b/plugins/git4idea/src/git4idea/vfs/GitConfigTracker.java
index 7760d5bfab1d..30f000c258c5 100644
--- a/plugins/git4idea/src/git4idea/vfs/GitConfigTracker.java
+++ b/plugins/git4idea/src/git4idea/vfs/GitConfigTracker.java
@@ -39,11 +39,11 @@ public class GitConfigTracker implements GitRootsListener {
   /**
    * The context project
    */
-  private Project myProject;
+  private final Project myProject;
   /**
    * The vcs object
    */
-  private GitVcs myVcs;
+  private final GitVcs myVcs;
   /**
    * The vcs manager that tracks content roots
    */
@@ -51,7 +51,7 @@ public class GitConfigTracker implements GitRootsListener {
   /**
    * The listener collection (managed by GitVcs object since lifetime of this object is less than lifetime of GitVcs)
    */
-  private GitConfigListener myMulticaster;
+  private final GitConfigListener myMulticaster;
   /**
    * The appeared roots that has been already reported as changed
    */
@@ -59,11 +59,11 @@ public class GitConfigTracker implements GitRootsListener {
   /**
    * Local file system service
    */
-  private LocalFileSystem myLocalFileSystem;
+  private final LocalFileSystem myLocalFileSystem;
   /**
    * The file listener
    */
-  private MyFileListener myFileListener;
+  private final MyFileListener myFileListener;
 
   /**
    * The constructor
diff --git a/plugins/git4idea/src/git4idea/vfs/GitIgnoreTracker.java b/plugins/git4idea/src/git4idea/vfs/GitIgnoreTracker.java
index 1a0c3441e935..3792c0f0c97e 100644
--- a/plugins/git4idea/src/git4idea/vfs/GitIgnoreTracker.java
+++ b/plugins/git4idea/src/git4idea/vfs/GitIgnoreTracker.java
@@ -56,7 +56,7 @@ public class GitIgnoreTracker {
   /**
    * The context project
    */
-  private Project myProject;
+  private final Project myProject;
   /**
    * The vcs instance
    */
@@ -88,7 +88,7 @@ public class GitIgnoreTracker {
   /**
    * The git configuration listener
    */
-  private GitConfigListener myConfigListener;
+  private final GitConfigListener myConfigListener;
   /**
    * The map from roots to paths of exclude files from config
    */
diff --git a/plugins/git4idea/src/git4idea/vfs/GitRootTracker.java b/plugins/git4idea/src/git4idea/vfs/GitRootTracker.java
index 7df2d34d0bad..03ffc8dbe9ad 100644
--- a/plugins/git4idea/src/git4idea/vfs/GitRootTracker.java
+++ b/plugins/git4idea/src/git4idea/vfs/GitRootTracker.java
@@ -105,23 +105,23 @@ public class GitRootTracker implements VcsListener {
   /**
    * The command listener
    */
-  private CommandListener myCommandListener;
+  private final CommandListener myCommandListener;
   /**
    * The file listener
    */
-  private MyFileListener myFileListener;
+  private final MyFileListener myFileListener;
   /**
    * Listener for refresh events
    */
-  private VirtualFileManagerAdapter myVirtualFileManagerListener;
+  private final VirtualFileManagerAdapter myVirtualFileManagerListener;
   /**
    * Local file system service
    */
-  private LocalFileSystem myLocalFileSystem;
+  private final LocalFileSystem myLocalFileSystem;
   /**
    * The multicaster for root events
    */
-  private GitRootsListener myMulticaster;
+  private final GitRootsListener myMulticaster;
 
   private final MessageBusConnection myMessageBusConnection;
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java
index 1af3db22ef53..b098ef055a59 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java
@@ -44,7 +44,7 @@ public class GroovyCompilerConfigurable implements SearchableConfigurable, Compi
   private JPanel myMainPanel;
   private JPanel myExcludesPanel;
   private JCheckBox myUseGroovycStubs;
-  private ExcludedEntriesConfigurable myExcludes;
+  private final ExcludedEntriesConfigurable myExcludes;
   private final GroovyCompilerConfiguration myConfig;
 
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/ui/GradlePanelWrapper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/ui/GradlePanelWrapper.java
index 82926d4b968a..df50ae8473c0 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/ui/GradlePanelWrapper.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/ui/GradlePanelWrapper.java
@@ -53,13 +53,13 @@ import java.util.List;
  <!==========================================================================> */
 public class GradlePanelWrapper
 {
-   private JPanel mainPanel = new JPanel( new BorderLayout() );
+   private final JPanel mainPanel = new JPanel( new BorderLayout() );
    private Project myProject;
    private GradleUISettings settings;
    private SinglePaneUIVersion1 singlePaneUIVersion1;
    private GradleSetupPanel gradleSetupPanel;
-   private List<GradleTabVersion1> additionalTabs = new ArrayList<GradleTabVersion1>();
-   private ObserverLord<GradleUIAvailabilityObserver> observerLord = new ObserverLord<GradleUIAvailabilityObserver>();
+   private final List<GradleTabVersion1> additionalTabs = new ArrayList<GradleTabVersion1>();
+   private final ObserverLord<GradleUIAvailabilityObserver> observerLord = new ObserverLord<GradleUIAvailabilityObserver>();
 
    public void initalize(@Nullable Module module, Project myProject)
    {
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java
index d5a9bb945fe0..8ed5b85f3296 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java
@@ -223,7 +223,7 @@ public abstract class GroovyCompilerTestCase extends JavaCodeInsightFixtureTestC
   private static class ErrorReportingCallback implements CompileStatusNotification {
     private final Semaphore mySemaphore;
     private Throwable myError;
-    private List<String> myMessages = new ArrayList<String>();
+    private final List<String> myMessages = new ArrayList<String>();
 
     public ErrorReportingCallback(Semaphore semaphore) {
       mySemaphore = semaphore;
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/GroovyCodeStyleFormatterTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/GroovyCodeStyleFormatterTest.java
index 2f1d477c792e..981311c3407a 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/GroovyCodeStyleFormatterTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/GroovyCodeStyleFormatterTest.java
@@ -28,9 +28,9 @@ import java.util.regex.Pattern;
  * @author peter
  */
 public class GroovyCodeStyleFormatterTest extends GroovyFormatterTestCase {
-  private static String OPTION_START = "<option>";
-  private static String OPTION_END = "</option>";
-  private static Pattern PATTERN = Pattern.compile(OPTION_START + "(\\w+=(true|false+|\\d|\\w+))" + OPTION_END + "\n");
+  private static final String OPTION_START = "<option>";
+  private static final String OPTION_END = "</option>";
+  private static final Pattern PATTERN = Pattern.compile(OPTION_START + "(\\w+=(true|false+|\\d|\\w+))" + OPTION_END + "\n");
 
   @Override
   protected String getBasePath() {
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/FormEditorErrorCollector.java b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/FormEditorErrorCollector.java
index 0a33f676f70f..b558c58f681e 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/FormEditorErrorCollector.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/FormEditorErrorCollector.java
@@ -40,7 +40,7 @@ public class FormEditorErrorCollector extends FormErrorCollector {
   private final RadComponent myComponent;
   private List<ErrorInfo> myResults = null;
   private final InspectionProfile myProfile;
-  private PsiFile myFormPsiFile;
+  private final PsiFile myFormPsiFile;
 
   public FormEditorErrorCollector(final GuiEditor editor, final RadComponent component) {
     myEditor = editor;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/FormFileErrorCollector.java b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/FormFileErrorCollector.java
index 4adf77d8faf3..a0315deee776 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/FormFileErrorCollector.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/FormFileErrorCollector.java
@@ -37,7 +37,7 @@ import java.util.List;
 public class FormFileErrorCollector extends FormErrorCollector {
   private final InspectionManager myManager;
   private final PsiFile myFile;
-  private boolean myOnTheFly;
+  private final boolean myOnTheFly;
   private final List<ProblemDescriptor> myProblems = new ArrayList<ProblemDescriptor>();
 
   public FormFileErrorCollector(final PsiFile file, final InspectionManager manager, boolean onTheFly) {
diff --git a/xml/dom-openapi/src/com/intellij/util/xml/JavaMethod.java b/xml/dom-openapi/src/com/intellij/util/xml/JavaMethod.java
index fc3348566c6d..ef0cb848970c 100644
--- a/xml/dom-openapi/src/com/intellij/util/xml/JavaMethod.java
+++ b/xml/dom-openapi/src/com/intellij/util/xml/JavaMethod.java
@@ -42,7 +42,7 @@ public final class JavaMethod implements AnnotatedElement{
   private final JavaMethodSignature mySignature;
   private final Class myDeclaringClass;
   private final Method myMethod;
-  private FactoryMap<Class, Annotation> myAnnotationsMap = new ConcurrentFactoryMap<Class, Annotation>() {
+  private final FactoryMap<Class, Annotation> myAnnotationsMap = new ConcurrentFactoryMap<Class, Annotation>() {
 
     protected Annotation create(Class key) {
       return mySignature.findAnnotation(key, myDeclaringClass);
diff --git a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaDialog.java b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaDialog.java
index 3ddd31936db3..a5e10800417a 100644
--- a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaDialog.java
+++ b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaDialog.java
@@ -59,7 +59,7 @@ public class GenerateInstanceDocumentFromSchemaDialog extends DialogWrapper {
   private JLabel outputFileNameText;
   private String previousUri;
   private Runnable myOkAction;
-  private Project myProject;
+  private final Project myProject;
 
   public GenerateInstanceDocumentFromSchemaDialog(Project project, VirtualFile file) {
     super(project, true);
diff --git a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentDialog.java b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentDialog.java
index 10c7294ef28b..3d5c863fe86b 100644
--- a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentDialog.java
+++ b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentDialog.java
@@ -57,7 +57,7 @@ public class GenerateSchemaFromInstanceDocumentDialog extends DialogWrapper {
   static final String LOCAL_ELEMENTS_TYPES = XmlBundle.message("local.elements.types.option.name");
   static final String GLOBAL_ELEMENTS_LOCAL_TYPES = XmlBundle.message("global.elements.local.types.option.name");
 
-  private static List<String> designTypes = Arrays.asList(
+  private static final List<String> designTypes = Arrays.asList(
     LOCAL_ELEMENTS_GLOBAL_COMPLEX_TYPES,
     LOCAL_ELEMENTS_TYPES,
     GLOBAL_ELEMENTS_LOCAL_TYPES
@@ -65,7 +65,7 @@ public class GenerateSchemaFromInstanceDocumentDialog extends DialogWrapper {
 
   static final String STRING_TYPE = "string";
   static final String SMART_TYPE = "smart";
-  private static List<String> simpleContentTypes = Arrays.asList(STRING_TYPE, SMART_TYPE);
+  private static final List<String> simpleContentTypes = Arrays.asList(STRING_TYPE, SMART_TYPE);
   private Runnable myOkAction;
 
   public GenerateSchemaFromInstanceDocumentDialog(Project project, VirtualFile file) {