Changeset 35662 in osm

Timestamp:

2020-12-06T02:51:47+01:00 (4 years ago)

Author:

Don-vip

Message:

see #20205 - remove unneeded class

Location:

applications/editors/josm/plugins/jna/src/org/openstreetmap/josm/plugins/jna/mac

Files:

• Foundation.java (modified) (4 diffs)
• FoundationLibrary.java (modified) (2 diffs)
• ID.java (deleted)

applications/editors/josm/plugins/jna/src/org/openstreetmap/josm/plugins/jna/mac/Foundation.java

@@ -5 +5 @@
 
 import com.sun.jna.Native; // NOSONAR
+import com.sun.jna.NativeLong;
 
 /**
@@ -41 +42 @@
      */
     public static void nsLog(String format, Object args) {
-        ID formatAsCFString = cfString(format);
+        NativeLong formatAsCFString = cfString(format);
         try {
             foundationLibrary.NSLog(formatAsCFString, args);
@@ -54 +55 @@
      * Note that the returned string must be freed with {@link #cfRelease(ID)}.
      */
-    static ID cfString(String s) {
+    static NativeLong cfString(String s) {
         // Use a byte[] rather than letting jna do the String -> char* marshalling itself.
         // Turns out about 10% quicker for long strings.
@@ -65 +66 @@
      * Release the NSObject with id
      */
-    static void cfRelease(ID id) {
+    static void cfRelease(NativeLong id) {
         foundationLibrary.CFRelease(id);
     }

applications/editors/josm/plugins/jna/src/org/openstreetmap/josm/plugins/jna/mac/FoundationLibrary.java

@@ -3 +3 @@
 
 import com.sun.jna.Library; // NOSONAR
+import com.sun.jna.NativeLong;
 
 /**
@@ -11 +12 @@
 interface FoundationLibrary extends Library {
 
-    void NSLog(ID pString, Object thing);
+    void NSLog(NativeLong pString, Object thing);
 
-    ID CFStringCreateWithBytes(ID allocator, byte[] bytes, int byteCount, int encoding, byte isExternalRepresentation);
+    NativeLong CFStringCreateWithBytes(NativeLong allocator, byte[] bytes, int byteCount, int encoding,
+            byte isExternalRepresentation);
 
-    void CFRelease(ID cfTypeRef);
+    void CFRelease(NativeLong cfTypeRef);
 }