You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2010/08/11 14:22:09 UTC
svn commit: r984389 -
/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
Author: lofwyr
Date: Wed Aug 11 12:22:09 2010
New Revision: 984389
URL: http://svn.apache.org/viewvc?rev=984389&view=rev
Log:
TOBAGO-897
- fix error/warn/info markup, because Sun RI and MyFaces using different values for the ordinal of the severity
Modified:
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java?rev=984389&r1=984388&r2=984389&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java Wed Aug 11 12:22:09 2010
@@ -52,6 +52,11 @@ public class StyleClasses implements Ser
private ListOrderedSet classes;
+ private static final int ORDINAL_FATAL = FacesMessage.SEVERITY_FATAL.getOrdinal();
+ private static final int ORDINAL_ERROR = FacesMessage.SEVERITY_ERROR.getOrdinal();
+ private static final int ORDINAL_WARN = FacesMessage.SEVERITY_WARN.getOrdinal();
+ private static final int ORDINAL_INFO = FacesMessage.SEVERITY_INFO.getOrdinal();
+
public StyleClasses() {
classes = new ListOrderedSet();
}
@@ -221,23 +226,19 @@ public class StyleClasses implements Ser
}
FacesMessage.Severity severity = ComponentUtil.getMaximumSeverity(component);
if (severity != null) {
- switch (severity.getOrdinal()) {
- case 4:
- addMarkupClass(rendererName, "fatal");
- addAspectClass(rendererName, Aspect.ERROR);
- break;
- case 3:
- addMarkupClass(rendererName, "error");
- addAspectClass(rendererName, Aspect.ERROR);
- break;
- case 2:
- addMarkupClass(rendererName, "warn");
- break;
- case 1:
- addMarkupClass(rendererName, "info");
- break;
- default:
- assert false : "Ordinal constants may be wrong";
+ int ordinal = severity.getOrdinal();
+ if (ordinal >= ORDINAL_FATAL) {
+ addMarkupClass(rendererName, "fatal");
+ addAspectClass(rendererName, Aspect.ERROR);
+ } else if (ordinal >= ORDINAL_ERROR) {
+ addMarkupClass(rendererName, "error");
+ addAspectClass(rendererName, Aspect.ERROR);
+ } else if (ordinal >= ORDINAL_WARN) {
+ addMarkupClass(rendererName, "warn");
+ } else if (ordinal >= ORDINAL_INFO) {
+ addMarkupClass(rendererName, "info");
+ } else {
+ assert false : "Ordinal constants may be wrong";
}
}
if (component instanceof UIInput) {
@@ -249,7 +250,7 @@ public class StyleClasses implements Ser
}
public boolean isEmpty() {
- return classes.isEmpty();
+ return classes.isEmpty();
}
@Override