Fix issues with nested classes

Author: jrosen081

Sources/Java2Swift/JavaToSwift.swift

@@ -243,7 +243,7 @@ struct JavaToSwift: ParsableCommand {
           if (internalClass.getCanonicalName().contains(prefix)) {
             currentClassName = "\(prefix).\(swiftName)"
           } else {
-            currentClassName = swiftName
+            continue // If we have a class that is not a nested one, ignore it
           }
 
           let currentSanitizedClassName = currentClassName.replacing("$", with: ".")
@@ -256,7 +256,7 @@ struct JavaToSwift: ParsableCommand {
     // Translate all of the Java classes into Swift classes.
     for javaClass in javaClasses {
       translator.startNewFile()
-      let swiftClassDecls = translator.translateClass(javaClass)
+      let swiftClassDecls = try! translator.translateClass(javaClass)
       let importDecls = translator.getImportDecls()
 
       let swiftFileText = """
@@ -296,15 +296,6 @@ struct JavaToSwift: ParsableCommand {
     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

@@ -190,9 +190,9 @@ extension JavaTranslator {
   /// Translates the given Java class into the corresponding Swift type. This
   /// can produce multiple declarations, such as a separate extension of
   /// JavaClass to house static methods.
-  package func translateClass(_ javaClass: JavaClass<JavaObject>) -> [DeclSyntax] {
+  package func translateClass(_ javaClass: JavaClass<JavaObject>) throws -> [DeclSyntax] {
     let fullName = javaClass.getCanonicalName()
-    let swiftTypeName = try! getSwiftTypeNameFromJavaClassName(fullName)
+    let swiftTypeName = try getSwiftTypeNameFromJavaClassName(fullName)
     let (swiftParentType, swiftInnermostTypeName) = swiftTypeName.splitSwiftTypeName()
 
     // If the swift parent type has not been translated, don't try to translate this one
@@ -393,7 +393,12 @@ extension JavaTranslator {
 
     let subClassDecls = javaClass.getClasses().compactMap {
       $0.flatMap { clazz in
-        return translateClass(clazz)
+        do {
+          return try translateClass(clazz)
+        } catch {
+          logUntranslated("Unable to translate '\(fullName)' subclass '\(clazz.getName())': \(error)")
+          return nil
+        }
       }
     }.flatMap(\.self)
 

Tests/Java2SwiftTests/Java2SwiftTests.swift

@@ -174,8 +174,8 @@ func assertTranslatedClass<JavaClassType: AnyJavaObject>(
 
 
   translator.startNewFile()
-  let translatedDecls = translator.translateClass(
-    try JavaClass<JavaObject>(
+  let translatedDecls = try translator.translateClass(
+    JavaClass<JavaObject>(
       javaThis: javaType.getJNIClass(in: environment),
       environment: environment)
   )