Fix java generator

- add import-statement to fix generated files

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

diff --git a/idlc/gen_cion/java_cion_gen_base.cc b/idlc/gen_cion/java_cion_gen_base.cc
index 7a528d1..317315d 100644 (file)
--- a/idlc/gen_cion/java_cion_gen_base.cc
+++ b/idlc/gen_cion/java_cion_gen_base.cc
@@ -36,7 +36,7 @@ JavaCionGeneratorBase::JavaCionGeneratorBase(std::shared_ptr<Document> doc)
 
   meta_type_map_ = {
     {"char", "Byte"},
-    {"int", "Integer"},
+    {"int", "Int"},
     {"short", "Short"},
     {"long", "Long"},
     {"string", "String"},

diff --git a/idlc/gen_cion/java_cion_proxy_gen.cc b/idlc/gen_cion/java_cion_proxy_gen.cc
index 7d9abc4..cde3037 100644 (file)
--- a/idlc/gen_cion/java_cion_proxy_gen.cc
+++ b/idlc/gen_cion/java_cion_proxy_gen.cc
@@ -46,6 +46,10 @@ void JavaCionProxyGen::OnInitGen(std::ofstream& stream) {
     stream << "import org.tizen.cion.DataPayload;" << NLine(1);
     stream << "import org.tizen.cion.FilePayload;" << NLine(1);
     stream << "import java.util.ArrayList;" << NLine(1);
+    stream << "import java.io.IOException;" << NLine(1);
+    stream << "import org.tizen.gen." << FileName << ".data.*;" << NLine(1);
+    stream << "import org.tizen.gen." << FileName << ".interfaces.*;" << NLine(1);
+
     stream << NLine(1);
     GenInterface(stream, iface);
     stream.close();
@@ -69,7 +73,7 @@ void JavaCionProxyGen::GenInterface(
     stream << Tab(1)
         << "private LiveData<ReceivedPayloadInfo> receivedPayloadInfoLiveData;"
         << NLine(1);
-    stream << Tab(1) << "private ArrayList<Delegator> delegators;" << NLine(1);
+    stream << Tab(1) << "private ArrayList<ProxyDelegator> delegators;" << NLine(1);
     stream << NLine(1);
     GenCtor(stream, iface);
     GenMethodId(stream, iface);

diff --git a/idlc/gen_cion/java_cion_stub_base_service_gen.cc b/idlc/gen_cion/java_cion_stub_base_service_gen.cc
index dbdb863..4884847 100644 (file)
--- a/idlc/gen_cion/java_cion_stub_base_service_gen.cc
+++ b/idlc/gen_cion/java_cion_stub_base_service_gen.cc
@@ -40,6 +40,7 @@ void JavaCionStubBaseServiceGen::OnInitGen(std::ofstream& stream) {
     Interface& iface = static_cast<Interface&>(*i);
     stream.open(fname + "/" + GetServiceBaseClassName(i->GetID()) + ".java");
     stream << "package org.tizen.gen." << FileName + ".interfaces;" << NLine(2);
+    stream << "import org.tizen.gen." << FileName << ".data.*;" << NLine(2);
     stream << "import java.util.LinkedList;" << NLine(1);
     stream << "import java.util.ArrayList;" << NLine(1);
     stream << NLine(1);

diff --git a/idlc/gen_cion/java_cion_stub_gen.cc b/idlc/gen_cion/java_cion_stub_gen.cc
index 8949f94..6b2965c 100644 (file)
--- a/idlc/gen_cion/java_cion_stub_gen.cc
+++ b/idlc/gen_cion/java_cion_stub_gen.cc
@@ -45,6 +45,8 @@ void JavaCionStubGen::OnInitGen(std::ofstream& stream) {
     stream << "import org.tizen.cion.DataPayload;" << NLine(1);
     stream << "import org.tizen.cion.FilePayload;" << NLine(1);
     stream << "import java.util.ArrayList;" << NLine(1);
+    stream << "import org.tizen.gen." << FileName << ".data.*;" << NLine(1);
+    stream << "import org.tizen.gen." << FileName << ".interfaces.*;" << NLine(1);
     stream << NLine(1);
     GenInterface(stream, iface);
     stream.close();