aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/windows
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-11-22 06:39:20 +0100
committerSven Gothel <[email protected]>2012-11-22 06:39:20 +0100
commit49416164a4729b1b7e234841ba9be48b9aa90830 (patch)
tree3ca433f39dd4886de493ccd7046d83809540c980 /plugins/windows
parentd0737cc4a34a41ad9bdac7de379250cacbf55a1d (diff)
parent5c894f5055dfdbf571afee3057e46b9912aedb9b (diff)
Merge remote-tracking branch 'conzar/detect'HEADmaster
Diffstat (limited to 'plugins/windows')
-rw-r--r--plugins/windows/build.xml4
-rw-r--r--plugins/windows/src/java/net/java/games/input/DirectAndRawInputEnvironmentPlugin.java5
-rw-r--r--plugins/windows/src/java/net/java/games/input/DirectInputEnvironmentPlugin.java5
-rw-r--r--plugins/windows/src/java/net/java/games/input/RawInputEnvironmentPlugin.java5
4 files changed, 17 insertions, 2 deletions
diff --git a/plugins/windows/build.xml b/plugins/windows/build.xml
index a10d7cb..39435a1 100644
--- a/plugins/windows/build.xml
+++ b/plugins/windows/build.xml
@@ -9,7 +9,7 @@
</target>
<target name="compile" depends="init">
- <javac srcdir="src/java" destdir="classes" debug="true" deprecation="true" source="1.4" target="1.4">
+ <javac srcdir="src/java" destdir="classes" debug="true" deprecation="true" source="1.5" target="1.5">
<!-- To add something to the classpath: -->
<classpath>
<pathelement location="../../coreAPI/bin/jinput-core.jar"/>
@@ -66,7 +66,7 @@
<mkdir dir="apidocs"/>
<javadoc packagenames="net.*"
destdir="apidocs"
- additionalparam="-source 1.4">
+ additionalparam="-source 1.5">
<sourcepath>
<pathelement location="src/java"/>
</sourcepath>
diff --git a/plugins/windows/src/java/net/java/games/input/DirectAndRawInputEnvironmentPlugin.java b/plugins/windows/src/java/net/java/games/input/DirectAndRawInputEnvironmentPlugin.java
index c789986..dfd3b22 100644
--- a/plugins/windows/src/java/net/java/games/input/DirectAndRawInputEnvironmentPlugin.java
+++ b/plugins/windows/src/java/net/java/games/input/DirectAndRawInputEnvironmentPlugin.java
@@ -91,4 +91,9 @@ public class DirectAndRawInputEnvironmentPlugin extends ControllerEnvironment {
return rawPlugin.isSupported() || dinputPlugin.isSupported();
}
+ @Override
+ public Controller[] rescanControllers() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
}
diff --git a/plugins/windows/src/java/net/java/games/input/DirectInputEnvironmentPlugin.java b/plugins/windows/src/java/net/java/games/input/DirectInputEnvironmentPlugin.java
index deb53c3..35253f4 100644
--- a/plugins/windows/src/java/net/java/games/input/DirectInputEnvironmentPlugin.java
+++ b/plugins/windows/src/java/net/java/games/input/DirectInputEnvironmentPlugin.java
@@ -235,6 +235,11 @@ public final class DirectInputEnvironmentPlugin extends ControllerEnvironment im
return controllers_array;
}
+ @Override
+ public Controller[] rescanControllers() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
private final class ShutdownHook extends Thread {
public final void run() {
/* Release the devices to kill off active force feedback effects */
diff --git a/plugins/windows/src/java/net/java/games/input/RawInputEnvironmentPlugin.java b/plugins/windows/src/java/net/java/games/input/RawInputEnvironmentPlugin.java
index 36f089b..0da3180 100644
--- a/plugins/windows/src/java/net/java/games/input/RawInputEnvironmentPlugin.java
+++ b/plugins/windows/src/java/net/java/games/input/RawInputEnvironmentPlugin.java
@@ -213,4 +213,9 @@ public final class RawInputEnvironmentPlugin extends ControllerEnvironment imple
private final static native byte[] getKeyboardClassGUID();
private final static native byte[] getMouseClassGUID();
+ @Override
+ public Controller[] rescanControllers() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
} // class DirectInputEnvironment