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/03/17 11:44:02 UTC
svn commit: r924218 -
/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/MessageUtils.java
Author: lofwyr
Date: Wed Mar 17 10:44:02 2010
New Revision: 924218
URL: http://svn.apache.org/viewvc?rev=924218&view=rev
Log:
reformat
Modified:
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/MessageUtils.java
Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/MessageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/MessageUtils.java?rev=924218&r1=924217&r2=924218&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/MessageUtils.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java-jsf-1.2/org/apache/myfaces/tobago/util/MessageUtils.java Wed Mar 17 10:44:02 2010
@@ -31,90 +31,90 @@ import java.util.ResourceBundle;
// TODO merge with MessageFactory
public class MessageUtils {
- private static final String DETAIL_SUFFIX = "_detail";
-
- public static void addMessage(FacesContext facesContext, UIComponent component, FacesMessage.Severity severity,
- String messageId, Object[] args) {
- facesContext.addMessage(component.getClientId(facesContext),
- getMessage(facesContext, facesContext.getViewRoot().getLocale(), severity, messageId, args));
- }
-
- public static FacesMessage getMessage(FacesContext facesContext, Locale locale,
- FacesMessage.Severity severity, String messageId, Object... args) {
-
- String detail;
- ResourceBundle appBundle = getApplicationBundle(facesContext, locale);
- String summary = getBundleString(appBundle, messageId);
+ private static final String DETAIL_SUFFIX = "_detail";
+
+ public static void addMessage(FacesContext facesContext, UIComponent component, FacesMessage.Severity severity,
+ String messageId, Object[] args) {
+ facesContext.addMessage(component.getClientId(facesContext),
+ getMessage(facesContext, facesContext.getViewRoot().getLocale(), severity, messageId, args));
+ }
+
+ public static FacesMessage getMessage(FacesContext facesContext, Locale locale,
+ FacesMessage.Severity severity, String messageId, Object... args) {
+
+ String detail;
+ ResourceBundle appBundle = getApplicationBundle(facesContext, locale);
+ String summary = getBundleString(appBundle, messageId);
+ if (summary != null) {
+ detail = getBundleString(appBundle, messageId + DETAIL_SUFFIX);
+ } else {
+ ResourceBundle defBundle = getDefaultBundle(facesContext, locale);
+ summary = getBundleString(defBundle, messageId);
if (summary != null) {
- detail = getBundleString(appBundle, messageId + DETAIL_SUFFIX);
+ detail = getBundleString(defBundle, messageId + DETAIL_SUFFIX);
} else {
- ResourceBundle defBundle = getDefaultBundle(facesContext, locale);
- summary = getBundleString(defBundle, messageId);
- if (summary != null) {
- detail = getBundleString(defBundle, messageId + DETAIL_SUFFIX);
+ //Try to find detail alone
+ detail = getBundleString(appBundle, messageId + DETAIL_SUFFIX);
+ if (detail != null) {
+ summary = null;
} else {
- //Try to find detail alone
- detail = getBundleString(appBundle, messageId + DETAIL_SUFFIX);
+ detail = getBundleString(defBundle, messageId + DETAIL_SUFFIX);
if (detail != null) {
summary = null;
} else {
- detail = getBundleString(defBundle, messageId + DETAIL_SUFFIX);
- if (detail != null) {
- summary = null;
- } else {
- //Neither detail nor summary found
- facesContext.getExternalContext().log("No message with id " + messageId + " found in any bundle");
- return new FacesMessage(severity, messageId, null);
- }
+ //Neither detail nor summary found
+ facesContext.getExternalContext().log("No message with id " + messageId + " found in any bundle");
+ return new FacesMessage(severity, messageId, null);
}
}
}
-
- if (args != null && args.length > 0) {
- MessageFormat format;
- if (summary != null) {
- format = new MessageFormat(summary, locale);
- summary = format.format(args);
- }
+ }
- if (detail != null) {
- format = new MessageFormat(detail, locale);
- detail = format.format(args);
- }
+ if (args != null && args.length > 0) {
+ MessageFormat format;
+ if (summary != null) {
+ format = new MessageFormat(summary, locale);
+ summary = format.format(args);
}
- return new LabelValueExpressionFacesMessage(severity, summary, detail);
- }
-
- private static String getBundleString(ResourceBundle bundle, String key) {
- try {
- return bundle == null ? null : bundle.getString(key);
- } catch (MissingResourceException e) {
- return null;
+
+ if (detail != null) {
+ format = new MessageFormat(detail, locale);
+ detail = format.format(args);
}
}
-
- private static ResourceBundle getApplicationBundle(FacesContext facesContext, Locale locale) {
- String bundleName = facesContext.getApplication().getMessageBundle();
- return bundleName != null ? getBundle(facesContext, locale, bundleName) : null;
- }
-
- private static ResourceBundle getDefaultBundle(FacesContext facesContext, Locale locale) {
- return getBundle(facesContext, locale, FacesMessage.FACES_MESSAGES);
+ return new LabelValueExpressionFacesMessage(severity, summary, detail);
+ }
+
+ private static String getBundleString(ResourceBundle bundle, String key) {
+ try {
+ return bundle == null ? null : bundle.getString(key);
+ } catch (MissingResourceException e) {
+ return null;
}
-
- private static ResourceBundle getBundle(FacesContext facesContext, Locale locale, String bundleName) {
+ }
+
+ private static ResourceBundle getApplicationBundle(FacesContext facesContext, Locale locale) {
+ String bundleName = facesContext.getApplication().getMessageBundle();
+ return bundleName != null ? getBundle(facesContext, locale, bundleName) : null;
+ }
+
+ private static ResourceBundle getDefaultBundle(FacesContext facesContext, Locale locale) {
+ return getBundle(facesContext, locale, FacesMessage.FACES_MESSAGES);
+ }
+
+ private static ResourceBundle getBundle(FacesContext facesContext, Locale locale, String bundleName) {
+ try {
+ return ResourceBundle.getBundle(bundleName, locale, MessageUtils.class.getClassLoader());
+ } catch (MissingResourceException ignore2) {
try {
- return ResourceBundle.getBundle(bundleName, locale, MessageUtils.class.getClassLoader());
- } catch (MissingResourceException ignore2) {
- try {
- return ResourceBundle.getBundle(bundleName, locale, Thread.currentThread().getContextClassLoader());
- } catch (MissingResourceException damned) {
- facesContext.getExternalContext().log("resource bundle " + bundleName + " could not be found");
- return null;
- }
+ return ResourceBundle.getBundle(bundleName, locale, Thread.currentThread().getContextClassLoader());
+ } catch (MissingResourceException damned) {
+ facesContext.getExternalContext().log("resource bundle " + bundleName + " could not be found");
+ return null;
}
}
-
+ }
+
public static String getLabel(FacesContext facesContext, UIComponent component) {
Object label = component.getAttributes().get("label");
if (label != null) {