Merge pull request #18 from NeuronRobotics/development

Moving to Java 8 and JavFX
NeuronRobotics · Mar 24, 2015 · ffffa82 · ffffa82
2 parents 3b86925 + 88e32c8
commit ffffa82
Show file tree

Hide file tree

Showing 178 changed files with 1,995 additions and 14,295 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml
diff --git a/.idea/libraries/lib1.xml b/.idea/libraries/lib1.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/javasdk/NRSDK/.classpath b/javasdk/NRSDK/.classpath
@@ -6,18 +6,29 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="addons"/>
+	<classpathentry kind="lib" path="lib/Jama-1.0.2.jar"/>
 	<classpathentry kind="lib" path="lib/bluecove-2.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/bluecove-gpl-2.1.1.jar"/>
-	<classpathentry kind="lib" path="lib_addons/j3dcore.jar"/>
-	<classpathentry kind="lib" path="lib_addons/j3dutils.jar"/>
+	<classpathentry kind="lib" path="lib/nrjavaserial-3.9.0.jar"/>
+	<classpathentry kind="lib" path="lib_addons/commons-lang3-3.2.1.jar"/>
+	<classpathentry kind="lib" path="lib_addons/libusb4java-1.2.0-linux-arm.jar"/>
+	<classpathentry kind="lib" path="lib_addons/libusb4java-1.2.0-linux-x86_64.jar"/>
+	<classpathentry kind="lib" path="lib_addons/libusb4java-1.2.0-linux-x86.jar"/>
+	<classpathentry kind="lib" path="lib_addons/libusb4java-1.2.0-osx-x86_64.jar"/>
+	<classpathentry kind="lib" path="lib_addons/libusb4java-1.2.0-osx-x86.jar"/>
+	<classpathentry kind="lib" path="lib_addons/libusb4java-1.2.0-windows-x86_64.jar"/>
+	<classpathentry kind="lib" path="lib_addons/libusb4java-1.2.0-windows-x86.jar"/>
 	<classpathentry kind="lib" path="lib_addons/miglayout-3.7.2-swing.jar"/>
 	<classpathentry kind="lib" path="lib_addons/motej.0.9.jar"/>
-	<classpathentry kind="lib" path="lib_addons/vecmath.jar"/>
-	<classpathentry kind="lib" path="lib/Jama-1.0.2.jar"/>
 	<classpathentry kind="lib" path="lib_addons/nr-jinput.jar"/>
 	<classpathentry kind="lib" path="lib_addons/smack.jar"/>
 	<classpathentry kind="lib" path="lib_addons/smackx.jar"/>
+	<classpathentry kind="lib" path="lib_addons/usb-api-1.0.2.jar"/>
+	<classpathentry kind="lib" path="lib_addons/usb4java-1.2.0.jar"/>
+	<classpathentry kind="lib" path="lib_addons/usb4java-javax-1.2.0.jar"/>
+	<classpathentry kind="lib" path="lib_addons/vecmath.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/nrjavaserial-3.9.0.jar"/>
+	<classpathentry kind="lib" path="lib_addons/j3dcore.jar"/>
+	<classpathentry kind="lib" path="lib_addons/j3dutils.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>