Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Boot Dash filters UI rework

Browse Source
This commit is contained in:
BoykoAlex
2021-05-11 13:56:30 -04:00
parent a8abea0cb0
commit 5a4eea4d2b
13 changed files with 173 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
eclipse-language-servers/org.springsource.ide.eclipse.commons.livexp/src/org/springsource/ide/eclipse/commons/livexp/ui/ChooseMultipleSection.java
View File

@@ -19,6 +19,7 @@ import org.eclipse.jface.viewers.ICheckStateListener;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
@@ -28,6 +29,7 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.springsource.ide.eclipse.commons.livexp.core.LiveExpression;
import org.springsource.ide.eclipse.commons.livexp.core.LiveSet;
import org.springsource.ide.eclipse.commons.livexp.core.LiveVariable;
import org.springsource.ide.eclipse.commons.livexp.core.ValidationResult;
import org.springsource.ide.eclipse.commons.livexp.core.ValueListener;
@@ -39,30 +41,49 @@ public class ChooseMultipleSection<T extends Ilabelable> extends WizardPageSecti
private Ilabelable[] validChoices;
private LiveSet<T> chosen;
private LiveExpression<ValidationResult> validator;
private LiveVariable<T> selected;
private boolean vertical;
public ChooseMultipleSection(IPageWithSections owner,
String labelText,
T[] validChoices,
LiveSet<T> chosen,
LiveExpression<ValidationResult> validator
LiveExpression<ValidationResult> validator,
LiveVariable<T> selected
) {
super(owner);
this.labelText = labelText;
this.validChoices = validChoices;
this.chosen = chosen;
this.validator = validator;
this.selected = selected;
}
public ChooseMultipleSection(IPageWithSections owner,
String labelText,
T[] validChoices,
LiveSet<T> chosen,
LiveExpression<ValidationResult> validator
) {
this(owner, labelText, validChoices, chosen, validator, null);
}
@Override
public LiveExpression<ValidationResult> getValidator() {
return validator;
}
public ChooseMultipleSection<T> vertical(boolean vertical) {
this.vertical = vertical;
return this;
}
@SuppressWarnings("unchecked")
@Override
public void createContents(Composite page) {
Composite composite = new Composite(page, SWT.NONE);
GridLayout layout = new GridLayout();
layout.numColumns = 2;
layout.numColumns = vertical ? 1 : 2;
layout.marginWidth = 0;
composite.setLayout(layout);
GridDataFactory grab = GridDataFactory.fillDefaults().grab(true, true).hint(SWT.DEFAULT, UIConstants.SCROLLABLE_LIST_HEIGTH);
@@ -72,8 +93,8 @@ public class ChooseMultipleSection<T extends Ilabelable> extends WizardPageSecti
Label label = new Label(composite, SWT.NONE);
label.setText(labelText);
GridDataFactory.fillDefaults()
.align(SWT.CENTER, SWT.BEGINNING)
.hint(UIConstants.fieldLabelWidthHint(label), SWT.DEFAULT)
.align(SWT.BEGINNING, SWT.BEGINNING)
.hint(vertical ? SWT.DEFAULT : UIConstants.fieldLabelWidthHint(label), SWT.DEFAULT)
.applyTo(label);
CheckboxTableViewer tv = CheckboxTableViewer.newCheckList(composite, SWT.BORDER);
@@ -95,6 +116,17 @@ public class ChooseMultipleSection<T extends Ilabelable> extends WizardPageSecti
}
}
});
if (selected != null) {
tv.addSelectionChangedListener(event -> {
IStructuredSelection structuredSelection = event.getStructuredSelection();
if (structuredSelection.isEmpty()) {
selected.setValue(null);
} else {
selected.setValue((T)structuredSelection.getFirstElement());
}
});
}
if (DEBUG) {
chosen.addListener(new ValueListener<Set<T>>() {

21
eclipse-language-servers/org.springsource.ide.eclipse.commons.livexp/src/org/springsource/ide/eclipse/commons/livexp/ui/StringFieldSection.java
View File

@@ -26,7 +26,6 @@ import org.springsource.ide.eclipse.commons.livexp.core.LiveVariable;
import org.springsource.ide.eclipse.commons.livexp.core.UIValueListener;
import org.springsource.ide.eclipse.commons.livexp.core.ValidationResult;
import org.springsource.ide.eclipse.commons.livexp.core.Validator;
import org.springsource.ide.eclipse.commons.livexp.core.ValueListener;
public class StringFieldSection extends WizardPageSection {
@@ -42,6 +41,8 @@ public class StringFieldSection extends WizardPageSection {
/// UI elements
private Text text;
private boolean password = false;
private boolean vertical = false;
//////////////////////////////
@@ -54,7 +55,15 @@ public class StringFieldSection extends WizardPageSection {
this.variable = variable;
this.validator = validator;
}
/**
* Should be called before createContents(...) is called, i.e. before SWT controls are created.
*/
public StringFieldSection vertical(boolean vertical) {
this.vertical = vertical;
return this;
}
public StringFieldSection(IPageWithSections owner, FieldModel<String> f) {
this(owner, f.getLabel(), f.getVariable(), f.getValidator());
}
@@ -75,19 +84,21 @@ public class StringFieldSection extends WizardPageSection {
this.password = enablePasswordBehavior;
return this;
}
@Override
public void createContents(Composite page) {
// project specification group
Composite projectGroup = new Composite(page, SWT.NONE);
GridLayout layout = GridLayoutFactory.fillDefaults().numColumns(2).margins(0,2).create();
int columns = vertical ? 1 : 2;
GridLayout layout = GridLayoutFactory.fillDefaults().numColumns(columns).margins(0,2).create();
projectGroup.setLayout(layout);
projectGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
Label label = new Label(projectGroup, SWT.NONE);
label.setText(labelText);
GridDataFactory.fillDefaults()
.hint(UIConstants.fieldLabelWidthHint(label), SWT.DEFAULT)
.hint(vertical ? SWT.DEFAULT : UIConstants.fieldLabelWidthHint(label), SWT.DEFAULT)
.align(SWT.BEGINNING, SWT.CENTER)
.applyTo(label);