Merge pull request #6 from umjammer/2.0.16v

2.0.16v
umjammer · Feb 1, 2024 · 136159d · 136159d
2 parents 3aa9f07 + ab1edb2
commit 136159d
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -35,3 +35,4 @@ Licensed under [BSD License](https://opensource.org/licenses/BSD-3-Clause), copy
   * backport cf lib to rococoa
   * separate jna parts as jna-platform-extended?
 * ~~at windows, i mistake dword as 2byte~~
+* component value should be generics? (currently float fixed)
diff --git a/coreAPI/pom.xml b/coreAPI/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>net.java.jinput</groupId>
     <artifactId>jinput-parent</artifactId>
-    <version>2.0.15v</version>
+    <version>2.0.16v</version>
   </parent>
 
   <artifactId>coreapi</artifactId>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>net.java.jinput</groupId>
     <artifactId>jinput-parent</artifactId>
-    <version>2.0.15v</version>
+    <version>2.0.16v</version>
   </parent>
 
   <artifactId>examples</artifactId>

diff --git a/plugins/OSX/pom.xml b/plugins/OSX/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>net.java.jinput</groupId>
     <artifactId>plugins</artifactId>
-    <version>2.0.15v</version>
+    <version>2.0.16v</version>
   </parent>
 
   <artifactId>osx-plugin</artifactId>

diff --git a/plugins/OSX/src/main/java/net/java/games/input/osx/OSXEnvironmentPlugin.java b/plugins/OSX/src/main/java/net/java/games/input/osx/OSXEnvironmentPlugin.java
@@ -35,6 +35,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.StringTokenizer;
 import java.util.logging.Level;
@@ -50,6 +51,7 @@
 import net.java.games.input.PollingController;
 import net.java.games.input.Rumbler;
 import net.java.games.input.usb.GenericDesktopUsageId;
+import net.java.games.input.usb.HidControllerEnvironment;
 import net.java.games.input.usb.UsagePage;
 import net.java.games.input.usb.UsagePair;
 
@@ -61,7 +63,7 @@
  * @author gregorypierce
  * @version 1.0
  */
-public final class OSXEnvironmentPlugin extends ControllerEnvironment {
+public final class OSXEnvironmentPlugin extends ControllerEnvironment implements HidControllerEnvironment {
 
     private static final Logger log = Logger.getLogger(OSXEnvironmentPlugin.class.getName());
 
@@ -256,4 +258,13 @@ private void enumerateControllers() {
             log.log(Level.FINE, "Failed to enumerate devices: " + e.getMessage(), e);
         }
     }
+
+    @Override
+    public OSXController getController(int mid, int pid) {
+        return Arrays.stream(getControllers())
+                .filter(c -> c instanceof OSXController)
+                .map(c -> (OSXController) c)
+                .filter(c -> c.getProductId() == pid && c.getVendorId() == mid)
+                .findFirst().get();
+    }
 }
diff --git a/plugins/OSX/src/main/java/net/java/games/input/osx/plugin/DualShock4Plugin.java b/plugins/OSX/src/main/java/net/java/games/input/osx/plugin/DualShock4Plugin.java
@@ -29,8 +29,6 @@
 /**
  * DualShock4Plugin.
  *
- * TODO extract osx independent part
- *
  * @author <a href="mailto:umjammer@gmail.com">Naohide Sano</a> (nsano)
  * @version 0.00 2023-10-24 nsano initial version <br>
  */

diff --git a/plugins/OSX/src/test/java/net/java/games/input/osx/OSXPluginTest.java b/plugins/OSX/src/test/java/net/java/games/input/osx/OSXPluginTest.java
@@ -59,9 +59,9 @@ void setup() throws Exception {
 
     @Test
     void test1() throws Exception {
-        OSXEnvironmentPlugin plugin = new OSXEnvironmentPlugin();
-Debug.println("getControllers: " + plugin.getControllers().length);
-        Arrays.stream(plugin.getControllers()).forEach(System.err::println);
+        OSXEnvironmentPlugin environment = new OSXEnvironmentPlugin();
+Debug.println("getControllers: " + environment.getControllers().length);
+        Arrays.stream(environment.getControllers()).forEach(System.err::println);
     }
 
     @Test
@@ -73,25 +73,17 @@ void test2() throws Exception {
     @EnabledIf("localPropertiesExists")
     @DisplayName("components count")
     void test3() throws Exception {
-        OSXEnvironmentPlugin plugin = new OSXEnvironmentPlugin();
-        OSXController controller = Arrays.stream(plugin.getControllers())
-                .filter(c -> c instanceof OSXController)
-                .map(c -> (OSXController) c)
-                .filter(c -> c.getProductId() == productId && c.getVendorId() == vendorId)
-                .findFirst().get();
+        OSXEnvironmentPlugin environment = new OSXEnvironmentPlugin();
+        OSXController controller = environment.getController(vendorId, productId);
         assertEquals(21, controller.getComponents().length);
     }
 
     @Test
     @EnabledIf("localPropertiesExists")
     @DisplayName("rumbler")
     void test4() throws Exception {
-        OSXEnvironmentPlugin plugin = new OSXEnvironmentPlugin();
-        OSXController controller = Arrays.stream(plugin.getControllers())
-                .filter(c -> c instanceof OSXController)
-                .map(c -> (OSXController) c)
-                .filter(c -> c.getProductId() == productId && c.getVendorId() == vendorId)
-                .findFirst().get();
+        OSXEnvironmentPlugin environment = new OSXEnvironmentPlugin();
+        OSXController controller = environment.getController(vendorId, productId);
 
         Report5 report = new Report5();
         report.smallRumble = 255;

diff --git a/plugins/awt/pom.xml b/plugins/awt/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>net.java.jinput</groupId>
     <artifactId>plugins</artifactId>
-    <version>2.0.15v</version>
+    <version>2.0.16v</version>
   </parent>
 
   <artifactId>awt-plugin</artifactId>

diff --git a/plugins/linux/pom.xml b/plugins/linux/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>net.java.jinput</groupId>
     <artifactId>plugins</artifactId>
-    <version>2.0.15v</version>
+    <version>2.0.16v</version>
   </parent>
 
   <artifactId>linux-plugin</artifactId>

diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>net.java.jinput</groupId>
     <artifactId>jinput-parent</artifactId>
-    <version>2.0.15v</version>
+    <version>2.0.16v</version>
   </parent>
 
   <artifactId>plugins</artifactId>

diff --git a/plugins/windows/pom.xml b/plugins/windows/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>net.java.jinput</groupId>
     <artifactId>plugins</artifactId>
-    <version>2.0.15v</version>
+    <version>2.0.16v</version>
   </parent>
 
   <artifactId>windows-plugin</artifactId>

diff --git a/plugins/wintab/pom.xml b/plugins/wintab/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>net.java.jinput</groupId>
     <artifactId>plugins</artifactId>
-    <version>2.0.15v</version>
+    <version>2.0.16v</version>
     <relativePath>../</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>net.java.jinput</groupId>
   <artifactId>jinput-parent</artifactId>
-  <version>2.0.15v</version>
+  <version>2.0.16v</version>
 
   <packaging>pom</packaging>
   <name>JInput</name>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>net.java.jinput</groupId>
     <artifactId>jinput-parent</artifactId>
-    <version>2.0.15v</version>
+    <version>2.0.16v</version>
   </parent>
 
   <artifactId>tests</artifactId>