From 01a24c6334917180b07f22d3168053a58da15876 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 5 Feb 2013 20:32:11 +0400 Subject: [PATCH] Better debugging of arguments in Maven --- .../kotlin/maven/KotlinCompileMojoBase.java | 36 +++++++------------ 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java index df654dbcac3..fbf969cd934 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java @@ -35,6 +35,7 @@ import java.io.IOException; import java.lang.reflect.Field; import java.net.URL; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import static org.jetbrains.jet.internal.com.intellij.openapi.util.text.StringUtil.join; @@ -177,9 +178,19 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo { Field[] fields = arguments.getClass().getFields(); for (Field f : fields) { Object value = f.get(arguments); - if (value != null) { - getLog().debug(f.getName() + "=" + value); + + String valueString; + if (value instanceof Object[]) { + valueString = Arrays.deepToString((Object[]) value); } + else if (value != null) { + valueString = String.valueOf(value); + } + else { + valueString = "(null)"; + } + + getLog().debug(f.getName() + "=" + valueString); } getLog().debug("End of arguments"); } @@ -234,12 +245,6 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo { log.debug("Removed target directory from compiler classpath (" + output + ")"); } -// final String runtime = getRuntimeFromClassPath(classpath); -// if (runtime != null) { -// log.debug("Removed Kotlin runtime from compiler classpath (" + runtime + ")"); -// classpathList.remove(runtime); -// } - if (classpathList.size() > 0) { final String classPathString = Joiner.on(File.pathSeparator).join(classpathList); log.info("Classpath: " + classPathString); @@ -274,21 +279,6 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo { } - // TODO: Make a better runtime detection or get rid of it entirely - private String getRuntimeFromClassPath(List classpath) { - for (String item : classpath) { - final int lastSeparatorIndex = item.lastIndexOf(File.separator); - - if (lastSeparatorIndex < 0) - continue; - - if (item.startsWith("kotlin-runtime-", lastSeparatorIndex + 1) && item.endsWith(".jar")) - return item; - } - - return null; - } - private File jdkAnnotationsPath; protected File getJdkAnnotations() {