Made Java 5 the default for IceJ

4 files changed, 118 insertions, 112 deletions

diff --git a/cpp/include/Slice/JavaUtil.h b/cpp/include/Slice/JavaUtil.h
index ee5286614ec..decc474943b 100644
--- a/cpp/include/Slice/JavaUtil.h
+++ b/cpp/include/Slice/JavaUtil.h
@@ -188,6 +188,7 @@ protected:
     Slice::FeatureProfile _featureProfile;
 
     static const std::string _getSetMetaData;
+    static const std::string _java2MetaData;
     static const std::string _java5MetaData;
 
 private:
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 968352cbf57..5406f1dedef 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -149,6 +149,7 @@ Slice::JavaOutput::printHeader()
 }
 
 const string Slice::JavaGenerator::_getSetMetaData = "java:getset";
+const string Slice::JavaGenerator::_java2MetaData = "java:java2";
 const string Slice::JavaGenerator::_java5MetaData = "java:java5";
 
 Slice::JavaGenerator::JavaGenerator(const string& dir) :
@@ -488,7 +489,7 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
 		    return getAbsolute(dict, package, "", "Holder");
 		}
 
-		bool java5 = dict->definitionContext()->findMetaData(_java5MetaData) == _java5MetaData;
+		bool java2 = dict->definitionContext()->findMetaData(_java2MetaData) == _java2MetaData;
 
 		//
 		// The custom type may or may not be compatible with the type used
@@ -496,13 +497,13 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
 		// that holds a value of the abstract custom type. Otherwise, we
 		// use MapHolder.
 		//
-		if(java5)
+		if(java2)
 		{
-		    return string("Ice.Holder<") + abstractType + " >";
+		    return "Ice.MapHolder";
 		}
 		else
 		{
-		    return "Ice.MapHolder";
+		    return string("Ice.Holder<") + abstractType + " >";
 		}
 	    }
         }
@@ -538,7 +539,7 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
 		    return getAbsolute(seq, package, "", "Holder");
 		}
 
-		bool java5 = seq->definitionContext()->findMetaData(_java5MetaData) == _java5MetaData;
+		bool java2 = seq->definitionContext()->findMetaData(_java2MetaData) == _java2MetaData;
 
 		//
 		// The custom type may or may not be compatible with the type used
@@ -546,11 +547,7 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
 		// that holds a value of the abstract custom type. Otherwise, we
 		// choose a predefined holder class.
 		//
-		if(java5)
-		{
-		    return string("Ice.Holder<") + abstractType + " >";
-		}
-		else
+		if(java2)
 		{
 		    if(abstractType == "java.util.ArrayList")
 		    {
@@ -565,6 +562,10 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
 			return "Ice.ListHolder";
 		    }
 		}
+		else
+		{
+		    return string("Ice.Holder<") + abstractType + " >";
+		}
 	    }
         }
         else
