commit 1b0bc0f42106700e45ce2e76049eefa6f57c1293
author Jake Farrell <jfarrell@apache.org> Tue Jun 04 22:46:38 2013 -0400
committer Jake Farrell <jfarrell@apache.org> Tue Jun 04 22:46:38 2013 -0400
tree beeb6b9c07c34568d2038b08dfee5e75b46114da
parent d65216df190b0ff1522098c8a552594ce29feb3d

THRIFT-1996:Constants generation is broken / inconsistent with regular Java generation
Client: as3/javame
Patch: Matthew Rathbone

Constants file missing program_name_ prefix.

compiler/cpp/src/generate/t_as3_generator.cc

diff --git a/compiler/cpp/src/generate/t_as3_generator.cc b/compiler/cpp/src/generate/t_as3_generator.cc
index 9f72eac..5abeba4 100644
--- a/compiler/cpp/src/generate/t_as3_generator.cc
+++ b/compiler/cpp/src/generate/t_as3_generator.cc
@@ -431,7 +431,7 @@
     return;
   }
 
-  string f_consts_name = package_dir_+"/Constants.as";
+  string f_consts_name = package_dir_+ "/" + program_name_ +  "Constants.as";
   ofstream f_consts;
   f_consts.open(f_consts_name.c_str());
 
@@ -447,7 +447,7 @@
  
   
   indent(f_consts) <<
-    "public class Constants {" << endl <<
+    "public class " << program_name_ << "Constants {" << endl <<
     endl;
   indent_up();
   vector<t_const*>::iterator c_iter;

compiler/cpp/src/generate/t_javame_generator.cc

diff --git a/compiler/cpp/src/generate/t_javame_generator.cc b/compiler/cpp/src/generate/t_javame_generator.cc
index aa847ac..a2a31a5 100644
--- a/compiler/cpp/src/generate/t_javame_generator.cc
+++ b/compiler/cpp/src/generate/t_javame_generator.cc
@@ -414,7 +414,7 @@
     return;
   }
 
-  string f_consts_name = package_dir_+"/Constants.java";
+  string f_consts_name = package_dir_+ "/" + program_name_ +  "Constants.java";
   ofstream f_consts;
   f_consts.open(f_consts_name.c_str());
 
@@ -425,7 +425,7 @@
     java_type_imports();
 
   f_consts <<
-    "public class Constants {" << endl <<
+    "public class " << program_name_ << "Constants {" << endl <<
     endl;
   indent_up();
   vector<t_const*>::iterator c_iter;