Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ public class CheckmarxView extends ViewPart implements EventHandler {
private Text commentText;
private DisplayModel rootModel;
private String selectedSeverity, selectedState;
private DisplayModel currentlyDisplayedItem;
private Button triageButton;
private SelectionAdapter triageButtonAdapter, codeBashingAdapter;
private Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
Expand Down Expand Up @@ -1082,8 +1083,7 @@ private void createScanIdComboBox(Composite parent) {
scanIdComboViewer.setContentProvider(ArrayContentProvider.getInstance());
scanIdComboViewer.setInput(new ArrayList<>());

GridData gridData = new GridData();
gridData.widthHint = 520;
GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
scanIdComboViewer.getCombo().setLayoutData(gridData);

scanIdComboViewer.getCombo().addListener(SWT.DefaultSelection, new Listener() {
Expand Down Expand Up @@ -1386,6 +1386,7 @@ protected IStatus run(IProgressMonitor arg0) {

if (selectedItem.getResult() != null && selectedItem.getResult().getSimilarityId() != null) {
sync.asyncExec(() -> {
currentlyDisplayedItem = selectedItem;
createTriageSeverityAndStateCombos(selectedItem);
populateTriageChanges(selectedItem);
resultViewComposite.setVisible(true);
Expand Down Expand Up @@ -2473,6 +2474,8 @@ private Image findSeverityImage(DisplayModel model) {
private void listener(PluginListenerDefinition definition) {
switch (definition.getListenerType()) {
case FILTER_CHANGED:
updateResultsTree(definition.getResutls(), true);
break;
case GET_RESULTS:
updateResultsTree(definition.getResutls(), false);
break;
Expand All @@ -2489,9 +2492,15 @@ private void listener(PluginListenerDefinition definition) {

private void updateResultsTree(List<DisplayModel> results, boolean expand) {
sync.asyncExec(() -> {
if (currentlyDisplayedItem == null
|| currentlyDisplayedItem.getSeverity() == null
|| !FilterState.isSeverityEnabled(currentlyDisplayedItem.getSeverity())) {
resultViewComposite.setVisible(false);
attackVectorCompositePanel.setVisible(false);
}
Object[] expanded = resultsTree.getExpandedElements();
rootModel.children.clear();
rootModel.children.addAll(results);
Object[] expanded = resultsTree.getExpandedElements();
resultsTree.refresh();
if (expand) {
Set<String> expandedDMNames = new HashSet<>();
Expand Down
Loading