fixes
This commit is contained in:
parent
a3c8610447
commit
88356ed821
1 changed files with 18 additions and 9 deletions
|
@ -131,7 +131,7 @@ public class TableFilter<ROW extends Entity> extends Composite {
|
||||||
|
|
||||||
static final int CELL_WIDTH_ADJUSTMENT = -30;
|
static final int CELL_WIDTH_ADJUSTMENT = -30;
|
||||||
|
|
||||||
protected RowData rowData;
|
protected final RowData rowData = new RowData();
|
||||||
final TableFilterAttribute attribute;
|
final TableFilterAttribute attribute;
|
||||||
|
|
||||||
FilterComponent(final TableFilterAttribute attribute) {
|
FilterComponent(final TableFilterAttribute attribute) {
|
||||||
|
@ -176,7 +176,6 @@ public class TableFilter<ROW extends Entity> extends Composite {
|
||||||
@Override
|
@Override
|
||||||
FilterComponent build(final Composite parent) {
|
FilterComponent build(final Composite parent) {
|
||||||
this.label = new Label(parent, SWT.NONE);
|
this.label = new Label(parent, SWT.NONE);
|
||||||
this.rowData = new RowData();
|
|
||||||
this.label.setLayoutData(this.rowData);
|
this.label.setLayoutData(this.rowData);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
@ -207,23 +206,28 @@ public class TableFilter<ROW extends Entity> extends Composite {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
FilterComponent reset() {
|
FilterComponent reset() {
|
||||||
|
if (this.textInput != null) {
|
||||||
this.textInput.setText(super.attribute.initValue);
|
this.textInput.setText(super.attribute.initValue);
|
||||||
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
FilterComponent build(final Composite parent) {
|
FilterComponent build(final Composite parent) {
|
||||||
this.textInput = new Text(parent, SWT.LEFT | SWT.BORDER);
|
this.textInput = new Text(parent, SWT.LEFT | SWT.BORDER);
|
||||||
this.rowData = new RowData();
|
|
||||||
this.textInput.setLayoutData(this.rowData);
|
this.textInput.setLayoutData(this.rowData);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
String getValue() {
|
String getValue() {
|
||||||
|
if (this.textInput != null) {
|
||||||
return this.textInput.getText();
|
return this.textInput.getText();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private class LanguageFilter extends FilterComponent {
|
private class LanguageFilter extends FilterComponent {
|
||||||
|
@ -237,21 +241,26 @@ public class TableFilter<ROW extends Entity> extends Composite {
|
||||||
@Override
|
@Override
|
||||||
FilterComponent build(final Composite parent) {
|
FilterComponent build(final Composite parent) {
|
||||||
this.selector = TableFilter.this.entityTable.widgetFactory.countrySelector(parent);
|
this.selector = TableFilter.this.entityTable.widgetFactory.countrySelector(parent);
|
||||||
this.rowData = new RowData();
|
|
||||||
this.selector.setLayoutData(this.rowData);
|
this.selector.setLayoutData(this.rowData);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
FilterComponent reset() {
|
FilterComponent reset() {
|
||||||
|
if (this.selector != null) {
|
||||||
this.selector.clear();
|
this.selector.clear();
|
||||||
this.selector.layout();
|
this.selector.layout();
|
||||||
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
String getValue() {
|
String getValue() {
|
||||||
|
if (this.selector != null) {
|
||||||
return this.selector.getSelectionValue();
|
return this.selector.getSelectionValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue