haraldwolff
/
java-org.hwo.ui
forked from LupusNobilis/java-org.hwo.ui
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of schwann.lupus:/git/java/org.hwo.ui

thobaben_diagram
Harald Wolff 2016-09-15 10:26:08 +02:00
parent b8af303479 d11fd8e10a
commit 1963bb40e0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/org/hwo/ui/JObjectSelector.java
View File

@ -30,6 +30,7 @@ public class JObjectSelector extends JDialog {
JObjectSelector os = new JObjectSelector();
os.setItems(items);
os.setVisible(true);
os.dispose();
return os.selectedItem;
}

7
src/org/hwo/ui/dialog/SerialPortChooser.java
View File

@ -128,8 +128,11 @@ public class SerialPortChooser extends JDialog {
private void accept()
{
selectedSerialPort = new NewSerialPort(cbPortList.getSelectedItem().toString());
setVisible(false);
String portName = (String)cbPortList.getSelectedItem();
if (portName != null){
selectedSerialPort = new NewSerialPort(portName);
setVisible(false);
}
}
private void cancel()