external build: fix loading processor data from xml; specify options to javac in correct format (IDEA-97426 Incorrect annotation processors executed)

This commit is contained in:
Eugene Zhuravlev
2012-12-16 23:31:49 +01:00
parent 538e315c1f
commit d77a1ae131
2 changed files with 4 additions and 3 deletions
@@ -593,9 +593,10 @@ public class JavaBuilder extends ModuleLevelBuilder {
options.add(processorsPath == null? "" : FileUtil.toSystemDependentName(processorsPath.trim()));
}
for (String procFQName : profile.getProcessors()) {
final Set<String> processors = profile.getProcessors();
if (!processors.isEmpty()) {
options.add("-processor");
options.add(procFQName);
options.add(StringUtil.join(processors, ","));
}
for (Map.Entry<String, String> optionEntry : profile.getProcessorOptions().entrySet()) {
@@ -68,7 +68,7 @@ public class AnnotationProcessorProfileSerializer {
profile.clearProcessors();
for (Object procElement : element.getChildren("processor")) {
final String name = ((Element)procElement).getAttributeValue(NAME);
if (StringUtil.isEmptyOrSpaces(name)) {
if (!StringUtil.isEmptyOrSpaces(name)) {
profile.addProcessor(name);
}
}