diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunDialog.java b/platform/lang-impl/src/com/intellij/execution/impl/RunDialog.java
index bcf2f61299a5..71e205c3f22c 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunDialog.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunDialog.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.
@@ -38,7 +38,7 @@ public class RunDialog extends DialogWrapper implements RunConfigurable.RunDialo
   private final Project myProject;
   private final RunConfigurable myConfigurable;
   private JComponent myCenterPanel;
-  @NonNls public static String HELP_ID = "reference.dialogs.rundebug";
+  @NonNls public static final String HELP_ID = "reference.dialogs.rundebug";
   private final Executor myExecutor;
 
   public RunDialog(final Project project, final Executor executor) {
diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ActionPlaces.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ActionPlaces.java
index a23b9ec78904..221733e505cf 100644
--- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ActionPlaces.java
+++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ActionPlaces.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.
@@ -109,7 +109,7 @@ public abstract class ActionPlaces {
   public static final String PHING_EXPLORER_POPUP = "PhingExplorerPopup";
   public static final String PHING_EXPLORER_TOOLBAR = "PhingExplorerToolbar";
   public static final String DOCK_MENU = "DockMenu";
-  public static String PHING_MESSAGES_TOOLBAR = "PhingMessagesToolbar";
+  public static final String PHING_MESSAGES_TOOLBAR = "PhingMessagesToolbar";
 
   public static final String CHANGES_LOCAL_DIFF_SETTINGS = "CHANGES_LOCAL_DIFF_SETTINGS";
 
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/ideSettings/IdeSettingsStatisticsService.java b/platform/platform-impl/src/com/intellij/internal/statistic/ideSettings/IdeSettingsStatisticsService.java
index 23cb562ef7a4..c0acb8435339 100644
--- a/platform/platform-impl/src/com/intellij/internal/statistic/ideSettings/IdeSettingsStatisticsService.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/ideSettings/IdeSettingsStatisticsService.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.
@@ -30,7 +30,7 @@ import java.net.URL;
 
 public class IdeSettingsStatisticsService extends SettingsConnectionService {
   private static final Logger LOG = Logger.getInstance("#com.intellij.internal.statistic.ideSettings.IdeSettingsUsagesCollector");
-  private static String FILE_NAME = "ide-settings-statistics.xml";
+  private static final String FILE_NAME = "ide-settings-statistics.xml";
 
   private static final IdeSettingsStatisticsService myInstance = new IdeSettingsStatisticsService();
   private IdeSettingsDescriptor[] myDescriptors;
diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/AbstractCommand.java b/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/AbstractCommand.java
index 3c234526f6b5..da4ac90fa448 100644
--- a/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/AbstractCommand.java
+++ b/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/AbstractCommand.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.
@@ -18,14 +18,13 @@ package com.intellij.openapi.ui.playback.commands;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.ui.playback.PlaybackCommand;
 import com.intellij.openapi.ui.playback.PlaybackContext;
-import com.intellij.openapi.ui.playback.PlaybackRunner;
 import com.intellij.openapi.util.ActionCallback;
 
 import java.io.File;
 
 public abstract class AbstractCommand implements PlaybackCommand {
 
-  public static String CMD_PREFIX = "%";
+  public static final String CMD_PREFIX = "%";
 
   private final String myText;
   private final int myLine;
diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/AssertFocused.java b/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/AssertFocused.java
index 7993aae5dfa3..657f39d1b15d 100644
--- a/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/AssertFocused.java
+++ b/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/AssertFocused.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.
@@ -17,7 +17,6 @@ package com.intellij.openapi.ui.playback.commands;
 
 import com.intellij.openapi.ui.Queryable;
 import com.intellij.openapi.ui.playback.PlaybackContext;
-import com.intellij.openapi.ui.playback.PlaybackRunner;
 import com.intellij.openapi.util.ActionCallback;
 import com.intellij.openapi.wm.IdeFocusManager;
 
@@ -26,7 +25,7 @@ import java.util.*;
 
 public class AssertFocused extends AbstractCommand {
 
-  public static String PREFIX = CMD_PREFIX + "assert focused";
+  public static final String PREFIX = CMD_PREFIX + "assert focused";
 
   public AssertFocused(String text, int line) {
     super(text, line);
diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/DelayCommand.java b/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/DelayCommand.java
index c4689ddef1eb..ba773d4534ed 100644
--- a/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/DelayCommand.java
+++ b/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/DelayCommand.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.
@@ -19,7 +19,7 @@ import com.intellij.openapi.ui.playback.PlaybackContext;
 import com.intellij.openapi.util.ActionCallback;
 
 public class DelayCommand extends AbstractCommand {
-  public static String PREFIX = CMD_PREFIX + "delay";
+  public static final String PREFIX = CMD_PREFIX + "delay";
 
   public DelayCommand(String text, int line) {
     super(text, line);
diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/KeyShortcutCommand.java b/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/KeyShortcutCommand.java
index c272125d32c2..5031ec37d904 100644
--- a/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/KeyShortcutCommand.java
+++ b/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/KeyShortcutCommand.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.
@@ -20,8 +20,8 @@ import com.intellij.openapi.util.ActionCallback;
 
 public class KeyShortcutCommand extends TypeCommand {
 
-  public static String PREFIX = CMD_PREFIX + "[";
-  public static String POSTFIX = "]";
+  public static final String PREFIX = CMD_PREFIX + "[";
+  public static final String POSTFIX = "]";
 
   public KeyShortcutCommand(String text, int line) {
     super(text, line);
diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/RegistryValueCommand.java b/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/RegistryValueCommand.java
index 36c4d3f2c62c..b4f7b2fbd1b0 100644
--- a/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/RegistryValueCommand.java
+++ b/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/RegistryValueCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 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.
@@ -21,7 +21,7 @@ import com.intellij.openapi.util.registry.Registry;
 
 public class RegistryValueCommand extends AbstractCommand {
 
-  public static String PREFIX = CMD_PREFIX + "set";
+  public static final String PREFIX = CMD_PREFIX + "set";
 
   public RegistryValueCommand(String text, int line) {
     super(text, line);
diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/StopCommand.java b/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/StopCommand.java
index 5e44570ec2ab..1d122fe47ebb 100644
--- a/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/StopCommand.java
+++ b/platform/platform-impl/src/com/intellij/openapi/ui/playback/commands/StopCommand.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.
@@ -20,7 +20,7 @@ import com.intellij.openapi.util.ActionCallback;
 
 public class StopCommand extends AbstractCommand {
 
-  public static String PREFIX = CMD_PREFIX + "stop";
+  public static final String PREFIX = CMD_PREFIX + "stop";
 
   public StopCommand(String text, int line) {
     super(text, line);
diff --git a/platform/util/src/com/intellij/execution/configurations/CommandLineTokenizer.java b/platform/util/src/com/intellij/execution/configurations/CommandLineTokenizer.java
index a2e103bbec20..a62af9aa62dc 100644
--- a/platform/util/src/com/intellij/execution/configurations/CommandLineTokenizer.java
+++ b/platform/util/src/com/intellij/execution/configurations/CommandLineTokenizer.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.
@@ -26,7 +26,7 @@ import java.util.StringTokenizer;
  */
 public class CommandLineTokenizer extends StringTokenizer {
 
-    private static String DEFAULT_DELIMITERS = " \t\n\r\f";
+    private static final String DEFAULT_DELIMITERS = " \t\n\r\f";
     // keep source level 1.4
     private List myTokens = new ArrayList();
     private int myCurrentToken = 0;
diff --git a/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java b/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
index 9f9e261657f3..bdd9304e9d88 100644
--- a/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
+++ b/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.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.
@@ -589,7 +589,7 @@ public class VcsUtil {
     return (! s1Trimmed.equals(s2Trimmed)) && s1Trimmed.equalsIgnoreCase(s2Trimmed);
   }
 
-  private static String ANNO_ASPECT = "show.vcs.annotation.aspect.";
+  private static final String ANNO_ASPECT = "show.vcs.annotation.aspect.";
   //public static boolean isAspectAvailableByDefault(LineAnnotationAspect aspect) {
   //  if (aspect.getId() == null) return aspect.isShowByDefault();
   //  return PropertiesComponent.getInstance().getBoolean(ANNO_ASPECT + aspect.getId(), aspect.isShowByDefault());
diff --git a/plugins/devkit/src/dom/impl/LanguageResolvingUtil.java b/plugins/devkit/src/dom/impl/LanguageResolvingUtil.java
index a7b18c62efab..acb0dbfc42bb 100644
--- a/plugins/devkit/src/dom/impl/LanguageResolvingUtil.java
+++ b/plugins/devkit/src/dom/impl/LanguageResolvingUtil.java
@@ -45,7 +45,7 @@ import java.util.List;
 
 class LanguageResolvingUtil {
 
-  private static String ANY_LANGUAGE_DEFAULT_ID = Language.ANY.getID();
+  private static final String ANY_LANGUAGE_DEFAULT_ID = Language.ANY.getID();
 
   static Collection<LanguageDefinition> getAllLanguageDefinitions(ConvertContext context) {
     List<LanguageDefinition> languageDefinitions = collectLanguageDefinitions(context);
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java
index 16d9de03b115..e595e1fa3788 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetbrains.idea.maven.dom.refactorings.introduce;
 
 import com.intellij.find.FindManager;
@@ -43,8 +58,8 @@ import org.jetbrains.idea.maven.dom.model.MavenDomProperties;
 import java.util.*;
 
 public class IntroducePropertyAction extends BaseRefactoringAction {
-  private static String PREFIX = "${";
-  private static String SUFFIX = "}";
+  private static final String PREFIX = "${";
+  private static final String SUFFIX = "}";
 
   public IntroducePropertyAction() {
     setInjectedContext(true);
diff --git a/plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnGroupsInspection.java b/plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnGroupsInspection.java
index 3f8699bf2959..16bd5ddec4b2 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnGroupsInspection.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnGroupsInspection.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.
@@ -48,7 +48,7 @@ public class DependsOnGroupsInspection extends BaseJavaLocalInspectionTool {
   private static final Pattern PATTERN = Pattern.compile("\"([a-zA-Z0-9_\\-\\(\\)]*)\"");
 
   public JDOMExternalizableStringList groups = new JDOMExternalizableStringList();
-  @NonNls public static String SHORT_NAME = "groupsTestNG";
+  @NonNls public static final String SHORT_NAME = "groupsTestNG";
 
   @NotNull
   @Override
diff --git a/python/testSrc/com/jetbrains/python/PyStructureViewTest.java b/python/testSrc/com/jetbrains/python/PyStructureViewTest.java
index 7556d0f1e70b..b1ed6037412c 100644
--- a/python/testSrc/com/jetbrains/python/PyStructureViewTest.java
+++ b/python/testSrc/com/jetbrains/python/PyStructureViewTest.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.
@@ -25,7 +25,7 @@ import static com.intellij.testFramework.PlatformTestUtil.assertTreeEqual;
  * @author vlan
  */
 public class PyStructureViewTest extends PyTestCase {
-  private static String TEST_DIRECTORY = "structureView/";
+  private static final String TEST_DIRECTORY = "structureView/";
 
   public void testBaseClassNames() {
     myFixture.configureByFiles(TEST_DIRECTORY + "baseClassNames.py",