From 4dc22f8c877fe0cb144fa1291802e253d5dffff7 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Fri, 10 Feb 2012 14:08:33 +0100 Subject: [PATCH] progress cleanup --- .../jps/incremental/java/JavaBuilder.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java index ac1d7e09b598..acbd1140f795 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java @@ -257,7 +257,7 @@ public class JavaBuilder extends ModuleLevelBuilder { if (hasSourcesToCompile) { final Set sourcePath = TEMPORARY_SOURCE_ROOTS_KEY.get(context, Collections.emptySet()); - final String chunkName = chunk.getName(); + final String chunkName = getChunkPresentableName(chunk); context.processMessage(new ProgressMessage("Compiling java [" + chunkName + "]")); final boolean compiledOk = compileJava(chunk, files, classpath, platformCp, sourcePath, outs, context, diagnosticSink, outputSink); @@ -316,6 +316,24 @@ public class JavaBuilder extends ModuleLevelBuilder { return exitCode; } + private static String getChunkPresentableName(ModuleChunk chunk) { + final Set modules = chunk.getModules(); + if (modules.isEmpty()) { + return ""; + } + if (modules.size() == 1) { + return modules.iterator().next().getName(); + } + final StringBuilder buf = new StringBuilder(); + for (Module module : modules) { + if (buf.length() > 0) { + buf.append(","); + } + buf.append(module.getName()); + } + return buf.toString(); + } + private boolean compileJava(ModuleChunk chunk, Collection files, Collection classpath, Collection platformCp,