Merge with 344cc3910fc99366dcea0254cc5949de2a3d0a12

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);
 			}
 		}
 

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);
 		

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);
 		}
 	}
 }

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);

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);
 	}

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();
 	}
 	

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);
 	}
 	

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);
 	}
 	

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);

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() {

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();

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);

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

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);

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) {

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);
 	}
 	

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

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);

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