From 290fafdf8618717812f87667be521bd3ab38a2fe Mon Sep 17 00:00:00 2001
From: Mark Spruiell <mes@zeroc.com>
Date: Fri, 1 Feb 2008 15:56:50 -0800
Subject: bug 2435 - Java custom types

---
 cpp/src/slice2java/Gen.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'cpp/src/slice2java/Gen.cpp')

diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index dc308d04081..86150620aad 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -3836,7 +3836,7 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
     string helper = getAbsolute(p, "", "", "Helper");
     string package = getPackage(p);
     StringList metaData = p->getMetaData();
-    string abstractType = typeToString(p, TypeModeIn, package, StringList(), true);
+    string formalType = typeToString(p, TypeModeIn, package, StringList(), true);
 
     if(open(helper))
     {
@@ -3846,16 +3846,16 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
         out << sp << nl << "public final class " << name << "Helper";
         out << sb;
 
-        out << nl << "public static void" << nl << "write(IceInternal.BasicStream __os, " << abstractType << " __v)";
+        out << nl << "public static void" << nl << "write(IceInternal.BasicStream __os, " << formalType << " __v)";
         out << sb;
         iter = 0;
         writeDictionaryMarshalUnmarshalCode(out, package, p, "__v", true, iter, false);
         out << eb;
 
-        out << sp << nl << "public static " << abstractType
+        out << sp << nl << "public static " << formalType
             << nl << "read(IceInternal.BasicStream __is)";
         out << sb;
-        out << nl << abstractType << " __v;";
+        out << nl << formalType << " __v;";
         iter = 0;
         writeDictionaryMarshalUnmarshalCode(out, package, p, "__v", false, iter, false);
         out << nl << "return __v;";
@@ -3863,17 +3863,17 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
 
         if(_stream)
         {
-            out << sp << nl << "public static void" << nl << "write(Ice.OutputStream __outS, " << abstractType
+            out << sp << nl << "public static void" << nl << "write(Ice.OutputStream __outS, " << formalType
                 << " __v)";
             out << sb;
             iter = 0;
             writeStreamDictionaryMarshalUnmarshalCode(out, package, p, "__v", true, iter, false);
             out << eb;
 
-            out << sp << nl << "public static " << abstractType
+            out << sp << nl << "public static " << formalType
                 << nl << "read(Ice.InputStream __inS)";
             out << sb;
-            out << nl << abstractType << " __v;";
+            out << nl << formalType << " __v;";
             iter = 0;
             writeStreamDictionaryMarshalUnmarshalCode(out, package, p, "__v", false, iter, false);
             out << nl << "return __v;";
-- 
cgit v1.2.3