diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java b/core/src/main/java/org/apache/struts2/components/UIBean.java index afd20a2a3..00526572c 100644 --- a/core/src/main/java/org/apache/struts2/components/UIBean.java +++ b/core/src/main/java/org/apache/struts2/components/UIBean.java @@ -40,7 +40,6 @@ import org.apache.struts2.views.util.ContextUtil; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.Writer; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -504,7 +503,7 @@ public abstract class UIBean extends Component { protected String tooltipIconPath; // dynamic attributes - protected Map dynamicAttributes = new HashMap<>(); + protected Map dynamicAttributes = new LinkedHashMap<>(); protected String defaultTemplateDir; protected String defaultUITheme; diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java index c5548f70b..c2a90b47a 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java @@ -23,7 +23,7 @@ import org.apache.struts2.views.jsp.ComponentTagSupport; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.DynamicAttributes; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; /** @@ -79,7 +79,7 @@ public abstract class AbstractUITag extends ComponentTagSupport implements Dynam protected String tooltipIconPath; // dynamic attributes. - protected Map dynamicAttributes = new HashMap<>(); + protected Map dynamicAttributes = new LinkedHashMap<>(); protected void populateParams() { super.populateParams(); diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt index f0bcb78ee..5dc125c18 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt @@ -1,4 +1,4 @@ - +