MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-61579

Browse Source
This commit is contained in:
Alexey Kudravtsev
2014-10-14 12:26:37 +04:00
parent ced6e96cb6
commit e184e658bc
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildAction.java
+21 -9
View File
@@ -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.
@@ -19,7 +19,10 @@ import com.intellij.compiler.CompilerConfiguration;
import com.intellij.compiler.CompilerConfigurationImpl;
import com.intellij.compiler.ant.*;
import com.intellij.compiler.impl.CompilerUtil;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.Presentation;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.compiler.CompilerBundle;
import com.intellij.openapi.progress.ProgressIndicator;
@@ -27,6 +30,7 @@ import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.Task;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.ReadonlyStatusHandler;
@@ -42,21 +46,27 @@ import java.util.*;
public class GenerateAntBuildAction extends CompileActionBase {
@NonNls private static final String XML_EXTENSION = ".xml";
@Override
protected void doAction(DataContext dataContext, final Project project) {
((CompilerConfigurationImpl)CompilerConfiguration.getInstance(project)).convertPatterns();
final GenerateAntBuildDialog dialog = new GenerateAntBuildDialog(project);
dialog.show();
if (dialog.isOK()) {
final String[] names = dialog.getRepresentativeModuleNames();
final GenerationOptionsImpl[] genOptions = {null};
Runnable runnable = new Runnable() {
final GenerationOptionsImpl[] genOptions = new GenerationOptionsImpl[1];
if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() {
@Override
public void run() {
genOptions[0] = new GenerationOptionsImpl(project, dialog.isGenerateSingleFileBuild(), dialog.isFormsCompilationEnabled(),
dialog.isBackupFiles(), dialog.isForceTargetJdk(), dialog.isRuntimeClasspathInlined(),
dialog.isIdeaHomeGenerated(), names, dialog.getOutputFileName());
genOptions[0] = ApplicationManager.getApplication().runReadAction(new Computable<GenerationOptionsImpl>() {
@Override
public GenerationOptionsImpl compute() {
return new GenerationOptionsImpl(project, dialog.isGenerateSingleFileBuild(), dialog.isFormsCompilationEnabled(),
dialog.isBackupFiles(), dialog.isForceTargetJdk(), dialog.isRuntimeClasspathInlined(),
dialog.isIdeaHomeGenerated(), names, dialog.getOutputFileName());
}
});
}
};
if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(runnable, "Analyzing project structure...", true, project)) {
}, "Analyzing project structure...", true, project)) {
return;
}
if (!validateGenOptions(project, genOptions[0])) {
@@ -100,6 +110,7 @@ public class GenerateAntBuildAction extends CompileActionBase {
return true;
}
@Override
public void update(AnActionEvent event) {
Presentation presentation = event.getPresentation();
Project project = CommonDataKeys.PROJECT.getData(event.getDataContext());
@@ -137,6 +148,7 @@ public class GenerateAntBuildAction extends CompileActionBase {
}
new Task.Modal(project, CompilerBundle.message("generate.ant.build.title"), false) {
@Override
public void run(@NotNull final ProgressIndicator indicator) {
indicator.setIndeterminate(true);
indicator.setText(CompilerBundle.message("generate.ant.build.progress.message"));