MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-80980 (Generate toString() error with array types)

Browse Source
This commit is contained in:
Bas Leijdekkers
2013-01-15 17:44:48 +01:00
parent ca8c23d891
commit 2766458f81
2 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/DefaultBuffer.vm
+11 -12
View File
@@ -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();
}
plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/DefaultBuilder.vm
+4 -15
View File
@@ -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();
}