From 7be95225ddf45965b4f2bb163a757bc7c8e57c18 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 16 Jul 2015 17:39:49 +0300 Subject: [PATCH] guava 18+ toStringHelper template (IDEA-142602) --- .../java/generate/template/toString/DefaultGuava18.vm | 7 +++++++ .../template/toString/ToStringTemplatesManager.java | 2 ++ 2 files changed, 9 insertions(+) create mode 100644 plugins/generate-tostring/src/org/jetbrains/java/generate/template/toString/DefaultGuava18.vm diff --git a/plugins/generate-tostring/src/org/jetbrains/java/generate/template/toString/DefaultGuava18.vm b/plugins/generate-tostring/src/org/jetbrains/java/generate/template/toString/DefaultGuava18.vm new file mode 100644 index 000000000000..f7c90086a542 --- /dev/null +++ b/plugins/generate-tostring/src/org/jetbrains/java/generate/template/toString/DefaultGuava18.vm @@ -0,0 +1,7 @@ +public java.lang.String toString() { +return com.google.common.base.MoreObjects.toStringHelper(this) +#foreach ($member in $members) +.add("$member.name", $member.accessor) +#end +.toString(); +} diff --git a/plugins/generate-tostring/src/org/jetbrains/java/generate/template/toString/ToStringTemplatesManager.java b/plugins/generate-tostring/src/org/jetbrains/java/generate/template/toString/ToStringTemplatesManager.java index af2c7e99aab1..97413c8a7676 100644 --- a/plugins/generate-tostring/src/org/jetbrains/java/generate/template/toString/ToStringTemplatesManager.java +++ b/plugins/generate-tostring/src/org/jetbrains/java/generate/template/toString/ToStringTemplatesManager.java @@ -41,6 +41,7 @@ public class ToStringTemplatesManager extends TemplatesManager { private static final String DEFAULT_TOSTRINGBUILDER = "/org/jetbrains/java/generate/template/toString/DefaultToStringBuilder.vm"; private static final String DEFAULT_TOSTRINGBUILDER3 = "/org/jetbrains/java/generate/template/toString/DefaultToStringBuilder3.vm"; private static final String DEFAULT_GUAVA = "/org/jetbrains/java/generate/template/toString/DefaultGuava.vm"; + private static final String DEFAULT_GUAVA_18 = "/org/jetbrains/java/generate/template/toString/DefaultGuava18.vm"; public static TemplatesManager getInstance() { return ServiceManager.getService(ToStringTemplatesManager.class); @@ -57,6 +58,7 @@ public class ToStringTemplatesManager extends TemplatesManager { new TemplateResource("ToStringBuilder (Apache commons-lang)", readFile(DEFAULT_TOSTRINGBUILDER), true), new TemplateResource("ToStringBuilder (Apache commons-lang 3)", readFile(DEFAULT_TOSTRINGBUILDER3), true), new TemplateResource("Objects.toStringHelper (Guava)", readFile(DEFAULT_GUAVA), true), + new TemplateResource("MoreObjects.toStringHelper (Guava 18+)", readFile(DEFAULT_GUAVA_18), true), new TemplateResource("Groovy: String concat (+)", readFile(DEFAULT_CONCAT_GROOVY), true), }; }