Update for Jinx 2 release

Jinx 2 has a new form for ExcelArgumentConverter methods that can register
converters for any class using an upper bound type parameter constraint.

This lets us convert the new Jinx IUnknown type to the Com4j wrapper
types automatically via an argument converter.

It also allows us to use the new safer form of ExcelAddIn.getApplication.

Author: tonyroberts

examples/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.exceljava</groupId>
         <artifactId>jinx-com4j-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -16,6 +16,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -27,12 +28,12 @@
         <dependency>
             <groupId>com.exceljava</groupId>
             <artifactId>jinx-com4j</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.exceljava</groupId>
             <artifactId>jinx</artifactId>
-            <version>1.6.0</version>
+            <version>2.0.0-beta1</version>
         </dependency>
     </dependencies>
 </project>

jinx-com4j/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.exceljava</groupId>
         <artifactId>jinx-com4j-root</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>com.exceljava</groupId>
             <artifactId>jinx</artifactId>
-            <version>[1.0.0,)</version>
+            <version>2.0.0-beta1</version>
         </dependency>
         <!-- com4j -->
         <dependency>
@@ -47,6 +47,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>

jinx-com4j/src/main/java/com/exceljava/com4j/JinxBridge.java

@@ -1,24 +1,18 @@
 package com.exceljava.com4j;
 
 import com.exceljava.jinx.ExcelAddIn;
+import com.exceljava.jinx.ExcelArgumentConverter;
+import com.exceljava.jinx.IUnknown;
 import com.exceljava.com4j.excel._Application;
 import com4j.COM4J;
 import com4j.Com4jObject;
-import com4j.ComThread;
-import com4j.ROT;
+
 
 /**
  * Bridge between the Jinx add-in and com4j.
  * Used for obtaining com4j COM wrappers from code running in Excel using Jinx.
  */
 public class JinxBridge {
-
-    private static final ThreadLocal<_Application> xlApp = new ThreadLocal<_Application>() {
-        public _Application initialValue() {
-            return null;
-        }
-    };
-
     /**
      * Gets the Excel Application object for the current Excel process.
      *
@@ -34,7 +28,24 @@ public _Application initialValue() {
      * @return An Excel Application instance.
      */
     public static _Application getApplication(ExcelAddIn xl) {
-        Com4jObject unk = COM4J.wrapSta(Com4jObject.class, xl.getExcelApplication());
-        return unk.queryInterface(_Application.class);
+        return xl.getExcelApplication(_Application.class);
+    }
+
+    /**
+     * Converts IUnknown to any Com4jObject type.
+     *
+     * This allows Com4jObjects to be used as method arguments where
+     * an IUnknown would be passed by Jinx. For example, in the
+     * ribbon actions.
+     *
+     * @param unk IUnknown instance.
+     * @param cls Class of type to cast to.
+     * @param <T> Type to cast to.
+     * @return IUnknown instance cast to a Com4jObject instance.
+     */
+    @ExcelArgumentConverter
+    public static <T extends Com4jObject> T convertIUnknown(IUnknown unk, Class<T> cls) {
+        Com4jObject obj = COM4J.wrapSta(Com4jObject.class, unk.getPointer(true));
+        return obj.queryInterface(cls);
     }
 }

jinx-com4j/src/main/resources/jinx-classes.txt

@@ -0,0 +1,5 @@
+#
+# Classes to be loaded by the Jinx Add-In
+#
+com.exceljava.com4j.JinxBridge
+

pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.exceljava</groupId>
     <artifactId>jinx-com4j-root</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1-SNAPSHOT</version>
     <modules>
         <module>examples</module>
         <module>jinx-com4j</module>