This commit is contained in:
Alexey Kudravtsev
2010-02-17 16:53:20 +03:00
parent b32acd226a
commit df51747db5
128 changed files with 212 additions and 221 deletions
@@ -102,10 +102,8 @@ public class CompileStepBeforeRun extends BeforeRunTaskProvider<CompileStepBefor
if (modules.length > 0) {
for (Module module : modules) {
if (module == null) {
LOG.assertTrue(
false,
"RunConfiguration should not return null modules. Configuration=" + runConfiguration.getName() + "; class=" + runConfiguration.getClass().getName()
);
LOG.error("RunConfiguration should not return null modules. Configuration=" + runConfiguration.getName() + "; class=" +
runConfiguration.getClass().getName());
}
}
scope = compilerManager.createModulesCompileScope(modules, true);
@@ -32,6 +32,7 @@ import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.ui.RawCommandLineEditor;
import com.intellij.util.ArrayUtil;
import javax.swing.*;
import java.awt.*;
@@ -152,7 +153,7 @@ public class CommonJavaParameters extends JPanel {
final List<String> macros = new ArrayList<String>(PathMacros.getInstance().getUserMacroNames());
macros.add("MODULE_DIR");
final JList list = new JList(macros.toArray(new String[macros.size()]));
final JList list = new JList(ArrayUtil.toStringArray(macros));
final JBPopup popup = JBPopupFactory.getInstance().createListPopupBuilder(list).setItemChoosenCallback(new Runnable() {
public void run() {
final Object value = list.getSelectedValue();