Moved the com.sun.jna.PointerTool into ca.weblite.objc.jna package for JPMS compatibility. #1 (comment)

shannah · shannah · commit 6ffdb5454841 · 2019-03-13T11:53:45.000-07:00
diff --git a/dist/ObjCBridge.jar b/dist/ObjCBridge.jar
diff --git a/java/src/ca/weblite/objc/NSObject.java b/java/src/ca/weblite/objc/NSObject.java
@@ -12,7 +12,7 @@
 import com.sun.jna.Function;
 import com.sun.jna.Native;
 import com.sun.jna.Pointer;
-import com.sun.jna.PointerTool;
+import ca.weblite.objc.jna.PointerTool;
 import com.sun.jna.ptr.ByReference;
 import com.sun.jna.ptr.DoubleByReference;
 import com.sun.jna.ptr.PointerByReference;
diff --git a/java/src/ca/weblite/objc/jna/PointerTool.java b/java/src/ca/weblite/objc/jna/PointerTool.java
@@ -2,14 +2,16 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package com.sun.jna;
+package ca.weblite.objc.jna;
+
+import com.sun.jna.Pointer;
 
 /**
  *
  * @author shannah
  */
 public class PointerTool {
     public static long getPeer(Pointer ptr){
-        return ptr.peer;
+        return Pointer.nativeValue(ptr);
     }
 }
diff --git a/java/src/ca/weblite/objc/mappers/NSObjectMapping.java b/java/src/ca/weblite/objc/mappers/NSObjectMapping.java
@@ -13,7 +13,7 @@
 import static ca.weblite.objc.RuntimeUtils.*;
 import com.sun.jna.Pointer;
 import ca.weblite.objc.Runtime;
-import com.sun.jna.PointerTool;
+import ca.weblite.objc.jna.PointerTool;
 
 /**
  *

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,16 @@`
`2`	`2`	`* To change this template, choose Tools \| Templates`
`3`	`3`	`* and open the template in the editor.`
`4`	`4`	`*/`
`5`		`-package com.sun.jna;`
	`5`	`+package ca.weblite.objc.jna;`
	`6`	`+`
	`7`	`+import com.sun.jna.Pointer;`
`6`	`8`
`7`	`9`	`/**`
`8`	`10`	`*`
`9`	`11`	`* @author shannah`
`10`	`12`	`*/`
`11`	`13`	`public class PointerTool {`
`12`	`14`	`public static long getPeer(Pointer ptr){`
`13`		`- return ptr.peer;`
	`15`	`+ return Pointer.nativeValue(ptr);`
`14`	`16`	`}`
`15`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`import static ca.weblite.objc.RuntimeUtils.*;`
`14`	`14`	`import com.sun.jna.Pointer;`
`15`	`15`	`import ca.weblite.objc.Runtime;`
`16`		`-import com.sun.jna.PointerTool;`
	`16`	`+import ca.weblite.objc.jna.PointerTool;`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`*`