Keep going

Author: jrosen081

Sources/Java2Swift/JavaToSwift.swift

@@ -228,6 +228,13 @@ struct JavaToSwift: ParsableCommand {
 
       // Note that we will be translating this Java class, so it is a known class.
       translator.translatedClasses[javaClassName] = (translatedSwiftName, nil, true)
+
+      for internalClass in javaClass.getClasses() {
+        if let internalClass {
+          let (javaName, swiftName) = names(from: internalClass.getCanonicalName())
+          translator.translatedClasses[internalClass.getCanonicalName()] = (swiftName.replacing("$", with: "."), nil, true)
+        }
+      }
     }
 
     // Translate all of the Java classes into Swift classes.
@@ -252,6 +259,36 @@ struct JavaToSwift: ParsableCommand {
     }
   }
 
+  private func names(from javaClassNameOpt: String) -> (javaClassName: String, swiftName: String) {
+    let javaClassName: String
+    let swiftName: String
+    if let equalLoc = javaClassNameOpt.firstIndex(of: "=") {
+      let afterEqual = javaClassNameOpt.index(after: equalLoc)
+      javaClassName = String(javaClassNameOpt[..<equalLoc])
+      swiftName = String(javaClassNameOpt[afterEqual...])
+    } else {
+      if let dotLoc = javaClassNameOpt.lastIndex(of: ".") {
+        let afterDot = javaClassNameOpt.index(after: dotLoc)
+        swiftName = String(javaClassNameOpt[afterDot...])
+      } else {
+        swiftName = javaClassNameOpt
+      }
+
+      javaClassName = javaClassNameOpt
+    }
+
+    return (javaClassName, swiftName)
+  }
+
+  /// Return the class path augmented with the Jar file, if there is one.
+  var classPathWithJarFile: [String] {
+    if jarFile {
+      return [input] + classpath
+    }
+
+    return classpath
+  }
+
   mutating func writeContents(_ contents: String, to filename: String, description: String) throws {
     guard let outputDir = actualOutputDirectory else {
       print("// \(filename) - \(description)")

Sources/Java2SwiftLib/JavaTranslator.swift

@@ -194,15 +194,6 @@ extension JavaTranslator {
     let fullName = javaClass.getCanonicalName()
     let swiftTypeName = try! getSwiftTypeNameFromJavaClassName(fullName)
 
-    for internalClass in javaClass.getClasses() {
-      if let internalClass {
-        print("Translating name \(internalClass.getName())")
-        let internalJavaClassName = internalClass.getName()
-        let translatedInternalSwiftName = internalJavaClassName.replacing("$", with: ".")
-        translatedClasses[translatedInternalSwiftName] = ("\(swiftTypeName).\(internalClass.getSimpleName())", nil, true)
-      }
-    }
-
     // Superclass.
     let extends: String
     if !javaClass.isInterface(),
@@ -248,18 +239,6 @@ extension JavaTranslator {
     // Members
     var members: [DeclSyntax] = []
 
-    members.append(
-      contentsOf: javaClass.getClasses().compactMap {
-        $0.flatMap { clazz in
-          let text = translateClass(clazz)
-          text.map { t in t.formatted().description  }
-            .forEach { t in print(t) }
-          print()
-          return text
-        }
-      }.flatMap(\.self)
-    )
-
     // Fields
     var staticFields: [Field] = []
     var enumConstants: [Field] = []
@@ -403,6 +382,15 @@ extension JavaTranslator {
     classDecl = classDecl.formatted(using: format).cast(DeclSyntax.self)
 
     topLevelDecls.append(classDecl)
+    let subClassDecls = javaClass.getClasses().compactMap {
+      $0.flatMap { clazz in
+        return translateClass(clazz)
+      }
+    }.flatMap(\.self)
+
+    topLevelDecls.append(
+      contentsOf: subClassDecls
+    )
 
     // Translate static members.
     var staticMembers: [DeclSyntax] = []

Sources/JavaKitReflection/JavaClass+Reflection.swift

@@ -37,10 +37,4 @@ extension JavaClass {
 
   @JavaMethod
   public func getGenericInterfaces() -> [Type?]
-
-  @JavaMethod
-  public func isInterface() -> Bool
-
-  @JavaMethod
-  public func getClasses() -> [JavaClass<JavaObject>?]
 }

Tests/Java2SwiftTests/Java2SwiftTests.swift

@@ -119,6 +119,12 @@ class Java2SwiftTests: XCTestCase {
     try assertTranslatedClass(
       ProcessBuilder.self,
       swiftTypeName: "ProcessBuilder",
+      translatedClasses: [
+        "java.lang.ProcessBuilder": ("ProcessBuilder", nil, true),
+        "java.lang.ProcessBuilder.Redirect": ("ProcessBuilder.Redirect", nil, true),
+        "java.lang.ProcessBuilder.Redirect.Type": ("ProcessBuilder.Redirect.Type", nil, true),
+        "java.lang.Enum.EnumDesc": ("Enum.EnumDesc", nil, true)
+      ],
       expectedChunks: [
         "import JavaKit",
         ""