diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
index c60a3b220906..f5404cd65023 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
@@ -81,6 +81,7 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
   private final MyDebuggerStateManager myDebuggerStateManager = new MyDebuggerStateManager();
 
   private final DebuggerContextListener mySessionListener = new DebuggerContextListener() {
+    @Override
     public void changeEvent(DebuggerContextImpl newContext, int event) {
 
       final DebuggerSession session = newContext.getDebuggerSession();
@@ -110,14 +111,17 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
   };
   @NonNls private static final String DEBUG_KEY_NAME = "idea.xdebug.key";
 
+  @Override
   public void addClassNameMapper(final NameMapper mapper) {
     myNameMappers.add(mapper);
   }
 
+  @Override
   public void removeClassNameMapper(final NameMapper mapper) {
     myNameMappers.remove(mapper);
   }
 
+  @Override
   public String getVMClassQualifiedName(@NotNull final PsiClass aClass) {
     for (NameMapper nameMapper : myNameMappers) {
       final String qName = nameMapper.getQualifiedName(aClass);
@@ -128,10 +132,12 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
     return aClass.getQualifiedName();
   }
 
+  @Override
   public void addDebuggerManagerListener(DebuggerManagerListener listener) {
     myDispatcher.addListener(listener);
   }
 
+  @Override
   public void removeDebuggerManagerListener(DebuggerManagerListener listener) {
     myDispatcher.removeListener(listener);
   }
@@ -141,6 +147,7 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
     myBreakpointManager = new BreakpointManager(myProject, startupManager, this);
     if (!project.isDefault()) {
       colorsManager.addEditorColorsListener(new EditorColorsListener() {
+        @Override
         public void globalSchemeChange(EditorColorsScheme scheme) {
           getBreakpointManager().updateBreakpointsUI();
         }
@@ -148,6 +155,7 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
     }
   }
 
+  @Override
   public DebuggerSession getSession(DebugProcess process) {
     ApplicationManager.getApplication().assertIsDispatchThread();
     for (final DebuggerSession debuggerSession : getSessions()) {
@@ -156,6 +164,7 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
     return null;
   }
 
+  @Override
   public Collection<DebuggerSession> getSessions() {
     synchronized (mySessions) {
       final Collection<DebuggerSession> values = mySessions.values();
@@ -163,15 +172,19 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
     }
   }
 
+  @Override
   public void disposeComponent() {
   }
 
+  @Override
   public void initComponent() {
   }
 
+  @Override
   public void projectClosed() {
   }
 
+  @Override
   public void projectOpened() {
     myBreakpointManager.init();
   }
@@ -193,6 +206,7 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
     myBreakpointManager.writeExternal(element);
   }
 
+  @Override
   public DebuggerSession attachVirtualMachine(Executor executor,
                                               ProgramRunner runner,
                                               ModuleRunProfile profile,
@@ -209,10 +223,12 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
                                                             pollConnection));
   }
 
+  @Override
   public DebuggerSession attachVirtualMachine(DebugEnvironment environment) throws ExecutionException {
     ApplicationManager.getApplication().assertIsDispatchThread();
     final DebugProcessEvents debugProcess = new DebugProcessEvents(myProject);
     debugProcess.addDebugProcessListener(new DebugProcessAdapter() {
+      @Override
       public void processAttached(final DebugProcess process) {
         process.removeDebugProcessListener(this);
         for (Function<DebugProcess, PositionManager> factory : myCustomPositionManagerFactories) {
@@ -229,10 +245,12 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
         }
       }
 
+      @Override
       public void processDetached(final DebugProcess process, final boolean closedByUser) {
         debugProcess.removeDebugProcessListener(this);
       }
 
+      @Override
       public void attachException(final RunProfileState state,
                                   final ExecutionException exception,
                                   final RemoteConnection remoteConnection) {
@@ -263,6 +281,7 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
       // RemoteProcessHandler on the other hand will call debugProcess.stop() as a part of destroyProcess() and detachProcess() implementation,
       // so we shouldn't add the listener to avoid calling stop() twice
       processHandler.addProcessListener(new ProcessAdapter() {
+        @Override
         public void processWillTerminate(ProcessEvent event, boolean willBeDestroyed) {
           final DebugProcessImpl debugProcess = getDebugProcess(event.getProcessHandler());
           if (debugProcess != null) {
@@ -283,6 +302,7 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
   }
 
 
+  @Override
   public DebugProcessImpl getDebugProcess(final ProcessHandler processHandler) {
     synchronized (mySessions) {
       DebuggerSession session = mySessions.get(processHandler);
@@ -298,6 +318,7 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
     }
   }
 
+  @Override
   public void addDebugProcessListener(final ProcessHandler processHandler, final DebugProcessListener listener) {
     DebugProcessImpl debugProcess = getDebugProcess(processHandler);
     if (debugProcess != null) {
@@ -305,6 +326,7 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
     }
     else {
       processHandler.addProcessListener(new ProcessAdapter() {
+        @Override
         public void startNotified(ProcessEvent event) {
           DebugProcessImpl debugProcess = getDebugProcess(processHandler);
           if (debugProcess != null) {
@@ -316,6 +338,7 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
     }
   }
 
+  @Override
   public void removeDebugProcessListener(final ProcessHandler processHandler, final DebugProcessListener listener) {
     DebugProcessImpl debugProcess = getDebugProcess(processHandler);
     if (debugProcess != null) {
@@ -323,6 +346,7 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
     }
     else {
       processHandler.addProcessListener(new ProcessAdapter() {
+        @Override
         public void startNotified(ProcessEvent event) {
           DebugProcessImpl debugProcess = getDebugProcess(processHandler);
           if (debugProcess != null) {
@@ -334,31 +358,38 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
     }
   }
 
+  @Override
   public boolean isDebuggerManagerThread() {
     return DebuggerManagerThreadImpl.isManagerThread();
   }
 
+  @Override
   @NotNull
   public String getComponentName() {
     return "DebuggerManager";
   }
 
+  @Override
   public BreakpointManager getBreakpointManager() {
     return myBreakpointManager;
   }
 
+  @Override
   public DebuggerContextImpl getContext() {
     return getContextManager().getContext();
   }
 
+  @Override
   public DebuggerStateManager getContextManager() {
     return myDebuggerStateManager;
   }
 
+  @Override
   public void registerPositionManagerFactory(final Function<DebugProcess, PositionManager> factory) {
     myCustomPositionManagerFactories.add(factory);
   }
 
+  @Override
   public void unregisterPositionManagerFactory(final Function<DebugProcess, PositionManager> factory) {
     myCustomPositionManagerFactories.remove(factory);
   }
@@ -473,6 +504,7 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
     final String _debuggeeRunProperties = debuggeeRunProperties;
 
     ApplicationManager.getApplication().runReadAction(new Runnable() {
+      @Override
       @SuppressWarnings({"HardCodedStringLiteral"})
       public void run() {
         JavaSdkUtil.addRtJar(parameters.getClassPath());
@@ -575,10 +607,12 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent
   private static class MyDebuggerStateManager extends DebuggerStateManager {
     private DebuggerSession myDebuggerSession;
 
+    @Override
     public DebuggerContextImpl getContext() {
       return myDebuggerSession == null ? DebuggerContextImpl.EMPTY_CONTEXT : myDebuggerSession.getContextManager().getContext();
     }
 
+    @Override
     public void setState(final DebuggerContextImpl context, int state, int event, String description) {
       ApplicationManager.getApplication().assertIsDispatchThread();
       myDebuggerSession = context.getDebuggerSession();
diff --git a/java/debugger/openapi/src/com/intellij/debugger/requests/ClassPrepareRequestor.java b/java/debugger/openapi/src/com/intellij/debugger/requests/ClassPrepareRequestor.java
index e58e05290b5b..e53ccf3e7d81 100644
--- a/java/debugger/openapi/src/com/intellij/debugger/requests/ClassPrepareRequestor.java
+++ b/java/debugger/openapi/src/com/intellij/debugger/requests/ClassPrepareRequestor.java
@@ -18,13 +18,6 @@ package com.intellij.debugger.requests;
 import com.intellij.debugger.engine.DebugProcess;
 import com.sun.jdi.ReferenceType;
 
-/**
- * Created by IntelliJ IDEA.
- * User: lex
- * Date: Jun 27, 2003
- * Time: 7:27:41 PM
- * To change this template use Options | File Templates.
- */
 public interface ClassPrepareRequestor extends Requestor {
   void processClassPrepare(DebugProcess debuggerProcess, final ReferenceType referenceType);
 }
diff --git a/java/debugger/openapi/src/com/intellij/debugger/requests/Requestor.java b/java/debugger/openapi/src/com/intellij/debugger/requests/Requestor.java
index 9a1383296ccc..93bba20a02d2 100644
--- a/java/debugger/openapi/src/com/intellij/debugger/requests/Requestor.java
+++ b/java/debugger/openapi/src/com/intellij/debugger/requests/Requestor.java
@@ -15,12 +15,5 @@
  */
 package com.intellij.debugger.requests;
 
-/**
- * Created by IntelliJ IDEA.
- * User: lex
- * Date: Jun 27, 2003
- * Time: 8:06:36 PM
- * To change this template use Options | File Templates.
- */
 public interface Requestor {
 }
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
index f98100026007..2370ad3bda71 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
@@ -26,7 +26,6 @@ import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.util.JavaParametersUtil;
 import com.intellij.execution.util.ProgramParametersUtil;
 import com.intellij.openapi.components.PathMacroManager;
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.options.SettingsEditor;
@@ -49,7 +48,6 @@ import java.util.Map;
 
 public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunConfigurationModule>
   implements CommonJavaRunConfigurationParameters, SingleClassConfiguration, RefactoringListenerProvider {
-  private static final Logger LOG = Logger.getInstance("com.intellij.execution.application.ApplicationConfiguration");
 
   public String MAIN_CLASS_NAME;
   public String VM_PARAMETERS;
@@ -71,6 +69,7 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
     super(name, new JavaRunConfigurationModule(project, true), factory);
   }
 
+  @Override
   public void setMainClass(final PsiClass psiClass) {
     final Module originalModule = getConfigurationModule().getModule();
     setMainClassName(JavaExecutionUtil.getRuntimeQualifiedName(psiClass));
@@ -78,6 +77,7 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
     restoreOriginalModule(originalModule);
   }
 
+  @Override
   public RunProfileState getState(@NotNull final Executor executor, @NotNull final ExecutionEnvironment env) throws ExecutionException {
     final JavaCommandLineState state = new JavaApplicationCommandLineState(this, env);
     JavaRunConfigurationModule module = getConfigurationModule();
@@ -85,6 +85,7 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
     return state;
   }
 
+  @Override
   @NotNull
   public SettingsEditor<? extends RunConfiguration> getConfigurationEditor() {
     SettingsEditorGroup<ApplicationConfiguration> group = new SettingsEditorGroup<ApplicationConfiguration>();
@@ -94,12 +95,14 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
     return group;
   }
 
+  @Override
   public RefactoringElementListener getRefactoringElementListener(final PsiElement element) {
     final RefactoringElementListener listener = RefactoringListeners.
       getClassOrPackageListener(element, new RefactoringListeners.SingleClassConfigurationAccessor(this));
     return RunConfigurationExtension.wrapRefactoringElementListener(element, this, listener);
   }
 
+  @Override
   @Nullable
   public PsiClass getMainClass() {
     return getConfigurationModule().findClass(MAIN_CLASS_NAME);
@@ -122,10 +125,12 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
     return ProgramRunnerUtil.shortenName(JavaExecutionUtil.getShortClassName(MAIN_CLASS_NAME), 6) + ".main()";
   }
 
+  @Override
   public void setMainClassName(final String qualifiedName) {
     MAIN_CLASS_NAME = qualifiedName;
   }
 
+  @Override
   public void checkConfiguration() throws RuntimeConfigurationException {
     JavaParametersUtil.checkAlternativeJRE(this);
     final JavaRunConfigurationModule configurationModule = getConfigurationModule();
@@ -137,78 +142,96 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
     JavaRunConfigurationExtensionManager.checkConfigurationIsValid(this);
   }
 
+  @Override
   public void setVMParameters(String value) {
     VM_PARAMETERS = value;
   }
 
+  @Override
   public String getVMParameters() {
     return VM_PARAMETERS;
   }
 
+  @Override
   public void setProgramParameters(String value) {
     PROGRAM_PARAMETERS = value;
   }
 
+  @Override
   public String getProgramParameters() {
     return PROGRAM_PARAMETERS;
   }
 
+  @Override
   public void setWorkingDirectory(String value) {
     WORKING_DIRECTORY = ExternalizablePath.urlValue(value);
   }
 
+  @Override
   public String getWorkingDirectory() {
     return ExternalizablePath.localPathValue(WORKING_DIRECTORY);
   }
 
+  @Override
   public void setPassParentEnvs(boolean passParentEnvs) {
     PASS_PARENT_ENVS = passParentEnvs;
   }
 
+  @Override
   @NotNull
   public Map<String, String> getEnvs() {
     return myEnvs;
   }
 
+  @Override
   public void setEnvs(@NotNull final Map<String, String> envs) {
     myEnvs.clear();
     myEnvs.putAll(envs);
   }
 
+  @Override
   public boolean isPassParentEnvs() {
     return PASS_PARENT_ENVS;
   }
 
+  @Override
   @Nullable
   public String getRunClass() {
     return MAIN_CLASS_NAME;
   }
 
+  @Override
   @Nullable
   public String getPackage() {
     return null;
   }
 
+  @Override
   public boolean isAlternativeJrePathEnabled() {
      return ALTERNATIVE_JRE_PATH_ENABLED;
    }
 
+   @Override
    public void setAlternativeJrePathEnabled(boolean enabled) {
-     this.ALTERNATIVE_JRE_PATH_ENABLED = enabled;
+     ALTERNATIVE_JRE_PATH_ENABLED = enabled;
    }
 
+   @Override
    public String getAlternativeJrePath() {
      return ALTERNATIVE_JRE_PATH;
    }
 
+   @Override
    public void setAlternativeJrePath(String path) {
-     this.ALTERNATIVE_JRE_PATH = path;
+     ALTERNATIVE_JRE_PATH = path;
    }
 
+  @Override
   public Collection<Module> getValidModules() {
     return JavaRunConfigurationModule.getModulesForClass(getProject(), MAIN_CLASS_NAME);
   }
 
+  @Override
   public void readExternal(final Element element) throws InvalidDataException {
     PathMacroManager.getInstance(getProject()).expandPaths(element);
     super.readExternal(element);
@@ -218,6 +241,7 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
     EnvironmentVariablesComponent.readExternal(element, getEnvs());
   }
 
+  @Override
   public void writeExternal(final Element element) throws WriteExternalException {
     super.writeExternal(element);
     JavaRunConfigurationExtensionManager.getInstance().writeExternal(this, element);
@@ -237,6 +261,7 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
       myConfiguration = configuration;
     }
 
+    @Override
     protected JavaParameters createJavaParameters() throws ExecutionException {
       final JavaParameters params = new JavaParameters();
       final JavaRunConfigurationModule module = myConfiguration.getConfigurationModule();
diff --git a/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineState.java b/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineState.java
index bab671678c57..47e0c35ade6b 100644
--- a/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineState.java
+++ b/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineState.java
@@ -30,6 +30,7 @@ public abstract class JavaCommandLineState extends CommandLineState implements J
     super(environment);
   }
 
+  @Override
   public JavaParameters getJavaParameters() throws ExecutionException {
     if (myParams == null) {
       myParams = createJavaParameters();
@@ -37,6 +38,7 @@ public abstract class JavaCommandLineState extends CommandLineState implements J
     return myParams;
   }
 
+  @Override
   @NotNull
   protected OSProcessHandler startProcess() throws ExecutionException {
     return JavaCommandLineStateUtil.startProcess(createCommandLine(), ansiColoringEnabled());
diff --git a/java/execution/openapi/src/com/intellij/execution/configurations/JavaParameters.java b/java/execution/openapi/src/com/intellij/execution/configurations/JavaParameters.java
index 99bb06703f0a..daf045c2638f 100644
--- a/java/execution/openapi/src/com/intellij/execution/configurations/JavaParameters.java
+++ b/java/execution/openapi/src/com/intellij/execution/configurations/JavaParameters.java
@@ -41,7 +41,7 @@ public class JavaParameters extends SimpleJavaParameters {
     }
 
     final String jdkHome = jdk.getHomeDirectory().getPresentableUrl();
-    if (jdkHome == null || jdkHome.length() == 0) {
+    if (jdkHome.isEmpty()) {
       throw new CantRunException(ExecutionBundle.message("home.directory.not.specified.for.jdk.error.message"));
     }
     return jdkHome;
diff --git a/java/execution/openapi/src/com/intellij/execution/process/DefaultJavaProcessHandler.java b/java/execution/openapi/src/com/intellij/execution/process/DefaultJavaProcessHandler.java
index 444f66d55443..b6721ac58fed 100644
--- a/java/execution/openapi/src/com/intellij/execution/process/DefaultJavaProcessHandler.java
+++ b/java/execution/openapi/src/com/intellij/execution/process/DefaultJavaProcessHandler.java
@@ -39,6 +39,7 @@ public class DefaultJavaProcessHandler extends OSProcessHandler {
     myCharset = charset;
   }
 
+  @Override
   public Charset getCharset() {
     return myCharset;
   }