svn commit: r895440 - /myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java

[gp...@apache.org]

Author: gpetracek
Date: Sun Jan  3 16:36:47 2010
New Revision: 895440

URL: http://svn.apache.org/viewvc?rev=895440&view=rev
Log:
EXTVAL-78 refactoring to be compatible with java 1.5

Modified:
    myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java

Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java?rev=895440&r1=895439&r2=895440&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java Sun Jan  3 16:36:47 2010
@@ -18,18 +18,19 @@
  */
 package org.apache.myfaces.extensions.validator.util;
 
-import org.apache.myfaces.extensions.validator.internal.UsageInformation;
-import org.apache.myfaces.extensions.validator.internal.UsageCategory;
 import org.apache.myfaces.extensions.validator.core.storage.FacesInformationStorage;
+import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
 
 import javax.faces.FactoryFinder;
 import javax.faces.application.FacesMessage;
 import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseListener;
 import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
 import javax.faces.lifecycle.Lifecycle;
 import javax.faces.lifecycle.LifecycleFactory;
 import java.util.Iterator;
+import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
 
@@ -82,7 +83,7 @@
         FacesContext facesContext = FacesContext.getCurrentInstance();
         String bundleName = facesContext.getApplication().getMessageBundle();
 
-        if(bundleName == null)
+        if (bundleName == null)
         {
             return null;
         }
@@ -94,9 +95,16 @@
     {
         ResourceBundle customResourceBundle = getCustomFacesMessageBundle();
 
-        if(customResourceBundle != null && customResourceBundle.containsKey(messageKey))
+        try
+        {
+            if (customResourceBundle != null)
+            {
+                return customResourceBundle.getString(messageKey);
+            }
+        }
+        catch (MissingResourceException e)
         {
-            return customResourceBundle.getString(messageKey);
+            //no custom message is available - do nothing
         }
 
         return getDefaultFacesMessageBundle().getString(messageKey);