The changes of Axis.Identifier to Component.Identifier was obviously not checked under windows. My fault. Fixed (I hope)

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

1 files changed, 9 insertions, 9 deletions

diff --git a/plugins/DX8/src/native/input.cpp b/plugins/DX8/src/native/input.cpp
index 188c439..5fd4bcb 100644
--- a/plugins/DX8/src/native/input.cpp
+++ b/plugins/DX8/src/native/input.cpp
@@ -190,21 +190,21 @@ BOOL InitIDs(JNIEnv* env) {
     if (FID_Slider == NULL) {
         return FALSE;
     }
-/*    FID_Button = env->GetStaticFieldID(CLASS_AxisIdentifier, "BUTTON",
-        FD_AxisIdentifier);
+    CLASS_ButtonIdentifier =
+        env->FindClass("net/java/games/input/Component$Identifier$Button");
+    if (CLASS_ButtonIdentifier == NULL) {
+        return FALSE;
+    }
+    FID_Button = env->GetStaticFieldID(CLASS_ButtonIdentifier, "UNKNOWN",
+        FD_ButtonIdentifier);
     if (FID_Button == NULL) {
         return FALSE;
-    }*/
+    }
     FID_POV = env->GetStaticFieldID(CLASS_AxisIdentifier, "POV",
         FD_AxisIdentifier);
     if (FID_POV == NULL) {
         return FALSE;
     }
-    CLASS_ButtonIdentifier =
-        env->FindClass("net/java/games/input/Component$Identifier$Button");
-    if (CLASS_ButtonIdentifier == NULL) {
-        return FALSE;
-    }
     FID_Left = env->GetStaticFieldID(CLASS_ButtonIdentifier, "LEFT",
         FD_ButtonIdentifier);
     if (FID_Left == NULL) {
@@ -622,7 +622,7 @@ BOOL CALLBACK EnumObjectsCallback(LPCDIDEVICEOBJECTINSTANCE lpddoi,
     } else if (lpddoi->guidType == GUID_Slider) {
         identifier = env->GetStaticObjectField(CLASS_AxisIdentifier, FID_Slider);
     } else if (lpddoi->guidType == GUID_Button) {
-        identifier = env->GetStaticObjectField(CLASS_AxisIdentifier, FID_Button);
+        identifier = env->GetStaticObjectField(CLASS_ButtonIdentifier, FID_Button);
     } else if (lpddoi->guidType == GUID_POV) {
         identifier = env->GetStaticObjectField(CLASS_AxisIdentifier, FID_POV);
     } else {