summaryrefslogtreecommitdiff
path: root/cpp/src/Slice/JavaUtil.cpp
diff options
context:
space:
mode:
authorBrent Eagles <brent@zeroc.com>2005-06-09 14:16:03 +0000
committerBrent Eagles <brent@zeroc.com>2005-06-09 14:16:03 +0000
commita488fa1e1fb7a6c952c50b759200d70093bba23d (patch)
treeea74a92d5db1bf9b458d2b8409e05db965eddbf0 /cpp/src/Slice/JavaUtil.cpp
parentadded TestCommon so that the tests can have a common base for output on (diff)
downloadice-a488fa1e1fb7a6c952c50b759200d70093bba23d.tar.bz2
ice-a488fa1e1fb7a6c952c50b759200d70093bba23d.tar.xz
ice-a488fa1e1fb7a6c952c50b759200d70093bba23d.zip
slice2javae changes to remove types that are unsupported by CLDC from
generated code
Diffstat (limited to 'cpp/src/Slice/JavaUtil.cpp')
-rw-r--r--cpp/src/Slice/JavaUtil.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 6c55124ec3b..d3c12473619 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -469,6 +469,11 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
}
else
{
+ if(_featureProfile == Slice::IceE)
+ {
+ return "java.util.Hashtable";
+ }
+
if(dictType.empty())
{
StringList l = dict->getMetaData();
@@ -491,7 +496,7 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
string listType = findMetaData(metaData);
if(mode == TypeModeOut)
{
- if(listType.empty())
+ if(listType.empty() || _featureProfile == Slice::IceE)
{
return getAbsolute(seq, package, "", "Holder");
}
@@ -510,6 +515,11 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
}
else
{
+ if(_featureProfile == Slice::IceE)
+ {
+ return typeToString(seq->type(), mode, package) + "[]";
+ }
+
if(listType.empty())
{
StringList l = seq->getMetaData();