diff --git a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs index 7c05eee..caef3a0 100644 --- a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs +++ b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs @@ -360,7 +360,7 @@ namespace Twiglet.CS2J.Translator // Verify the signature of the signed XML. if (!VerifyXml(xmlDoc, RsaKey)) { - Console.Out.WriteLine("Bad / Missing signature found for " + fullName); + Console.Out.WriteLine("Bad / Missing signature found for " + fullName); badXmlTxCount--; if (badXmlTxCount <= 0) { @@ -374,9 +374,13 @@ namespace Twiglet.CS2J.Translator txStream.Seek(0, SeekOrigin.Begin); } - TypeRepTemplate t = TypeRepTemplate.newInstance(txStream); - // Fullname has form: /.xml - AppEnv[t.TypeName+(t.TypeParams != null && t.TypeParams.Length > 0 ? "'" + t.TypeParams.Length.ToString() : "")] = t; + try { + TypeRepTemplate t = TypeRepTemplate.newInstance(txStream); + // Fullname has form: /.xml + AppEnv[t.TypeName+(t.TypeParams != null && t.TypeParams.Length > 0 ? "'" + t.TypeParams.Length.ToString() : "")] = t; + } catch (Exception e) { + Console.WriteLine ("WARNING -- Could not import " + fullName + " (" + e.Message + ")"); + } } // Here's where we do the real work... diff --git a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTemplate/TranslationTemplate.cs b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTemplate/TranslationTemplate.cs index 4f734ed..2da28d9 100644 --- a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTemplate/TranslationTemplate.cs +++ b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTemplate/TranslationTemplate.cs @@ -2218,38 +2218,34 @@ namespace Twiglet.CS2J.Translator.TypeRep string typeType = null; // class, interface, enum, etc. bool found = false; - - try { - while (reader.Read () && !found) { - if (reader.NodeType == XmlNodeType.Element) { - switch (reader.LocalName) { - case "Class": - typeType = "Twiglet.CS2J.Translator.TypeRep.ClassRepTemplate"; - break; - case "Struct": - typeType = "Twiglet.CS2J.Translator.TypeRep.StructRepTemplate"; - break; - case "Interface": - typeType = "Twiglet.CS2J.Translator.TypeRep.InterfaceRepTemplate"; - break; - case "Enum": - typeType = "Twiglet.CS2J.Translator.TypeRep.EnumRepTemplate"; - break; - case "Delegate": - typeType = "Twiglet.CS2J.Translator.TypeRep.DelegateRepTemplate"; - break; - default: - typeType = "UnknownType"; - break; - } - found = true; - } + + while (reader.Read () && !found) { + if (reader.NodeType == XmlNodeType.Element) { + switch (reader.LocalName) { + case "Class": + typeType = "Twiglet.CS2J.Translator.TypeRep.ClassRepTemplate"; + break; + case "Struct": + typeType = "Twiglet.CS2J.Translator.TypeRep.StructRepTemplate"; + break; + case "Interface": + typeType = "Twiglet.CS2J.Translator.TypeRep.InterfaceRepTemplate"; + break; + case "Enum": + typeType = "Twiglet.CS2J.Translator.TypeRep.EnumRepTemplate"; + break; + case "Delegate": + typeType = "Twiglet.CS2J.Translator.TypeRep.DelegateRepTemplate"; + break; + default: + typeType = "UnknownType"; + break; + } + found = true; } - s.Seek (0, SeekOrigin.Begin); - ret = (TypeRepTemplate)Deserialize (s, System.Type.GetType (typeType)); - } catch (Exception e) { - Console.WriteLine ("WARNING -- (Deserialize) " + e.Message); } + s.Seek (0, SeekOrigin.Begin); + ret = (TypeRepTemplate)Deserialize (s, System.Type.GetType (typeType)); return ret; }