diff --git a/src/main/java/org/olat/admin/user/bulkChange/UserBulkChangeStep02.java b/src/main/java/org/olat/admin/user/bulkChange/UserBulkChangeStep02.java
index b11daeb761a5595d96a2bffa0237c834c743c610..c937649b53fc33685717bc3123fb1932172e534b 100644
--- a/src/main/java/org/olat/admin/user/bulkChange/UserBulkChangeStep02.java
+++ b/src/main/java/org/olat/admin/user/bulkChange/UserBulkChangeStep02.java
@@ -270,7 +270,7 @@ class UserBulkChangeStep02 extends BasicStep {
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);
- uifactory.addTableElement(getWindowControl(), "newUsers", tableDataModel, formLayoutVertical);
+ uifactory.addTableElement(getWindowControl(), "newUsers", tableDataModel, getTranslator(), formLayoutVertical);
Set<Long> allGroups = new HashSet<Long>();
@SuppressWarnings("unchecked")
@@ -295,7 +295,7 @@ class UserBulkChangeStep02 extends BasicStep {
TableDataModel<BusinessGroup> model = new GroupAddOverviewModel(groups, ownGroups, partGroups, mailGroups, getTranslator());
FlexiTableDataModel<BusinessGroup> groupDataModel = new FlexiTableDataModelImpl<BusinessGroup>(model, groupColumnModel);
- uifactory.addTableElement(getWindowControl(), "groupOverview", groupDataModel, formLayout);
+ uifactory.addTableElement(getWindowControl(), "groupOverview", groupDataModel, getTranslator(), formLayout);
}
}
diff --git a/src/main/java/org/olat/admin/user/groups/GroupSearchController.java b/src/main/java/org/olat/admin/user/groups/GroupSearchController.java
index 6fba7acf31368c1b0c8654506a37b39969d29dd5..636e28258dcd1cf8cf4c665d24dd36c9b31c7bd5 100644
--- a/src/main/java/org/olat/admin/user/groups/GroupSearchController.java
+++ b/src/main/java/org/olat/admin/user/groups/GroupSearchController.java
@@ -144,7 +144,7 @@ public class GroupSearchController extends StepFormBasicController {
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.participant.i18n(), Cols.participant.ordinal()));
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);
tableCont.add("groupList", table);
diff --git a/src/main/java/org/olat/admin/user/imp/ImportStep01.java b/src/main/java/org/olat/admin/user/imp/ImportStep01.java
index 5ffd5ecd83fa26e6c7777ee8bc29c4e436652c01..24d293df3f1dd9752ebf7227694768567a5d3b61 100644
--- a/src/main/java/org/olat/admin/user/imp/ImportStep01.java
+++ b/src/main/java/org/olat/admin/user/imp/ImportStep01.java
@@ -172,7 +172,7 @@ class ImportStep01 extends BasicStep {
}
FlexiTableDataModel<Identity> tableDataModel = new FlexiTableDataModelImpl<Identity>(new Model(idents, colPos), tableColumnModel);
- uifactory.addTableElement(getWindowControl(), "newUsers", tableDataModel, formLayoutVertical);
+ uifactory.addTableElement(getWindowControl(), "newUsers", tableDataModel, getTranslator(), formLayoutVertical);
}
}
}
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/FormUIFactory.java b/src/main/java/org/olat/core/gui/components/form/flexible/FormUIFactory.java
index c7be235917962890bb4f64461a8e7f457e15c143..feaa76227f9779de6511b1e008733f39380534b4 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/FormUIFactory.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/FormUIFactory.java
@@ -835,19 +835,13 @@ public class FormUIFactory {
/**
*
- * @see FlexiTableDataModel and its implementations
+ * @param wControl
* @param name
* @param tableModel
+ * @param translator
* @param formLayout
* @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,
Translator translator, FormItemContainer formLayout) {
FlexiTableElementImpl fte = new FlexiTableElementImpl(wControl, name, translator, tableModel);
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java
index 93279aaf7762ea202d14f3a0a535cb6ef823717c..d95730ac430c3767bec1bf5e2119c108eb8a96a7 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java
@@ -133,10 +133,6 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle
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) {
this(wControl, name, translator, tableModel, -1, true);
}
diff --git a/src/main/java/org/olat/course/assessment/bulk/BulkAssessmentOverviewController.java b/src/main/java/org/olat/course/assessment/bulk/BulkAssessmentOverviewController.java
index f8a63a6dd63c319d4bf216601c6b194c47471bf8..6c3adc1c73e31256da2b1079ca8d3a1388f85897 100644
--- a/src/main/java/org/olat/course/assessment/bulk/BulkAssessmentOverviewController.java
+++ b/src/main/java/org/olat/course/assessment/bulk/BulkAssessmentOverviewController.java
@@ -125,7 +125,7 @@ public class BulkAssessmentOverviewController extends FormBasicController {
columnsModel.addFlexiColumnModel(new StaticFlexiColumnModel("delete", translate("delete"), "delete"));
taskModel = new TaskDataModel(Collections.<TaskData>emptyList(), columnsModel);
- taskListEl = uifactory.addTableElement(getWindowControl(), "taskList", taskModel, formLayout);
+ taskListEl = uifactory.addTableElement(getWindowControl(), "taskList", taskModel, getTranslator(), formLayout);
reloadTaskModel();
}
diff --git a/src/main/java/org/olat/course/assessment/bulk/ChooseColumnsStepForm.java b/src/main/java/org/olat/course/assessment/bulk/ChooseColumnsStepForm.java
index 40b62861a955cc536fcce7ec14cf821e6ea4e7c8..92d8f99ddb1e2d2a05c83bf8cfef671eebbf9e30 100644
--- a/src/main/java/org/olat/course/assessment/bulk/ChooseColumnsStepForm.java
+++ b/src/main/java/org/olat/course/assessment/bulk/ChooseColumnsStepForm.java
@@ -140,7 +140,7 @@ public class ChooseColumnsStepForm extends StepFormBasicController {
}
overviewDataModel.setTableColumnModel(tableColumnModel);
- FlexiTableElement tableEl = uifactory.addTableElement(getWindowControl(), "overviewList", overviewDataModel, formLayout);
+ FlexiTableElement tableEl = uifactory.addTableElement(getWindowControl(), "overviewList", overviewDataModel, getTranslator(), formLayout);
tableEl.setCustomizeColumns(false);
}
diff --git a/src/main/java/org/olat/course/assessment/bulk/SelectCourseNodeStepForm.java b/src/main/java/org/olat/course/assessment/bulk/SelectCourseNodeStepForm.java
index 5519156d82ecdd9b8a1cc693e3440d5531750464..04c8d88683dfc5d58f5fd127ef8683c6934889a3 100644
--- a/src/main/java/org/olat/course/assessment/bulk/SelectCourseNodeStepForm.java
+++ b/src/main/java/org/olat/course/assessment/bulk/SelectCourseNodeStepForm.java
@@ -85,7 +85,7 @@ public class SelectCourseNodeStepForm extends StepFormBasicController {
new BooleanCellRenderer(new StaticFlexiCellRenderer(translate("table.action.select"), "select"), null)));
tableModel.setTableColumnModel(tableColumnModel);
- tableEl = uifactory.addTableElement(getWindowControl(), "nodeList", tableModel, formLayout);
+ tableEl = uifactory.addTableElement(getWindowControl(), "nodeList", tableModel, getTranslator(), formLayout);
tableEl.setCustomizeColumns(false);
}
diff --git a/src/main/java/org/olat/course/assessment/bulk/ValidationStepForm.java b/src/main/java/org/olat/course/assessment/bulk/ValidationStepForm.java
index 5ab6320c47df530c33783ceb68eedfed44593e51..2c2709c840a574ba077783ccac8f17d65745f54a 100644
--- a/src/main/java/org/olat/course/assessment/bulk/ValidationStepForm.java
+++ b/src/main/java/org/olat/course/assessment/bulk/ValidationStepForm.java
@@ -99,12 +99,12 @@ public class ValidationStepForm extends StepFormBasicController {
validModel = new ValidDataModel(Collections.<UserData>emptyList());
validModel.setTableColumnModel(tableColumnModel);
- validTableEl = uifactory.addTableElement(getWindowControl(), "validList", validModel, formLayout);
+ validTableEl = uifactory.addTableElement(getWindowControl(), "validList", validModel, getTranslator(), formLayout);
validTableEl.setCustomizeColumns(false);
invalidModel = new ValidDataModel(Collections.<UserData>emptyList());
invalidModel.setTableColumnModel(tableColumnModel);
- invalidTableEl = uifactory.addTableElement(getWindowControl(), "notFoundList", invalidModel, formLayout);
+ invalidTableEl = uifactory.addTableElement(getWindowControl(), "notFoundList", invalidModel, getTranslator(), formLayout);
invalidTableEl.setCustomizeColumns(false);
flc.contextPut("settings", settings);
diff --git a/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementListController.java b/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementListController.java
index 29bfee14aa7f2435a3d42b483943ccdade41397f..8b3afc5a0458bbc92175f5847983fdf12a92c042 100644
--- a/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementListController.java
+++ b/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementListController.java
@@ -185,7 +185,7 @@ public class CertificateAndEfficiencyStatementListController extends FormBasicCo
tableModel = new CertificateAndEfficiencyStatementListModel(tableColumnModel);
loadModel();
- tableEl = uifactory.addTableElement(getWindowControl(), "certificates", tableModel, formLayout);
+ tableEl = uifactory.addTableElement(getWindowControl(), "certificates", tableModel, getTranslator(), formLayout);
}
private void loadModel() {
diff --git a/src/main/java/org/olat/course/certificate/ui/CertificatesAdminController.java b/src/main/java/org/olat/course/certificate/ui/CertificatesAdminController.java
index 41c18ca8c45503e58db24c4a27636f0bda8c354b..93b804d966ee6c5ccfa2347038e9bd7975749194 100644
--- a/src/main/java/org/olat/course/certificate/ui/CertificatesAdminController.java
+++ b/src/main/java/org/olat/course/certificate/ui/CertificatesAdminController.java
@@ -79,7 +79,7 @@ public class CertificatesAdminController extends FormBasicController {
tableColumnModel.addFlexiColumnModel(new StaticFlexiColumnModel("delete", translate("delete"), "delete"));
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);
updateDataModel();
diff --git a/src/main/java/org/olat/course/certificate/ui/CertificatesSelectionController.java b/src/main/java/org/olat/course/certificate/ui/CertificatesSelectionController.java
index 23ecc6e314d193f180920239f45aaff651e35f8c..ca9d2797e56480921326f520169087e60ed1c167 100644
--- a/src/main/java/org/olat/course/certificate/ui/CertificatesSelectionController.java
+++ b/src/main/java/org/olat/course/certificate/ui/CertificatesSelectionController.java
@@ -138,7 +138,7 @@ public class CertificatesSelectionController extends StepFormBasicController {
}
tableModel.setObjects(infos);
- tableEl = uifactory.addTableElement(getWindowControl(), "selection", tableModel, formLayout);
+ tableEl = uifactory.addTableElement(getWindowControl(), "selection", tableModel, getTranslator(), formLayout);
tableEl.setMultiSelect(true);
tableEl.setSelectAllEnable(true);
tableEl.setMultiSelectedIndex(preselectedRows);
diff --git a/src/main/java/org/olat/course/certificate/ui/CertificatesSelectionOverviewController.java b/src/main/java/org/olat/course/certificate/ui/CertificatesSelectionOverviewController.java
index cf3a89b35b516924369cc65d917367a3cce3b5a1..9404d0b990a83d83ef1e4d460ea5916996714b6c 100644
--- a/src/main/java/org/olat/course/certificate/ui/CertificatesSelectionOverviewController.java
+++ b/src/main/java/org/olat/course/certificate/ui/CertificatesSelectionOverviewController.java
@@ -104,7 +104,7 @@ public class CertificatesSelectionOverviewController extends StepFormBasicContro
@SuppressWarnings("unchecked")
List<CertificateInfos> selectedInfos = (List<CertificateInfos>)getFromRunContext("infos");
tableModel.setObjects(selectedInfos);
- uifactory.addTableElement(getWindowControl(), "selection", tableModel, formLayout);
+ uifactory.addTableElement(getWindowControl(), "selection", tableModel, getTranslator(), formLayout);
}
@Override
diff --git a/src/main/java/org/olat/course/groupsandrights/GroupsAndRightsController.java b/src/main/java/org/olat/course/groupsandrights/GroupsAndRightsController.java
index de0828de04f9d71bee702a7ddd332915211154b6..740317853de02651767d61172be13b541cd41d70 100644
--- a/src/main/java/org/olat/course/groupsandrights/GroupsAndRightsController.java
+++ b/src/main/java/org/olat/course/groupsandrights/GroupsAndRightsController.java
@@ -93,7 +93,7 @@ public class GroupsAndRightsController extends FormBasicController {
List<BGRightsOption> groupRights = loadModel();
tableDataModel = new GroupsAndRightsDataModel(groupRights, tableColumnModel);
- uifactory.addTableElement(getWindowControl(), "rightList", tableDataModel, formLayout);
+ uifactory.addTableElement(getWindowControl(), "rightList", tableDataModel, getTranslator(), formLayout);
FormLayoutContainer buttonsLayout = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
buttonsLayout.setRootForm(mainForm);
diff --git a/src/main/java/org/olat/group/ui/main/EditMembershipController.java b/src/main/java/org/olat/group/ui/main/EditMembershipController.java
index 9010e1792891545193d8dd83950e5c6f87900736..f65916e82d65fad5ce60422172e5397a65914966 100644
--- a/src/main/java/org/olat/group/ui/main/EditMembershipController.java
+++ b/src/main/java/org/olat/group/ui/main/EditMembershipController.java
@@ -251,7 +251,7 @@ public class EditMembershipController extends FormBasicController {
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel("table.header.waitingList", 6));
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);
if(withButtons) {
diff --git a/src/main/java/org/olat/gui/demo/guidemo/GuiDemoFlexiTablesController.java b/src/main/java/org/olat/gui/demo/guidemo/GuiDemoFlexiTablesController.java
index 3a0af01abdae3f19dc7df8b9b346df051d427446..e03c90bdd9ce15a837ee99020f82eea24b1f598b 100644
--- a/src/main/java/org/olat/gui/demo/guidemo/GuiDemoFlexiTablesController.java
+++ b/src/main/java/org/olat/gui/demo/guidemo/GuiDemoFlexiTablesController.java
@@ -87,7 +87,7 @@ public class GuiDemoFlexiTablesController extends FormBasicController {
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel("guidemo.table.header7", 6));
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);
}
diff --git a/src/main/java/org/olat/ims/qti/questionimport/OverviewQuestionController.java b/src/main/java/org/olat/ims/qti/questionimport/OverviewQuestionController.java
index 9f523c57349e408217fa3f84a3fb30bd24f82b34..3fcfd442cb436c7bc20171e02073cb4c459560cd 100644
--- a/src/main/java/org/olat/ims/qti/questionimport/OverviewQuestionController.java
+++ b/src/main/java/org/olat/ims/qti/questionimport/OverviewQuestionController.java
@@ -71,7 +71,7 @@ public class OverviewQuestionController extends StepFormBasicController {
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.points.i18n(), Cols.points.ordinal()));
ItemsTableDataModel model = new ItemsTableDataModel(importedItems.getItems(), columnsModel);
- uifactory.addTableElement(getWindowControl(), "overviewTable", model, formLayout);
+ uifactory.addTableElement(getWindowControl(), "overviewTable", model, getTranslator(), formLayout);
}
@Override
diff --git a/src/main/java/org/olat/ldap/ui/DeletStep00.java b/src/main/java/org/olat/ldap/ui/DeletStep00.java
index c78532f1761ad7bfaa6206e62390c13a3b8e265d..282da976730af0edf98b100d021656ab5985d3d3 100644
--- a/src/main/java/org/olat/ldap/ui/DeletStep00.java
+++ b/src/main/java/org/olat/ldap/ui/DeletStep00.java
@@ -126,7 +126,7 @@ public class DeletStep00 extends BasicStep{
}
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.setPageSize(10000);
tableEl.setSelectAllEnable(true);
diff --git a/src/main/java/org/olat/ldap/ui/DeletStep01.java b/src/main/java/org/olat/ldap/ui/DeletStep01.java
index c8ce6d84cd28b2097c7f38b574c622802a90cccc..1a6d80d95bbec15bf500c6ca172fcc7f6f3afc15 100644
--- a/src/main/java/org/olat/ldap/ui/DeletStep01.java
+++ b/src/main/java/org/olat/ldap/ui/DeletStep01.java
@@ -146,7 +146,7 @@ public class DeletStep01 extends BasicStep {
}
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