svn commit: r892357 - /incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc

[bryanduxbury]

Author: bryanduxbury
Date: Fri Dec 18 19:34:25 2009
New Revision: 892357

URL: http://svn.apache.org/viewvc?rev=892357&view=rev
Log:
THRIFT-653. java: Fix toString method for enums

Modified:
    incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc

Modified: incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc?rev=892357&r1=892356&r2=892357&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc 
(original)
+++ incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc Fri 
Dec 18 19:34:25 2009
@@ -1933,16 +1933,6 @@
       indent(out) << "    sb.append(Integer.toHexString(this." << 
field->get_name() << "[i]).length() > 1 ? Integer.toHexString(this." << 
field->get_name() << "[i]).substring(Integer.toHexString(this." << 
field->get_name() << "[i]).length() - 2).toUpperCase() : \"0\" + 
Integer.toHexString(this." << field->get_name() << "[i]).toUpperCase());" 
<<endl;
       indent(out) << "  }" << endl;
       indent(out) << "  if (this." << field->get_name() << ".length > 128) 
sb.append(\" ...\");" << endl;
-    } else if(field->get_type()->is_enum()) {
-      indent(out) << "String " << field->get_name() << "_name = " << 
field->get_name() << ".name();"<< endl;
-      indent(out) << "if (" << field->get_name() << "_name != null) {" << endl;
-      indent(out) << "  sb.append(" << field->get_name() << "_name);" << endl;
-      indent(out) << "  sb.append(\" (\");" << endl;
-      indent(out) << "}" << endl;
-      indent(out) << "sb.append(this." << field->get_name() << ");" << endl;
-      indent(out) << "if (" << field->get_name() << "_name != null) {" << endl;
-      indent(out) << "  sb.append(\")\");" << endl;
-      indent(out) << "}" << endl;
     } else {
       indent(out) << "sb.append(this." << (*f_iter)->get_name() << ");" << 
endl;
     }