cleanup, use lambdas

diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java b/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java
index 61dedb00fca3e441eaed36379d98dd19fa9f50d7..b968a35df7e9b7af97a4801cd58a752c8617fd2a 100644 (file)
--- a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java
+++ b/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2016 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.
@@ -23,7 +23,6 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.module.*;
 import com.intellij.openapi.options.ConfigurationException;
-import com.intellij.openapi.project.DumbAwareRunnable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectType;
 import com.intellij.openapi.project.ProjectTypeService;
@@ -34,7 +33,6 @@ import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
 import com.intellij.openapi.startup.StartupManager;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.ThrowableComputable;
 import com.intellij.openapi.util.io.FileUtil;
@@ -93,7 +91,7 @@ public abstract class ModuleBuilder extends AbstractModuleBuilder {
   }
 
   @Nullable
-  protected final String acceptParameter(String param) {
+  protected static String acceptParameter(String param) {
     return param != null && param.length() > 0 ? param : null;
   }
 
@@ -123,8 +121,8 @@ public abstract class ModuleBuilder extends AbstractModuleBuilder {
    * Typically delegates to ModuleType (e.g. JavaModuleType) that is more generic than ModuleBuilder
    *
    * @param settingsStep step to be modified
-   * @return callback ({@link com.intellij.ide.util.projectWizard.ModuleWizardStep#validate()}
-   *         and {@link com.intellij.ide.util.projectWizard.ModuleWizardStep#updateDataModel()}
+   * @return callback ({@link ModuleWizardStep#validate()}
+   *         and {@link ModuleWizardStep#updateDataModel()}
    *         will be invoked)
    */
   @Override
@@ -296,12 +294,8 @@ public abstract class ModuleBuilder extends AbstractModuleBuilder {
     if (model == null) moduleModel.commit();
 
     if (runFromProjectWizard) {
-      StartupManager.getInstance(module.getProject()).runWhenProjectIsInitialized(new DumbAwareRunnable() {
-        @Override
-        public void run() {
-          ApplicationManager.getApplication().runWriteAction(() -> onModuleInitialized(module));
-        }
-      });
+      StartupManager.getInstance(module.getProject()).runWhenProjectIsInitialized(
+        () -> ApplicationManager.getApplication().runWriteAction(() -> onModuleInitialized(module)));
     }
     else {
       onModuleInitialized(module);
@@ -338,12 +332,8 @@ public abstract class ModuleBuilder extends AbstractModuleBuilder {
         myModuleFilePath = project.getBaseDir().getPath() + File.separator + myName + ModuleFileType.DOT_DEFAULT_EXTENSION;
       }
       try {
-        return ApplicationManager.getApplication().runWriteAction(new ThrowableComputable<Module, Exception>() {
-          @Override
-          public Module compute() throws Exception {
-            return createAndCommitIfNeeded(project, model, true);
-          }
-        });
+        return ApplicationManager.getApplication().runWriteAction(
+          (ThrowableComputable<Module, Exception>)() -> createAndCommitIfNeeded(project, model, true));
       }
       catch (Exception ex) {
         LOG.warn(ex);