Skip to content

Commit 6ce652a

Browse files
ktosoktoso
committed
more source renames
1 parent 04083f2 commit 6ce652a

File tree

9 files changed

+65
-36
lines changed

9 files changed

+65
-36
lines changed

‎Sources/JExtractSwiftLib/Convenience/String+Extensions.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ extension String {
5858
.joined()
5959
}
6060

61-
/// Looks up self as a JavaKit wrapped class name and converts it
61+
/// Looks up self as a SwiftJNI wrapped class name and converts it
6262
/// into a `JavaType.class` if it exists in `lookupTable`.
6363
func parseJavaClassFromJavaKitName(in lookupTable: [String: String]) -> JavaType? {
6464
guard let canonicalJavaName = lookupTable[self] else {

‎Sources/JavaKitDependencyResolver/DependencyResolver.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import SwiftJNI
1616
import CJNI
1717

18-
@JavaInterface("org.swift.javakit.dependencies.DependencyResolver")
18+
@JavaInterface("org.swift.jni.dependencies.DependencyResolver")
1919
public struct DependencyResolver {
2020
}
2121

‎Sources/JavaKitDependencyResolver/swift-java.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"dependencies": [
3-
":JavaKit",
3+
":SwiftJNI",
44
]
55
}

‎Sources/SwiftJavaDocumentation/Documentation.docc/SwiftJavaCommandLineTool.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ The easiest way to build a command-line program in Swift is with the [Swift argu
180180
import ArgumentParser
181181
import SwiftJNI
182182

183-
@JavaClass("org.swift.javakit.HelloSwiftMain")
183+
@JavaClass("org.swift.jni.HelloSwiftMain")
184184
struct HelloSwiftMain: ParsableCommand {
185185
@Option(name: .shortAndLong, help: "Enable verbose output")
186186
var verbose: Bool = false

‎Sources/SwiftJavaLib/JavaTranslator.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ package class JavaTranslator {
4545
/// an AnyJavaObject-conforming type) whereas the entry here should map to
4646
/// a value type.
4747
package let translatedToValueTypes: [String: (swiftType: String, swiftModule: String) ] = [
48-
"java.lang.String": ("String", "JavaKit"),
48+
"java.lang.String": ("String", "SwiftJNI"),
4949
]
5050

5151
/// The set of Swift modules that need to be imported to make the generated
@@ -93,7 +93,7 @@ extension JavaTranslator {
9393

9494
/// Default set of modules that will always be imported.
9595
private static let defaultImportedSwiftModules: Set<String> = [
96-
"JavaKit",
96+
"SwiftJava",
9797
"CJNI",
9898
]
9999
}

‎Sources/SwiftJavaTool/Commands/JExtractCommand.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ extension SwiftJava {
7373
@Option(
7474
help: """
7575
A swift-java configuration file for a given Swift module name on which this module depends,
76-
e.g., Sources/JavaKitJar/swift-java.config. There should be one of these options
76+
e.g., Sources/JavaJar/swift-java.config. There should be one of these options
7777
for each Swift module that this module depends on (transitively) that contains wrapped Java sources.
7878
"""
7979
)

‎SwiftKitFFM/src/main/java/org/swift/swiftkit/ffm/FFMSwiftInstanceCleanup.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
import org.swift.swiftkit.core.SwiftInstanceCleanup;
1818

19+
import static org.swift.swiftkit.ffm.SwiftJavaLogGroup.LIFECYCLE;
20+
1921
import java.lang.foreign.MemorySegment;
2022

2123
public class FFMSwiftInstanceCleanup implements SwiftInstanceCleanup {
@@ -35,7 +37,7 @@ public void run() {
3537

3638
// Allow null pointers just for AutoArena tests.
3739
if (type != null && memoryAddress != null) {
38-
System.out.println("[debug] Destroy swift value [" + type.getSwiftName() + "]: " + memoryAddress);
40+
SwiftRuntime.log(LIFECYCLE, "Destroy swift value [" + type.getSwiftName() + "]: " + memoryAddress);
3941
SwiftValueWitnessTable.destroy(type, memoryAddress);
4042
}
4143
}

‎SwiftKitFFM/src/main/java/org/swift/swiftkit/ffm/SwiftRuntime.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.swift.swiftkit.core.SwiftInstance;
1818
import org.swift.swiftkit.core.CallTraces;
1919
import org.swift.swiftkit.core.util.PlatformUtils;
20+
import org.swift.swiftkit.ffm.SwiftRuntime.swiftjava;
2021

2122
import java.lang.foreign.*;
2223
import java.lang.invoke.MethodHandle;
@@ -460,4 +461,30 @@ private static class swift_getTypeName {
460461
public static final MethodHandle HANDLE = Linker.nativeLinker().downcallHandle(ADDR, DESC);
461462
}
462463

464+
public static void log(SwiftJavaLogGroup group, String message) {
465+
if (group.isEnabled()) {
466+
System.err.println(message);
467+
}
468+
}
469+
470+
public static void log(SwiftJavaLogGroup group, String format, String ...args) {
471+
if (group.isEnabled()) {
472+
System.err.println(String.format(format, (Object[]) args));
473+
}
474+
}
475+
463476
}
477+
478+
enum SwiftJavaLogGroup {
479+
LIFECYCLE;
480+
481+
static boolean LOG_LIFECYCLE =
482+
Boolean.getBoolean("swift-java.log.lifecycle");
483+
484+
boolean isEnabled() {
485+
switch (this) {
486+
case LIFECYCLE: return LOG_LIFECYCLE;
487+
}
488+
throw new IllegalArgumentException("Not handled log group: " + this);
489+
}
490+
}

‎Tests/SwiftJavaTests/Java2SwiftTests.swift‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,9 @@ class Java2SwiftTests: XCTestCase {
248248
MyObjects.self,
249249
swiftTypeName: "MyJavaObjects",
250250
translatedClasses: [
251-
"java.lang.Object" : ("JavaObject", "JavaKit"),
252-
"java.util.function.Supplier" : ("MySupplier", "JavaKitFunction"),
253-
"java.lang.String" : ("JavaString", "JavaKit"),
251+
"java.lang.Object" : ("JavaObject", "SwiftJNI"),
252+
"java.util.function.Supplier" : ("MySupplier", "JavaUtilFunction"),
253+
"java.lang.String" : ("JavaString", "SwiftJNI"),
254254
],
255255
expectedChunks: [
256256
"""
@@ -305,7 +305,7 @@ class Java2SwiftTests: XCTestCase {
305305
swiftTypeName: "JavaString",
306306
asClass: true,
307307
translatedClasses: [
308-
"java.lang.Object" : ("JavaObject", "JavaKit"),
308+
"java.lang.Object" : ("JavaObject", "SwiftJNI"),
309309
],
310310
expectedChunks: [
311311
"import SwiftJNI",
@@ -380,9 +380,9 @@ class Java2SwiftTests: XCTestCase {
380380
swiftTypeName: "URLClassLoader",
381381
asClass: true,
382382
translatedClasses: [
383-
"java.lang.Object" : ("JavaObject", "JavaKit"),
384-
"java.lang.ClassLoader" : ("ClassLoader", "JavaKit"),
385-
"java.net.URL" : ("URL", "JavaKitNetwork"),
383+
"java.lang.Object" : ("JavaObject", "SwiftJNI"),
384+
"java.lang.ClassLoader" : ("ClassLoader", "SwiftJNI"),
385+
"java.net.URL" : ("URL", "JavaNet"),
386386
],
387387
expectedChunks: [
388388
"import SwiftJNI",
@@ -411,8 +411,8 @@ class Java2SwiftTests: XCTestCase {
411411
swiftTypeName: "URLClassLoader",
412412
asClass: true,
413413
translatedClasses: [
414-
"java.lang.Object" : ("JavaObject", "JavaKit"),
415-
"java.net.URL" : ("URL", "JavaKitNetwork"),
414+
"java.lang.Object" : ("JavaObject", "SwiftJNI"),
415+
"java.net.URL" : ("URL", "JavaNet"),
416416
],
417417
expectedChunks: [
418418
"import SwiftJNI",
@@ -440,9 +440,9 @@ class Java2SwiftTests: XCTestCase {
440440
swiftTypeName: "JavaByte",
441441
asClass: true,
442442
translatedClasses: [
443-
"java.lang.Object" : ("JavaObject", "JavaKit"),
444-
"java.lang.Number" : ("JavaNumber", "JavaKit"),
445-
"java.lang.Byte" : ("JavaByte", "JavaKit"),
443+
"java.lang.Object" : ("JavaObject", "SwiftJNI"),
444+
"java.lang.Number" : ("JavaNumber", "SwiftJNI"),
445+
"java.lang.Byte" : ("JavaByte", "SwiftJNI"),
446446
],
447447
expectedChunks: [
448448
"import SwiftJNI",
@@ -464,7 +464,7 @@ class Java2SwiftTests: XCTestCase {
464464
swiftTypeName: "MyJavaIntFunction",
465465
asClass: true,
466466
translatedClasses: [
467-
"java.lang.Object" : ("JavaObject", "JavaKit"),
467+
"java.lang.Object" : ("JavaObject", "SwiftJNI"),
468468
"java.util.function.IntFunction": ("MyJavaIntFunction", nil),
469469
],
470470
expectedChunks: [
@@ -487,11 +487,11 @@ class Java2SwiftTests: XCTestCase {
487487
swiftTypeName: "Method",
488488
asClass: true,
489489
translatedClasses: [
490-
"java.lang.Object" : ("JavaObject", "JavaKit"),
491-
"java.lang.Class" : ("JavaClass", "JavaKit"),
492-
"java.lang.reflect.Executable": ("Executable", "JavaKitReflection"),
493-
"java.lang.reflect.Method": ("Method", "JavaKitReflection"),
494-
"java.lang.reflect.TypeVariable" : ("TypeVariable", "JavaKitReflection"),
490+
"java.lang.Object" : ("JavaObject", "SwiftJNI"),
491+
"java.lang.Class" : ("JavaClass", "SwiftJNI"),
492+
"java.lang.reflect.Executable": ("Executable", "JavaLangReflect"),
493+
"java.lang.reflect.Method": ("Method", "JavaLangReflect"),
494+
"java.lang.reflect.TypeVariable" : ("TypeVariable", "JavaLangReflect"),
495495
],
496496
expectedChunks: [
497497
"import JavaLangReflect",
@@ -521,11 +521,11 @@ class Java2SwiftTests: XCTestCase {
521521
swiftTypeName: "Constructor",
522522
asClass: true,
523523
translatedClasses: [
524-
"java.lang.Object" : ("JavaObject", "JavaKit"),
525-
"java.lang.Class" : ("JavaClass", "JavaKit"),
526-
"java.lang.reflect.Executable": ("Executable", "JavaKitReflection"),
527-
"java.lang.reflect.Method": ("Method", "JavaKitReflection"),
528-
"java.lang.reflect.TypeVariable" : ("TypeVariable", "JavaKitReflection"),
524+
"java.lang.Object" : ("JavaObject", "SwiftJNI"),
525+
"java.lang.Class" : ("JavaClass", "SwiftJNI"),
526+
"java.lang.reflect.Executable": ("Executable", "JavaLangReflect"),
527+
"java.lang.reflect.Method": ("Method", "JavaLangReflect"),
528+
"java.lang.reflect.TypeVariable" : ("TypeVariable", "JavaLangReflect"),
529529
],
530530
expectedChunks: [
531531
"import JavaLangReflect",
@@ -555,13 +555,13 @@ class Java2SwiftTests: XCTestCase {
555555
swiftTypeName: "NIOByteBuffer",
556556
asClass: true,
557557
translatedClasses: [
558-
"java.lang.Object" : ("JavaObject", "JavaKit"),
559-
"java.lang.Class" : ("JavaClass", "JavaKit"),
560-
"java.nio.Buffer": ("NIOBuffer", "JavaKitNIO"),
561-
"java.nio.ByteBuffer": ("NIOByteBuffer", "JavaKitNIO"),
558+
"java.lang.Object" : ("JavaObject", "SwiftJNI"),
559+
"java.lang.Class" : ("JavaClass", "SwiftJNI"),
560+
"java.nio.Buffer": ("NIOBuffer", "JavaNio"),
561+
"java.nio.ByteBuffer": ("NIOByteBuffer", "JavaNio"),
562562
],
563563
expectedChunks: [
564-
"import SwiftJNINIO",
564+
"import JavaNio",
565565
"""
566566
@JavaClass("java.nio.ByteBuffer")
567567
open class NIOByteBuffer: NIOBuffer {

0 commit comments

Comments
 (0)