Merge pull request #5490 from eclipse-ee4j/mojarra_issue_5489_support…

…_FacesMessage.Severity.SUCCESS Support new FacesMessage.Severity.SUCCESS in h:message/h:messages
eclipse-ee4j · Sep 16, 2024 · 3d066f4 · 3d066f4
2 parents ce5d863 + 1ba4c10
commit 3d066f4
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 24 deletions.
diff --git a/impl/src/main/java/com/sun/faces/renderkit/html_basic/MessageRenderer.java b/impl/src/main/java/com/sun/faces/renderkit/html_basic/MessageRenderer.java
@@ -134,18 +134,10 @@ public void encodeEnd(FacesContext context, UIComponent component) throws IOExce
         // Default to summary if we have no detail
         String detail = null != (detail = curMessage.getDetail()) ? detail : summary;
 
-        if (curMessage.getSeverity() == FacesMessage.SEVERITY_INFO) {
-            severityStyle = (String) component.getAttributes().get("infoStyle");
-            severityStyleClass = (String) component.getAttributes().get("infoClass");
-        } else if (curMessage.getSeverity() == FacesMessage.SEVERITY_WARN) {
-            severityStyle = (String) component.getAttributes().get("warnStyle");
-            severityStyleClass = (String) component.getAttributes().get("warnClass");
-        } else if (curMessage.getSeverity() == FacesMessage.SEVERITY_ERROR) {
-            severityStyle = (String) component.getAttributes().get("errorStyle");
-            severityStyleClass = (String) component.getAttributes().get("errorClass");
-        } else if (curMessage.getSeverity() == FacesMessage.SEVERITY_FATAL) {
-            severityStyle = (String) component.getAttributes().get("fatalStyle");
-            severityStyleClass = (String) component.getAttributes().get("fatalClass");
+        if (curMessage.getSeverity() != null) {
+            String severityPrefix = curMessage.getSeverity().name().toLowerCase();
+            severityStyle = (String) component.getAttributes().get(severityPrefix + "Style");
+            severityStyleClass = (String) component.getAttributes().get(severityPrefix + "Class");
         }
 
         String style = (String) component.getAttributes().get("style");

diff --git a/impl/src/main/java/com/sun/faces/renderkit/html_basic/MessagesRenderer.java b/impl/src/main/java/com/sun/faces/renderkit/html_basic/MessagesRenderer.java
@@ -139,18 +139,10 @@ public void encodeEnd(FacesContext context, UIComponent component) throws IOExce
             // Default to summary if we have no detail
             String detail = null != (detail = curMessage.getDetail()) ? detail : summary;
 
-            if (curMessage.getSeverity() == FacesMessage.SEVERITY_INFO) {
-                severityStyle = (String) component.getAttributes().get("infoStyle");
-                severityStyleClass = (String) component.getAttributes().get("infoClass");
-            } else if (curMessage.getSeverity() == FacesMessage.SEVERITY_WARN) {
-                severityStyle = (String) component.getAttributes().get("warnStyle");
-                severityStyleClass = (String) component.getAttributes().get("warnClass");
-            } else if (curMessage.getSeverity() == FacesMessage.SEVERITY_ERROR) {
-                severityStyle = (String) component.getAttributes().get("errorStyle");
-                severityStyleClass = (String) component.getAttributes().get("errorClass");
-            } else if (curMessage.getSeverity() == FacesMessage.SEVERITY_FATAL) {
-                severityStyle = (String) component.getAttributes().get("fatalStyle");
-                severityStyleClass = (String) component.getAttributes().get("fatalClass");
+            if (curMessage.getSeverity() != null) {
+                String severityPrefix = curMessage.getSeverity().name().toLowerCase();
+                severityStyle = (String) component.getAttributes().get(severityPrefix + "Style");
+                severityStyleClass = (String) component.getAttributes().get(severityPrefix + "Class");
             }
 
             // Done intializing local variables. Move on to rendering.

diff --git a/impl/src/main/resources/com/sun/faces/metadata/taglib/faces.html.taglib.xml b/impl/src/main/resources/com/sun/faces/metadata/taglib/faces.html.taglib.xml
@@ -5604,6 +5604,24 @@
             <required>false</required>
             <type>java.lang.String</type>
         </attribute>
+        <attribute>
+            <description>
+                CSS style class to apply to any message
+                with a severity class of "SUCCESS".
+            </description>
+            <name>successClass</name>
+            <required>false</required>
+            <type>java.lang.String</type>
+        </attribute>
+        <attribute>
+            <description>
+                CSS style(s) to apply to any message
+                with a severity class of "SUCCESS".
+            </description>
+            <name>successStyle</name>
+            <required>false</required>
+            <type>java.lang.String</type>
+        </attribute>
         <attribute>
             <description>
                 Advisory title information about markup elements generated

diff --git a/impl/src/main/resources/com/sun/faces/standard-html-renderkit.xml b/impl/src/main/resources/com/sun/faces/standard-html-renderkit.xml
@@ -5103,6 +5103,26 @@
         <attribute-name>infoStyle</attribute-name>
         <attribute-class>java.lang.String</attribute-class>
       </attribute>
+      <attribute>
+        <description>
+          CSS style class to apply to any message
+          with a severity class of "SUCCESS".
+        </description>
+        <display-name>Success Class</display-name>
+        <icon/>
+        <attribute-name>successClass</attribute-name>
+        <attribute-class>java.lang.String</attribute-class>
+      </attribute>
+      <attribute>
+        <description>
+          CSS style(s) to apply to any message
+          with a severity class of "SUCCESS".
+        </description>
+        <display-name>Success Styles</display-name>
+        <icon/>
+        <attribute-name>successStyle</attribute-name>
+        <attribute-class>java.lang.String</attribute-class>
+      </attribute>
       <attribute>
         <description>
           Flag indicating whether the detail portion of the