cleaning up a bit

AVeenstra · Aug 28, 2015 · f0b7332 · f0b7332
1 parent 8ffcb16
commit f0b7332
Show file tree

Hide file tree

Showing 16 changed files with 183 additions and 196 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,7 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+.idea/**
+out/**
+
diff --git a/.idea/artifacts/JoyMon.xml b/.idea/artifacts/JoyMon.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/commons-cli-1.3.1.jar b/commons-cli-1.3.1.jar
diff --git a/jinput.jar b/jinput.jar
diff --git a/jinput_nightly_20150718.zip b/jinput_nightly_20150718.zip
diff --git a/jxl.jar b/jxl.jar
diff --git a/jinput-dx8.dll → lib/jinput-dx8.dll b/jinput-dx8.dll → lib/jinput-dx8.dll
diff --git a/jinput-dx8_64.dll → lib/jinput-dx8_64.dll b/jinput-dx8_64.dll → lib/jinput-dx8_64.dll
diff --git a/jinput-raw.dll → lib/jinput-raw.dll b/jinput-raw.dll → lib/jinput-raw.dll
diff --git a/jinput-raw_64.dll → lib/jinput-raw_64.dll b/jinput-raw_64.dll → lib/jinput-raw_64.dll
diff --git a/jinput-wintab.dll → lib/jinput-wintab.dll b/jinput-wintab.dll → lib/jinput-wintab.dll
diff --git a/libjinput-linux.so → lib/libjinput-linux.so b/libjinput-linux.so → lib/libjinput-linux.so
diff --git a/libjinput-linux64.so → lib/libjinput-linux64.so b/libjinput-linux64.so → lib/libjinput-linux64.so
diff --git a/libjinput-osx.jnilib → lib/libjinput-osx.jnilib b/libjinput-osx.jnilib → lib/libjinput-osx.jnilib
diff --git a/src/nl/utwente/aveenstra/Main.java b/src/nl/utwente/aveenstra/Main.java
@@ -3,9 +3,9 @@
 import javafx.application.Application;
 import javafx.stage.Stage;
 import jfx.messagebox.MessageBox;
-import net.java.games.input.Component;
 import org.apache.commons.cli.*;
 
+import java.io.File;
 import java.util.Arrays;
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
@@ -17,7 +17,6 @@
  */
 public class Main {
 
-    public static final String DEBUGGING = "blurp";
     public static final String AUTHOR = "author";
     public static final String CLI = "cli";
     public static final String DIRECTORY = "dir";
@@ -39,7 +38,6 @@ public class Main {
     static {
         options.addOption(AUTHOR.charAt(0)+"", AUTHOR, true, "Set the name of the author of the results");
         options.addOption(CLI.charAt(0)+"", CLI, false, "Do not open a UI, but instead start a CLI.");
-        options.addOption(DEBUGGING.charAt(0)+"", DEBUGGING, false, "Start the debugging mode.");
         options.addOption(DIRECTORY.charAt(0)+"", DIRECTORY, true, "Set the root directory for the results.");
         options.addOption("h", "help", false, "Prints this help message.");
     }
@@ -55,20 +53,8 @@ public static void main(String[] args) {
             CommandLine line = parser.parse(options, args);
             if (line.hasOption('h')) {
                 printHelp();
-            } else if (line.hasOption(DEBUGGING)) {
-                JoystickWrapper joystick = JoystickWrapper.getInstance();
-                joystickThread = new Thread(joystick, "Joystick Thread");
-                joystick.addObserver((o, arg) -> {
-                    int i = 0;
-                    for (Component c : JoystickWrapper.getInstance().getController().getComponents()) {
-
-                        System.out.printf("%d:%1.2f  ", i++, c.getPollData());
-                    }
-                    System.out.print("\r");
-                });
-                joystickThread.run();
-                joystickThread.join();
-            }else {
+            } else {
+                System.setProperty("net.java.games.input.librarypath", System.getProperty("user.dir") + File.separator + "lib");
                 try {
                     System.out.println(Arrays.toString(Preferences.userRoot().node("JavaJoyMon").keys()));
                 } catch (BackingStoreException e) {