From 51eae05994f2dd4c7230e9d76120008a398dc77f Mon Sep 17 00:00:00 2001 From: TimotheeHrl Date: Thu, 14 Sep 2023 15:20:10 +0200 Subject: [PATCH 1/3] LUT-26249 : SONAR - Strings and Boxed types should be compared using "equals()" --- .../lutece/plugins/forms/web/admin/FormControlJspBean.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/java/fr/paris/lutece/plugins/forms/web/admin/FormControlJspBean.java b/src/java/fr/paris/lutece/plugins/forms/web/admin/FormControlJspBean.java index 413266ce7..30742599f 100644 --- a/src/java/fr/paris/lutece/plugins/forms/web/admin/FormControlJspBean.java +++ b/src/java/fr/paris/lutece/plugins/forms/web/admin/FormControlJspBean.java @@ -544,7 +544,8 @@ private void buildControlModel( HttpServletRequest request, Map IValidator validator = EntryServiceManager.getInstance( ).getValidator( _control.getValidatorName( ) ); strValidatorTemplate = validator.getDisplayHtml( _control ); } - if(_controlType.name() == "TRANSITION") { + if(_controlType.name().equals("TRANSITION")) + { model.put("nextStepTitle", request.getParameter("nextStepTitle")); } From 63d1ff56168621d752c9e77a7b0b641e812900c6 Mon Sep 17 00:00:00 2001 From: TimotheeHrl Date: Thu, 14 Sep 2023 15:20:10 +0200 Subject: [PATCH 2/3] LUT-26253 : SONAR - Strings and Boxed types should be compared using "equals()" --- .../lutece/plugins/forms/web/admin/FormControlJspBean.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/java/fr/paris/lutece/plugins/forms/web/admin/FormControlJspBean.java b/src/java/fr/paris/lutece/plugins/forms/web/admin/FormControlJspBean.java index 413266ce7..30742599f 100644 --- a/src/java/fr/paris/lutece/plugins/forms/web/admin/FormControlJspBean.java +++ b/src/java/fr/paris/lutece/plugins/forms/web/admin/FormControlJspBean.java @@ -544,7 +544,8 @@ private void buildControlModel( HttpServletRequest request, Map IValidator validator = EntryServiceManager.getInstance( ).getValidator( _control.getValidatorName( ) ); strValidatorTemplate = validator.getDisplayHtml( _control ); } - if(_controlType.name() == "TRANSITION") { + if(_controlType.name().equals("TRANSITION")) + { model.put("nextStepTitle", request.getParameter("nextStepTitle")); } From 764eb30a7c49a0776e5f261a72899e9e27ceb825 Mon Sep 17 00:00:00 2001 From: TimotheeHrl Date: Thu, 14 Sep 2023 15:26:11 +0200 Subject: [PATCH 3/3] LUT-26253 : SONAR - String literals should not be duplicated --- .../lutece/plugins/forms/web/admin/FormControlJspBean.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/java/fr/paris/lutece/plugins/forms/web/admin/FormControlJspBean.java b/src/java/fr/paris/lutece/plugins/forms/web/admin/FormControlJspBean.java index 30742599f..33ef9ecc8 100644 --- a/src/java/fr/paris/lutece/plugins/forms/web/admin/FormControlJspBean.java +++ b/src/java/fr/paris/lutece/plugins/forms/web/admin/FormControlJspBean.java @@ -134,6 +134,7 @@ public class FormControlJspBean extends AbstractJspBean private static final String MARK_LOGICAL_OPERATORS_LIST = "logicalOperators"; private static final String MARK_PAGINATOR = "paginator"; private static final String MARK_NB_ITEMS_PER_PAGE = "nb_items_per_page"; + private static final String MARK_NEXT_STEP_TITLE = "nextStepTitle"; private static final String PARAMETER_PAGE_INDEX = "page_index"; @@ -178,7 +179,7 @@ public String getManageControl( HttpServletRequest request ) Map model = getModel( ); if(_controlType == ControlType.TRANSITION) { Transition transition = TransitionHome.findByPrimaryKey( _nIdTarget ); - model.put( "nextStepTitle", StepHome.findByPrimaryKey( transition.getNextStep() ).getTitle( ) ); + model.put( MARK_NEXT_STEP_TITLE, StepHome.findByPrimaryKey( transition.getNextStep() ).getTitle( ) ); } model.put( MARK_PAGINATOR, paginator ); model.put( MARK_NB_ITEMS_PER_PAGE, StringUtils.EMPTY + _nItemsPerPage ); @@ -546,7 +547,7 @@ private void buildControlModel( HttpServletRequest request, Map } if(_controlType.name().equals("TRANSITION")) { - model.put("nextStepTitle", request.getParameter("nextStepTitle")); + model.put(MARK_NEXT_STEP_TITLE, request.getParameter(MARK_NEXT_STEP_TITLE)); } model.put( FormsConstants.MARK_QUESTION, _question );