diff --git a/applet/build.xml b/applet/build.xml deleted file mode 100644 index f1dd330..0000000 --- a/applet/build.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/applet/pom.xml b/applet/pom.xml new file mode 100644 index 0000000..de79023 --- /dev/null +++ b/applet/pom.xml @@ -0,0 +1,27 @@ + + 4.0.0 + applet + jar + JInput - applet + + + net.java.jinput + jinput-parent + 2.0.8-SNAPSHOT + ../ + + + + + + + + + maven-source-plugin + + + maven-javadoc-plugin + + + + \ No newline at end of file diff --git a/applet/src/net/java/games/input/applet/JInputAppletResourceLoader.java b/applet/src/main/java/net/java/games/input/applet/JInputAppletResourceLoader.java similarity index 100% rename from applet/src/net/java/games/input/applet/JInputAppletResourceLoader.java rename to applet/src/main/java/net/java/games/input/applet/JInputAppletResourceLoader.java diff --git a/build.xml b/build.xml deleted file mode 100644 index 9496a5d..0000000 --- a/build.xml +++ /dev/null @@ -1,385 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/coreAPI/.gitignore b/coreAPI/.gitignore deleted file mode 100644 index 6dbf1b5..0000000 --- a/coreAPI/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build.number diff --git a/coreAPI/README.txt b/coreAPI/README.txt deleted file mode 100644 index 90caf93..0000000 --- a/coreAPI/README.txt +++ /dev/null @@ -1,54 +0,0 @@ -This file modified last on 06/06/2003 by Jeff Kesselman - -This is the source tree for the core input API. - -Directory Organization: - -The root contains a master ANT build.xml. -After a successful build of the project you will have the following sub directories: - -- apidocs Where the javadocs get built to - -- lib Where dependant libraries are kept. - -- bin Where the actual API is built to - -- src The source files. - -- src/test Execution directories and data for tests. - -Build instructions: - -To clean: ant clean -To build: ant all (or just ant) -To build docs: ant javadoc -To test: - Textest: A simple discovery test that dumps - the data about the discovered controllers to stdout - To run: ant textest - Readtest: A test that creates a window for each discovered - controller (or sub-controller) which displays the - current state of all the controller's axiis. - (Note: The windows currrently all open at the same - place on the screen so yo uwill have to move them to - see them all.) - To run: ant readtest - - -Release Info: - Initial Release: This release contains an implementation of the input - API designed by Mike Martak of Sun and Thomas (?) of Sony CEA for - the WIn32 platform. All the code in src/input is cross platform. The - Win32 code is segregated to the DirectX plugin (src/DXplugin) which - depends on DirectInput from DX7 (or later). - - 05/09/2003: A number of bugs and problems with the DXPlugin are fixed in this - release. This release also brings the code up to date using the DI8 - interface. This thus is the first release that requries Peter Puck's - DX8 bindings to compile with MinGW. - - 05/09/2003 (second update): - This version adds a new standard value type to the API. - Axis.POV holds standard definitions for values for POV (hat) switches - -- Axis.POV.CENTER and Axis.POV.OFF are synonmous and are - the center position. - -- Axis.POV.UP, Axis.POV.DOWN, Axis.POV.LEFT and Axis.POV.RIGHT - should be self explainatory. - Any hat that claims to be "normalized" will return these values. (It is - recommended that all hats be normalized by the systemn specific plugins.) - diff --git a/coreAPI/build.xml b/coreAPI/build.xml deleted file mode 100644 index f585b00..0000000 --- a/coreAPI/build.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/coreAPI/pom.xml b/coreAPI/pom.xml new file mode 100644 index 0000000..cb7ecfa --- /dev/null +++ b/coreAPI/pom.xml @@ -0,0 +1,31 @@ + + 4.0.0 + coreapi + jar + JInput - core API + + + net.java.jinput + jinput-parent + 2.0.8-SNAPSHOT + ../ + + + + + net.java.jutils + jutils + + + + + + + maven-source-plugin + + + maven-javadoc-plugin + + + + \ No newline at end of file diff --git a/coreAPI/src/java/net/java/games/input/AbstractComponent.java b/coreAPI/src/main/java/net/java/games/input/AbstractComponent.java similarity index 100% rename from coreAPI/src/java/net/java/games/input/AbstractComponent.java rename to coreAPI/src/main/java/net/java/games/input/AbstractComponent.java diff --git a/coreAPI/src/java/net/java/games/input/AbstractController.java b/coreAPI/src/main/java/net/java/games/input/AbstractController.java similarity index 100% rename from coreAPI/src/java/net/java/games/input/AbstractController.java rename to coreAPI/src/main/java/net/java/games/input/AbstractController.java diff --git a/coreAPI/src/java/net/java/games/input/Component.java b/coreAPI/src/main/java/net/java/games/input/Component.java similarity index 100% rename from coreAPI/src/java/net/java/games/input/Component.java rename to coreAPI/src/main/java/net/java/games/input/Component.java diff --git a/coreAPI/src/java/net/java/games/input/Controller.java b/coreAPI/src/main/java/net/java/games/input/Controller.java similarity index 100% rename from coreAPI/src/java/net/java/games/input/Controller.java rename to coreAPI/src/main/java/net/java/games/input/Controller.java diff --git a/coreAPI/src/java/net/java/games/input/ControllerEnvironment.java b/coreAPI/src/main/java/net/java/games/input/ControllerEnvironment.java similarity index 100% rename from coreAPI/src/java/net/java/games/input/ControllerEnvironment.java rename to coreAPI/src/main/java/net/java/games/input/ControllerEnvironment.java diff --git a/coreAPI/src/java/net/java/games/input/ControllerEvent.java b/coreAPI/src/main/java/net/java/games/input/ControllerEvent.java similarity index 100% rename from coreAPI/src/java/net/java/games/input/ControllerEvent.java rename to coreAPI/src/main/java/net/java/games/input/ControllerEvent.java diff --git a/coreAPI/src/java/net/java/games/input/ControllerListener.java b/coreAPI/src/main/java/net/java/games/input/ControllerListener.java similarity index 100% rename from coreAPI/src/java/net/java/games/input/ControllerListener.java rename to coreAPI/src/main/java/net/java/games/input/ControllerListener.java diff --git a/coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java b/coreAPI/src/main/java/net/java/games/input/DefaultControllerEnvironment.java similarity index 100% rename from coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java rename to coreAPI/src/main/java/net/java/games/input/DefaultControllerEnvironment.java diff --git a/coreAPI/src/java/net/java/games/input/Event.java b/coreAPI/src/main/java/net/java/games/input/Event.java similarity index 100% rename from coreAPI/src/java/net/java/games/input/Event.java rename to coreAPI/src/main/java/net/java/games/input/Event.java diff --git a/coreAPI/src/java/net/java/games/input/EventQueue.java b/coreAPI/src/main/java/net/java/games/input/EventQueue.java similarity index 100% rename from coreAPI/src/java/net/java/games/input/EventQueue.java rename to coreAPI/src/main/java/net/java/games/input/EventQueue.java diff --git a/coreAPI/src/java/net/java/games/input/Keyboard.java b/coreAPI/src/main/java/net/java/games/input/Keyboard.java similarity index 100% rename from coreAPI/src/java/net/java/games/input/Keyboard.java rename to coreAPI/src/main/java/net/java/games/input/Keyboard.java diff --git a/coreAPI/src/java/net/java/games/input/Mouse.java b/coreAPI/src/main/java/net/java/games/input/Mouse.java similarity index 100% rename from coreAPI/src/java/net/java/games/input/Mouse.java rename to coreAPI/src/main/java/net/java/games/input/Mouse.java diff --git a/coreAPI/src/java/net/java/games/input/PluginClassLoader.java b/coreAPI/src/main/java/net/java/games/input/PluginClassLoader.java similarity index 100% rename from coreAPI/src/java/net/java/games/input/PluginClassLoader.java rename to coreAPI/src/main/java/net/java/games/input/PluginClassLoader.java diff --git a/coreAPI/src/java/net/java/games/input/Rumbler.java b/coreAPI/src/main/java/net/java/games/input/Rumbler.java similarity index 100% rename from coreAPI/src/java/net/java/games/input/Rumbler.java rename to coreAPI/src/main/java/net/java/games/input/Rumbler.java diff --git a/coreAPI/src/java/net/java/games/input/Version.java b/coreAPI/src/main/java/net/java/games/input/Version.java similarity index 70% rename from coreAPI/src/java/net/java/games/input/Version.java rename to coreAPI/src/main/java/net/java/games/input/Version.java index 1aac468..c913c64 100644 --- a/coreAPI/src/java/net/java/games/input/Version.java +++ b/coreAPI/src/main/java/net/java/games/input/Version.java @@ -33,9 +33,14 @@ package net.java.games.input; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + /** * The version and build number of this implementation. - * Version numbers for a release are of the form: w.x.y[-a]-z, where: + * Version numbers for a release are of the form: w.x.y, where: * * * For example, the following are all valid version strings: * * */ @@ -86,33 +77,26 @@ public final class Version { private Version() { } - /** - * Version string of this build. - */ - private static final String apiVersion = "@API_VERSION@"; - private static final String buildNumber = "@BUILD_NUMBER@"; - - /* - * Split so that ant does not replace the token; - */ - private static final String antBuildNumberToken = "@BUILD_" + "NUMBER@"; - private static final String antAPIVersionToken = "@API_" + "VERSION@"; - /** * Returns the verison string and build number of * this implementation. See the class descritpion - * for the version string format. + * for the version string format. * * @return The version string of this implementation. */ public static String getVersion() { - String version = "Unversioned"; - if(!antAPIVersionToken.equals(apiVersion)) { - version = apiVersion; - } - if(!antBuildNumberToken.equals(buildNumber)) { - version += "-b" + buildNumber; - } - return version; + String version = "Unversioned"; + try { + Properties p = new Properties(); + InputStream is = Version.class.getResourceAsStream("/META-INF/maven/net.java.jinput/coreapi/pom.properties"); + if(is != null) { + p.load(is); + version = p.getProperty("version", ""); + } + } catch(IOException e) { + // ignore + } + + return version; } } diff --git a/coreAPI/src/java/net/java/games/input/package.html b/coreAPI/src/main/java/net/java/games/input/package.html similarity index 100% rename from coreAPI/src/java/net/java/games/input/package.html rename to coreAPI/src/main/java/net/java/games/input/package.html diff --git a/examples/pom.xml b/examples/pom.xml new file mode 100644 index 0000000..990d916 --- /dev/null +++ b/examples/pom.xml @@ -0,0 +1,170 @@ + + 4.0.0 + examples + jar + JInput - examples + + + net.java.jinput + jinput-parent + 2.0.8-SNAPSHOT + ../ + + + + + net.java.jinput + coreapi + ${project.version} + + + + + + + + + maven-source-plugin + + + maven-javadoc-plugin + + + com.googlecode.mavennatives + maven-nativedependencies-plugin + + + + + + + linux + + + linux + + + + + ${project.groupId} + linux-plugin + ${project.version} + natives-linux + + + ${project.groupId} + linux-plugin + ${project.version} + + + + + osx + + + mac + + + + + ${project.groupId} + osx-plugin + ${project.version} + natives-osx + + + ${project.groupId} + osx-plugin + ${project.version} + + + + + windows + + + windows + + + + + ${project.groupId} + windows-plugin + ${project.version} + natives-windows + + + ${project.groupId} + windows-plugin + ${project.version} + + + + + wintab + + + windows + + + env.WINTABSDKDIR + + + + + ${project.groupId} + wintab-plugin + ${project.version} + natives-wintab + + + ${project.groupId} + wintab-plugin + ${project.version} + + + + + ReadAllEvents + + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + + exec + + + + + java + + -classpath + + -Djava.library.path=${project.build.directory}/natives + net.java.games.input.example.ReadAllEvents + + + + + + + + \ No newline at end of file diff --git a/coreAPI/src/java/net/java/games/input/example/ReadAllEvents.java b/examples/src/main/java/net/java/games/input/example/ReadAllEvents.java similarity index 100% rename from coreAPI/src/java/net/java/games/input/example/ReadAllEvents.java rename to examples/src/main/java/net/java/games/input/example/ReadAllEvents.java diff --git a/coreAPI/src/java/net/java/games/input/example/ReadFirstMouse.java b/examples/src/main/java/net/java/games/input/example/ReadFirstMouse.java similarity index 97% rename from coreAPI/src/java/net/java/games/input/example/ReadFirstMouse.java rename to examples/src/main/java/net/java/games/input/example/ReadFirstMouse.java index 83788ec..2ec87ce 100644 --- a/coreAPI/src/java/net/java/games/input/example/ReadFirstMouse.java +++ b/examples/src/main/java/net/java/games/input/example/ReadFirstMouse.java @@ -3,7 +3,6 @@ package net.java.games.input.example; import net.java.games.input.Component; import net.java.games.input.Controller; import net.java.games.input.ControllerEnvironment; -import net.java.games.input.test.ControllerTextTest; /** * This class shows how to read the values in a polling loop for the first mouse diff --git a/jinput-platform.pom b/jinput-platform.pom deleted file mode 100644 index 8a47164..0000000 --- a/jinput-platform.pom +++ /dev/null @@ -1,27 +0,0 @@ - - 4.0.0 - net.java.jinput - jinput-platform - pom - JInput natives - @VERSION@ - Library for access to input devices. - https://github.com/jinput/jinput - - - BSD - http://www.opensource.org/licenses/bsd-license.php - repo - - - - - Members - https://github.com/jinput/jinput/graphs/contributors - - - - https://github.com/jinput/jinput - scm:git:git@github.com:jinput/jinput.git - - \ No newline at end of file diff --git a/jinput.pom b/jinput.pom deleted file mode 100644 index a9c2cdb..0000000 --- a/jinput.pom +++ /dev/null @@ -1,55 +0,0 @@ - - 4.0.0 - net.java.jinput - jinput - jar - JInput - @VERSION@ - Library for access to input devices. - https://github.com/jinput/jinput - - - BSD - http://www.opensource.org/licenses/bsd-license.php - repo - - - - - Members - https://github.com/jinput/jinput/graphs/contributors - - - - https://github.com/jinput/jinput - https://github.com/jinput/jinput - - - - net.java.jutils - jutils - 1.0.0 - - - net.java.jinput - jinput-platform - @VERSION@ - natives-linux - runtime - - - net.java.jinput - jinput-platform - @VERSION@ - natives-windows - runtime - - - net.java.jinput - jinput-platform - @VERSION@ - natives-osx - runtime - - - \ No newline at end of file diff --git a/lib/.gitignore b/lib/.gitignore deleted file mode 100644 index 4ce91ae..0000000 --- a/lib/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/jutils-1.0.1-SNAPSHOT.jar -/jutils.jar \ No newline at end of file diff --git a/lib/maven-ant-tasks-2.1.0.jar b/lib/maven-ant-tasks-2.1.0.jar deleted file mode 100644 index b240040..0000000 Binary files a/lib/maven-ant-tasks-2.1.0.jar and /dev/null differ diff --git a/plugins/OSX/build.xml b/plugins/OSX/build.xml index 659f766..05bda4b 100644 --- a/plugins/OSX/build.xml +++ b/plugins/OSX/build.xml @@ -1,80 +1,52 @@ - - OSX JInput Plugin - - - - - - - - - - - - - - - + + OSX JInput Native Plugin - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/OSX/pom.xml b/plugins/OSX/pom.xml new file mode 100644 index 0000000..0d08c28 --- /dev/null +++ b/plugins/OSX/pom.xml @@ -0,0 +1,75 @@ + + 4.0.0 + osx-plugin + jar + JInput - OSX Plugin + + + net.java.jinput + plugins + 2.0.8-SNAPSHOT + ../ + + + + + net.java.jinput + coreapi + ${project.version} + + + + + + + maven-source-plugin + + + maven-javadoc-plugin + + + maven-compiler-plugin + + + -h + ${project.build.directory}/generated-sources/natives + + + + + maven-antrun-plugin + + + compile + + + + + + + run + + + + + + maven-jar-plugin + + + package + + jar + + + ${project.build.directory}/natives + natives-osx + + *.jnilib + + + + + + + + \ No newline at end of file diff --git a/plugins/OSX/src/java/net/java/games/input/ButtonUsage.java b/plugins/OSX/src/main/java/net/java/games/input/ButtonUsage.java similarity index 100% rename from plugins/OSX/src/java/net/java/games/input/ButtonUsage.java rename to plugins/OSX/src/main/java/net/java/games/input/ButtonUsage.java diff --git a/plugins/OSX/src/java/net/java/games/input/ElementType.java b/plugins/OSX/src/main/java/net/java/games/input/ElementType.java similarity index 100% rename from plugins/OSX/src/java/net/java/games/input/ElementType.java rename to plugins/OSX/src/main/java/net/java/games/input/ElementType.java diff --git a/plugins/OSX/src/java/net/java/games/input/GenericDesktopUsage.java b/plugins/OSX/src/main/java/net/java/games/input/GenericDesktopUsage.java similarity index 100% rename from plugins/OSX/src/java/net/java/games/input/GenericDesktopUsage.java rename to plugins/OSX/src/main/java/net/java/games/input/GenericDesktopUsage.java diff --git a/plugins/OSX/src/java/net/java/games/input/KeyboardUsage.java b/plugins/OSX/src/main/java/net/java/games/input/KeyboardUsage.java similarity index 100% rename from plugins/OSX/src/java/net/java/games/input/KeyboardUsage.java rename to plugins/OSX/src/main/java/net/java/games/input/KeyboardUsage.java diff --git a/plugins/OSX/src/java/net/java/games/input/OSXAbstractController.java b/plugins/OSX/src/main/java/net/java/games/input/OSXAbstractController.java similarity index 100% rename from plugins/OSX/src/java/net/java/games/input/OSXAbstractController.java rename to plugins/OSX/src/main/java/net/java/games/input/OSXAbstractController.java diff --git a/plugins/OSX/src/java/net/java/games/input/OSXComponent.java b/plugins/OSX/src/main/java/net/java/games/input/OSXComponent.java similarity index 100% rename from plugins/OSX/src/java/net/java/games/input/OSXComponent.java rename to plugins/OSX/src/main/java/net/java/games/input/OSXComponent.java diff --git a/plugins/OSX/src/java/net/java/games/input/OSXControllers.java b/plugins/OSX/src/main/java/net/java/games/input/OSXControllers.java similarity index 100% rename from plugins/OSX/src/java/net/java/games/input/OSXControllers.java rename to plugins/OSX/src/main/java/net/java/games/input/OSXControllers.java diff --git a/plugins/OSX/src/java/net/java/games/input/OSXEnvironmentPlugin.java b/plugins/OSX/src/main/java/net/java/games/input/OSXEnvironmentPlugin.java similarity index 100% rename from plugins/OSX/src/java/net/java/games/input/OSXEnvironmentPlugin.java rename to plugins/OSX/src/main/java/net/java/games/input/OSXEnvironmentPlugin.java diff --git a/plugins/OSX/src/java/net/java/games/input/OSXEvent.java b/plugins/OSX/src/main/java/net/java/games/input/OSXEvent.java similarity index 100% rename from plugins/OSX/src/java/net/java/games/input/OSXEvent.java rename to plugins/OSX/src/main/java/net/java/games/input/OSXEvent.java diff --git a/plugins/OSX/src/java/net/java/games/input/OSXHIDDevice.java b/plugins/OSX/src/main/java/net/java/games/input/OSXHIDDevice.java similarity index 100% rename from plugins/OSX/src/java/net/java/games/input/OSXHIDDevice.java rename to plugins/OSX/src/main/java/net/java/games/input/OSXHIDDevice.java diff --git a/plugins/OSX/src/java/net/java/games/input/OSXHIDDeviceIterator.java b/plugins/OSX/src/main/java/net/java/games/input/OSXHIDDeviceIterator.java similarity index 100% rename from plugins/OSX/src/java/net/java/games/input/OSXHIDDeviceIterator.java rename to plugins/OSX/src/main/java/net/java/games/input/OSXHIDDeviceIterator.java diff --git a/plugins/OSX/src/java/net/java/games/input/OSXHIDElement.java b/plugins/OSX/src/main/java/net/java/games/input/OSXHIDElement.java similarity index 100% rename from plugins/OSX/src/java/net/java/games/input/OSXHIDElement.java rename to plugins/OSX/src/main/java/net/java/games/input/OSXHIDElement.java diff --git a/plugins/OSX/src/java/net/java/games/input/OSXHIDQueue.java b/plugins/OSX/src/main/java/net/java/games/input/OSXHIDQueue.java similarity index 100% rename from plugins/OSX/src/java/net/java/games/input/OSXHIDQueue.java rename to plugins/OSX/src/main/java/net/java/games/input/OSXHIDQueue.java diff --git a/plugins/OSX/src/java/net/java/games/input/OSXKeyboard.java b/plugins/OSX/src/main/java/net/java/games/input/OSXKeyboard.java similarity index 100% rename from plugins/OSX/src/java/net/java/games/input/OSXKeyboard.java rename to plugins/OSX/src/main/java/net/java/games/input/OSXKeyboard.java diff --git a/plugins/OSX/src/java/net/java/games/input/OSXMouse.java b/plugins/OSX/src/main/java/net/java/games/input/OSXMouse.java similarity index 100% rename from plugins/OSX/src/java/net/java/games/input/OSXMouse.java rename to plugins/OSX/src/main/java/net/java/games/input/OSXMouse.java diff --git a/plugins/OSX/src/java/net/java/games/input/Usage.java b/plugins/OSX/src/main/java/net/java/games/input/Usage.java similarity index 100% rename from plugins/OSX/src/java/net/java/games/input/Usage.java rename to plugins/OSX/src/main/java/net/java/games/input/Usage.java diff --git a/plugins/OSX/src/java/net/java/games/input/UsagePage.java b/plugins/OSX/src/main/java/net/java/games/input/UsagePage.java similarity index 100% rename from plugins/OSX/src/java/net/java/games/input/UsagePage.java rename to plugins/OSX/src/main/java/net/java/games/input/UsagePage.java diff --git a/plugins/OSX/src/java/net/java/games/input/UsagePair.java b/plugins/OSX/src/main/java/net/java/games/input/UsagePair.java similarity index 100% rename from plugins/OSX/src/java/net/java/games/input/UsagePair.java rename to plugins/OSX/src/main/java/net/java/games/input/UsagePair.java diff --git a/plugins/OSX/src/native/macosxutil.c b/plugins/OSX/src/main/native/macosxutil.c similarity index 100% rename from plugins/OSX/src/native/macosxutil.c rename to plugins/OSX/src/main/native/macosxutil.c diff --git a/plugins/OSX/src/native/macosxutil.h b/plugins/OSX/src/main/native/macosxutil.h similarity index 100% rename from plugins/OSX/src/native/macosxutil.h rename to plugins/OSX/src/main/native/macosxutil.h diff --git a/plugins/OSX/src/native/net_java_games_input_OSXHIDDevice.c b/plugins/OSX/src/main/native/net_java_games_input_OSXHIDDevice.c similarity index 100% rename from plugins/OSX/src/native/net_java_games_input_OSXHIDDevice.c rename to plugins/OSX/src/main/native/net_java_games_input_OSXHIDDevice.c diff --git a/plugins/OSX/src/native/net_java_games_input_OSXHIDDeviceIterator.c b/plugins/OSX/src/main/native/net_java_games_input_OSXHIDDeviceIterator.c similarity index 100% rename from plugins/OSX/src/native/net_java_games_input_OSXHIDDeviceIterator.c rename to plugins/OSX/src/main/native/net_java_games_input_OSXHIDDeviceIterator.c diff --git a/plugins/OSX/src/native/net_java_games_input_OSXHIDQueue.c b/plugins/OSX/src/main/native/net_java_games_input_OSXHIDQueue.c similarity index 100% rename from plugins/OSX/src/native/net_java_games_input_OSXHIDQueue.c rename to plugins/OSX/src/main/native/net_java_games_input_OSXHIDQueue.c diff --git a/plugins/OSX/src/native/.gitignore b/plugins/OSX/src/native/.gitignore deleted file mode 100644 index 2b1c8e9..0000000 --- a/plugins/OSX/src/native/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/net_java_games_input_OSXHIDDevice.h -/net_java_games_input_OSXHIDDeviceIterator.h -/net_java_games_input_OSXHIDQueue.h diff --git a/plugins/OSX/src/native/build.xml b/plugins/OSX/src/native/build.xml deleted file mode 100644 index 8dd4662..0000000 --- a/plugins/OSX/src/native/build.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - OSX JInput Native Plugin - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/awt/pom.xml b/plugins/awt/pom.xml new file mode 100644 index 0000000..d7fbfdb --- /dev/null +++ b/plugins/awt/pom.xml @@ -0,0 +1,32 @@ + + 4.0.0 + awt-plugin + jar + JInput - AWT Plugin + + + net.java.jinput + plugins + 2.0.8-SNAPSHOT + ../ + + + + + net.java.jinput + coreapi + ${project.version} + + + + + + + maven-source-plugin + + + maven-javadoc-plugin + + + + \ No newline at end of file diff --git a/plugins/awt/src/net/java/games/input/AWTEnvironmentPlugin.java b/plugins/awt/src/main/java/net/java/games/input/AWTEnvironmentPlugin.java similarity index 100% rename from plugins/awt/src/net/java/games/input/AWTEnvironmentPlugin.java rename to plugins/awt/src/main/java/net/java/games/input/AWTEnvironmentPlugin.java diff --git a/plugins/awt/src/net/java/games/input/AWTKeyMap.java b/plugins/awt/src/main/java/net/java/games/input/AWTKeyMap.java similarity index 100% rename from plugins/awt/src/net/java/games/input/AWTKeyMap.java rename to plugins/awt/src/main/java/net/java/games/input/AWTKeyMap.java diff --git a/plugins/awt/src/net/java/games/input/AWTKeyboard.java b/plugins/awt/src/main/java/net/java/games/input/AWTKeyboard.java similarity index 100% rename from plugins/awt/src/net/java/games/input/AWTKeyboard.java rename to plugins/awt/src/main/java/net/java/games/input/AWTKeyboard.java diff --git a/plugins/awt/src/net/java/games/input/AWTMouse.java b/plugins/awt/src/main/java/net/java/games/input/AWTMouse.java similarity index 100% rename from plugins/awt/src/net/java/games/input/AWTMouse.java rename to plugins/awt/src/main/java/net/java/games/input/AWTMouse.java diff --git a/plugins/linux/build.xml b/plugins/linux/build.xml index 7cde22e..ccdc209 100644 --- a/plugins/linux/build.xml +++ b/plugins/linux/build.xml @@ -1,72 +1,45 @@ - + + + + - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/plugins/linux/pom.xml b/plugins/linux/pom.xml new file mode 100644 index 0000000..c3b8d95 --- /dev/null +++ b/plugins/linux/pom.xml @@ -0,0 +1,75 @@ + + 4.0.0 + linux-plugin + jar + JInput - Linux Plugin + + + net.java.jinput + plugins + 2.0.8-SNAPSHOT + ../ + + + + + net.java.jinput + coreapi + ${project.version} + + + + + + + maven-source-plugin + + + maven-javadoc-plugin + + + maven-compiler-plugin + + + -h + ${project.build.directory}/generated-sources/natives + + + + + maven-antrun-plugin + + + compile + + + + + + + run + + + + + + maven-jar-plugin + + + package + + jar + + + ${project.build.directory}/natives + natives-linux + + *.so + + + + + + + + \ No newline at end of file diff --git a/plugins/linux/src/java/net/java/games/input/LinuxAbsInfo.java b/plugins/linux/src/main/java/net/java/games/input/LinuxAbsInfo.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxAbsInfo.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxAbsInfo.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxAbstractController.java b/plugins/linux/src/main/java/net/java/games/input/LinuxAbstractController.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxAbstractController.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxAbstractController.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxAxisDescriptor.java b/plugins/linux/src/main/java/net/java/games/input/LinuxAxisDescriptor.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxAxisDescriptor.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxAxisDescriptor.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxCombinedController.java b/plugins/linux/src/main/java/net/java/games/input/LinuxCombinedController.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxCombinedController.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxCombinedController.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxComponent.java b/plugins/linux/src/main/java/net/java/games/input/LinuxComponent.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxComponent.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxComponent.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxConstantFF.java b/plugins/linux/src/main/java/net/java/games/input/LinuxConstantFF.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxConstantFF.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxConstantFF.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxControllers.java b/plugins/linux/src/main/java/net/java/games/input/LinuxControllers.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxControllers.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxControllers.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxDevice.java b/plugins/linux/src/main/java/net/java/games/input/LinuxDevice.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxDevice.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxDevice.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxDeviceTask.java b/plugins/linux/src/main/java/net/java/games/input/LinuxDeviceTask.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxDeviceTask.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxDeviceTask.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxDeviceThread.java b/plugins/linux/src/main/java/net/java/games/input/LinuxDeviceThread.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxDeviceThread.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxDeviceThread.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java b/plugins/linux/src/main/java/net/java/games/input/LinuxEnvironmentPlugin.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxEnvironmentPlugin.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxEvent.java b/plugins/linux/src/main/java/net/java/games/input/LinuxEvent.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxEvent.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxEvent.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxEventComponent.java b/plugins/linux/src/main/java/net/java/games/input/LinuxEventComponent.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxEventComponent.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxEventComponent.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java b/plugins/linux/src/main/java/net/java/games/input/LinuxEventDevice.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxEventDevice.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxForceFeedbackEffect.java b/plugins/linux/src/main/java/net/java/games/input/LinuxForceFeedbackEffect.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxForceFeedbackEffect.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxForceFeedbackEffect.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxInputID.java b/plugins/linux/src/main/java/net/java/games/input/LinuxInputID.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxInputID.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxInputID.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxJoystickAbstractController.java b/plugins/linux/src/main/java/net/java/games/input/LinuxJoystickAbstractController.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxJoystickAbstractController.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxJoystickAbstractController.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxJoystickAxis.java b/plugins/linux/src/main/java/net/java/games/input/LinuxJoystickAxis.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxJoystickAxis.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxJoystickAxis.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxJoystickButton.java b/plugins/linux/src/main/java/net/java/games/input/LinuxJoystickButton.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxJoystickButton.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxJoystickButton.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxJoystickDevice.java b/plugins/linux/src/main/java/net/java/games/input/LinuxJoystickDevice.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxJoystickDevice.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxJoystickDevice.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxJoystickEvent.java b/plugins/linux/src/main/java/net/java/games/input/LinuxJoystickEvent.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxJoystickEvent.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxJoystickEvent.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxJoystickPOV.java b/plugins/linux/src/main/java/net/java/games/input/LinuxJoystickPOV.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxJoystickPOV.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxJoystickPOV.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxKeyboard.java b/plugins/linux/src/main/java/net/java/games/input/LinuxKeyboard.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxKeyboard.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxKeyboard.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxMouse.java b/plugins/linux/src/main/java/net/java/games/input/LinuxMouse.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxMouse.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxMouse.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxNativeTypesMap.java b/plugins/linux/src/main/java/net/java/games/input/LinuxNativeTypesMap.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxNativeTypesMap.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxNativeTypesMap.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxPOV.java b/plugins/linux/src/main/java/net/java/games/input/LinuxPOV.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxPOV.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxPOV.java diff --git a/plugins/linux/src/java/net/java/games/input/LinuxRumbleFF.java b/plugins/linux/src/main/java/net/java/games/input/LinuxRumbleFF.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/LinuxRumbleFF.java rename to plugins/linux/src/main/java/net/java/games/input/LinuxRumbleFF.java diff --git a/plugins/linux/src/java/net/java/games/input/NativeDefinitions.java b/plugins/linux/src/main/java/net/java/games/input/NativeDefinitions.java similarity index 100% rename from plugins/linux/src/java/net/java/games/input/NativeDefinitions.java rename to plugins/linux/src/main/java/net/java/games/input/NativeDefinitions.java diff --git a/plugins/linux/src/native/getDefinitions b/plugins/linux/src/main/native/getDefinitions similarity index 100% rename from plugins/linux/src/native/getDefinitions rename to plugins/linux/src/main/native/getDefinitions diff --git a/plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c b/plugins/linux/src/main/native/net_java_games_input_LinuxEventDevice.c similarity index 100% rename from plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c rename to plugins/linux/src/main/native/net_java_games_input_LinuxEventDevice.c diff --git a/plugins/linux/src/native/net_java_games_input_LinuxJoystickDevice.c b/plugins/linux/src/main/native/net_java_games_input_LinuxJoystickDevice.c similarity index 100% rename from plugins/linux/src/native/net_java_games_input_LinuxJoystickDevice.c rename to plugins/linux/src/main/native/net_java_games_input_LinuxJoystickDevice.c diff --git a/plugins/linux/src/native/.gitignore b/plugins/linux/src/native/.gitignore deleted file mode 100644 index bf6ba2d..0000000 --- a/plugins/linux/src/native/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -/net_java_games_input_LinuxEventDevice.h -/net_java_games_input_LinuxJoystickDevice.h -/libjinput-linux64.so -/net_java_games_input_LinuxEventDevice.o -/net_java_games_input_LinuxJoystickDevice.o -/util.o diff --git a/plugins/linux/src/native/build.xml b/plugins/linux/src/native/build.xml deleted file mode 100644 index f6a1a3a..0000000 --- a/plugins/linux/src/native/build.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/pom.xml b/plugins/pom.xml new file mode 100644 index 0000000..e003dc5 --- /dev/null +++ b/plugins/pom.xml @@ -0,0 +1,67 @@ + + 4.0.0 + plugins + pom + JInput - plugins + + + net.java.jinput + jinput-parent + 2.0.8-SNAPSHOT + ../ + + + + awt + + + + + Linux + + + linux + + + + linux + + + + Windows + + + windows + + + + windows + + + + OSX + + + mac + + + + OSX + + + + wintab + + + windows + + + env.WINTABSDKDIR + + + + wintab + + + + diff --git a/plugins/windows/build.xml b/plugins/windows/build.xml deleted file mode 100644 index a10d7cb..0000000 --- a/plugins/windows/build.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/windows/pom.xml b/plugins/windows/pom.xml new file mode 100644 index 0000000..4228150 --- /dev/null +++ b/plugins/windows/pom.xml @@ -0,0 +1,75 @@ + + 4.0.0 + windows-plugin + jar + JInput - Windows Plugin + + + net.java.jinput + plugins + 2.0.8-SNAPSHOT + ../ + + + + + net.java.jinput + coreapi + ${project.version} + + + + + + + maven-source-plugin + + + maven-javadoc-plugin + + + maven-compiler-plugin + + + -h + ${project.build.directory}/generated-sources/natives + + + + + maven-antrun-plugin + + + compile + + + + + + + run + + + + + + maven-jar-plugin + + + package + + jar + + + ${project.build.directory}/natives + natives-windows + + *.dll + + + + + + + + \ No newline at end of file diff --git a/plugins/windows/src/java/net/java/games/input/DIAbstractController.java b/plugins/windows/src/main/java/net/java/games/input/DIAbstractController.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/DIAbstractController.java rename to plugins/windows/src/main/java/net/java/games/input/DIAbstractController.java diff --git a/plugins/windows/src/java/net/java/games/input/DIComponent.java b/plugins/windows/src/main/java/net/java/games/input/DIComponent.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/DIComponent.java rename to plugins/windows/src/main/java/net/java/games/input/DIComponent.java diff --git a/plugins/windows/src/java/net/java/games/input/DIControllers.java b/plugins/windows/src/main/java/net/java/games/input/DIControllers.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/DIControllers.java rename to plugins/windows/src/main/java/net/java/games/input/DIControllers.java diff --git a/plugins/windows/src/java/net/java/games/input/DIDeviceObject.java b/plugins/windows/src/main/java/net/java/games/input/DIDeviceObject.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/DIDeviceObject.java rename to plugins/windows/src/main/java/net/java/games/input/DIDeviceObject.java diff --git a/plugins/windows/src/java/net/java/games/input/DIDeviceObjectData.java b/plugins/windows/src/main/java/net/java/games/input/DIDeviceObjectData.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/DIDeviceObjectData.java rename to plugins/windows/src/main/java/net/java/games/input/DIDeviceObjectData.java diff --git a/plugins/windows/src/java/net/java/games/input/DIEffectInfo.java b/plugins/windows/src/main/java/net/java/games/input/DIEffectInfo.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/DIEffectInfo.java rename to plugins/windows/src/main/java/net/java/games/input/DIEffectInfo.java diff --git a/plugins/windows/src/java/net/java/games/input/DIIdentifierMap.java b/plugins/windows/src/main/java/net/java/games/input/DIIdentifierMap.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/DIIdentifierMap.java rename to plugins/windows/src/main/java/net/java/games/input/DIIdentifierMap.java diff --git a/plugins/windows/src/java/net/java/games/input/DIKeyboard.java b/plugins/windows/src/main/java/net/java/games/input/DIKeyboard.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/DIKeyboard.java rename to plugins/windows/src/main/java/net/java/games/input/DIKeyboard.java diff --git a/plugins/windows/src/java/net/java/games/input/DIMouse.java b/plugins/windows/src/main/java/net/java/games/input/DIMouse.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/DIMouse.java rename to plugins/windows/src/main/java/net/java/games/input/DIMouse.java diff --git a/plugins/windows/src/java/net/java/games/input/DataQueue.java b/plugins/windows/src/main/java/net/java/games/input/DataQueue.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/DataQueue.java rename to plugins/windows/src/main/java/net/java/games/input/DataQueue.java diff --git a/plugins/windows/src/java/net/java/games/input/DirectAndRawInputEnvironmentPlugin.java b/plugins/windows/src/main/java/net/java/games/input/DirectAndRawInputEnvironmentPlugin.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/DirectAndRawInputEnvironmentPlugin.java rename to plugins/windows/src/main/java/net/java/games/input/DirectAndRawInputEnvironmentPlugin.java diff --git a/plugins/windows/src/java/net/java/games/input/DirectInputEnvironmentPlugin.java b/plugins/windows/src/main/java/net/java/games/input/DirectInputEnvironmentPlugin.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/DirectInputEnvironmentPlugin.java rename to plugins/windows/src/main/java/net/java/games/input/DirectInputEnvironmentPlugin.java diff --git a/plugins/windows/src/java/net/java/games/input/DummyWindow.java b/plugins/windows/src/main/java/net/java/games/input/DummyWindow.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/DummyWindow.java rename to plugins/windows/src/main/java/net/java/games/input/DummyWindow.java diff --git a/plugins/windows/src/java/net/java/games/input/IDirectInput.java b/plugins/windows/src/main/java/net/java/games/input/IDirectInput.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/IDirectInput.java rename to plugins/windows/src/main/java/net/java/games/input/IDirectInput.java diff --git a/plugins/windows/src/java/net/java/games/input/IDirectInputDevice.java b/plugins/windows/src/main/java/net/java/games/input/IDirectInputDevice.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/IDirectInputDevice.java rename to plugins/windows/src/main/java/net/java/games/input/IDirectInputDevice.java diff --git a/plugins/windows/src/java/net/java/games/input/IDirectInputEffect.java b/plugins/windows/src/main/java/net/java/games/input/IDirectInputEffect.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/IDirectInputEffect.java rename to plugins/windows/src/main/java/net/java/games/input/IDirectInputEffect.java diff --git a/plugins/windows/src/java/net/java/games/input/RawDevice.java b/plugins/windows/src/main/java/net/java/games/input/RawDevice.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/RawDevice.java rename to plugins/windows/src/main/java/net/java/games/input/RawDevice.java diff --git a/plugins/windows/src/java/net/java/games/input/RawDeviceInfo.java b/plugins/windows/src/main/java/net/java/games/input/RawDeviceInfo.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/RawDeviceInfo.java rename to plugins/windows/src/main/java/net/java/games/input/RawDeviceInfo.java diff --git a/plugins/windows/src/java/net/java/games/input/RawHIDInfo.java b/plugins/windows/src/main/java/net/java/games/input/RawHIDInfo.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/RawHIDInfo.java rename to plugins/windows/src/main/java/net/java/games/input/RawHIDInfo.java diff --git a/plugins/windows/src/java/net/java/games/input/RawIdentifierMap.java b/plugins/windows/src/main/java/net/java/games/input/RawIdentifierMap.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/RawIdentifierMap.java rename to plugins/windows/src/main/java/net/java/games/input/RawIdentifierMap.java diff --git a/plugins/windows/src/java/net/java/games/input/RawInputEnvironmentPlugin.java b/plugins/windows/src/main/java/net/java/games/input/RawInputEnvironmentPlugin.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/RawInputEnvironmentPlugin.java rename to plugins/windows/src/main/java/net/java/games/input/RawInputEnvironmentPlugin.java diff --git a/plugins/windows/src/java/net/java/games/input/RawInputEventQueue.java b/plugins/windows/src/main/java/net/java/games/input/RawInputEventQueue.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/RawInputEventQueue.java rename to plugins/windows/src/main/java/net/java/games/input/RawInputEventQueue.java diff --git a/plugins/windows/src/java/net/java/games/input/RawKeyboard.java b/plugins/windows/src/main/java/net/java/games/input/RawKeyboard.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/RawKeyboard.java rename to plugins/windows/src/main/java/net/java/games/input/RawKeyboard.java diff --git a/plugins/windows/src/java/net/java/games/input/RawKeyboardEvent.java b/plugins/windows/src/main/java/net/java/games/input/RawKeyboardEvent.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/RawKeyboardEvent.java rename to plugins/windows/src/main/java/net/java/games/input/RawKeyboardEvent.java diff --git a/plugins/windows/src/java/net/java/games/input/RawKeyboardInfo.java b/plugins/windows/src/main/java/net/java/games/input/RawKeyboardInfo.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/RawKeyboardInfo.java rename to plugins/windows/src/main/java/net/java/games/input/RawKeyboardInfo.java diff --git a/plugins/windows/src/java/net/java/games/input/RawMouse.java b/plugins/windows/src/main/java/net/java/games/input/RawMouse.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/RawMouse.java rename to plugins/windows/src/main/java/net/java/games/input/RawMouse.java diff --git a/plugins/windows/src/java/net/java/games/input/RawMouseEvent.java b/plugins/windows/src/main/java/net/java/games/input/RawMouseEvent.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/RawMouseEvent.java rename to plugins/windows/src/main/java/net/java/games/input/RawMouseEvent.java diff --git a/plugins/windows/src/java/net/java/games/input/RawMouseInfo.java b/plugins/windows/src/main/java/net/java/games/input/RawMouseInfo.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/RawMouseInfo.java rename to plugins/windows/src/main/java/net/java/games/input/RawMouseInfo.java diff --git a/plugins/windows/src/java/net/java/games/input/SetupAPIDevice.java b/plugins/windows/src/main/java/net/java/games/input/SetupAPIDevice.java similarity index 100% rename from plugins/windows/src/java/net/java/games/input/SetupAPIDevice.java rename to plugins/windows/src/main/java/net/java/games/input/SetupAPIDevice.java diff --git a/plugins/windows/src/native/build.xml b/plugins/windows/src/main/native/build.xml similarity index 54% rename from plugins/windows/src/native/build.xml rename to plugins/windows/src/main/native/build.xml index 75548ec..412a9b7 100644 --- a/plugins/windows/src/native/build.xml +++ b/plugins/windows/src/main/native/build.xml @@ -2,60 +2,49 @@ - + + + + + + + - - + + - - - - - - - + + + + + + - - + - - - - + - - - - - - - - - - - - - + - + @@ -63,10 +52,7 @@ - - - - + @@ -81,19 +67,15 @@ - - + - + - diff --git a/plugins/windows/src/native/dx8/dxversion.h b/plugins/windows/src/main/native/dx8/dxversion.h similarity index 100% rename from plugins/windows/src/native/dx8/dxversion.h rename to plugins/windows/src/main/native/dx8/dxversion.h diff --git a/plugins/windows/src/native/dx8/net_java_games_input_IDirectInput.c b/plugins/windows/src/main/native/dx8/net_java_games_input_IDirectInput.c similarity index 100% rename from plugins/windows/src/native/dx8/net_java_games_input_IDirectInput.c rename to plugins/windows/src/main/native/dx8/net_java_games_input_IDirectInput.c diff --git a/plugins/windows/src/native/dx8/net_java_games_input_IDirectInputDevice.c b/plugins/windows/src/main/native/dx8/net_java_games_input_IDirectInputDevice.c similarity index 100% rename from plugins/windows/src/native/dx8/net_java_games_input_IDirectInputDevice.c rename to plugins/windows/src/main/native/dx8/net_java_games_input_IDirectInputDevice.c diff --git a/plugins/windows/src/native/dx8/net_java_games_input_IDirectInputEffect.c b/plugins/windows/src/main/native/dx8/net_java_games_input_IDirectInputEffect.c similarity index 100% rename from plugins/windows/src/native/dx8/net_java_games_input_IDirectInputEffect.c rename to plugins/windows/src/main/native/dx8/net_java_games_input_IDirectInputEffect.c diff --git a/plugins/windows/src/native/net_java_games_input_DummyWindow.c b/plugins/windows/src/main/native/net_java_games_input_DummyWindow.c similarity index 100% rename from plugins/windows/src/native/net_java_games_input_DummyWindow.c rename to plugins/windows/src/main/native/net_java_games_input_DummyWindow.c diff --git a/plugins/windows/src/native/raw/net_java_games_input_RawDevice.c b/plugins/windows/src/main/native/raw/net_java_games_input_RawDevice.c similarity index 100% rename from plugins/windows/src/native/raw/net_java_games_input_RawDevice.c rename to plugins/windows/src/main/native/raw/net_java_games_input_RawDevice.c diff --git a/plugins/windows/src/native/raw/net_java_games_input_RawInputEnvironmentPlugin.c b/plugins/windows/src/main/native/raw/net_java_games_input_RawInputEnvironmentPlugin.c similarity index 100% rename from plugins/windows/src/native/raw/net_java_games_input_RawInputEnvironmentPlugin.c rename to plugins/windows/src/main/native/raw/net_java_games_input_RawInputEnvironmentPlugin.c diff --git a/plugins/windows/src/native/raw/net_java_games_input_RawInputEventQueue.c b/plugins/windows/src/main/native/raw/net_java_games_input_RawInputEventQueue.c similarity index 100% rename from plugins/windows/src/native/raw/net_java_games_input_RawInputEventQueue.c rename to plugins/windows/src/main/native/raw/net_java_games_input_RawInputEventQueue.c diff --git a/plugins/windows/src/native/raw/rawwinver.h b/plugins/windows/src/main/native/raw/rawwinver.h similarity index 100% rename from plugins/windows/src/native/raw/rawwinver.h rename to plugins/windows/src/main/native/raw/rawwinver.h diff --git a/plugins/windows/src/native/winutil.c b/plugins/windows/src/main/native/winutil.c similarity index 100% rename from plugins/windows/src/native/winutil.c rename to plugins/windows/src/main/native/winutil.c diff --git a/plugins/windows/src/native/winutil.h b/plugins/windows/src/main/native/winutil.h similarity index 100% rename from plugins/windows/src/native/winutil.h rename to plugins/windows/src/main/native/winutil.h diff --git a/plugins/windows/src/native/.gitignore b/plugins/windows/src/native/.gitignore deleted file mode 100644 index 04fb3ee..0000000 --- a/plugins/windows/src/native/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/net_java_games_input_DummyWindow.h diff --git a/plugins/windows/src/native/build.xml.mingw b/plugins/windows/src/native/build.xml.mingw deleted file mode 100644 index 4250be7..0000000 --- a/plugins/windows/src/native/build.xml.mingw +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/windows/src/native/dx8/.gitignore b/plugins/windows/src/native/dx8/.gitignore deleted file mode 100644 index 0fd0ace..0000000 --- a/plugins/windows/src/native/dx8/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/net_java_games_input_IDirectInput.h -/net_java_games_input_IDirectInputDevice.h -/net_java_games_input_IDirectInputEffect.h diff --git a/plugins/windows/src/native/raw/.gitignore b/plugins/windows/src/native/raw/.gitignore deleted file mode 100644 index fb0c52f..0000000 --- a/plugins/windows/src/native/raw/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/net_java_games_input_RawDevice.h -/net_java_games_input_RawInputEnvironmentPlugin.h -/net_java_games_input_RawInputEventQueue_QueueThread.h -/net_java_games_input_RawInputEventQueue.h diff --git a/plugins/wintab/build.xml b/plugins/wintab/build.xml deleted file mode 100644 index 6e47c64..0000000 --- a/plugins/wintab/build.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/wintab/pom.xml b/plugins/wintab/pom.xml new file mode 100644 index 0000000..4121eeb --- /dev/null +++ b/plugins/wintab/pom.xml @@ -0,0 +1,75 @@ + + 4.0.0 + wintab-plugin + jar + JInput - Wintab Plugin + + + net.java.jinput + plugins + 2.0.8-SNAPSHOT + ../ + + + + + net.java.jinput + windows-plugin + ${project.version} + + + + + + + maven-source-plugin + + + maven-javadoc-plugin + + + maven-compiler-plugin + + + -h + ${project.build.directory}/generated-sources/natives + + + + + maven-antrun-plugin + + + compile + + + + + + + run + + + + + + maven-jar-plugin + + + package + + jar + + + ${project.build.directory}/natives + natives-wintab + + *.dll + + + + + + + + \ No newline at end of file diff --git a/plugins/wintab/src/java/net/java/games/input/WinTabButtonComponent.java b/plugins/wintab/src/main/java/net/java/games/input/WinTabButtonComponent.java similarity index 100% rename from plugins/wintab/src/java/net/java/games/input/WinTabButtonComponent.java rename to plugins/wintab/src/main/java/net/java/games/input/WinTabButtonComponent.java diff --git a/plugins/wintab/src/java/net/java/games/input/WinTabComponent.java b/plugins/wintab/src/main/java/net/java/games/input/WinTabComponent.java similarity index 94% rename from plugins/wintab/src/java/net/java/games/input/WinTabComponent.java rename to plugins/wintab/src/main/java/net/java/games/input/WinTabComponent.java index 0c2944d..03bea98 100644 --- a/plugins/wintab/src/java/net/java/games/input/WinTabComponent.java +++ b/plugins/wintab/src/main/java/net/java/games/input/WinTabComponent.java @@ -33,14 +33,6 @@ import java.util.List; public class WinTabComponent extends AbstractComponent { - public final static int XAxis = 1; - public final static int YAxis = 2; - public final static int ZAxis = 3; - public final static int NPressureAxis = 4; - public final static int TPressureAxis = 5; - public final static int OrientationAxis = 6; - public final static int RotationAxis = 7; - private int min; private int max; protected float lastKnownValue; @@ -77,27 +69,27 @@ public class WinTabComponent extends AbstractComponent { List components = new ArrayList(); Identifier id; switch(axisId) { - case XAxis: + case WinTabDevice.XAxis: id = Identifier.Axis.X; components.add(new WinTabComponent(context, parentDevice, id.getName(), id, axisRanges[0], axisRanges[1])); break; - case YAxis: + case WinTabDevice.YAxis: id = Identifier.Axis.Y; components.add(new WinTabComponent(context, parentDevice, id.getName(), id, axisRanges[0], axisRanges[1])); break; - case ZAxis: + case WinTabDevice.ZAxis: id = Identifier.Axis.Z; components.add(new WinTabComponent(context, parentDevice, id.getName(), id, axisRanges[0], axisRanges[1])); break; - case NPressureAxis: + case WinTabDevice.NPressureAxis: id = Identifier.Axis.X_FORCE; components.add(new WinTabComponent(context, parentDevice, id.getName(), id, axisRanges[0], axisRanges[1])); break; - case TPressureAxis: + case WinTabDevice.TPressureAxis: id = Identifier.Axis.Y_FORCE; components.add(new WinTabComponent(context, parentDevice, id.getName(), id, axisRanges[0], axisRanges[1])); break; - case OrientationAxis: + case WinTabDevice.OrientationAxis: id = Identifier.Axis.RX; components.add(new WinTabComponent(context, parentDevice, id.getName(), id, axisRanges[0], axisRanges[1])); id = Identifier.Axis.RY; @@ -105,7 +97,7 @@ public class WinTabComponent extends AbstractComponent { id = Identifier.Axis.RZ; components.add(new WinTabComponent(context, parentDevice, id.getName(), id, axisRanges[4], axisRanges[5])); break; - case RotationAxis: + case WinTabDevice.RotationAxis: id = Identifier.Axis.RX; components.add(new WinTabComponent(context, parentDevice, id.getName(), id, axisRanges[0], axisRanges[1])); id = Identifier.Axis.RY; diff --git a/plugins/wintab/src/java/net/java/games/input/WinTabContext.java b/plugins/wintab/src/main/java/net/java/games/input/WinTabContext.java similarity index 100% rename from plugins/wintab/src/java/net/java/games/input/WinTabContext.java rename to plugins/wintab/src/main/java/net/java/games/input/WinTabContext.java diff --git a/plugins/wintab/src/java/net/java/games/input/WinTabCursorComponent.java b/plugins/wintab/src/main/java/net/java/games/input/WinTabCursorComponent.java similarity index 100% rename from plugins/wintab/src/java/net/java/games/input/WinTabCursorComponent.java rename to plugins/wintab/src/main/java/net/java/games/input/WinTabCursorComponent.java diff --git a/plugins/wintab/src/java/net/java/games/input/WinTabDevice.java b/plugins/wintab/src/main/java/net/java/games/input/WinTabDevice.java similarity index 85% rename from plugins/wintab/src/java/net/java/games/input/WinTabDevice.java rename to plugins/wintab/src/main/java/net/java/games/input/WinTabDevice.java index 819abc7..a6df095 100644 --- a/plugins/wintab/src/java/net/java/games/input/WinTabDevice.java +++ b/plugins/wintab/src/main/java/net/java/games/input/WinTabDevice.java @@ -30,6 +30,14 @@ import java.util.ArrayList; import java.util.List; public class WinTabDevice extends AbstractController { + public final static int XAxis = 1; + public final static int YAxis = 2; + public final static int ZAxis = 3; + public final static int NPressureAxis = 4; + public final static int TPressureAxis = 5; + public final static int OrientationAxis = 6; + public final static int RotationAxis = 7; + private WinTabContext context; private List eventList = new ArrayList(); @@ -74,60 +82,60 @@ public class WinTabDevice extends AbstractController { WinTabEnvironmentPlugin.logln("Device " + deviceIndex + ", name: " + name); List componentsList = new ArrayList(); - int[] axisDetails = nGetAxisDetails(deviceIndex, WinTabComponent.XAxis); + int[] axisDetails = nGetAxisDetails(deviceIndex, XAxis); if(axisDetails.length==0) { WinTabEnvironmentPlugin.logln("ZAxis not supported"); } else { WinTabEnvironmentPlugin.logln("Xmin: " + axisDetails[0] + ", Xmax: " + axisDetails[1]); - componentsList.addAll(WinTabComponent.createComponents(context, deviceIndex, WinTabComponent.XAxis, axisDetails)); + componentsList.addAll(WinTabComponent.createComponents(context, deviceIndex, XAxis, axisDetails)); } - axisDetails = nGetAxisDetails(deviceIndex, WinTabComponent.YAxis); + axisDetails = nGetAxisDetails(deviceIndex, YAxis); if(axisDetails.length==0) { WinTabEnvironmentPlugin.logln("YAxis not supported"); } else { WinTabEnvironmentPlugin.logln("Ymin: " + axisDetails[0] + ", Ymax: " + axisDetails[1]); - componentsList.addAll(WinTabComponent.createComponents(context, deviceIndex, WinTabComponent.YAxis, axisDetails)); + componentsList.addAll(WinTabComponent.createComponents(context, deviceIndex, YAxis, axisDetails)); } - axisDetails = nGetAxisDetails(deviceIndex, WinTabComponent.ZAxis); + axisDetails = nGetAxisDetails(deviceIndex, ZAxis); if(axisDetails.length==0) { WinTabEnvironmentPlugin.logln("ZAxis not supported"); } else { WinTabEnvironmentPlugin.logln("Zmin: " + axisDetails[0] + ", Zmax: " + axisDetails[1]); - componentsList.addAll(WinTabComponent.createComponents(context, deviceIndex, WinTabComponent.ZAxis, axisDetails)); + componentsList.addAll(WinTabComponent.createComponents(context, deviceIndex, ZAxis, axisDetails)); } - axisDetails = nGetAxisDetails(deviceIndex, WinTabComponent.NPressureAxis); + axisDetails = nGetAxisDetails(deviceIndex, NPressureAxis); if(axisDetails.length==0) { WinTabEnvironmentPlugin.logln("NPressureAxis not supported"); } else { WinTabEnvironmentPlugin.logln("NPressMin: " + axisDetails[0] + ", NPressMax: " + axisDetails[1]); - componentsList.addAll(WinTabComponent.createComponents(context, deviceIndex, WinTabComponent.NPressureAxis, axisDetails)); + componentsList.addAll(WinTabComponent.createComponents(context, deviceIndex, NPressureAxis, axisDetails)); } - axisDetails = nGetAxisDetails(deviceIndex, WinTabComponent.TPressureAxis); + axisDetails = nGetAxisDetails(deviceIndex, TPressureAxis); if(axisDetails.length==0) { WinTabEnvironmentPlugin.logln("TPressureAxis not supported"); } else { WinTabEnvironmentPlugin.logln("TPressureAxismin: " + axisDetails[0] + ", TPressureAxismax: " + axisDetails[1]); - componentsList.addAll(WinTabComponent.createComponents(context, deviceIndex, WinTabComponent.TPressureAxis, axisDetails)); + componentsList.addAll(WinTabComponent.createComponents(context, deviceIndex, TPressureAxis, axisDetails)); } - axisDetails = nGetAxisDetails(deviceIndex, WinTabComponent.OrientationAxis); + axisDetails = nGetAxisDetails(deviceIndex, OrientationAxis); if(axisDetails.length==0) { WinTabEnvironmentPlugin.logln("OrientationAxis not supported"); } else { WinTabEnvironmentPlugin.logln("OrientationAxis mins/maxs: " + axisDetails[0] + "," + axisDetails[1] + ", " + axisDetails[2] + "," + axisDetails[3] + ", " + axisDetails[4] + "," + axisDetails[5]); - componentsList.addAll(WinTabComponent.createComponents(context, deviceIndex, WinTabComponent.OrientationAxis, axisDetails)); + componentsList.addAll(WinTabComponent.createComponents(context, deviceIndex, OrientationAxis, axisDetails)); } - axisDetails = nGetAxisDetails(deviceIndex, WinTabComponent.RotationAxis); + axisDetails = nGetAxisDetails(deviceIndex, RotationAxis); if(axisDetails.length==0) { WinTabEnvironmentPlugin.logln("RotationAxis not supported"); } else { WinTabEnvironmentPlugin.logln("RotationAxis is supported (by the device, not by this plugin)"); - componentsList.addAll(WinTabComponent.createComponents(context, deviceIndex, WinTabComponent.RotationAxis, axisDetails)); + componentsList.addAll(WinTabComponent.createComponents(context, deviceIndex, RotationAxis, axisDetails)); } String[] cursorNames = nGetCursorNames(deviceIndex); diff --git a/plugins/wintab/src/java/net/java/games/input/WinTabEnvironmentPlugin.java b/plugins/wintab/src/main/java/net/java/games/input/WinTabEnvironmentPlugin.java similarity index 100% rename from plugins/wintab/src/java/net/java/games/input/WinTabEnvironmentPlugin.java rename to plugins/wintab/src/main/java/net/java/games/input/WinTabEnvironmentPlugin.java diff --git a/plugins/wintab/src/java/net/java/games/input/WinTabPacket.java b/plugins/wintab/src/main/java/net/java/games/input/WinTabPacket.java similarity index 100% rename from plugins/wintab/src/java/net/java/games/input/WinTabPacket.java rename to plugins/wintab/src/main/java/net/java/games/input/WinTabPacket.java diff --git a/plugins/wintab/src/main/native/WinTabUtils.c b/plugins/wintab/src/main/native/WinTabUtils.c new file mode 100644 index 0000000..3c9d709 --- /dev/null +++ b/plugins/wintab/src/main/native/WinTabUtils.c @@ -0,0 +1,167 @@ +/*---------------------------------------------------------------------------- + + NAME + Utils.c + + PURPOSE + Some general-purpose functions for the WinTab demos. + + COPYRIGHT + Copyright (c) Wacom Company, Ltd. 2014 All Rights Reserved + All rights reserved. + + The text and information contained in this file may be freely used, + copied, or distributed without compensation or licensing restrictions. + +---------------------------------------------------------------------------- */ + +#include "WinTabUtils.h" + +#ifdef WACOM_DEBUG + +void WacomTrace( char *lpszFormat, ...); + +#define WACOM_ASSERT( x ) assert( x ) +#define WACOM_TRACE(...) WacomTrace(__VA_ARGS__) +#else +#define WACOM_TRACE(...) +#define WACOM_ASSERT( x ) + +#endif // WACOM_DEBUG + +////////////////////////////////////////////////////////////////////////////// +HINSTANCE ghWintab = NULL; + +WTINFOA gpWTInfoA = NULL; +WTOPENA gpWTOpenA = NULL; +WTGETA gpWTGetA = NULL; +WTSETA gpWTSetA = NULL; +WTCLOSE gpWTClose = NULL; +WTPACKET gpWTPacket = NULL; +WTENABLE gpWTEnable = NULL; +WTOVERLAP gpWTOverlap = NULL; +WTSAVE gpWTSave = NULL; +WTCONFIG gpWTConfig = NULL; +WTRESTORE gpWTRestore = NULL; +WTEXTSET gpWTExtSet = NULL; +WTEXTGET gpWTExtGet = NULL; +WTQUEUESIZESET gpWTQueueSizeSet = NULL; +WTDATAPEEK gpWTDataPeek = NULL; +WTPACKETSGET gpWTPacketsGet = NULL; + +// TODO - add more wintab32 function pointers as needed + +#define GETPROCADDRESS(type, func) \ + gp##func = (type)GetProcAddress(ghWintab, #func); \ + if (!gp##func){ WACOM_ASSERT(FALSE); UnloadWintab(); return FALSE; } + +////////////////////////////////////////////////////////////////////////////// +// Purpose +// Find wintab32.dll and load it. +// Find the exported functions we need from it. +// +// Returns +// TRUE on success. +// FALSE on failure. +// +BOOL LoadWintab( void ) +{ + ghWintab = LoadLibraryA( "Wintab32.dll" ); + if ( !ghWintab ) + { + DWORD err = GetLastError(); + WACOM_TRACE("LoadLibrary error: %i\n", err); + return FALSE; + } + + // Explicitly find the exported Wintab functions in which we are interested. + // We are using the ASCII, not unicode versions (where applicable). + GETPROCADDRESS( WTOPENA, WTOpenA ); + GETPROCADDRESS( WTINFOA, WTInfoA ); + GETPROCADDRESS( WTGETA, WTGetA ); + GETPROCADDRESS( WTSETA, WTSetA ); + GETPROCADDRESS( WTPACKET, WTPacket ); + GETPROCADDRESS( WTCLOSE, WTClose ); + GETPROCADDRESS( WTENABLE, WTEnable ); + GETPROCADDRESS( WTOVERLAP, WTOverlap ); + GETPROCADDRESS( WTSAVE, WTSave ); + GETPROCADDRESS( WTCONFIG, WTConfig ); + GETPROCADDRESS( WTRESTORE, WTRestore ); + GETPROCADDRESS( WTEXTSET, WTExtSet ); + GETPROCADDRESS( WTEXTGET, WTExtGet ); + GETPROCADDRESS( WTQUEUESIZESET, WTQueueSizeSet ); + GETPROCADDRESS( WTDATAPEEK, WTDataPeek ); + GETPROCADDRESS( WTPACKETSGET, WTPacketsGet ); + + + // TODO - don't forget to NULL out pointers in UnloadWintab(). + return TRUE; +} + + + +////////////////////////////////////////////////////////////////////////////// +// Purpose +// Uninitializes use of wintab32.dll +// +// Returns +// Nothing. +// +void UnloadWintab( void ) +{ + WACOM_TRACE( "UnloadWintab()\n" ); + + if ( ghWintab ) + { + FreeLibrary( ghWintab ); + ghWintab = NULL; + } + + gpWTOpenA = NULL; + gpWTClose = NULL; + gpWTInfoA = NULL; + gpWTPacket = NULL; + gpWTEnable = NULL; + gpWTOverlap = NULL; + gpWTSave = NULL; + gpWTConfig = NULL; + gpWTGetA = NULL; + gpWTSetA = NULL; + gpWTRestore = NULL; + gpWTExtSet = NULL; + gpWTExtGet = NULL; + gpWTQueueSizeSet = NULL; + gpWTDataPeek = NULL; + gpWTPacketsGet = NULL; +} + + + +#ifdef WACOM_DEBUG + +////////////////////////////////////////////////////////////////////////////// + +void WacomTrace( char *lpszFormat, ...) +{ + char szTraceMessage[ 128 ]; + + int nBytesWritten; + + va_list args; + + WACOM_ASSERT( lpszFormat ); + + va_start( args, lpszFormat ); + + nBytesWritten = _vsnprintf( szTraceMessage, sizeof( szTraceMessage ) - 1, + lpszFormat, args ); + + if ( nBytesWritten > 0 ) + { + OutputDebugStringA( szTraceMessage ); + } + + va_end( args ); +} + +#endif // WACOM_DEBUG diff --git a/plugins/wintab/src/main/native/WinTabUtils.h b/plugins/wintab/src/main/native/WinTabUtils.h new file mode 100644 index 0000000..89b31a3 --- /dev/null +++ b/plugins/wintab/src/main/native/WinTabUtils.h @@ -0,0 +1,92 @@ +/*---------------------------------------------------------------------------- + + NAME + Utils.h + + PURPOSE + Defines for the general-purpose functions for the WinTab demos. + + COPYRIGHT + Copyright (c) Wacom Company, Ltd. 2014 All Rights Reserved + All rights reserved. + + The text and information contained in this file may be freely used, + copied, or distributed without compensation or licensing restrictions. + +---------------------------------------------------------------------------- */ +#pragma once + +#include +#include +#include +#include + +#include "wintab.h" // NOTE: get from wactab header package + + +////////////////////////////////////////////////////////////////////////////// +#define WACOM_DEBUG + +// Ignore warnings about using unsafe string functions. +#pragma warning( disable : 4996 ) + +////////////////////////////////////////////////////////////////////////////// +// Function pointers to Wintab functions exported from wintab32.dll. +typedef UINT ( API * WTINFOA ) ( UINT, UINT, LPVOID ); +typedef HCTX ( API * WTOPENA )( HWND, LPLOGCONTEXTA, BOOL ); +typedef BOOL ( API * WTGETA ) ( HCTX, LPLOGCONTEXT ); +typedef BOOL ( API * WTSETA ) ( HCTX, LPLOGCONTEXT ); +typedef BOOL ( API * WTCLOSE ) ( HCTX ); +typedef BOOL ( API * WTENABLE ) ( HCTX, BOOL ); +typedef BOOL ( API * WTPACKET ) ( HCTX, UINT, LPVOID ); +typedef BOOL ( API * WTOVERLAP ) ( HCTX, BOOL ); +typedef BOOL ( API * WTSAVE ) ( HCTX, LPVOID ); +typedef BOOL ( API * WTCONFIG ) ( HCTX, HWND ); +typedef HCTX ( API * WTRESTORE ) ( HWND, LPVOID, BOOL ); +typedef BOOL ( API * WTEXTSET ) ( HCTX, UINT, LPVOID ); +typedef BOOL ( API * WTEXTGET ) ( HCTX, UINT, LPVOID ); +typedef BOOL ( API * WTQUEUESIZESET ) ( HCTX, int ); +typedef int ( API * WTDATAPEEK ) ( HCTX, UINT, UINT, int, LPVOID, LPINT); +typedef int ( API * WTPACKETSGET ) (HCTX, int, LPVOID); + +// TODO - add more wintab32 function defs as needed + +// Loaded Wintab32 API functions. +extern HINSTANCE ghWintab; + +extern WTINFOA gpWTInfoA; +extern WTOPENA gpWTOpenA; +extern WTGETA gpWTGetA; +extern WTSETA gpWTSetA; +extern WTCLOSE gpWTClose; +extern WTPACKET gpWTPacket; +extern WTENABLE gpWTEnable; +extern WTOVERLAP gpWTOverlap; +extern WTSAVE gpWTSave; +extern WTCONFIG gpWTConfig; +extern WTRESTORE gpWTRestore; +extern WTEXTSET gpWTExtSet; +extern WTEXTGET gpWTExtGet; +extern WTQUEUESIZESET gpWTQueueSizeSet; +extern WTDATAPEEK gpWTDataPeek; +extern WTPACKETSGET gpWTPacketsGet; + +// TODO - add more wintab32 function pointers as needed + +////////////////////////////////////////////////////////////////////////////// +BOOL LoadWintab( void ); +void UnloadWintab( void ); + +////////////////////////////////////////////////////////////////////////////// +#ifdef WACOM_DEBUG + +void WacomTrace( char *lpszFormat, ...); + +#define WACOM_ASSERT( x ) assert( x ) +#define WACOM_TRACE(...) WacomTrace(__VA_ARGS__) +#else +#define WACOM_TRACE(...) +#define WACOM_ASSERT( x ) + +#endif // WACOM_DEBUG + diff --git a/plugins/wintab/src/main/native/build.xml b/plugins/wintab/src/main/native/build.xml new file mode 100644 index 0000000..8de51f9 --- /dev/null +++ b/plugins/wintab/src/main/native/build.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/wintab/src/native/net_java_games_input_WinTabContext.c b/plugins/wintab/src/main/native/net_java_games_input_WinTabContext.c similarity index 86% rename from plugins/wintab/src/native/net_java_games_input_WinTabContext.c rename to plugins/wintab/src/main/native/net_java_games_input_WinTabContext.c index 99d6fe5..d455197 100644 --- a/plugins/wintab/src/native/net_java_games_input_WinTabContext.c +++ b/plugins/wintab/src/main/native/net_java_games_input_WinTabContext.c @@ -3,6 +3,7 @@ #include #include "net_java_games_input_WinTabContext.h" +#include "wintabutils.h" #include //#define PACKETDATA ( PK_X | PK_Y | PK_Z | PK_BUTTONS | PK_NORMAL_PRESSURE | PK_TANGENT_PRESSURE | PK_ROTATION | PK_ORIENTATION | PK_CURSOR ) #define PACKETDATA ( PK_TIME | PK_X | PK_Y | PK_Z | PK_BUTTONS | PK_NORMAL_PRESSURE | PK_TANGENT_PRESSURE | PK_ORIENTATION | PK_CURSOR ) @@ -22,7 +23,19 @@ JNIEXPORT jlong JNICALL Java_net_java_games_input_WinTabContext_nOpen(JNIEnv *en jmethodID getBooleanMethod = (*env)->GetStaticMethodID(env, booleanClass, "getBoolean", "(Ljava/lang/String;)Z"); jboolean detachCursor = (*env)->CallStaticBooleanMethod(env, booleanClass, getBooleanMethod, propertyName); - WTInfo(WTI_DEFCONTEXT, 0, &context); + if(!LoadWintab()) { + throwIOException(env, "Failed to load wintab (%d)\n", GetLastError()); + } else { + printfJava(env, "Wintab dll loaded\n"); + } + + if (!gpWTInfoA(0, 0, NULL)) { + throwIOException(env, "Wintab is not available (%d)\n", GetLastError()); + } else { + printfJava(env, "Wintab is available\n"); + } + + gpWTInfoA(WTI_DEFCONTEXT, 0, &context); wsprintf(context.lcName, "JInput Digitizing"); context.lcPktData = PACKETDATA; @@ -34,18 +47,19 @@ JNIEXPORT jlong JNICALL Java_net_java_games_input_WinTabContext_nOpen(JNIEnv *en } /* open the region */ - hCtx = WTOpen(hWnd, &context, TRUE); + hCtx = gpWTOpenA(hWnd, &context, TRUE); return (jlong)(intptr_t)hCtx; } JNIEXPORT void JNICALL Java_net_java_games_input_WinTabContext_nClose(JNIEnv *env, jclass unused, jlong hCtx_long) { - WTClose((HCTX)(INT_PTR)hCtx_long); + gpWTClose((HCTX)(INT_PTR)hCtx_long); + UnloadWintab(); } JNIEXPORT jint JNICALL Java_net_java_games_input_WinTabContext_nGetNumberOfSupportedDevices(JNIEnv *env, jclass unused) { int numDevices; - WTInfo(WTI_INTERFACE, IFC_NDEVICES, &numDevices); + gpWTInfoA(WTI_INTERFACE, IFC_NDEVICES, &numDevices); return numDevices; } @@ -54,7 +68,7 @@ JNIEXPORT jobjectArray JNICALL Java_net_java_games_input_WinTabContext_nGetPacke jobjectArray retval; int i=0; PACKET packets[MAX_PACKETS]; - int numberRead = WTPacketsGet((HCTX)(INT_PTR)hCtx_long, MAX_PACKETS, packets); + int numberRead = gpWTPacketsGet((HCTX)(INT_PTR)hCtx_long, MAX_PACKETS, packets); jclass winTabPacketClass = (*env)->FindClass(env, "net/java/games/input/WinTabPacket"); jfieldID packetTimeField = (*env)->GetFieldID(env, winTabPacketClass, "PK_TIME", "J"); jfieldID packetXAxisField = (*env)->GetFieldID(env, winTabPacketClass, "PK_X", "I"); diff --git a/plugins/wintab/src/native/net_java_games_input_WinTabDevice.c b/plugins/wintab/src/main/native/net_java_games_input_WinTabDevice.c similarity index 63% rename from plugins/wintab/src/native/net_java_games_input_WinTabDevice.c rename to plugins/wintab/src/main/native/net_java_games_input_WinTabDevice.c index 45f202e..45af0c1 100644 --- a/plugins/wintab/src/native/net_java_games_input_WinTabDevice.c +++ b/plugins/wintab/src/main/native/net_java_games_input_WinTabDevice.c @@ -3,8 +3,8 @@ #include #include "net_java_games_input_WinTabDevice.h" -#include "net_java_games_input_WinTabComponent.h" #include "util.h" +#include "wintabutils.h" #include #include #define PACKETDATA ( PK_X | PK_Y | PK_Z | PK_BUTTONS | PK_NORMAL_PRESSURE | PK_ORIENTATION | PK_CURSOR ) @@ -13,7 +13,7 @@ JNIEXPORT jstring JNICALL Java_net_java_games_input_WinTabDevice_nGetName(JNIEnv *env, jclass unused, jint deviceIndex) { char name[50]; - WTInfo(WTI_DEVICES + deviceIndex, DVC_NAME, name); + gpWTInfoA(WTI_DEVICES + deviceIndex, DVC_NAME, name); return (*env)->NewStringUTF(env, name); } @@ -26,16 +26,16 @@ JNIEXPORT jintArray JNICALL Java_net_java_games_input_WinTabDevice_nGetAxisDetai int res; jintArray retVal = NULL; - if(axisId==net_java_games_input_WinTabComponent_XAxis) type = DVC_X; - else if(axisId==net_java_games_input_WinTabComponent_YAxis) type = DVC_Y; - else if(axisId==net_java_games_input_WinTabComponent_ZAxis) type = DVC_Z; - else if(axisId==net_java_games_input_WinTabComponent_NPressureAxis) type = DVC_NPRESSURE; - else if(axisId==net_java_games_input_WinTabComponent_TPressureAxis) type = DVC_TPRESSURE; - else if(axisId==net_java_games_input_WinTabComponent_OrientationAxis) type = DVC_ORIENTATION; - else if(axisId==net_java_games_input_WinTabComponent_RotationAxis) type = DVC_ROTATION; + if(axisId==net_java_games_input_WinTabDevice_XAxis) type = DVC_X; + else if(axisId==net_java_games_input_WinTabDevice_YAxis) type = DVC_Y; + else if(axisId==net_java_games_input_WinTabDevice_ZAxis) type = DVC_Z; + else if(axisId==net_java_games_input_WinTabDevice_NPressureAxis) type = DVC_NPRESSURE; + else if(axisId==net_java_games_input_WinTabDevice_TPressureAxis) type = DVC_TPRESSURE; + else if(axisId==net_java_games_input_WinTabDevice_OrientationAxis) type = DVC_ORIENTATION; + else if(axisId==net_java_games_input_WinTabDevice_RotationAxis) type = DVC_ROTATION; - if(axisId==net_java_games_input_WinTabComponent_RotationAxis || axisId==net_java_games_input_WinTabComponent_OrientationAxis) { - res = WTInfo(WTI_DEVICES + deviceIndex, type, &threeAxisArray); + if(axisId==net_java_games_input_WinTabDevice_RotationAxis || axisId==net_java_games_input_WinTabDevice_OrientationAxis) { + res = gpWTInfoA(WTI_DEVICES + deviceIndex, type, &threeAxisArray); if(res!=0) { threeAxisData[0] = threeAxisArray[0].axMin; threeAxisData[1] = threeAxisArray[0].axMax; @@ -47,7 +47,7 @@ JNIEXPORT jintArray JNICALL Java_net_java_games_input_WinTabDevice_nGetAxisDetai (*env)->SetIntArrayRegion(env, retVal, 0, 6, threeAxisData); } } else { - res = WTInfo(WTI_DEVICES + deviceIndex, type, &axis); + res = gpWTInfoA(WTI_DEVICES + deviceIndex, type, &axis); if(res!=0) { axisData[0] = axis.axMin; axisData[1] = axis.axMax; @@ -72,13 +72,13 @@ JNIEXPORT jobjectArray JNICALL Java_net_java_games_input_WinTabDevice_nGetCursor jstring nameString; jobjectArray retval; - WTInfo(WTI_DEVICES + deviceId, DVC_NCSRTYPES, &numberCursorTypes); - WTInfo(WTI_DEVICES + deviceId, DVC_FIRSTCSR, &firstCursorType); + gpWTInfoA(WTI_DEVICES + deviceId, DVC_NCSRTYPES, &numberCursorTypes); + gpWTInfoA(WTI_DEVICES + deviceId, DVC_FIRSTCSR, &firstCursorType); retval = (*env)->NewObjectArray(env, numberCursorTypes, stringClass, NULL); for(i=0;iNewStringUTF(env, name); (*env)->SetObjectArrayElement(env, retval, i-firstCursorType, nameString); } @@ -93,11 +93,11 @@ JNIEXPORT jint JNICALL Java_net_java_games_input_WinTabDevice_nGetMaxButtonCount int i; byte retval=0; - WTInfo(WTI_DEVICES + deviceId, DVC_NCSRTYPES, &numberCursorTypes); - WTInfo(WTI_DEVICES + deviceId, DVC_FIRSTCSR, &firstCursorType); + gpWTInfoA(WTI_DEVICES + deviceId, DVC_NCSRTYPES, &numberCursorTypes); + gpWTInfoA(WTI_DEVICES + deviceId, DVC_FIRSTCSR, &firstCursorType); for(i=0;iretval) { retval = buttonCount; } diff --git a/plugins/wintab/src/native/.gitignore b/plugins/wintab/src/native/.gitignore deleted file mode 100644 index 85b86d0..0000000 --- a/plugins/wintab/src/native/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/net_java_games_input_DummyWindow.h -/net_java_games_input_WinTabComponent.h -/net_java_games_input_WinTabContext.h -/net_java_games_input_WinTabDevice.h diff --git a/plugins/wintab/src/native/build.xml b/plugins/wintab/src/native/build.xml deleted file mode 100644 index 38691d9..0000000 --- a/plugins/wintab/src/native/build.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..0a90e68 --- /dev/null +++ b/pom.xml @@ -0,0 +1,152 @@ + + 4.0.0 + net.java.jinput + jinput-parent + pom + JInput + 2.0.8-SNAPSHOT + Library for access to input devices. + https://github.com/jinput/jinput + + + BSD + http://www.opensource.org/licenses/bsd-license.php + repo + + + + + Members + https://github.com/jinput/jinput/graphs/contributors + + + + https://github.com/jinput/jinput + scm:git:https://github.com/jinput/jinput + + + + UTF-8 + 1.6 + 1.6 + + + + + + net.java.jutils + jutils + 1.0.0 + + + + + + coreAPI + plugins + applet + examples + tests + + + + + + + maven-compiler-plugin + 3.7.0 + + true + true + + + + maven-jar-plugin + 3.1.0 + + + + true + + + + + + maven-source-plugin + 3.0.1 + + + attach-sources + + jar + + + + + + maven-javadoc-plugin + 3.0.0 + + -Xdoclint:none + + + + attach-javadocs + package + + jar + + + + + + maven-antrun-plugin + 1.8 + + + com.googlecode.mavennatives + maven-nativedependencies-plugin + 0.0.7 + + + unpacknatives + + copy + + + + + + + + + + + release-sign-artifacts + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.1 + + + sign-artifacts + verify + + sign + + + + + + + + + \ No newline at end of file diff --git a/tests/pom.xml b/tests/pom.xml new file mode 100644 index 0000000..e5928b7 --- /dev/null +++ b/tests/pom.xml @@ -0,0 +1,37 @@ + + 4.0.0 + tests + jar + JInput - tests + + + net.java.jinput + jinput-parent + 2.0.8-SNAPSHOT + ../ + + + + + net.java.jinput + coreapi + ${project.version} + + + net.java.jinput + applet + ${project.version} + + + + + + + maven-source-plugin + + + maven-javadoc-plugin + + + + \ No newline at end of file diff --git a/coreAPI/src/java/net/java/games/input/test/ControllerEventTest.java b/tests/src/main/java/net/java/games/input/ControllerEventTest.java similarity index 99% rename from coreAPI/src/java/net/java/games/input/test/ControllerEventTest.java rename to tests/src/main/java/net/java/games/input/ControllerEventTest.java index 366e072..a6069e7 100644 --- a/coreAPI/src/java/net/java/games/input/test/ControllerEventTest.java +++ b/tests/src/main/java/net/java/games/input/ControllerEventTest.java @@ -30,7 +30,7 @@ * the design, construction, operation or maintenance of any nuclear facility * *****************************************************************************/ -package net.java.games.input.test; +package net.java.games.input; import java.awt.BorderLayout; import java.awt.Color; diff --git a/coreAPI/src/java/net/java/games/input/test/ControllerReadTest.java b/tests/src/main/java/net/java/games/input/ControllerReadTest.java similarity index 99% rename from coreAPI/src/java/net/java/games/input/test/ControllerReadTest.java rename to tests/src/main/java/net/java/games/input/ControllerReadTest.java index f1ccab6..ee3b85d 100644 --- a/coreAPI/src/java/net/java/games/input/test/ControllerReadTest.java +++ b/tests/src/main/java/net/java/games/input/ControllerReadTest.java @@ -35,7 +35,7 @@ * the design, construction, operation or maintenance of any nuclear facility * *****************************************************************************/ -package net.java.games.input.test; +package net.java.games.input; import java.awt.BorderLayout; import java.awt.Color; @@ -53,7 +53,6 @@ import javax.swing.JScrollPane; import net.java.games.input.Component; import net.java.games.input.Controller; import net.java.games.input.ControllerEnvironment; -import net.java.games.input.Version; public class ControllerReadTest extends JFrame{ private abstract static class AxisPanel extends JPanel{ diff --git a/coreAPI/src/java/net/java/games/input/test/ControllerTextTest.java b/tests/src/main/java/net/java/games/input/ControllerTextTest.java similarity index 99% rename from coreAPI/src/java/net/java/games/input/test/ControllerTextTest.java rename to tests/src/main/java/net/java/games/input/ControllerTextTest.java index 3366d43..8e28c99 100644 --- a/coreAPI/src/java/net/java/games/input/test/ControllerTextTest.java +++ b/tests/src/main/java/net/java/games/input/ControllerTextTest.java @@ -35,7 +35,7 @@ * the design, construction, operation or maintenance of any nuclear facility * *****************************************************************************/ -package net.java.games.input.test; +package net.java.games.input; /** * diff --git a/coreAPI/src/java/net/java/games/input/test/RumbleTest.java b/tests/src/main/java/net/java/games/input/RumbleTest.java similarity index 98% rename from coreAPI/src/java/net/java/games/input/test/RumbleTest.java rename to tests/src/main/java/net/java/games/input/RumbleTest.java index a493462..4dc0725 100644 --- a/coreAPI/src/java/net/java/games/input/test/RumbleTest.java +++ b/tests/src/main/java/net/java/games/input/RumbleTest.java @@ -3,7 +3,7 @@ * * Created on 01 December 2003, 23:02 */ -package net.java.games.input.test; +package net.java.games.input; import net.java.games.input.ControllerEnvironment; import net.java.games.input.Controller; diff --git a/coreAPI/src/java/net/java/games/input/test/VersionTest.java b/tests/src/main/java/net/java/games/input/VersionTest.java similarity index 85% rename from coreAPI/src/java/net/java/games/input/test/VersionTest.java rename to tests/src/main/java/net/java/games/input/VersionTest.java index b97cc62..caf2a44 100644 --- a/coreAPI/src/java/net/java/games/input/test/VersionTest.java +++ b/tests/src/main/java/net/java/games/input/VersionTest.java @@ -1,4 +1,4 @@ -package net.java.games.input.test; +package net.java.games.input; import net.java.games.input.Version; diff --git a/applet/src/net/java/games/input/applet/test/ControllerEventTestApplet.java b/tests/src/main/java/net/java/games/input/applet/ControllerEventTestApplet.java similarity index 95% rename from applet/src/net/java/games/input/applet/test/ControllerEventTestApplet.java rename to tests/src/main/java/net/java/games/input/applet/ControllerEventTestApplet.java index 00ed8ef..9127686 100644 --- a/applet/src/net/java/games/input/applet/test/ControllerEventTestApplet.java +++ b/tests/src/main/java/net/java/games/input/applet/ControllerEventTestApplet.java @@ -23,12 +23,12 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE */ -package net.java.games.input.applet.test; +package net.java.games.input.applet; import java.applet.Applet; import java.io.IOException; -import net.java.games.input.test.ControllerEventTest; +import net.java.games.input.ControllerEventTest; import net.java.games.input.applet.JInputAppletResourceLoader; public class ControllerEventTestApplet extends Applet { diff --git a/applet/src/net/java/games/input/applet/test/ControllerReadTestApplet.java b/tests/src/main/java/net/java/games/input/applet/ControllerReadTestApplet.java similarity index 95% rename from applet/src/net/java/games/input/applet/test/ControllerReadTestApplet.java rename to tests/src/main/java/net/java/games/input/applet/ControllerReadTestApplet.java index 135d7e1..1f9fff2 100644 --- a/applet/src/net/java/games/input/applet/test/ControllerReadTestApplet.java +++ b/tests/src/main/java/net/java/games/input/applet/ControllerReadTestApplet.java @@ -23,12 +23,12 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE */ -package net.java.games.input.applet.test; +package net.java.games.input.applet; import java.applet.Applet; import java.io.IOException; -import net.java.games.input.test.ControllerReadTest; +import net.java.games.input.ControllerReadTest; import net.java.games.input.applet.JInputAppletResourceLoader; public class ControllerReadTestApplet extends Applet {