Skip to content
Snippets Groups Projects
Commit bc8587f8 authored by srosse's avatar srosse
Browse files

OO-1293: always pass the translator to flexi tables

parent 0bdecb31
No related branches found
No related tags found
No related merge requests found
Showing
with 21 additions and 31 deletions
...@@ -270,7 +270,7 @@ class UserBulkChangeStep02 extends BasicStep { ...@@ -270,7 +270,7 @@ class UserBulkChangeStep02 extends BasicStep {
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(true, "table.role.status", colPos++, false, null, FlexiColumnModel.ALIGNMENT_LEFT, textRenderer)); tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(true, "table.role.status", colPos++, false, null, FlexiColumnModel.ALIGNMENT_LEFT, textRenderer));
FlexiTableDataModel<List<String>> tableDataModel = new FlexiTableDataModelImpl<List<String>>(new OverviewModel(mergedDataChanges, colPos), tableColumnModel); FlexiTableDataModel<List<String>> tableDataModel = new FlexiTableDataModelImpl<List<String>>(new OverviewModel(mergedDataChanges, colPos), tableColumnModel);
uifactory.addTableElement(getWindowControl(), "newUsers", tableDataModel, formLayoutVertical); uifactory.addTableElement(getWindowControl(), "newUsers", tableDataModel, getTranslator(), formLayoutVertical);
Set<Long> allGroups = new HashSet<Long>(); Set<Long> allGroups = new HashSet<Long>();
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
...@@ -295,7 +295,7 @@ class UserBulkChangeStep02 extends BasicStep { ...@@ -295,7 +295,7 @@ class UserBulkChangeStep02 extends BasicStep {
TableDataModel<BusinessGroup> model = new GroupAddOverviewModel(groups, ownGroups, partGroups, mailGroups, getTranslator()); TableDataModel<BusinessGroup> model = new GroupAddOverviewModel(groups, ownGroups, partGroups, mailGroups, getTranslator());
FlexiTableDataModel<BusinessGroup> groupDataModel = new FlexiTableDataModelImpl<BusinessGroup>(model, groupColumnModel); FlexiTableDataModel<BusinessGroup> groupDataModel = new FlexiTableDataModelImpl<BusinessGroup>(model, groupColumnModel);
uifactory.addTableElement(getWindowControl(), "groupOverview", groupDataModel, formLayout); uifactory.addTableElement(getWindowControl(), "groupOverview", groupDataModel, getTranslator(), formLayout);
} }
} }
......
...@@ -144,7 +144,7 @@ public class GroupSearchController extends StepFormBasicController { ...@@ -144,7 +144,7 @@ public class GroupSearchController extends StepFormBasicController {
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.participant.i18n(), Cols.participant.ordinal())); tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.participant.i18n(), Cols.participant.ordinal()));
tableDataModel = new GroupTableDataModel(Collections.<GroupWrapper>emptyList(), tableColumnModel); tableDataModel = new GroupTableDataModel(Collections.<GroupWrapper>emptyList(), tableColumnModel);
table = uifactory.addTableElement(getWindowControl(), "groupList", tableDataModel, tableCont); table = uifactory.addTableElement(getWindowControl(), "groupList", tableDataModel, getTranslator(), tableCont);
table.setCustomizeColumns(false); table.setCustomizeColumns(false);
tableCont.add("groupList", table); tableCont.add("groupList", table);
......
...@@ -172,7 +172,7 @@ class ImportStep01 extends BasicStep { ...@@ -172,7 +172,7 @@ class ImportStep01 extends BasicStep {
} }
FlexiTableDataModel<Identity> tableDataModel = new FlexiTableDataModelImpl<Identity>(new Model(idents, colPos), tableColumnModel); FlexiTableDataModel<Identity> tableDataModel = new FlexiTableDataModelImpl<Identity>(new Model(idents, colPos), tableColumnModel);
uifactory.addTableElement(getWindowControl(), "newUsers", tableDataModel, formLayoutVertical); uifactory.addTableElement(getWindowControl(), "newUsers", tableDataModel, getTranslator(), formLayoutVertical);
} }
} }
} }
......
...@@ -835,19 +835,13 @@ public class FormUIFactory { ...@@ -835,19 +835,13 @@ public class FormUIFactory {
/** /**
* *
* @see FlexiTableDataModel and its implementations * @param wControl
* @param name * @param name
* @param tableModel * @param tableModel
* @param translator
* @param formLayout * @param formLayout
* @return * @return
*/ */
public FlexiTableElement addTableElement(WindowControl wControl, String name, FlexiTableDataModel<?> tableModel,
FormItemContainer formLayout) {
FlexiTableElementImpl fte = new FlexiTableElementImpl(wControl, name,tableModel);
formLayout.add(fte);
return fte;
}
public FlexiTableElement addTableElement(WindowControl wControl, String name, FlexiTableDataModel<?> tableModel, public FlexiTableElement addTableElement(WindowControl wControl, String name, FlexiTableDataModel<?> tableModel,
Translator translator, FormItemContainer formLayout) { Translator translator, FormItemContainer formLayout) {
FlexiTableElementImpl fte = new FlexiTableElementImpl(wControl, name, translator, tableModel); FlexiTableElementImpl fte = new FlexiTableElementImpl(wControl, name, translator, tableModel);
......
...@@ -133,10 +133,6 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle ...@@ -133,10 +133,6 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle
private Map<String,FormItem> components = new HashMap<String,FormItem>(); private Map<String,FormItem> components = new HashMap<String,FormItem>();
public FlexiTableElementImpl(WindowControl wControl, String name, FlexiTableDataModel<?> tableModel) {
this(wControl, name, null, tableModel, -1, true);
}
public FlexiTableElementImpl(WindowControl wControl, String name, Translator translator, FlexiTableDataModel<?> tableModel) { public FlexiTableElementImpl(WindowControl wControl, String name, Translator translator, FlexiTableDataModel<?> tableModel) {
this(wControl, name, translator, tableModel, -1, true); this(wControl, name, translator, tableModel, -1, true);
} }
......
...@@ -125,7 +125,7 @@ public class BulkAssessmentOverviewController extends FormBasicController { ...@@ -125,7 +125,7 @@ public class BulkAssessmentOverviewController extends FormBasicController {
columnsModel.addFlexiColumnModel(new StaticFlexiColumnModel("delete", translate("delete"), "delete")); columnsModel.addFlexiColumnModel(new StaticFlexiColumnModel("delete", translate("delete"), "delete"));
taskModel = new TaskDataModel(Collections.<TaskData>emptyList(), columnsModel); taskModel = new TaskDataModel(Collections.<TaskData>emptyList(), columnsModel);
taskListEl = uifactory.addTableElement(getWindowControl(), "taskList", taskModel, formLayout); taskListEl = uifactory.addTableElement(getWindowControl(), "taskList", taskModel, getTranslator(), formLayout);
reloadTaskModel(); reloadTaskModel();
} }
......
...@@ -140,7 +140,7 @@ public class ChooseColumnsStepForm extends StepFormBasicController { ...@@ -140,7 +140,7 @@ public class ChooseColumnsStepForm extends StepFormBasicController {
} }
overviewDataModel.setTableColumnModel(tableColumnModel); overviewDataModel.setTableColumnModel(tableColumnModel);
FlexiTableElement tableEl = uifactory.addTableElement(getWindowControl(), "overviewList", overviewDataModel, formLayout); FlexiTableElement tableEl = uifactory.addTableElement(getWindowControl(), "overviewList", overviewDataModel, getTranslator(), formLayout);
tableEl.setCustomizeColumns(false); tableEl.setCustomizeColumns(false);
} }
......
...@@ -85,7 +85,7 @@ public class SelectCourseNodeStepForm extends StepFormBasicController { ...@@ -85,7 +85,7 @@ public class SelectCourseNodeStepForm extends StepFormBasicController {
new BooleanCellRenderer(new StaticFlexiCellRenderer(translate("table.action.select"), "select"), null))); new BooleanCellRenderer(new StaticFlexiCellRenderer(translate("table.action.select"), "select"), null)));
tableModel.setTableColumnModel(tableColumnModel); tableModel.setTableColumnModel(tableColumnModel);
tableEl = uifactory.addTableElement(getWindowControl(), "nodeList", tableModel, formLayout); tableEl = uifactory.addTableElement(getWindowControl(), "nodeList", tableModel, getTranslator(), formLayout);
tableEl.setCustomizeColumns(false); tableEl.setCustomizeColumns(false);
} }
......
...@@ -99,12 +99,12 @@ public class ValidationStepForm extends StepFormBasicController { ...@@ -99,12 +99,12 @@ public class ValidationStepForm extends StepFormBasicController {
validModel = new ValidDataModel(Collections.<UserData>emptyList()); validModel = new ValidDataModel(Collections.<UserData>emptyList());
validModel.setTableColumnModel(tableColumnModel); validModel.setTableColumnModel(tableColumnModel);
validTableEl = uifactory.addTableElement(getWindowControl(), "validList", validModel, formLayout); validTableEl = uifactory.addTableElement(getWindowControl(), "validList", validModel, getTranslator(), formLayout);
validTableEl.setCustomizeColumns(false); validTableEl.setCustomizeColumns(false);
invalidModel = new ValidDataModel(Collections.<UserData>emptyList()); invalidModel = new ValidDataModel(Collections.<UserData>emptyList());
invalidModel.setTableColumnModel(tableColumnModel); invalidModel.setTableColumnModel(tableColumnModel);
invalidTableEl = uifactory.addTableElement(getWindowControl(), "notFoundList", invalidModel, formLayout); invalidTableEl = uifactory.addTableElement(getWindowControl(), "notFoundList", invalidModel, getTranslator(), formLayout);
invalidTableEl.setCustomizeColumns(false); invalidTableEl.setCustomizeColumns(false);
flc.contextPut("settings", settings); flc.contextPut("settings", settings);
......
...@@ -185,7 +185,7 @@ public class CertificateAndEfficiencyStatementListController extends FormBasicCo ...@@ -185,7 +185,7 @@ public class CertificateAndEfficiencyStatementListController extends FormBasicCo
tableModel = new CertificateAndEfficiencyStatementListModel(tableColumnModel); tableModel = new CertificateAndEfficiencyStatementListModel(tableColumnModel);
loadModel(); loadModel();
tableEl = uifactory.addTableElement(getWindowControl(), "certificates", tableModel, formLayout); tableEl = uifactory.addTableElement(getWindowControl(), "certificates", tableModel, getTranslator(), formLayout);
} }
private void loadModel() { private void loadModel() {
......
...@@ -79,7 +79,7 @@ public class CertificatesAdminController extends FormBasicController { ...@@ -79,7 +79,7 @@ public class CertificatesAdminController extends FormBasicController {
tableColumnModel.addFlexiColumnModel(new StaticFlexiColumnModel("delete", translate("delete"), "delete")); tableColumnModel.addFlexiColumnModel(new StaticFlexiColumnModel("delete", translate("delete"), "delete"));
tableModel = new TemplatesDataModel(tableColumnModel); tableModel = new TemplatesDataModel(tableColumnModel);
tableEl = uifactory.addTableElement(getWindowControl(), "templates", tableModel, formLayout); tableEl = uifactory.addTableElement(getWindowControl(), "templates", tableModel, getTranslator(), formLayout);
uploadLink = uifactory.addFormLink("upload", formLayout, Link.BUTTON); uploadLink = uifactory.addFormLink("upload", formLayout, Link.BUTTON);
updateDataModel(); updateDataModel();
......
...@@ -138,7 +138,7 @@ public class CertificatesSelectionController extends StepFormBasicController { ...@@ -138,7 +138,7 @@ public class CertificatesSelectionController extends StepFormBasicController {
} }
tableModel.setObjects(infos); tableModel.setObjects(infos);
tableEl = uifactory.addTableElement(getWindowControl(), "selection", tableModel, formLayout); tableEl = uifactory.addTableElement(getWindowControl(), "selection", tableModel, getTranslator(), formLayout);
tableEl.setMultiSelect(true); tableEl.setMultiSelect(true);
tableEl.setSelectAllEnable(true); tableEl.setSelectAllEnable(true);
tableEl.setMultiSelectedIndex(preselectedRows); tableEl.setMultiSelectedIndex(preselectedRows);
......
...@@ -104,7 +104,7 @@ public class CertificatesSelectionOverviewController extends StepFormBasicContro ...@@ -104,7 +104,7 @@ public class CertificatesSelectionOverviewController extends StepFormBasicContro
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
List<CertificateInfos> selectedInfos = (List<CertificateInfos>)getFromRunContext("infos"); List<CertificateInfos> selectedInfos = (List<CertificateInfos>)getFromRunContext("infos");
tableModel.setObjects(selectedInfos); tableModel.setObjects(selectedInfos);
uifactory.addTableElement(getWindowControl(), "selection", tableModel, formLayout); uifactory.addTableElement(getWindowControl(), "selection", tableModel, getTranslator(), formLayout);
} }
@Override @Override
......
...@@ -93,7 +93,7 @@ public class GroupsAndRightsController extends FormBasicController { ...@@ -93,7 +93,7 @@ public class GroupsAndRightsController extends FormBasicController {
List<BGRightsOption> groupRights = loadModel(); List<BGRightsOption> groupRights = loadModel();
tableDataModel = new GroupsAndRightsDataModel(groupRights, tableColumnModel); tableDataModel = new GroupsAndRightsDataModel(groupRights, tableColumnModel);
uifactory.addTableElement(getWindowControl(), "rightList", tableDataModel, formLayout); uifactory.addTableElement(getWindowControl(), "rightList", tableDataModel, getTranslator(), formLayout);
FormLayoutContainer buttonsLayout = FormLayoutContainer.createButtonLayout("buttons", getTranslator()); FormLayoutContainer buttonsLayout = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
buttonsLayout.setRootForm(mainForm); buttonsLayout.setRootForm(mainForm);
......
...@@ -251,7 +251,7 @@ public class EditMembershipController extends FormBasicController { ...@@ -251,7 +251,7 @@ public class EditMembershipController extends FormBasicController {
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel("table.header.waitingList", 6)); tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel("table.header.waitingList", 6));
tableDataModel = new EditMemberTableDataModel(Collections.<MemberOption>emptyList(), tableColumnModel); tableDataModel = new EditMemberTableDataModel(Collections.<MemberOption>emptyList(), tableColumnModel);
FlexiTableElement tableEl = uifactory.addTableElement(getWindowControl(), "groupList", tableDataModel, formLayout); FlexiTableElement tableEl = uifactory.addTableElement(getWindowControl(), "groupList", tableDataModel, getTranslator(), formLayout);
tableEl.setCustomizeColumns(false); tableEl.setCustomizeColumns(false);
if(withButtons) { if(withButtons) {
......
...@@ -87,7 +87,7 @@ public class GuiDemoFlexiTablesController extends FormBasicController { ...@@ -87,7 +87,7 @@ public class GuiDemoFlexiTablesController extends FormBasicController {
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel("guidemo.table.header7", 6)); tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel("guidemo.table.header7", 6));
tableDataModel = new FlexiTableDataModelImpl<Row>(new SampleFlexiTableModel(formLayout), tableColumnModel); tableDataModel = new FlexiTableDataModelImpl<Row>(new SampleFlexiTableModel(formLayout), tableColumnModel);
uifactory.addTableElement(getWindowControl(), "gui-demo", tableDataModel, formLayout); uifactory.addTableElement(getWindowControl(), "gui-demo", tableDataModel, getTranslator(), formLayout);
uifactory.addFormSubmitButton("ok", formLayout); uifactory.addFormSubmitButton("ok", formLayout);
} }
......
...@@ -71,7 +71,7 @@ public class OverviewQuestionController extends StepFormBasicController { ...@@ -71,7 +71,7 @@ public class OverviewQuestionController extends StepFormBasicController {
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.points.i18n(), Cols.points.ordinal())); columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.points.i18n(), Cols.points.ordinal()));
ItemsTableDataModel model = new ItemsTableDataModel(importedItems.getItems(), columnsModel); ItemsTableDataModel model = new ItemsTableDataModel(importedItems.getItems(), columnsModel);
uifactory.addTableElement(getWindowControl(), "overviewTable", model, formLayout); uifactory.addTableElement(getWindowControl(), "overviewTable", model, getTranslator(), formLayout);
} }
@Override @Override
......
...@@ -126,7 +126,7 @@ public class DeletStep00 extends BasicStep{ ...@@ -126,7 +126,7 @@ public class DeletStep00 extends BasicStep{
} }
tableModel = new IdentityFlexiTableModel(identitiesToDelete, tableColumnModel, handlers, getLocale()); tableModel = new IdentityFlexiTableModel(identitiesToDelete, tableColumnModel, handlers, getLocale());
tableEl = uifactory.addTableElement(getWindowControl(), "newUsers", tableModel, formLayout); tableEl = uifactory.addTableElement(getWindowControl(), "newUsers", tableModel, getTranslator(), formLayout);
tableEl.setMultiSelect(true); tableEl.setMultiSelect(true);
tableEl.setPageSize(10000); tableEl.setPageSize(10000);
tableEl.setSelectAllEnable(true); tableEl.setSelectAllEnable(true);
......
...@@ -146,7 +146,7 @@ public class DeletStep01 extends BasicStep { ...@@ -146,7 +146,7 @@ public class DeletStep01 extends BasicStep {
} }
FlexiTableDataModel<Identity> tableDataModel = new IdentityFlexiTableModel(identitiesToDelete, tableColumnModel, handlers, getLocale()); FlexiTableDataModel<Identity> tableDataModel = new IdentityFlexiTableModel(identitiesToDelete, tableColumnModel, handlers, getLocale());
uifactory.addTableElement(getWindowControl(), "newUsers", tableDataModel, formLayout); uifactory.addTableElement(getWindowControl(), "newUsers", tableDataModel, getTranslator(), formLayout);
} }
} }
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment