From 3ad0b16e4b4313551d27182d549b22d4ef61d4d6 Mon Sep 17 00:00:00 2001 From: Kevin Glynn Date: Wed, 7 Sep 2011 11:12:05 +0200 Subject: [PATCH] Changes necessary to ensure that mono and windows both serialize templates identically --- .../src/CS2JTranslator/CS2JTemplate/TranslationTemplate.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTemplate/TranslationTemplate.cs b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTemplate/TranslationTemplate.cs index 8ec9ad1..30c7ba2 100644 --- a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTemplate/TranslationTemplate.cs +++ b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTemplate/TranslationTemplate.cs @@ -1274,6 +1274,7 @@ namespace Twiglet.CS2J.Translator.TypeRep set { _javaGet = value; } } +/* public override string Java { get @@ -1281,6 +1282,7 @@ namespace Twiglet.CS2J.Translator.TypeRep return JavaGet; } } + */ protected string _javaSet = null; [XmlElementAttribute("Set")] @@ -1348,7 +1350,7 @@ namespace Twiglet.CS2J.Translator.TypeRep public override string mkJava () { // favour JavaGet - return null; + return JavaGet; } #region Equality @@ -2647,6 +2649,7 @@ namespace Twiglet.CS2J.Translator.TypeRep } } + [XmlArrayItem("Cast")] public override List Casts { get { if (_casts == null)