Move Iterator to correct namespace

5 files changed, 6 insertions, 6 deletions

diff --git a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpBackend.java b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpBackend.java
index 312fd0d..7785ec5 100644
--- a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpBackend.java
+++ b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpBackend.java
@@ -22,7 +22,7 @@ public class CsharpBackend implements Backend {
         "java/util/Arrays.cs",
         // TODO: implement Iterable/Iterator in Java
         "java/lang/Iterable.cs",
-        "java/lang/Iterator.cs");
+        "java/util/Iterator.cs");
 
     private final Path directoryPath;
     private final String namespace;
diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaTypes.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaTypes.java
index 1e373d8..1421e83 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaTypes.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaTypes.java
@@ -143,6 +143,6 @@ public class JavaTypes {
     }
 
     public static Type iterator(Type elementType) {
-        return parameterizedType(ScalarType.of("java.lang.Iterator"), list(elementType));
+        return parameterizedType(ScalarType.of("java.util.Iterator"), list(elementType));
     }
 }
diff --git a/src/main/resources/csharp/runtime/java/lang/Iterable.cs b/src/main/resources/csharp/runtime/java/lang/Iterable.cs
index 090b3e5..1565e2b 100644
--- a/src/main/resources/csharp/runtime/java/lang/Iterable.cs
+++ b/src/main/resources/csharp/runtime/java/lang/Iterable.cs
@@ -1,6 +1,6 @@
 namespace Couscous.java.lang {
     // TODO: implement in Java
     internal interface Iterable<T> {
-        Iterator<T> iterator();
+        java.util.Iterator<T> iterator();
     }
 }
diff --git a/src/main/resources/csharp/runtime/java/util/Arrays.cs b/src/main/resources/csharp/runtime/java/util/Arrays.cs
index 6833582..96b31d4 100644
--- a/src/main/resources/csharp/runtime/java/util/Arrays.cs
+++ b/src/main/resources/csharp/runtime/java/util/Arrays.cs
@@ -12,12 +12,12 @@ namespace Couscous.java.util {
             this.values = values;
         }
         
-        public java.lang.Iterator<T> iterator() {
+        public java.util.Iterator<T> iterator() {
             return new _ArrayIterator<T>(values);
         }
     }
     
-    internal class _ArrayIterator<T> : java.lang.Iterator<T> {
+    internal class _ArrayIterator<T> : java.util.Iterator<T> {
         private readonly T[] values;
         private int nextIndex;
         
diff --git a/src/main/resources/csharp/runtime/java/lang/Iterator.cs b/src/main/resources/csharp/runtime/java/util/Iterator.cs
index 75d985f..6b902cc 100644
--- a/src/main/resources/csharp/runtime/java/lang/Iterator.cs
+++ b/src/main/resources/csharp/runtime/java/util/Iterator.cs
@@ -1,4 +1,4 @@
-namespace Couscous.java.lang {
+namespace Couscous.java.util {
     // TODO: implement in Java
     internal interface Iterator<T> {
         bool hasNext();