diff --git a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs index 4e254d2..7c05eee 100644 --- a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs +++ b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs @@ -519,7 +519,8 @@ namespace Twiglet.CS2J.Translator netMaker.AliasNamespaces = javaMaker.CUMap[typeName].NameSpaceAliasValues; netMaker.IsJavaish = cfg.InternalIsJavaish; - netMaker.Imports = javaMaker.Imports; + netMaker.Imports = new Set(); + netMaker.AddToImports(javaMaker.Imports); if (cfg.DebugLevel > 5) Console.Out.WriteLine("Translating {0} Net Calls to Java", javaFName); NetMaker.compilation_unit_return javaCompilationUnit = netMaker.compilation_unit(); diff --git a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/CommonWalker.cs b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/CommonWalker.cs index f18836a..5fd2e13 100644 --- a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/CommonWalker.cs +++ b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/CommonWalker.cs @@ -221,7 +221,7 @@ namespace Twiglet.CS2J.Translator.Transform } } - public void AddToImports(ICollection imps) { + public void AddToImports(IEnumerable imps) { if (imps != null) { foreach (string imp in imps) { AddToImports(imp); diff --git a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JUtil/Set.cs b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JUtil/Set.cs index 0e24b2a..1ad6d5d 100644 --- a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JUtil/Set.cs +++ b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JUtil/Set.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; namespace Twiglet.CS2J.Translator.Utils { - public class Set : IEnumerable + public class Set : IEnumerable { /// @@ -24,7 +24,12 @@ namespace Twiglet.CS2J.Translator.Utils } - public IEnumerator GetEnumerator() + public IEnumerator GetEnumerator() + { + return setD.Keys.GetEnumerator(); + } + + IEnumerator IEnumerable.GetEnumerator() { return setD.Keys.GetEnumerator(); }