Merge branch 'development' of github.com:NeuronRobotics/java-bowler into development

Author: madhephaestus

javasdk/NRSDK/.classpath

@@ -27,8 +27,8 @@
 	<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_addons/j3dcore.jar"/>
 	<classpathentry kind="lib" path="lib_addons/j3dutils.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

javasdk/NRSDK/addons/com/neuronrobotics/sdk/ui/ConnectionDialog.java

@@ -108,18 +108,14 @@ public void windowGainedFocus(WindowEvent e) {
 
 	private void loadDefaultConnections() {
 		try{
-			if(!OsInfoUtil.isWindows() || OsInfoUtil.getOsName().contains("Windows 8") ){
-				
+			try{
 				addConnectionPanel(new UsbConnectionPanel());
-			}else{
-				System.out.println(OsInfoUtil.getOsName());
+				addConnectionPanel(new BluetoothConnectionPanel());
 				addConnectionPanel(new SerialConnectionPanel());
-			}
-			addConnectionPanel(new BluetoothConnectionPanel());
-			//serial at the end if USB is enabled
-			if(!OsInfoUtil.isWindows())
+			}catch(Exception ex){
 				addConnectionPanel(new SerialConnectionPanel());
-			
+				addConnectionPanel(new BluetoothConnectionPanel());
+			}
 		}catch(Error e){
 			e.printStackTrace();
 			Log.error("This is not a java 8 compliant system, removing the serial, bluetooth and usb connections");

javasdk/NRSDK/addons/com/neuronrobotics/sdk/ui/UsbConnectionPanel.java

@@ -107,19 +107,28 @@ public BowlerAbstractConnection getConnection() {
 
 
 	public void refresh() {	
-		System.err.println("Refreshing USB");
+		//System.err.println("Refreshing USB");
 		connectionCbo.removeAllItems();
 
-		List<UsbDevice> prts;
-		try {
-			prts = UsbCDCSerialConnection.getAllUsbBowlerDevices();
+		List<UsbDevice> prts=null;
+		
+			try {
+				prts = UsbCDCSerialConnection.getAllUsbBowlerDevices();
+			} catch (UnsupportedEncodingException | UsbDisconnectedException
+					| SecurityException | UsbException e1) {
+				e1.printStackTrace();
+				throw new RuntimeException(e1);
+			}
 			for(int i=0;i<prts.size();i++) {
-				String s = UsbCDCSerialConnection.getUniqueID(prts.get(i));
-				connectionCbo.addItem(s);
+				try {
+					String s = UsbCDCSerialConnection.getUniqueID(prts.get(i));
+					connectionCbo.addItem(s);
+				} catch (Exception e) {
+					e.printStackTrace();
+					throw new RuntimeException(e);
+				}
 			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+		
 
 	}