Fix java generator

- Fixed some bugs for java generator
- Add some methods

Change-Id: Id209473a8c0f31f5366436611415dcbc83b99b20
Signed-off-by: jh9216.park <jh9216.park@samsung.com>

diff --git a/idlc/gen_cion/java_cion_gen_cb.h b/idlc/gen_cion/java_cion_gen_cb.h
index 59dba9e..0724bf5 100644 (file)
--- a/idlc/gen_cion/java_cion_gen_cb.h
+++ b/idlc/gen_cion/java_cion_gen_cb.h
@@ -169,6 +169,14 @@ public abstract class ServerBase implements ServerConnectionLifecycleCallback,
     }
 
     /**
+     * Gets context
+     * @return Context
+     */
+    public Context getContext() {
+        return mContext;
+    }
+
+    /**
      * Gets service name
      * @return Service name
      */

diff --git a/idlc/gen_cion/java_cion_stub_gen.cc b/idlc/gen_cion/java_cion_stub_gen.cc
index af125dd..4b51d55 100644 (file)
--- a/idlc/gen_cion/java_cion_stub_gen.cc
+++ b/idlc/gen_cion/java_cion_stub_gen.cc
@@ -56,7 +56,7 @@ void JavaCionStubGen::OnInitGen(std::ofstream& stream) {
 void JavaCionStubGen::OnFiniGen(std::ofstream& stream) {}
 
 void JavaCionStubGen::GenInterface(std::ofstream& stream, const Interface& iface) {
-  stream << "public final class " << iface.GetID()
+  stream << "public class " << iface.GetID()
          << " extends ServerBase ";
   GenBrace(stream, TAB_SIZE * 0, [&]() {
     stream << ReplaceAll(CB_DATA_MEMBERS, "<VERSION>", FULLVER);

diff --git a/idlc/gen_cion/java_cion_stub_gen_cb.h b/idlc/gen_cion/java_cion_stub_gen_cb.h
index 1e3eeb1..3fc899b 100644 (file)
--- a/idlc/gen_cion/java_cion_stub_gen_cb.h
+++ b/idlc/gen_cion/java_cion_stub_gen_cb.h
@@ -31,7 +31,7 @@ R"__java_cb(
     /**
      * Abstract class for making a service
      */
-    public abstract class ServiceBase {
+    public static abstract class ServiceBase {
         private String mServiceName;
 
         private String mDisplayName;
@@ -43,10 +43,18 @@ R"__java_cb(
         private ServerBase mServerBase;
 
         /**
+         * Gets server object
+         * @return Server object
+         */
+        public ServerBase getServer() {
+            return mServerBase;
+        }
+
+        /**
          * Gets service name
          * @return Service name
          */
-        public String getmServiceName() {
+        public String getServiceName() {
             return mServiceName;
         }
 
@@ -54,7 +62,7 @@ R"__java_cb(
          * Gets display name
          * @return Display name
          */
-        public String getmDisplayName() {
+        public String getDisplayName() {
               return mDisplayName;
         }
 
@@ -62,7 +70,7 @@ R"__java_cb(
          * Gets client information
          * @return Client information
          */
-        public PeerInfo getmClient() {
+        public PeerInfo getClient() {
             return mClient;
         }
 
@@ -156,6 +164,7 @@ R"__java_cb(
                     return;
             }
         } catch (Exception e) {
+            e.printStackTrace();
             return;
         }
     }
@@ -200,6 +209,7 @@ R"__java_cb(
 
             return returnData;
         } catch (Exception e) {
+            e.printStackTrace();
             return returnData;
         }
     }
@@ -215,6 +225,7 @@ R"__java_cb(
             final Object o = mServiceType.newInstance();
             s = (ServiceBase) o;
         } catch (Exception e) {
+            e.printStackTrace();
             return;
         }
 
@@ -222,8 +233,8 @@ R"__java_cb(
         s.mDisplayName = getDisplayName();
         s.mConnectionRequestClient = peerInfo;
         s.mServerBase = this;
-        s.onConnectionRequest();
         mServices.add(s);
+        s.onConnectionRequest();
     }
 )__java_cb";