diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/DefaultBuffer.vm b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/DefaultBuffer.vm
index 7c4f30828d8b..e4ba6ea5c4bf 100644
--- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/DefaultBuffer.vm
+++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/DefaultBuffer.vm
@@ -1,11 +1,9 @@
 public String toString() {
-final StringBuffer sb = new StringBuffer();
-sb.append("$classname");
+final StringBuffer sb = new StringBuffer("$classname{");
 #set ($i = 0)
 #foreach ($member in $members)
-#if (!$member.modifierStatic)
 #if ($i == 0)
-sb.append("{##
+sb.append("##
 #else
 sb.append(", ##
 #end
@@ -15,9 +13,15 @@ $member.name='")##
 $member.name=")##
 #end
 #if ($member.primitiveArray)
-.append($member.name == null ? "null" : "");
-for (int i = 0; $member.name != null && i < $member.name .length; ++i)
-    sb.append(i == 0 ? "" : ", ").append($member.name[$i]);
+;
+if ($member.name == null)
+sb.append("null");
+else {
+sb.append('[');
+for (int i = 0; i < $member.name .length; ++i)
+sb.append(i == 0 ? "" : ", ").append($member.name [i]);
+sb.append(']');
+}
 #elseif ($member.objectArray)
 .append($member.name == null ? "null" : Arrays.asList($member.name).toString());
 #elseif ($member.string)
@@ -27,11 +31,6 @@ for (int i = 0; $member.name != null && i < $member.name .length; ++i)
 #end
 #set ($i = $i + 1)
 #end
-#end
-#if ($members.size() == 0)
-sb.append("{}");
-#else
 sb.append('}');
-#end
 return sb.toString();
 }
\ No newline at end of file
diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/DefaultBuilder.vm b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/DefaultBuilder.vm
index e424555dbf64..a0912554c2b7 100644
--- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/DefaultBuilder.vm
+++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/DefaultBuilder.vm
@@ -1,11 +1,9 @@
 public String toString() {
-final StringBuilder sb = new StringBuilder();
-sb.append("$classname");
+final StringBuilder sb = new StringBuilder("$classname{");
 #set ($i = 0)
 #foreach ($member in $members)
-#if (!$member.modifierStatic)
 #if ($i == 0)
-sb.append("{##
+sb.append("##
 #else
 sb.append(", ##
 #end
@@ -14,12 +12,8 @@ $member.name='")##
 #else
 $member.name=")##
 #end
-#if ($member.primitiveArray)
-.append($member.name == null ? "null" : "");
-for (int i = 0; $member.name != null && i < $member.name .length; ++i)
-    sb.append(i == 0 ? "" : ", ").append($member.name[$i]);
-#elseif ($member.objectArray)
-.append($member.name == null ? "null" : Arrays.asList($member.name).toString());
+#if ($member.primitiveArray || $member.objectArray)
+.append(java.util.Arrays.toString($member.name));
 #elseif ($member.string)
 .append($member.accessor).append('\'');
 #else
@@ -27,11 +21,6 @@ for (int i = 0; $member.name != null && i < $member.name .length; ++i)
 #end
 #set ($i = $i + 1)
 #end
-#end
-#if ($members.size() == 0)
-sb.append("{}");
-#else
 sb.append('}');
-#end
 return sb.toString();
 }
\ No newline at end of file