Adding support for global metadata. Removing the --package option in

    slice2java. Using global metadata to define packaging in slice2java,
    slice2freezej.

1 files changed, 15 insertions, 17 deletions

diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h
index e89ac5d0363..fa19b9f1e12 100644
--- a/cpp/src/slice2java/Gen.h
+++ b/cpp/src/slice2java/Gen.h
@@ -28,7 +28,7 @@ public:
 
 protected:
 
-    JavaVisitor(const std::string&, const std::string&);
+    JavaVisitor(const std::string&);
 
     //
     // Compose the parameter lists for an operation.
@@ -74,7 +74,6 @@ public:
     Gen(const std::string&,
         const std::string&,
         const std::vector<std::string>&,
-        const std::string&,
         const std::string&);
     ~Gen();
 
@@ -89,14 +88,13 @@ private:
 
     std::string _base;
     std::vector<std::string> _includePaths;
-    std::string _package;
     std::string _dir;
 
     class OpsVisitor : public JavaVisitor
     {
     public:
 
-        OpsVisitor(const std::string&, const std::string&);
+        OpsVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
         virtual void visitClassDefEnd(const ClassDefPtr&);
@@ -107,7 +105,7 @@ private:
     {
     public:
 
-        TieVisitor(const std::string&, const std::string&);
+        TieVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
     };
@@ -116,7 +114,7 @@ private:
     {
     public:
 
-        TypesVisitor(const std::string&, const std::string&);
+        TypesVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
         virtual void visitClassDefEnd(const ClassDefPtr&);
@@ -133,7 +131,7 @@ private:
     {
     public:
 
-        HolderVisitor(const std::string&, const std::string&);
+        HolderVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
         virtual bool visitStructStart(const StructPtr&);
@@ -150,7 +148,7 @@ private:
     {
     public:
 
-        HelperVisitor(const std::string&, const std::string&);
+        HelperVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
         virtual void visitSequence(const SequencePtr&);
@@ -161,7 +159,7 @@ private:
     {
     public:
 
-        ProxyVisitor(const std::string&, const std::string&);
+        ProxyVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
         virtual void visitClassDefEnd(const ClassDefPtr&);
@@ -172,7 +170,7 @@ private:
     {
     public:
 
-        DelegateVisitor(const std::string&, const std::string&);
+        DelegateVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
     };
@@ -181,7 +179,7 @@ private:
     {
     public:
 
-        DelegateMVisitor(const std::string&, const std::string&);
+        DelegateMVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
     };
@@ -190,7 +188,7 @@ private:
     {
     public:
 
-        DelegateDVisitor(const std::string&, const std::string&);
+        DelegateDVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
     };
@@ -199,7 +197,7 @@ private:
     {
     public:
 
-        DispatcherVisitor(const std::string&, const std::string&);
+        DispatcherVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
     };
@@ -208,7 +206,7 @@ private:
     {
     public:
 
-        BaseImplVisitor(const std::string&, const std::string&);
+        BaseImplVisitor(const std::string&);
 
     protected:
 
@@ -233,7 +231,7 @@ private:
     {
     public:
 
-        ImplVisitor(const std::string&, const std::string&);
+        ImplVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
     };
@@ -242,7 +240,7 @@ private:
     {
     public:
 
-        ImplTieVisitor(const std::string&, const std::string&);
+        ImplTieVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
     };
@@ -251,7 +249,7 @@ private:
     {
     public:
 
-        AsyncVisitor(const std::string&, const std::string&);
+        AsyncVisitor(const std::string&);
 
         virtual void visitOperation(const OperationPtr&);
     };