Changed the default plugin for XP to be the combined raw and direct input plugins.

git-svn-id: file:///home/sven/projects/JOGL/git-svn/svn-server-sync/jinput/trunk@195 e343933a-64c8-49c5-92b1-88f2ce3e89e8

1 files changed, 4 insertions, 3 deletions

diff --git a/coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java b/coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java
index 098a1cf..3ce9b3f 100644
--- a/coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java
+++ b/coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java
@@ -133,15 +133,15 @@ class DefaultControllerEnvironment extends ControllerEnvironment {
 					pluginClasses = pluginClasses + " net.java.games.input.LinuxEnvironmentPlugin";
 				} else if(osName.equals("Mac OS X")) {
 					pluginClasses = pluginClasses + " net.java.games.input.OSXEnvironmentPlugin";
-				} else if(osName.equals("Windows 98") || osName.equals("Windows 2000") || osName.equals("Windows XP")) {
+				} else  if(osName.equals("Windows XP")) {
+					pluginClasses = pluginClasses + " net.java.games.input.DirectAndRawInputEnvironmentPlugin";
+				} else if(osName.equals("Windows 98") || osName.equals("Windows 2000")) {
 					pluginClasses = pluginClasses + " net.java.games.input.DirectInputEnvironmentPlugin";
-//					pluginClasses = pluginClasses + " net.java.games.input.RawInputEnvironmentPlugin";
 				} else if (osName.startsWith("Windows")) {
 					System.out.println("WARNING: Found unknown Windows version: " + osName);
 					System.out.println("Attempting to use default windows plug-in.");
 					System.out.flush();
 					pluginClasses = pluginClasses + " net.java.games.input.DirectInputEnvironmentPlugin";
-//					pluginClasses = pluginClasses + " net.java.games.input.RawInputEnvironmentPlugin";
 				} else {
 					System.out.println("Trying to use default plugin, OS name " + osName +" not recognised");
 				}
@@ -152,6 +152,7 @@ class DefaultControllerEnvironment extends ControllerEnvironment {
 				String className = pluginClassTok.nextToken();					
 				try {
 					if(!loadedPlugins.contains(className)) {
+						System.out.println("Loading: " + className);
 						Class ceClass = Class.forName(className);						
 						ControllerEnvironment ce = (ControllerEnvironment) ceClass.newInstance();
 						if(ce.isSupported()) {