[Jnode-svn-commits] SF.net SVN: jnode: [2887] trunk/core/src/core/org/jnode/plugin/PluginUtils. java

[<Qa...@us...>]

Revision: 2887
          http://jnode.svn.sourceforge.net/jnode/?rev=2887&view=rev
Author:   QaDeS
Date:     2006-12-10 11:16:46 -0800 (Sun, 10 Dec 2006)

Log Message:
-----------
optional "clean fallback" for localization, gulping possible errors and merely returning the given key on a miss

Modified Paths:
--------------
    trunk/core/src/core/org/jnode/plugin/PluginUtils.java

Modified: trunk/core/src/core/org/jnode/plugin/PluginUtils.java
===================================================================
--- trunk/core/src/core/org/jnode/plugin/PluginUtils.java	2006-12-10 19:10:11 UTC (rev 2886)
+++ trunk/core/src/core/org/jnode/plugin/PluginUtils.java	2006-12-10 19:16:46 UTC (rev 2887)
@@ -49,9 +49,13 @@
         }
     }
 
-	public static String getLocalizedMessage(Class parent, String bundleName, 
-						String messageKey)
-	{
+	public static String getLocalizedMessage(Class parent, String bundleName,
+			String messageKey) {
+		return getLocalizedMessage(parent, bundleName, messageKey, false);
+	}
+	
+	public static String getLocalizedMessage(Class parent, String bundleName,
+			String messageKey, boolean cleanFallback) {
 		String fullName;
 		ClassLoader loader;
 		if(parent == null)
@@ -84,7 +88,8 @@
 	        }
 	        catch (MissingResourceException mre)
 	        {                
-	        	BootLog.error("can't get message", mre);
+	        	if( !cleanFallback )
+	        		BootLog.error("can't get message", mre);
 	        }
 	    }    
 	    
@@ -98,16 +103,17 @@
 	        }
 	        catch (MissingResourceException mre)
 	        {                
-	            mre.printStackTrace();                
+	            if( !cleanFallback)
+	            	mre.printStackTrace();                
 	        }
 	    }
 	
-	    if(message == null)
+	    if(message == null && !cleanFallback)
 	    {
 	    	BootLog.error("can't get message from bundle "+bundleName+" with key "+messageKey);	    	
 	    }
 	    
-	    return (message == null) ? ('?' + messageKey + '?') : message; 
+	    return (message == null) ? (cleanFallback ? messageKey : ('?' + messageKey + '?')) : message; 
 	}
         
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.