You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by cz...@apache.org on 2009/04/08 18:46:09 UTC
svn commit: r763310 -
/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java
Author: cziegeler
Date: Wed Apr 8 16:46:09 2009
New Revision: 763310
URL: http://svn.apache.org/viewvc?rev=763310&view=rev
Log:
Use correct log level for warning.
Modified:
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java?rev=763310&r1=763309&r2=763310&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java Wed Apr 8 16:46:09 2009
@@ -65,20 +65,20 @@
PortletInfo info = dd.getPortletInfo();
-
+
if(info != null) {
String title = windowInfo == null ? info.getTitle() : windowInfo.getTitle();
String shortTitle = windowInfo == null ? info.getShortTitle() : windowInfo.getShortTitle();
String keywords = windowInfo == null ? info.getKeywords() : windowInfo.getKeywords();
defaultBundle = new InlinePortletResourceBundle(
- title, shortTitle, keywords
+ title, shortTitle, keywords
);
}
else {
defaultBundle = new InlinePortletResourceBundle(new Object[][] { {"a", "b"} });
}
- }
+ }
public ResourceBundle getResourceBundle(Locale locale) {
if(LOG.isDebugEnabled()) {
@@ -94,22 +94,22 @@
ResourceBundle bundle = null;
if(bundleName != null) {
ClassLoader loader =
- Thread.currentThread().getContextClassLoader();
+ Thread.currentThread().getContextClassLoader();
bundle = ResourceBundle.getBundle(bundleName, locale, loader);
bundles.put(locale, new CombinedPortletResourceBundle(defaultBundle, bundle));
}
else {
bundles.put(locale, defaultBundle);
}
- } catch (MissingResourceException mre) {
+ } catch (MissingResourceException mre) {
if(bundleName != null && LOG.isWarnEnabled()) {
- LOG.info(EXCEPTIONS.getString("warning.resourcebundle.notfound",bundleName, mre.getMessage()));
+ LOG.warn(EXCEPTIONS.getString("warning.resourcebundle.notfound",bundleName, mre.getMessage()));
}
if(LOG.isDebugEnabled()) {
LOG.debug("Using default bundle for locale ("+locale+").");
}
bundles.put(locale, defaultBundle);
}
- return bundles.get(locale);
+ return bundles.get(locale);
}
}