Preparations for the headless-form-module: currentFormSupplier

tallence · Sep 6, 2021 · eb69ddf · eb69ddf
1 parent 23cd447
commit eb69ddf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/form-editor-cae/src/main/java/com/tallence/formeditor/cae/handler/FormConfigController.java b/form-editor-cae/src/main/java/com/tallence/formeditor/cae/handler/FormConfigController.java
@@ -106,7 +106,7 @@ public String getFormConfig(@PathVariable CMChannel currentContext,
 
     Navigation navigation = currentContext.getRootNavigation();
     request.setAttribute(NavigationLinkSupport.ATTR_NAME_CMNAVIGATION, navigation);
-    CurrentFormSupplier.setCurrentFormLocale(editor.getContent());
+    CurrentFormSupplier.setCurrentForm(editor.getContent());
 
     List<FormElement<?>> formElements = formFreemarkerFacade.parseFormElements(editor);
     if (formElements.isEmpty()) {

diff --git a/form-editor-cae/src/main/java/com/tallence/formeditor/cae/handler/FormController.java b/form-editor-cae/src/main/java/com/tallence/formeditor/cae/handler/FormController.java
@@ -130,7 +130,7 @@ public FormProcessingResult socialFormAction(@PathVariable(name = "currentContex
     modelAndView.addObject(MODEL_ROOT, navigation);
     pageResourceBundlesInterceptor.postHandle(request, response, null, modelAndView);
     request.setAttribute(NavigationLinkSupport.ATTR_NAME_CMNAVIGATION, navigation);
-    CurrentFormSupplier.setCurrentFormLocale(target.getContent());
+    CurrentFormSupplier.setCurrentForm(target.getContent());
 
     List<FormElement<?>> formElements = formFreemarkerFacade.parseFormElements(target);
     if (formElements.isEmpty()) {

diff --git a/...headless-server/src/main/java/com/tallence/formeditor/caas/adapter/FormEditorAdapter.java b/...headless-server/src/main/java/com/tallence/formeditor/caas/adapter/FormEditorAdapter.java
@@ -38,7 +38,7 @@ public FormEditorAdapter(Content content, FormElementFactory formElementFactory)
   public List<FormElement<?>> formElements() {
 
     //The formElements parsers might need the locale of the current site.
-    CurrentFormSupplier.setCurrentFormLocale(content);
+    CurrentFormSupplier.setCurrentForm(content);
 
     return FormEditorHelper.parseFormElements(content, formElementFactory);
   }

diff --git a/form-editor-shared/src/main/java/com/tallence/formeditor/parser/CurrentFormSupplier.java b/form-editor-shared/src/main/java/com/tallence/formeditor/parser/CurrentFormSupplier.java
@@ -36,7 +36,7 @@ public Content get() {
     return currentForm;
   }
 
-  public static void setCurrentFormLocale(Content currentForm) {
+  public static void setCurrentForm(Content currentForm) {
     ofNullable(RequestContextHolder.getRequestAttributes())
             .orElseThrow(() -> new IllegalStateException("No RequestAttributes available, cannot set the currect form"))
             .setAttribute(CURRENT_FORM, currentForm, RequestAttributes.SCOPE_REQUEST);