update also in project

Author: elchananarb

checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/CheckmarxView.java

@@ -183,6 +183,8 @@ public class CheckmarxView extends ViewPart implements EventHandler {
 	private String latestScanId = PluginConstants.EMPTY_STRING;
 	private static String currentScanIdFormmated = PluginConstants.EMPTY_STRING;
 	private List<String> currentBranches = new ArrayList<>();
+	private List<Project> currentProjects = new ArrayList<>();
+
 
 	private boolean scansCleanedByProject = false;
 	private boolean firstTimeTriggered = false;
@@ -375,10 +377,10 @@ private void loadComboboxes() {
 
 			@Override
 			protected IStatus run(IProgressMonitor arg0) {
-				List<Project> projectList = getProjects();
+				currentProjects = getProjects();
 				sync.asyncExec(() -> {
-					projectComboViewer.setInput(projectList);
-					if (currentProjectId.isEmpty() || projectList.isEmpty()) {
+					projectComboViewer.setInput(currentProjects);
+					if (currentProjectId.isEmpty() || currentProjects.isEmpty()) {
 						PluginUtils.setTextForComboViewer(projectComboViewer, PROJECT_COMBO_VIEWER_TEXT);
 						PluginUtils.setTextForComboViewer(branchComboViewer, BRANCH_COMBO_VIEWER_TEXT);
 						PluginUtils.setTextForComboViewer(scanIdComboViewer, PluginConstants.COMBOBOX_SCAND_ID_PLACEHOLDER);
@@ -389,7 +391,7 @@ protected IStatus run(IProgressMonitor arg0) {
 				});
 
 				// set project ID
-				String currentProjectName = getProjectFromId(projectList, currentProjectId);
+				String currentProjectName = getProjectFromId(currentProjects, currentProjectId);
 				sync.asyncExec(() -> {
 					PluginUtils.setTextForComboViewer(projectComboViewer, currentProjectName);
 				});
@@ -763,6 +765,15 @@ public void selectionChanged(SelectionChangedEvent event) {
 
 					Project selectedProject = ((Project) selection.getFirstElement());
 
+
+					// Check if selected branch exists in currentBranches
+					if (!currentProjects.contains(selectedProject)) {
+						// Invalid branch - reset to default text and disable scan button
+						PluginUtils.setTextForComboViewer(projectComboViewer, PROJECT_COMBO_VIEWER_TEXT);
+						updateStartScanButton(false);
+						return;
+					}
+
 					// Avoid non-sense trigger changed when opening the combo
 					if (selectedProject.getId().equals(currentProjectId)) {
 						CxLogger.info(PluginConstants.INFO_CHANGE_PROJECT_EVENT_NOT_TRIGGERED);