From bc8587f86f9da84252095826ca37b11d4bf6438f Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 2 Dec 2014 09:30:11 +0100
Subject: [PATCH] OO-1293: always pass the translator to flexi tables
---
.../admin/user/bulkChange/UserBulkChangeStep02.java | 4 ++--
.../olat/admin/user/groups/GroupSearchController.java | 2 +-
.../java/org/olat/admin/user/imp/ImportStep01.java | 2 +-
.../gui/components/form/flexible/FormUIFactory.java | 10 ++--------
.../impl/elements/table/FlexiTableElementImpl.java | 4 ----
.../bulk/BulkAssessmentOverviewController.java | 2 +-
.../course/assessment/bulk/ChooseColumnsStepForm.java | 2 +-
.../assessment/bulk/SelectCourseNodeStepForm.java | 2 +-
.../course/assessment/bulk/ValidationStepForm.java | 4 ++--
...ertificateAndEfficiencyStatementListController.java | 2 +-
.../certificate/ui/CertificatesAdminController.java | 2 +-
.../ui/CertificatesSelectionController.java | 2 +-
.../ui/CertificatesSelectionOverviewController.java | 2 +-
.../groupsandrights/GroupsAndRightsController.java | 2 +-
.../olat/group/ui/main/EditMembershipController.java | 2 +-
.../gui/demo/guidemo/GuiDemoFlexiTablesController.java | 2 +-
.../qti/questionimport/OverviewQuestionController.java | 2 +-
src/main/java/org/olat/ldap/ui/DeletStep00.java | 2 +-
src/main/java/org/olat/ldap/ui/DeletStep01.java | 2 +-
19 files changed, 21 insertions(+), 31 deletions(-)
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 b11daeb761a..c937649b53f 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 6fba7acf313..636e28258dc 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 5ffd5ecd83f..24d293df3f1 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 c7be2359179..feaa76227f9 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 93279aaf776..d95730ac430 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 f8a63a6dd63..6c3adc1c73e 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 40b62861a95..92d8f99ddb1 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 5519156d82e..04c8d88683d 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 5ab6320c47d..2c2709c840a 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 29bfee14aa7..8b3afc5a045 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 41c18ca8c45..93b804d966e 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 23ecc6e314d..ca9d2797e56 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 cf3a89b35b5..9404d0b990a 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 de0828de04f..740317853de 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 9010e179289..f65916e82d6 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 3a0af01abda..e03c90bdd9c 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 9f523c57349..3fcfd442cb4 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 c78532f1761..282da976730 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 c8ce6d84cd2..1a6d80d95bb 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
--
GitLab