From: Jake Farrell <jfarrell@apache.org>
Date: Wed, 5 Jun 2013 02:46:38 +0000 (-0400)
Subject: THRIFT-1996:Constants generation is broken / inconsistent with regular Java generation
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=1b0bc0f42106700e45ce2e76049eefa6f57c1293;p=common%2Fthrift.git

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

Constants file missing program_name_ prefix.
---

diff --git a/compiler/cpp/src/generate/t_as3_generator.cc b/compiler/cpp/src/generate/t_as3_generator.cc
index 9f72eaca..5abeba4f 100644
--- a/compiler/cpp/src/generate/t_as3_generator.cc
+++ b/compiler/cpp/src/generate/t_as3_generator.cc
@@ -431,7 +431,7 @@ void t_as3_generator::generate_consts(std::vector<t_const*> consts) {
     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 @@ void t_as3_generator::generate_consts(std::vector<t_const*> consts) {
  
   
   indent(f_consts) <<
-    "public class Constants {" << endl <<
+    "public class " << program_name_ << "Constants {" << endl <<
     endl;
   indent_up();
   vector<t_const*>::iterator c_iter;
diff --git a/compiler/cpp/src/generate/t_javame_generator.cc b/compiler/cpp/src/generate/t_javame_generator.cc
index aa847ac9..a2a31a55 100644
--- a/compiler/cpp/src/generate/t_javame_generator.cc
+++ b/compiler/cpp/src/generate/t_javame_generator.cc
@@ -414,7 +414,7 @@ void t_javame_generator::generate_consts(std::vector<t_const*> consts) {
     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 @@ void t_javame_generator::generate_consts(std::vector<t_const*> consts) {
     java_type_imports();
 
   f_consts <<
-    "public class Constants {" << endl <<
+    "public class " << program_name_ << "Constants {" << endl <<
     endl;
   indent_up();
   vector<t_const*>::iterator c_iter;