diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java index dea086b43fd4..95fb5b6d587b 100644 --- a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java +++ b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java @@ -34,7 +34,6 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ArrayUtil; -import com.intellij.util.Options; import org.apache.oro.text.regex.*; import org.jdom.Element; import org.jetbrains.annotations.NonNls; @@ -70,8 +69,6 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements private final ModuleManager myModuleManager; private final ExcludedEntriesConfiguration myExcludedEntriesConfiguration; - public int DEPLOY_AFTER_MAKE = Options.SHOW_DIALOG; - private final Collection myRegisteredCompilers = new ArrayList(); private JavacCompiler JAVAC_EXTERNAL_BACKEND; private final Perl5Matcher myPatternMatcher = new Perl5Matcher(); diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/BuildArtifactAction.java b/java/compiler/impl/src/com/intellij/compiler/actions/BuildArtifactAction.java index 4fae96e82f68..dc9206436c1c 100644 --- a/java/compiler/impl/src/com/intellij/compiler/actions/BuildArtifactAction.java +++ b/java/compiler/impl/src/com/intellij/compiler/actions/BuildArtifactAction.java @@ -33,6 +33,8 @@ import com.intellij.packaging.artifacts.ArtifactManager; import com.intellij.packaging.artifacts.ModifiableArtifactModel; import com.intellij.packaging.impl.compiler.ArtifactCompileScope; +import java.util.Collections; + /** * @author nik */ @@ -63,6 +65,6 @@ public class BuildArtifactAction extends AnAction { } }.execute(); } - CompilerManager.getInstance(myProject).make(ArtifactCompileScope.create(myProject, myArtifact), null); + CompilerManager.getInstance(myProject).make(ArtifactCompileScope.createArtifactsScope(myProject, Collections.singletonList(myArtifact)), null); } } diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form index b07e57fe72a2..fd103479d5c6 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form @@ -8,7 +8,7 @@ - + @@ -55,49 +55,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java index 6981d4898584..38ac669aa16b 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java @@ -24,7 +24,6 @@ import com.intellij.openapi.compiler.CompilerBundle; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.Project; -import com.intellij.util.Options; import javax.swing.*; import java.util.ArrayList; @@ -39,19 +38,11 @@ public class CompilerUIConfigurable implements Configurable { private JCheckBox myCbCompileInBackground; private JCheckBox myCbClearOutputDirectory; private JCheckBox myCbCompileDependent; - private JRadioButton myDoNotDeploy; - private JRadioButton myDeploy; - private JRadioButton myShowDialog; private JCheckBox myCbAssertNotNull; private JLabel myPatternLegendLabel; public CompilerUIConfigurable(final Project project) { myProject = project; - - ButtonGroup deployGroup = new ButtonGroup(); - deployGroup.add(myShowDialog); - deployGroup.add(myDeploy); - deployGroup.add(myDoNotDeploy); } public void reset() { @@ -66,16 +57,6 @@ public class CompilerUIConfigurable implements Configurable { configuration.convertPatterns(); myResourcePatternsField.setText(patternsToString(configuration.getResourceFilePatterns())); - - if (configuration.DEPLOY_AFTER_MAKE == Options.SHOW_DIALOG) { - myShowDialog.setSelected(true); - } - else if (configuration.DEPLOY_AFTER_MAKE == Options.PERFORM_ACTION_AUTOMATICALLY) { - myDeploy.setSelected(true); - } - else { - myDoNotDeploy.setSelected(true); - } } private static String patternsToString(final String[] patterns) { @@ -102,9 +83,7 @@ public class CompilerUIConfigurable implements Configurable { String extensionString = myResourcePatternsField.getText().trim(); applyResourcePatterns(extensionString, (CompilerConfigurationImpl)CompilerConfiguration.getInstance(myProject)); - configuration.DEPLOY_AFTER_MAKE = getSelectedDeploymentOption(); - - // this will schedule for compilation all files that might become compilable after resource patterns' changing + // this will schedule for compilation all files that might become compilable after resource patterns' changing TranslatingCompilerFilesMonitor.getInstance().scanSourcesForCompilableFiles(myProject); } @@ -149,17 +128,10 @@ public class CompilerUIConfigurable implements Configurable { final CompilerConfigurationImpl compilerConfiguration = (CompilerConfigurationImpl)CompilerConfiguration.getInstance(myProject); isModified |= ComparingUtils.isModified(myCbClearOutputDirectory, workspaceConfiguration.CLEAR_OUTPUT_DIRECTORY); isModified |= ComparingUtils.isModified(myResourcePatternsField, patternsToString(compilerConfiguration.getResourceFilePatterns())); - isModified |= compilerConfiguration.DEPLOY_AFTER_MAKE != getSelectedDeploymentOption(); return isModified; } - private int getSelectedDeploymentOption() { - if (myShowDialog.isSelected()) return Options.SHOW_DIALOG; - if (myDeploy.isSelected()) return Options.PERFORM_ACTION_AUTOMATICALLY; - return Options.DO_NOTHING; - } - public String getDisplayName() { return "General"; } diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactCompileScope.java b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactCompileScope.java index 20d779dcb969..882f166e33dc 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactCompileScope.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactCompileScope.java @@ -16,25 +16,21 @@ package com.intellij.packaging.impl.compiler; import com.intellij.compiler.impl.ModuleCompileScope; -import com.intellij.compiler.impl.ProjectCompileScope; +import com.intellij.openapi.compiler.CompileScope; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; -import com.intellij.packaging.impl.artifacts.ArtifactUtil; import com.intellij.openapi.util.Key; -import com.intellij.openapi.compiler.CompileScope; import com.intellij.packaging.artifacts.Artifact; import com.intellij.packaging.artifacts.ArtifactManager; import com.intellij.packaging.elements.PackagingElementResolvingContext; +import com.intellij.packaging.impl.artifacts.ArtifactUtil; import com.intellij.packaging.impl.elements.ModuleOutputElementType; import com.intellij.packaging.impl.elements.ModuleOutputPackagingElement; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.HashSet; -import java.util.Set; -import java.util.Collection; -import java.util.Arrays; +import java.util.*; /** * @author nik @@ -45,30 +41,29 @@ public class ArtifactCompileScope { private ArtifactCompileScope() { } - @NotNull - public static ModuleCompileScope create(@NotNull Project project, @NotNull Artifact artifact) { + public static ModuleCompileScope createScopeForModulesInArtifacts(@NotNull Project project, @NotNull Collection artifacts) { final Set modules = new HashSet(); final PackagingElementResolvingContext context = ArtifactManager.getInstance(project).getResolvingContext(); - ArtifactUtil.processPackagingElements(artifact, ModuleOutputElementType.MODULE_OUTPUT_ELEMENT_TYPE, new Processor() { - public boolean process(ModuleOutputPackagingElement moduleOutputPackagingElement) { - final Module module = moduleOutputPackagingElement.findModule(context); - if (module != null) { - modules.add(module); + for (Artifact artifact : artifacts) { + ArtifactUtil.processPackagingElements(artifact, ModuleOutputElementType.MODULE_OUTPUT_ELEMENT_TYPE, new Processor() { + public boolean process(ModuleOutputPackagingElement moduleOutputPackagingElement) { + final Module module = moduleOutputPackagingElement.findModule(context); + if (module != null) { + modules.add(module); + } + return true; } - return true; - } - }, context, true); + }, context, true); + } - final ModuleCompileScope scope = new ModuleCompileScope(project, modules.toArray(new Module[modules.size()]), true); - scope.putUserData(ARTIFACTS_KEY, new Artifact[]{artifact}); - return scope; + return new ModuleCompileScope(project, modules.toArray(new Module[modules.size()]), true); } - public static CompileScope create(@NotNull Project project, @NotNull Collection artifacts) { - return create(new ProjectCompileScope(project), artifacts); + public static CompileScope createArtifactsScope(@NotNull Project project, @NotNull Collection artifacts) { + return createScopeWithArtifacts(createScopeForModulesInArtifacts(project, artifacts), artifacts); } - public static CompileScope create(final CompileScope baseScope, @NotNull Collection artifacts) { + public static CompileScope createScopeWithArtifacts(final CompileScope baseScope, @NotNull Collection artifacts) { baseScope.putUserData(ARTIFACTS_KEY, artifacts.toArray(new Artifact[artifacts.size()])); return baseScope; } diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRun.java b/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRun.java index 37cc0974b880..d16dfac6052f 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRun.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRun.java @@ -136,7 +136,7 @@ public class BuildArtifactsBeforeRun implements BeforeRunTaskProvider= 0) { boolean useMacMnemonic = value.contains("&&");