Skip to content
Merged
Show file tree
Hide file tree
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 @@ -626,6 +626,13 @@ private void createResultViewPanel(Composite resultsComposite) {
combo_1.setLayoutData(gd_combo_1);

triageStateComboViewer = new ComboViewer(triageView, SWT.READ_ONLY);
triageStateComboViewer.setLabelProvider(new LabelProvider() {
@Override
public String getText(Object element) {
String s = element instanceof String ? (String) element : super.getText(element);
return s.length() > 50 ? s.substring(0, 47) + "..." : s;
}
});
Combo combo_2 = triageStateComboViewer.getCombo();
combo_2.setEnabled(true);
combo_2.setData(PluginConstants.DATA_ID_KEY, PluginConstants.TRIAGE_STATE_COMBO_ID);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public Menu getMenu(final Control parent) {

for (String customState : customStates) {
MenuItem item = new MenuItem(menu, SWT.CHECK);
item.setText(customState);
item.setText(truncate(customState));
item.setSelection(FilterState.isCustomStateSelected(customState));
item.addSelectionListener(new SelectionAdapter() {
@Override
Expand Down Expand Up @@ -127,4 +127,8 @@ public void widgetSelected(SelectionEvent e) {
public Menu getMenu(final Menu parent) {
return null;
}

private static String truncate(String text) {
return text.length() > 50 ? text.substring(0, 47) + "..." : text;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ private String getCurrentGitBranch() {
*/
private boolean cxProjectMatchesWorkspaceProject() {
Results results = DataProvider.getInstance().getCurrentResults();
boolean noResultsInScan = results == null || results.getResults().isEmpty();
boolean noResultsInScan = results == null || results.getResults() == null || results.getResults().isEmpty();
boolean noFilesInWorkspace = ResourcesPlugin.getWorkspace().getRoot().getProjects().length == 0;

if (noResultsInScan || noFilesInWorkspace) {
Expand Down
Loading