zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes

Browse source
This commit is contained in:
anhefti 2019-02-20 21:37:52 +01:00
parent a3c8610447
commit 88356ed821
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/ch/ethz/seb/sebserver/gui/service/table/TableFilter.java
View file

@ -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,21 +206,26 @@ public class TableFilter<ROW extends Entity> extends Composite {
@Override @Override
FilterComponent reset() { FilterComponent reset() {
this.textInput.setText(super.attribute.initValue); if (this.textInput != null) {
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() {
return this.textInput.getText(); if (this.textInput != null) {
return this.textInput.getText();
}
return null;
} }
} }
@ -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() {
this.selector.clear(); if (this.selector != null) {
this.selector.layout(); this.selector.clear();
this.selector.layout();
}
return this; return this;
} }
@Override @Override
String getValue() { String getValue() {
return this.selector.getSelectionValue(); if (this.selector != null) {
return this.selector.getSelectionValue();
}
return null;
} }
} }
} }