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

per-module bytecode target option supported for out-of-process make

Browse Source
This commit is contained in:
Eugene Zhuravlev
2012-05-11 17:20:49 +02:00
parent b72bdae38c
commit f43a3e6ac2
5 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java
+2 -1
View File
@@ -763,7 +763,8 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements
final Element moduleElement = new Element("module");
bytecodeTarget.addContent(moduleElement);
moduleElement.setAttribute("name", name);
moduleElement.setAttribute("target", myModuleBytecodeTarget.get(name));
final String value = myModuleBytecodeTarget.get(name);
moduleElement.setAttribute("target", value != null? value : "");
}
}
}
java/compiler/impl/src/com/intellij/compiler/options/TargetOptionsComponent.java
+2 -2
View File
@@ -44,7 +44,7 @@ import java.util.List;
*/
public class TargetOptionsComponent extends JPanel {
private static final String[] KNOWN_TARGETS = new String[] {"1.1", "1.2", "1.3","1.4","1.5", "1.6", "1.7", "1.8"};
private static final String COMPILER_DEFAULT = "compiler default";
private static final String COMPILER_DEFAULT = "JDK default";
private ComboBox myCbProjectTargetLevel;
private JBTable myTable;
@@ -74,7 +74,7 @@ public class TargetOptionsComponent extends JPanel {
targetLevelColumn.setMinWidth(width);
targetLevelColumn.setMaxWidth(width);
add(new JLabel("Project bytecode version (leave blank for compiler default): "),
add(new JLabel("Project bytecode version (leave blank for jdk default): "),
constraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.NONE));
add(myCbProjectTargetLevel, constraints(1, 0, 1, 1, 1.0, 0.0, GridBagConstraints.NONE));
add(new JLabel("Per-module bytecode version:"), constraints(0, 1, 2, 1, 1.0, 0.0, GridBagConstraints.NONE));