@@ -913,12 +914,12 @@ Slice::JavaGenerator::writeDictionaryMarshalUnmarshalCode(Output& out,
     string stream = marshal ? "__os" : "__is";
     string v = param;
 
-    bool java5 = false;
+    bool java2 = false;
     string concreteType;
 
     if(_featureProfile != Slice::IceE)
     {
-	java5 = dict->definitionContext()->findMetaData(_java5MetaData) == _java5MetaData;
+	java2 = dict->definitionContext()->findMetaData(_java2MetaData) == _java2MetaData;
 
 	//
 	// We have to determine whether it's possible to use the
@@ -982,20 +983,20 @@ Slice::JavaGenerator::writeDictionaryMarshalUnmarshalCode(Output& out,
         out << nl << "else";
         out << sb;
         out << nl << "__os.writeSize(" << v << ".size());";
-	if(java5)
+	if(java2)
 	{
-	    string keyObjectS = typeToObjectString(key, TypeModeIn, package);
-	    string valueObjectS = typeToObjectString(value, TypeModeIn, package);
-	    out << nl << "for(java.util.Map.Entry<" << keyObjectS << ", " << valueObjectS << "> __e : " << v
-		<< ".entrySet())";
+	    out << nl << "java.util.Iterator __i" << iterS << " = " << v << ".entrySet().iterator();";
+	    out << nl << "while(__i" << iterS << ".hasNext())";
 	    out << sb;
+	    out << nl << "java.util.Map.Entry __e = (java.util.Map.Entry)" << "__i" << iterS << ".next();";
 	}
 	else
 	{
-	    out << nl << "java.util.Iterator __i" << iterS << " = " << v << ".entrySet().iterator();";
-	    out << nl << "while(__i" << iterS << ".hasNext())";
+	    string keyObjectS = typeToObjectString(key, TypeModeIn, package);
+	    string valueObjectS = typeToObjectString(value, TypeModeIn, package);
+	    out << nl << "for(java.util.Map.Entry<" << keyObjectS << ", " << valueObjectS << "> __e : " << v
+		<< ".entrySet())";
 	    out << sb;
-	    out << nl << "java.util.Map.Entry __e = (java.util.Map.Entry)" << "__i" << iterS << ".next();";
 	}
         for(i = 0; i < 2; i++)
         {
@@ -1016,11 +1017,7 @@ Slice::JavaGenerator::writeDictionaryMarshalUnmarshalCode(Output& out,
 	    //
 	    // We have to downcast unless we're using Java5.
 	    //
-	    if(java5)
-	    {
-		val = arg;
-	    }
-	    else
+	    if(java2)
 	    {
 		BuiltinPtr b = BuiltinPtr::dynamicCast(type);
 		if(b)
@@ -1081,6 +1078,10 @@ Slice::JavaGenerator::writeDictionaryMarshalUnmarshalCode(Output& out,
 		    val = "((" + typeToString(type, TypeModeIn, package) + ')' + arg + ')';
 		}
 	    }
+	    else
+	    {
+		val = arg;
+	    }
             writeMarshalUnmarshalCode(out, package, type, val, true, iter, false);
         }
         out << eb;
@@ -1111,7 +1112,7 @@ Slice::JavaGenerator::writeDictionaryMarshalUnmarshalCode(Output& out,
             }
 
             BuiltinPtr b = BuiltinPtr::dynamicCast(type);
-            if(b && !java5)
+            if(b && java2)
             {
                 switch(b->kind())
                 {
@@ -1211,13 +1212,13 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
     string stream = marshal ? "__os" : "__is";
     string v = param;
 
-    bool java5 = false;
+    bool java2 = false;
     bool customType = false;
     string concreteType;
 
     if(_featureProfile != Slice::IceE)
     {
-	java5 = seq->definitionContext()->findMetaData(_java5MetaData) == _java5MetaData;
+	java2 = seq->definitionContext()->findMetaData(_java2MetaData) == _java2MetaData;
 
 	//
 	// We have to determine whether it's possible to use the
@@ -1289,7 +1290,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
         // Marshal/unmarshal a custom sequence type.
         //
         BuiltinPtr b = BuiltinPtr::dynamicCast(type);
-        if(b && b->kind() != Builtin::KindObject && b->kind() != Builtin::KindObjectProxy && !java5)
+        if(b && b->kind() != Builtin::KindObject && b->kind() != Builtin::KindObjectProxy && java2)
         {
             if(marshal)
             {
@@ -1500,15 +1501,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                 out << nl << "else";
                 out << sb;
                 out << nl << stream << ".writeSize(" << v << ".size());";
-		if(java5)
-		{
-		    string typeS = typeToString(type, TypeModeIn, package);
-		    out << nl << "for(" << typeS << " __elem : " << v << ')';
-		    out << sb;
-		    writeMarshalUnmarshalCode(out, package, type, "__elem", true, iter, false);
-		    out << eb;
-		}
-		else
+		if(java2)
 		{
 		    ostringstream oit;
 		    oit << "__i" << iter;
@@ -1521,6 +1514,14 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
 		    writeMarshalUnmarshalCode(out, package, type, "__elem", true, iter, false);
 		    out << eb;
 		}
+		else
+		{
+		    string typeS = typeToString(type, TypeModeIn, package);
+		    out << nl << "for(" << typeS << " __elem : " << v << ')';
+		    out << sb;
+		    writeMarshalUnmarshalCode(out, package, type, "__elem", true, iter, false);
+		    out << eb;
+		}
                 out << eb; // else
             }
             else
@@ -2134,7 +2135,7 @@ Slice::JavaGenerator::writeStreamDictionaryMarshalUnmarshalCode(Output& out,
     string stream = marshal ? "__outS" : "__inS";
     string v = param;
 
-    bool java5 = dict->definitionContext()->findMetaData(_java5MetaData) == _java5MetaData;
+    bool java2 = dict->definitionContext()->findMetaData(_java2MetaData) == _java2MetaData;
 
     //
     // We have to determine whether it's possible to use the
@@ -2197,20 +2198,20 @@ Slice::JavaGenerator::writeStreamDictionaryMarshalUnmarshalCode(Output& out,
         out << nl << "else";
         out << sb;
         out << nl << "__outS.writeSize(" << v << ".size());";
-	if(java5)
+	if(java2)
 	{
-	    string keyObjectS = typeToObjectString(key, TypeModeIn, package);
-	    string valueObjectS = typeToObjectString(value, TypeModeIn, package);
-	    out << nl << "for(java.util.Map.Entry<" << keyObjectS << ", " << valueObjectS << "> __e : " << v
-		<< ".entrySet())";
+	    out << nl << "java.util.Iterator __i" << iterS << " = " << v << ".entrySet().iterator();";
+	    out << nl << "while(__i" << iterS << ".hasNext())";
 	    out << sb;
+	    out << nl << "java.util.Map.Entry __e = (java.util.Map.Entry)" << "__i" << iterS << ".next();";
 	}
 	else
 	{
-	    out << nl << "java.util.Iterator __i" << iterS << " = " << v << ".entrySet().iterator();";
-	    out << nl << "while(__i" << iterS << ".hasNext())";
+	    string keyObjectS = typeToObjectString(key, TypeModeIn, package);
+	    string valueObjectS = typeToObjectString(value, TypeModeIn, package);
+	    out << nl << "for(java.util.Map.Entry<" << keyObjectS << ", " << valueObjectS << "> __e : " << v
+		<< ".entrySet())";
 	    out << sb;
-	    out << nl << "java.util.Map.Entry __e = (java.util.Map.Entry)" << "__i" << iterS << ".next();";
 	}
         for(i = 0; i < 2; i++)
         {
@@ -2231,11 +2232,7 @@ Slice::JavaGenerator::writeStreamDictionaryMarshalUnmarshalCode(Output& out,
 	    //
 	    // We have to downcast unless we're using Java5.
 	    //
-	    if(java5)
-	    {
-		val = arg;
-	    }
-	    else
+	    if(java2)
 	    {
 		BuiltinPtr b = BuiltinPtr::dynamicCast(type);
 		if(b)
@@ -2296,6 +2293,10 @@ Slice::JavaGenerator::writeStreamDictionaryMarshalUnmarshalCode(Output& out,
 		    val = "((" + typeToString(type, TypeModeIn, package) + ')' + arg + ')';
 		}
 	    }
+	    else
+	    {
+		val = arg;
+	    }
             writeStreamMarshalUnmarshalCode(out, package, type, val, true, iter, false);
         }
         out << eb;
@@ -2326,7 +2327,7 @@ Slice::JavaGenerator::writeStreamDictionaryMarshalUnmarshalCode(Output& out,
             }
 
             BuiltinPtr b = BuiltinPtr::dynamicCast(type);
-            if(b && !java5)
+            if(b && java2)
             {
                 switch(b->kind())
                 {
@@ -2426,7 +2427,7 @@ Slice::JavaGenerator::writeStreamSequenceMarshalUnmarshalCode(Output& out,
     string stream = marshal ? "__outS" : "__inS";
     string v = param;
 
-    bool java5 = seq->definitionContext()->findMetaData(_java5MetaData) == _java5MetaData;
+    bool java2 = seq->definitionContext()->findMetaData(_java2MetaData) == _java2MetaData;
 
     //
     // We have to determine whether it's possible to use the
@@ -2497,7 +2498,7 @@ Slice::JavaGenerator::writeStreamSequenceMarshalUnmarshalCode(Output& out,
         // Marshal/unmarshal a custom sequence type.
         //
         BuiltinPtr b = BuiltinPtr::dynamicCast(type);
-        if(b && b->kind() != Builtin::KindObject && b->kind() != Builtin::KindObjectProxy && !java5)
+        if(b && b->kind() != Builtin::KindObject && b->kind() != Builtin::KindObjectProxy && java2)
         {
             if(marshal)
             {
@@ -2708,15 +2709,7 @@ Slice::JavaGenerator::writeStreamSequenceMarshalUnmarshalCode(Output& out,
                 out << nl << "else";
                 out << sb;
                 out << nl << stream << ".writeSize(" << v << ".size());";
-		if(java5)
-		{
-		    string typeS = typeToString(type, TypeModeIn, package);
-		    out << nl << "for(" << typeS << " __elem : " << v << ')';
-		    out << sb;
-		    writeStreamMarshalUnmarshalCode(out, package, type, "__elem", true, iter, false);
-		    out << eb;
-		}
-		else
+		if(java2)
 		{
 		    ostringstream oit;
 		    oit << "__i" << iter;
@@ -2729,6 +2722,14 @@ Slice::JavaGenerator::writeStreamSequenceMarshalUnmarshalCode(Output& out,
 		    writeStreamMarshalUnmarshalCode(out, package, type, "__elem", true, iter, false);
 		    out << eb;
 		}
+		else
+		{
+		    string typeS = typeToString(type, TypeModeIn, package);
+		    out << nl << "for(" << typeS << " __elem : " << v << ')';
+		    out << sb;
+		    writeStreamMarshalUnmarshalCode(out, package, type, "__elem", true, iter, false);
+		    out << eb;
+		}
                 out << eb; // else
             }
             else
@@ -3061,7 +3062,7 @@ Slice::JavaGenerator::getDictionaryTypes(const DictionaryPtr& dict,
 	return customType;
     }
 
-    bool java5 = dict->definitionContext()->findMetaData(_java5MetaData) == _java5MetaData;
+    bool java2 = dict->definitionContext()->findMetaData(_java2MetaData) == _java2MetaData;
 
     //
     // Collect metadata for a custom type.
@@ -3078,7 +3079,7 @@ Slice::JavaGenerator::getDictionaryTypes(const DictionaryPtr& dict,
     //
     string keyTypeStr;
     string valueTypeStr;
-    if(java5)
+    if(!java2)
     {
 	keyTypeStr = typeToObjectString(dict->keyType(), TypeModeIn, package);
 	valueTypeStr = typeToObjectString(dict->valueType(), TypeModeIn, package);
@@ -3100,7 +3101,7 @@ Slice::JavaGenerator::getDictionaryTypes(const DictionaryPtr& dict,
 	    if(pos != string::npos)
 	    {
 		concreteType = ct.substr(1, pos - 1);
-		if(java5)
+		if(!java2)
 		{
 		    concreteType += "<" + keyTypeStr + ", " + valueTypeStr + ">";
 		}
@@ -3119,7 +3120,7 @@ Slice::JavaGenerator::getDictionaryTypes(const DictionaryPtr& dict,
 		if(pos != string::npos)
 		{
 		    abstractType = at.substr(1, pos - 1);
-		    if(java5)
+		    if(!java2)
 		    {
 			abstractType += "<" + keyTypeStr + ", " + valueTypeStr + ">";
 		    }
@@ -3138,7 +3139,7 @@ Slice::JavaGenerator::getDictionaryTypes(const DictionaryPtr& dict,
     if(concreteType.empty())
     {
 	concreteType = "java.util.HashMap";
-	if(java5)
+	if(!java2)
 	{
 	    concreteType += "<" + keyTypeStr + ", " + valueTypeStr + ">";
 	}
@@ -3154,7 +3155,7 @@ Slice::JavaGenerator::getDictionaryTypes(const DictionaryPtr& dict,
     if(abstractType.empty())
     {
 	abstractType = "java.util.Map";
-	if(java5)
+	if(!java2)
 	{
 	    abstractType += "<" + keyTypeStr + ", " + valueTypeStr + ">";
 	}
@@ -3178,7 +3179,7 @@ Slice::JavaGenerator::getSequenceTypes(const SequencePtr& seq,
 	return customType;
     }
 
-    bool java5 = seq->definitionContext()->findMetaData(_java5MetaData) == _java5MetaData;
+    bool java2 = seq->definitionContext()->findMetaData(_java2MetaData) == _java2MetaData;
 
     //
     // Collect metadata for a custom type.
@@ -3194,7 +3195,7 @@ Slice::JavaGenerator::getSequenceTypes(const SequencePtr& seq,
     // Get the inner type.
     //
     string typeStr;
-    if(java5)
+    if(!java2)
     {
 	typeStr = typeToObjectString(seq->type(), TypeModeIn, package);
     }
@@ -3215,7 +3216,7 @@ Slice::JavaGenerator::getSequenceTypes(const SequencePtr& seq,
 	    if(pos != string::npos)
 	    {
 		concreteType = ct.substr(1, pos - 1);
-		if(java5)
+		if(!java2)
 		{
 		    concreteType += "<" + typeStr + ">";
 		}
@@ -3234,7 +3235,7 @@ Slice::JavaGenerator::getSequenceTypes(const SequencePtr& seq,
 		if(pos != string::npos)
 		{
 		    abstractType = at.substr(1, pos - 1);
-		    if(java5)
+		    if(!java2)
 		    {
 			abstractType += "<" + typeStr + ">";
 		    }
@@ -3255,7 +3256,7 @@ Slice::JavaGenerator::getSequenceTypes(const SequencePtr& seq,
 	    // compile-time type safety rules.
 	    //
 	    abstractType = "java.util.List";
-	    if(java5)
+	    if(!java2)
 	    {
 		abstractType += "<" + typeStr + ">";
 	    }
@@ -3311,6 +3312,10 @@ Slice::JavaGenerator::MetaDataVisitor::visitModuleStart(const ModulePtr& p)
 		{
 		    ok = true;
 		}
+		else if(s == _java2MetaData)
+		{
+		    ok = true;
+		}
 		else if(s == _java5MetaData)
 		{
 		    ok = true;
@@ -3423,7 +3428,7 @@ Slice::JavaGenerator::MetaDataVisitor::visitSequence(const SequencePtr& p)
     // the inner sequence actually maps to a generic type, we only issue a
     // warning.
     //
-    if(p->definitionContext()->findMetaData(_java5MetaData) == _java5MetaData && !hasTypeMetaData(p))
+    if(p->definitionContext()->findMetaData(_java2MetaData) != _java2MetaData && !hasTypeMetaData(p))
     {
 	SequencePtr innerSeq = SequencePtr::dynamicCast(p->type());
 	DictionaryPtr innerDict = DictionaryPtr::dynamicCast(p->type());
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 2b774228f4a..bdc1709c89a 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -1025,7 +1025,7 @@ Slice::Gen::generateImplTie(const UnitPtr& p)
 }
 
 void
-Slice::Gen::writeChecksumClass(const string& checksumClass, const string& dir, const ChecksumMap& m, bool java5)
+Slice::Gen::writeChecksumClass(const string& checksumClass, const string& dir, const ChecksumMap& m, bool java2)
 {
     //
     // Attempt to open the source file for the checksum class.
@@ -1060,23 +1060,23 @@ Slice::Gen::writeChecksumClass(const string& checksumClass, const string& dir, c
     //
     // Use a static initializer to populate the checksum map.
     //
-    if(java5)
+    if(java2)
     {
-	out << sp << nl << "public static java.util.Map<String, String> checksums;";
+	out << sp << nl << "public static java.util.Map checksums;";
     }
     else
     {
-	out << sp << nl << "public static java.util.Map checksums;";
+	out << sp << nl << "public static java.util.Map<String, String> checksums;";
     }
     out << sp << nl << "static";
     out << sb;
-    if(java5)
+    if(java2)
     {
-	out << nl << "java.util.Map<String, String> map = new java.util.HashMap<String, String>();";
+	out << nl << "java.util.Map map = new java.util.HashMap();";
     }
     else
     {
-	out << nl << "java.util.Map map = new java.util.HashMap();";
+	out << nl << "java.util.Map<String, String> map = new java.util.HashMap<String, String>();";
     }
     for(ChecksumMap::const_iterator p = m.begin(); p != m.end(); ++p)
     {
@@ -2753,19 +2753,19 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p)
 	out << nl << " **/";
     }
 
-    bool java5 = p->definitionContext()->findMetaData("java:java5") == "java:java5";
+    bool java2 = p->definitionContext()->findMetaData("java:java2") == "java:java2";
 
-    if(java5)
+    if(java2)
     {
-	out << nl << "public enum " << name;
+	out << nl << "public final class " << name;
     }
     else
     {
-	out << nl << "public final class " << name;
+	out << nl << "public enum " << name;
     }
     out << sb;
 
-    if(java5)
+    if(!java2)
     {
 	int n;
 	for(en = enumerators.begin(), n = 0; en != enumerators.end(); ++en, ++n)
@@ -2781,7 +2781,7 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p)
     }
 
     out << nl << "private static " << name << "[] __values = new " << name << "[" << sz << "];";
-    if(java5)
+    if(!java2)
     {
 	out << nl << "static";
 	out << sb;
@@ -2804,7 +2804,7 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p)
 	{
 	    string member = fixKwd((*en)->name());
 	    out << nl << "public static final int _" << member << " = " << n << ';';
-	    if(!java5)
+	    if(java2)
 	    {
 		out << nl << "public static final " << name << ' ' << fixKwd(member)
 		    << " = new " << name << "(_" << member << ");";
@@ -2836,7 +2836,7 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p)
     out << nl << "return __value;";
     out << eb;
 
-    if(!java5)
+    if(java2)
     {
 	out << sp << nl << "public String" << nl << "toString()";
 	out << sb;
@@ -2847,7 +2847,7 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p)
     out << sp << nl << "private" << nl << name << "(int val)";
     out << sb;
     out << nl << "__value = val;";
-    if(!java5)
+    if(java2)
     {
 	out << nl << "__values[val] = this;";
     }
@@ -2933,7 +2933,7 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p)
         }
     }
 
-    if(!java5)
+    if(java2)
     {
 	out << sp << nl << "final static private String[] __T =";
 	out << sb;
@@ -3274,8 +3274,8 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
 
     out << sb;
 
-    bool java5 = p->definitionContext()->findMetaData("java:java5") == "java:java5";
-    string contextType = java5 ? "java.util.Map<String, String>" : "java.util.Map";
+    bool java2 = p->definitionContext()->findMetaData("java:java2") == "java:java2";
+    string contextType = java2 ? "java.util.Map" : "java.util.Map<String, String>";
     string contextParam = contextType + " __ctx";
     string explicitContextParam = "boolean __explicitCtx";
 
@@ -3334,7 +3334,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
 	// by the fact that _emptyContext returns the unchecked type
 	// java.util.Map but Ice.Context is mapped to Map<String, String>.
 	//
-	if(java5)
+	if(!java2)
 	{
 	    out << nl << "@SuppressWarnings(\"unchecked\")";
 	}
@@ -3409,7 +3409,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p)
 	    // by the fact that _emptyContext returns the unchecked type
 	    // java.util.Map but Ice.Context is mapped to Map<String, String>.
 	    //
-	    if(java5)
+	    if(!java2)
 	    {
 		out << nl << "@SuppressWarnings(\"unchecked\")";
 	    }
@@ -3923,8 +3923,8 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
 	out << nl << " **/";
     }
 
-    bool java5 = p->definitionContext()->findMetaData("java:java5") == "java:java5";
-    string contextParam = java5 ? "java.util.Map<String, String> __ctx" : "java.util.Map __ctx";
+    bool java2 = p->definitionContext()->findMetaData("java:java2") == "java:java2";
+    string contextParam = java2 ? "java.util.Map __ctx" : "java.util.Map<String, String> __ctx";
 
     out << nl << "public " << retS << ' ' << name << spar << params << contextParam << epar;
     writeThrowsClause(package, throws);
@@ -4003,8 +4003,8 @@ Slice::Gen::DelegateVisitor::visitClassDefStart(const ClassDefPtr& p)
 
     out << sb;
 
-    bool java5 = p->definitionContext()->findMetaData("java:java5") == "java:java5";
-    string contextParam = java5 ? "java.util.Map<String, String> __ctx" : "java.util.Map __ctx";
+    bool java2 = p->definitionContext()->findMetaData("java:java2") == "java:java2";
+    string contextParam = java2 ? "java.util.Map __ctx" : "java.util.Map<String, String> __ctx";
 
     OperationList ops = p->operations();
 
@@ -4062,8 +4062,8 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
     out << sp << nl << "public final class _" << name << "DelM extends Ice._ObjectDelM implements _" << name << "Del";
     out << sb;
 
-    bool java5 = p->definitionContext()->findMetaData("java:java5") == "java:java5";
-    string contextParam = java5 ? "java.util.Map<String, String> __ctx" : "java.util.Map __ctx";
+    bool java2 = p->definitionContext()->findMetaData("java:java2") == "java:java2";
+    string contextParam = java2 ? "java.util.Map __ctx" : "java.util.Map<String, String> __ctx";
 
     OperationList ops = p->allOperations();
 
@@ -4244,8 +4244,8 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p)
     out << sp << nl << "public final class _" << name << "DelD extends Ice._ObjectDelD implements _" << name << "Del";
     out << sb;
 
-    bool java5 = p->definitionContext()->findMetaData("java:java5") == "java:java5";
-    string contextParam = java5 ? "java.util.Map<String, String> __ctx" : "java.util.Map __ctx";
+    bool java2 = p->definitionContext()->findMetaData("java:java2") == "java:java2";
+    string contextParam = java2 ? "java.util.Map __ctx" : "java.util.Map<String, String> __ctx";
 
     OperationList ops = p->allOperations();
 
@@ -4856,8 +4856,8 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
 	    out << nl << "public abstract void ice_exception(Ice.UserException ex);";
 	}
 	
-	bool java5 = p->definitionContext()->findMetaData("java:java5") == "java:java5";
-	string contextParam = java5 ? "java.util.Map<String, String> __ctx" : "java.util.Map __ctx";
+	bool java2 = p->definitionContext()->findMetaData("java:java2") == "java:java2";
+	string contextParam = java2 ? "java.util.Map __ctx" : "java.util.Map<String, String> __ctx";
 
 	out << sp << nl << "public final void" << nl << "__invoke" << spar << "Ice.ObjectPrx __prx"
 	    << paramsInvoke << contextParam << epar;
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index e3ff15c3496..b2014f0e247 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -240,18 +240,18 @@ main(int argc, char* argv[])
     if(!checksumClass.empty())
     {
 	//
-	// Look for the Java5 metadata.
+	// Look for the Java2 metadata.
 	//
-	bool java5 = false;
+	bool java2 = false;
 	for(StringList::iterator p = globalMetadata.begin(); p != globalMetadata.end(); ++p)
 	{
-	    if((*p) == "java:java5")
+	    if((*p) == "java:java2")
 	    {
-		java5 = true;
+		java2 = true;
 		break;
 	    }
 	}
-	Gen::writeChecksumClass(checksumClass, output, checksums, java5);
+	Gen::writeChecksumClass(checksumClass, output, checksums, java2);
     }
 
     return status;