changes for empty scan id

Author: cx-aniket-shinde

checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/utils/PluginConstants.java

@@ -15,7 +15,7 @@ public class PluginConstants {
 	public static final String NO_CHANGES = "No changes...";
 	public static final String BTN_UPDATE = "Update";
 	public static final String BTN_LOADING = "Loading";
-	public static final String DEFAULT_COMMENT_TXT = "Notes";
+	public static final String DEFAULT_COMMENT_TXT = "Enter comment";
 	public static final String LOADING_BFL = "Loading BFL";
 	public static final String BFL_FOUND = "Indicates the Best Fix Location. Speed up your remediation by fixing multiple vulnerabilities at once";
 	public static final String BFL_NOT_FOUND = "Best fix Location not available for given results";
@@ -53,6 +53,7 @@ public class PluginConstants {
 	/******************************** TREE MESSAGES ********************************/
 	public static final String TREE_INVALID_SCAN_ID_FORMAT = "Invalid scan id format.";
 	public static final String TREE_NO_RESULTS = "No results.";
+	public static final String NO_SCAN_ID_PROVIDED = "No Scan ID provided.";
 
 	/******************************** PREFERENCES ********************************/
 	public static final String PREFERENCES_API_KEY = "API key:";
@@ -133,4 +134,4 @@ public class PluginConstants {
 	public static final String CX_PROJECT_MISMATCH = "Project mismatch";	
 	public static final String CX_PROJECT_MISMATCH_QUESTION = "The files open in your workspace don't match the files previously scanned in this Checkmarx project. Do you want to scan anyway?";	
 	public static final String CX_REFRESHING_TOOLBAR = "Checkmarx: Refreshing toolbar...";	
-}
+}

checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/utils/PluginUtils.java

@@ -132,6 +132,16 @@ public static void showMessage(DisplayModel rootModel, TreeViewer viewer, String
 		viewer.refresh();
 	}
 
+	
+	/**
+	 * Clear message in the tree
+	 * 
+	 */
+	public static void clearMessage(DisplayModel rootModel,TreeViewer viewer) {
+		rootModel.children.clear();
+		viewer.refresh();
+	}
+		
 	/**
 	 * Get Event Broker
 	 * 
@@ -260,4 +270,4 @@ public static void clearVulnerabilitiesFromProblemsView() {
 			CxLogger.error(String.format(PluginConstants.ERROR_FINDING_OR_DELETING_MARKER, e.getMessage()), e);
 		}
 	}
-}
+}

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

@@ -1114,6 +1114,12 @@ private Scan getLatestScanFromScanList(List<Scan> scanList) {
 	 */
 	private void setSelectionForProjectComboViewer() {
 		String scanId = scanIdComboViewer.getCombo().getText();
+		
+		if(scanId.isEmpty()) {
+			PluginUtils.clearMessage(rootModel, resultsTree);
+			CxLogger.info(String.format(PluginConstants.NO_SCAN_ID_PROVIDED, scanId));
+			return;
+		}
 
 		if (currentScanId.equals(scanId)) {
 			PluginUtils.setTextForComboViewer(scanIdComboViewer, currentScanIdFormmated);
@@ -1371,7 +1377,7 @@ public void widgetSelected(SelectionEvent event) {
 
 					Job job = new Job("Checkmarx: Updating triage information...") {
 						String comment = commentText.getText() != null
-								&& !commentText.getText().equalsIgnoreCase("Notes") ? commentText.getText()
+								&& !commentText.getText().equalsIgnoreCase("Enter comment") ? commentText.getText()
 										: "";
 
 						@Override
@@ -2681,4 +2687,4 @@ private void updateStartScanButton(boolean enabled) {
 			toolBarActions.getStartScanAction().setEnabled(false);
 		}
 	}
-}
+}