Skip to content

Commit

Permalink
Revise enablement and checkboxes in Trace Explorer - #9
Browse files Browse the repository at this point in the history 
- Enabling the edit button if there is no table selection, but 1, and only 1, formula in the table.
- Adding a little more sanity to the enabling of buttons on data fill.

#9
[Bug][Toolbox]
  • Loading branch information
@quaeler
quaeler committed May 3, 2019
1 parent 9a87062 commit 1bae210
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 69 deletions.
109 changes: 43 additions & 66 deletions ...ool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/traceexplorer/TraceExplorerComposite.java
View file
Expand Up @@ -39,14 +39,9 @@
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTableViewer;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.ICheckStateListener;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardDialog;
Expand Down Expand Up @@ -144,14 +139,11 @@ public void widgetSelected(SelectionEvent e)
// a listener reacting on selection in the table viewer
// this calls the method that changes button enablement
// depending on whether a formula is selected or not
protected ISelectionChangedListener fSelectionChangedListener = new ISelectionChangedListener() {
public void selectionChanged(SelectionChangedEvent event)
protected ISelectionChangedListener fSelectionChangedListener = (event) -> {
final Object source = event.getSource();
if ((source != null) && (source == tableViewer))
{
Object source = event.getSource();
if (source != null && source == tableViewer)
{
changeButtonEnablement();
}
changeButtonEnablement();
}
};

Expand Down Expand Up @@ -238,32 +230,25 @@ protected void sectionInitialize(FormToolkit toolkit)
* @param table
* @return
*/
protected CheckboxTableViewer createTableViewer(Table table)
{
protected CheckboxTableViewer createTableViewer(Table table) {
// create
CheckboxTableViewer tableViewer = new CheckboxTableViewer(table);
final CheckboxTableViewer tableViewer = new CheckboxTableViewer(table);
// represent formulas in the view
tableViewer.setContentProvider(new FormulaContentProvider());
// on changed selection change button enablement
tableViewer.addSelectionChangedListener(fSelectionChangedListener);
// edit on double-click on a formula
tableViewer.addDoubleClickListener(new IDoubleClickListener() {
public void doubleClick(DoubleClickEvent event)
{
doEdit();
}
});
tableViewer.addDoubleClickListener((event) -> {
doEdit();
});

// save the input when an element is checked or unchecked
tableViewer.addCheckStateListener(new ICheckStateListener() {
tableViewer.addCheckStateListener((event) -> {
view.getModel().save(new NullProgressMonitor());
});

public void checkStateChanged(CheckStateChangedEvent event)
{
view.getModel().save(new NullProgressMonitor());
}
});

tableViewer.setInput(new Vector<>());
tableViewer.setInput(new Vector<Formula>());

return tableViewer;
}

Expand Down Expand Up @@ -334,13 +319,6 @@ public TableViewer getTableViewer()
{
return tableViewer;
}

/**
* @return the number of checked elements in the table view
*/
public int getEnabledExpressionCount() {
return tableViewer.getCheckedElements().length;
}

/**
* Remove the selected formulas
Expand Down Expand Up @@ -385,23 +363,25 @@ protected void doAdd()
/**
* Edit selected formula
*/
protected void doEdit()
{
IStructuredSelection selection = (IStructuredSelection) tableViewer.getSelection();
Formula formula = (Formula) selection.getFirstElement();
Formula editedFormula = doEditFormula(formula);
if (editedFormula != null)
{
formula.setFormula(editedFormula.getFormula());
if (tableViewer instanceof CheckboxTableViewer)
{
((CheckboxTableViewer) tableViewer).setChecked(formula, true);
protected void doEdit() {
final IStructuredSelection selection = (IStructuredSelection) tableViewer.getSelection();
final Formula formula;

if (selection.size() == 1) {
formula = (Formula) selection.getFirstElement();
} else {
formula = (Formula) tableViewer.getElementAt(0);
}

final Formula editedFormula = doEditFormula(formula);
if (editedFormula != null) {
formula.setFormula(editedFormula.getFormula());
if (tableViewer instanceof CheckboxTableViewer) {
((CheckboxTableViewer) tableViewer).setChecked(formula, true);
}
tableViewer.refresh();
}

changeButtonEnablement();

view.getModel().setTraceExplorerExpression(FormHelper.getSerializedInput(tableViewer));
}

Expand Down Expand Up @@ -517,17 +497,21 @@ private void doRestore()
buttonExplore.setEnabled(true);
buttonAdd.setEnabled(true);
buttonEdit.setEnabled(true);
buttonRemove.setEnabled(true);
buttonRemove.setEnabled(!((IStructuredSelection)tableViewer.getSelection()).isEmpty());

buttonRestore.setEnabled(false);
}

/**
* If a formula in the table is selected, then enable the
* Remove and Edit buttons, else disable them.
*/
protected void changeButtonEnablement()
{
* If a formula in the table is selected, then enable the Remove and Edit
* buttons, else disable the Remove button, and the Edit button iff there are 0
* or many formulas in the table.
*/
public void changeButtonEnablement() {
if (tableViewer == null) {
return;
}

IStructuredSelection selection = (IStructuredSelection) tableViewer.getSelection();
if (!tableViewer.getTable().isEnabled()) {
return;
Expand All @@ -537,26 +521,19 @@ protected void changeButtonEnablement()
{
buttonRemove.setEnabled(!selection.isEmpty());
}

if (buttonEdit != null)
{
buttonEdit.setEnabled(selection.size() == 1);
buttonEdit.setEnabled((selection.size() == 1) || (tableViewer.getTable().getItemCount() == 1));
}

if (buttonExplore != null)
{
buttonExplore.setEnabled((view.getTrace() != null) && !view.getTrace().isTraceEmpty()
&& (getEnabledExpressionCount() > 0));
&& (tableViewer.getCheckedElements().length> 0));
}
}

/**
* Sets the explore button enablement status to isTrace.
* @param isTrace
*/
public void changeExploreEnablement(boolean isTrace)
{
buttonExplore.setEnabled(isTrace);
}

/**
* Opens a dialog for formula processing and returns the edited formula
* @param formula initial formula, can be <code>null</code>
Expand Down
6 changes: 3 additions & 3 deletions ...rt.tla.toolbox.tool.tlc.ui/src/org/lamport/tla/toolbox/tool/tlc/ui/view/TLCErrorView.java
View file
Expand Up @@ -170,8 +170,7 @@ public void clear()
{
errorViewer.setDocument(EMPTY_DOCUMENT());
setTraceInput(new TLCError());
traceExplorerComposite.getTableViewer().setInput(new Vector<TLCState>());
traceExplorerComposite.changeExploreEnablement(false);
traceExplorerComposite.getTableViewer().setInput(new Vector<Formula>());
valueViewer.setInput(EMPTY_DOCUMENT());
}

Expand Down Expand Up @@ -245,7 +244,6 @@ protected void fill(Model model, List<TLCError> problems, final List<String> ser
if (isNewTrace)
{
this.setTraceInput(trace);
traceExplorerComposite.changeExploreEnablement(traceExplorerComposite.getEnabledExpressionCount() > 0);
}
if (model.isSnapshot()) {
final String date = sdf.format(model.getSnapshotTimeStamp());
Expand All @@ -259,6 +257,8 @@ protected void fill(Model model, List<TLCError> problems, final List<String> ser
clear();
}
// TODO Check if a run of the trace explorer produced no errors. This would be a bug.

traceExplorerComposite.changeButtonEnablement();
}

/**
Expand Down

0 comments on commit 1bae210

Please sign in to comment.