keep improving ui logic

Author: carlosuc3m

src/main/java/ai/nets/samj/gui/ImageSelectionOnlyComboBox.java

@@ -55,6 +55,8 @@ protected void updateList() {
 	        DefaultComboBoxModel<ComboBoxItem> comboBoxModel = new DefaultComboBoxModel<ComboBoxItem>(objects);
 	        if (selected != null && objects.length != 0)
 	        	comboBoxModel.setSelectedItem(selected);
+	        if (objects.length == 0)
+	        	selected = null;
 	        this.cmbBox.setModel(comboBoxModel);
 		} catch (Exception ex) {
 			ex.printStackTrace();
@@ -70,7 +72,12 @@ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
 	public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
 		try {
 			ComboBoxItem item = (ComboBoxItem) this.cmbBox.getSelectedItem();
-			if (selected == null || item == null || !selected.getId().equals(item.getId())) {
+			if ((selected == null && item != null) || (selected != null && item == null)
+					|| (selected != null && item != null && !selected.getId().equals(item.getId()))) {
+				listener.modelActionsOnImageChanged();
+				listener.imageActionsOnImageChanged();
+			} else if (selected == null && item == null) {
+				selected = null;
 				listener.modelActionsOnImageChanged();
 				listener.imageActionsOnImageChanged();
 			}

src/main/java/ai/nets/samj/gui/MainGUI.java

@@ -110,6 +110,8 @@ public MainGUI(List<SAMModel> modelList, ConsumerInterface consumer) {
         this.consumer.setGuiCallback(() -> {
 	            setTwoThirdsEnabled(false);
 	            cmbImages.updateList();
+	            if (cmbImages.getSelectedObject() == null)
+	            	return;
 	            go.setEnabled(false);
 	            go.showAnimation(true);
 	            new Thread(() -> {
@@ -575,6 +577,10 @@ public void imageActionsOnImageChanged() {
                 consumer.deactivateListeners();
                 consumer.deselectImage();
             	setTwoThirdsEnabled(false);
+            	if (MainGUI.this.cmbImages.getSelectedObject() == null) {
+            		go.setEnabled(false);
+            		return;
+            	}
                 if (go.isEnabled())
                 	return;
                 go.showAnimation(true);