You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by br...@apache.org on 2009/02/10 19:36:56 UTC
svn commit: r743046 -
/incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc
Author: bryanduxbury
Date: Tue Feb 10 18:36:56 2009
New Revision: 743046
URL: http://svn.apache.org/viewvc?rev=743046&view=rev
Log:
THRIFT-316. java: @Override isn't generated for hashCode() without the hash code builder
Fixed with a trivial reorganization of the hashCode method generation.
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=743046&r1=743045&r2=743046&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 Tue Feb 10 18:36:56 2009
@@ -861,13 +861,11 @@
scope_down(out);
out << endl;
+ out << indent() << "@Override" << endl <<
+ indent() << "public int hashCode() {" << endl;
+ indent_up();
if (gen_hash_code_) {
- out << indent() << "@Override" << endl <<
- indent() << "public int hashCode() {" << endl;
- indent_up();
-
- out <<
- indent() << "HashCodeBuilder builder = new HashCodeBuilder();" << endl;
+ indent(out) << "HashCodeBuilder builder = new HashCodeBuilder();" << endl;
for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
out << endl;
@@ -895,20 +893,12 @@
}
out << endl;
- out <<
- indent() << "return builder.toHashCode();" << endl;
- scope_down(out);
- out << endl;
-
+ indent(out) << "return builder.toHashCode();" << endl;
} else {
- out <<
- indent() << "public int hashCode() {" << endl;
- indent_up();
- out <<
- indent() << "return 0;" << endl;
- scope_down(out);
- out << endl;
+ indent(out) << "return 0;" << endl;
}
+ indent_down();
+ indent(out) << "}" << endl << endl;
}
/**