diff --git a/platform/core-api/src/com/intellij/openapi/progress/EmptyProgressIndicator.java b/platform/core-api/src/com/intellij/openapi/progress/EmptyProgressIndicator.java
index 9cae8fc8690f..82abd36d4777 100644
--- a/platform/core-api/src/com/intellij/openapi/progress/EmptyProgressIndicator.java
+++ b/platform/core-api/src/com/intellij/openapi/progress/EmptyProgressIndicator.java
@@ -23,79 +23,100 @@ public class EmptyProgressIndicator implements ProgressIndicator {
   private boolean myIsRunning = false;
   private volatile boolean myIsCanceled = false;
 
+  @Override
   public void start() {
     myIsRunning = true;
     myIsCanceled = false;
   }
 
+  @Override
   public void stop() {
     myIsRunning = false;
   }
 
+  @Override
   public boolean isRunning() {
     return myIsRunning;
   }
 
+  @Override
   public void cancel() {
     myIsCanceled = true;
   }
 
+  @Override
   public boolean isCanceled() {
     return myIsCanceled;
   }
 
+  @Override
   public void setText(String text) {
   }
 
+  @Override
   public String getText() {
     return "";
   }
 
+  @Override
   public void setText2(String text) {
   }
 
+  @Override
   public String getText2() {
     return "";
   }
 
+  @Override
   public double getFraction() {
     return 1;
   }
 
+  @Override
   public void setFraction(double fraction) {
   }
 
+  @Override
   public void pushState() {
   }
 
+  @Override
   public void popState() {
   }
 
+  @Override
   public void startNonCancelableSection() {
   }
 
+  @Override
   public void finishNonCancelableSection() {
   }
 
+  @Override
   public boolean isModal() {
     return false;
   }
 
+  @Override
   @NotNull
   public ModalityState getModalityState() {
     return ModalityState.NON_MODAL;
   }
 
+  @Override
   public void setModalityProgress(ProgressIndicator modalityProgress) {
   }
 
+  @Override
   public boolean isIndeterminate() {
     return false;
   }
 
+  @Override
   public void setIndeterminate(boolean indeterminate) {
   }
 
+  @Override
   public void checkCanceled() {
     if (myIsCanceled) {
       throw new ProcessCanceledException();
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateFileFix.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateFileFix.java
index 964103ac2955..4b78d86d67b2 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateFileFix.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateFileFix.java
@@ -51,7 +51,7 @@ public class CreateFileFix extends LocalQuickFixAndIntentionActionOnPsiElement {
   private final boolean myIsDirectory;
   private final String myNewFileName;
   private final String myText;
-  @NotNull private String myKey;
+  @NotNull private final String myKey;
   private boolean myIsAvailable;
   private long myIsAvailableTimeStamp;
   private static final int REFRESH_INTERVAL = 1000;
@@ -71,14 +71,11 @@ public class CreateFileFix extends LocalQuickFixAndIntentionActionOnPsiElement {
     myIsAvailableTimeStamp = System.currentTimeMillis();
   }
 
-  public CreateFileFix(final String newFileName,
-                                   @NotNull PsiDirectory directory, String text) {
-    this(false,newFileName,directory, text, "create.file.text" );
+  public CreateFileFix(@NotNull String newFileName, @NotNull PsiDirectory directory, String text) {
+    this(false,newFileName,directory, text, "create.file.text");
   }
 
-  public CreateFileFix(final boolean isDirectory,
-                                   final String newFileName,
-                                   @NotNull PsiDirectory directory) {
+  public CreateFileFix(final boolean isDirectory, @NotNull String newFileName, @NotNull PsiDirectory directory) {
     this(isDirectory,newFileName,directory,null, isDirectory ? "create.directory.text":"create.file.text" );
   }