[richfaces-svn-commits] JBoss Rich Faces SVN: r6031 - trunk/ui/calendar/src/main/java/org/richfaces/renderkit.

[richfaces-svn-commits at lists.jboss.org]

Author: akushunin
Date: 2008-02-12 11:29:20 -0500 (Tue, 12 Feb 2008)
New Revision: 6031

Modified:
   trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
Log:
fixed bundle search behavior

Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java	2008-02-12 16:29:03 UTC (rev 6030)
+++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java	2008-02-12 16:29:20 UTC (rev 6031)
@@ -522,22 +522,29 @@
 			ResponseWriter writer) throws IOException {
 		
 		String label = null;
-		try {
-			if(null != bundle1){
-				label = bundle1.getString("RICH_CALENDAR_" + name.toUpperCase() + "_LABEL");
-			}
-			
-		} catch (MissingResourceException e) {
-			// Current key wasn't found in application bundle, use CALENDAR_BUNDLE
-			try {
+		if(null != bundle1){
+				try {
+					label = bundle1.getString("RICH_CALENDAR_" + name.toUpperCase() + "_LABEL");
+				} catch (MissingResourceException e) {
+					// Current key wasn't found in application bundle, use CALENDAR_BUNDLE
+					try {						
+						if(null != bundle2){
+							label = bundle2.getString("RICH_CALENDAR_" + name.toUpperCase() + "_LABEL");
+						}
+					} catch (MissingResourceException exc) {
+						// Current key wasn't found, use default, ignore this exception.				
+					}	
+				}
 				
-				if(null != bundle2){
+			}else if(null != bundle2){
+				try {
 					label = bundle2.getString("RICH_CALENDAR_" + name.toUpperCase() + "_LABEL");
+				} catch (MissingResourceException exc) {
+					// Current key wasn't found, use default, ignore this exception.
 				}
-			} catch (MissingResourceException exc) {
-				// Current key wasn't found, use default, ignore this exception.				
-			}			
-		}		
+				
+			}
+		
 		writeStringFoundInBundle(name, label, writer);				
 			
 	}