You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2012/03/12 21:46:18 UTC
svn commit: r1299845 - in /myfaces/core/branches/2.0.x/shared-public/src:
main/java/org/apache/myfaces/shared/
main/java/org/apache/myfaces/shared/application/
main/java/org/apache/myfaces/shared/component/
main/java/org/apache/myfaces/shared/config/ m...
Author: lu4242
Date: Mon Mar 12 20:46:16 2012
New Revision: 1299845
URL: http://svn.apache.org/viewvc?rev=1299845&view=rev
Log:
remove classes that belongs to shared but are not meant for public use (only for myfaces projects)
Removed:
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/application/
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/component/
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/config/
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/context/
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/el/
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/readme.txt
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/renderkit/
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/resource/
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/spi/
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/taglib/
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/test/
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/trace/
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/Assert.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/BiLevelCacheMap.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/CommentUtils.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ConcurrentLRUCache.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ExceptionUtils.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/FastWriter.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/HashMapUtils.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/MyFacesObjectInputStream.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/NullEnumeration.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/NullIterator.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/PriorityQueue.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/RestoreStateUtils.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/StateUtils.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/StreamCharBuffer.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/StringCharArrayAccessor.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/_ComponentUtils.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/el/
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/io/
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/serial/
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/servlet/
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/xml/
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/view/
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/webapp/
myfaces/core/branches/2.0.x/shared-public/src/main/javascript/
myfaces/core/branches/2.0.x/shared-public/src/test/java/org/apache/myfaces/shared/application/
myfaces/core/branches/2.0.x/shared-public/src/test/java/org/apache/myfaces/shared/context/
myfaces/core/branches/2.0.x/shared-public/src/test/java/org/apache/myfaces/shared/renderkit/
myfaces/core/branches/2.0.x/shared-public/src/test/java/org/apache/myfaces/shared/resource/
myfaces/core/branches/2.0.x/shared-public/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
myfaces/core/branches/2.0.x/shared-public/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsAES_CBCTest.java
myfaces/core/branches/2.0.x/shared-public/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsBlowfish_ECBTest.java
myfaces/core/branches/2.0.x/shared-public/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsDefaultTest.java
myfaces/core/branches/2.0.x/shared-public/src/test/java/org/apache/myfaces/shared/util/CachedStateUtilsTripleDES_ECBTest.java
myfaces/core/branches/2.0.x/shared-public/src/test/java/org/apache/myfaces/shared/util/CommentUtilsTest.java
myfaces/core/branches/2.0.x/shared-public/src/test/java/org/apache/myfaces/shared/util/InitVector_CBCTestCase.java
myfaces/core/branches/2.0.x/shared-public/src/test/java/org/apache/myfaces/shared/util/SecretKeyCacheTest.java
myfaces/core/branches/2.0.x/shared-public/src/test/java/org/apache/myfaces/shared/util/SecretKeyConfigurationTest.java
myfaces/core/branches/2.0.x/shared-public/src/test/java/org/apache/myfaces/shared/util/StateUtilsAES_CBCTest.java
myfaces/core/branches/2.0.x/shared-public/src/test/java/org/apache/myfaces/shared/util/StateUtilsBlowfish_ECBTest.java
myfaces/core/branches/2.0.x/shared-public/src/test/java/org/apache/myfaces/shared/util/StateUtilsDefaultTest.java
myfaces/core/branches/2.0.x/shared-public/src/test/java/org/apache/myfaces/shared/util/StateUtilsTripleDES_ECBTest.java
myfaces/core/branches/2.0.x/shared-public/src/test/java/org/apache/myfaces/shared/webapp/
Modified:
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ClassLoaderUtils.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ParametrizableFacesMessage.java
myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/WebConfigParamUtils.java
Modified: myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ClassLoaderUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ClassLoaderUtils.java?rev=1299845&r1=1299844&r2=1299845&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ClassLoaderUtils.java (original)
+++ myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ClassLoaderUtils.java Mon Mar 12 20:46:16 2012
@@ -123,20 +123,25 @@ public final class ClassLoaderUtils
ClassLoader loader = getContextClassLoader();
if (loader != null)
- clazz = loader.loadClass(name);
+ {
+ clazz = loader.loadClass(name);
+ }
}
catch (ClassNotFoundException e)
{
// treat as though loader not set
- ;
}
if (clazz == null)
{
if (callerClassLoader != null)
- clazz = callerClassLoader.loadClass(name);
+ {
+ clazz = callerClassLoader.loadClass(name);
+ }
else
- clazz = Class.forName(name);
+ {
+ clazz = Class.forName(name);
+ }
}
return clazz;
@@ -164,14 +169,20 @@ public final class ClassLoaderUtils
ClassLoader loader = getContextClassLoader();
if (loader != null)
- url = loader.getResource(name);
+ {
+ url = loader.getResource(name);
+ }
if (url == null)
{
if (callerClassLoader != null)
- url = callerClassLoader.getResource(name);
+ {
+ url = callerClassLoader.getResource(name);
+ }
else
- url = ClassLoader.getSystemResource(name);
+ {
+ url = ClassLoader.getSystemResource(name);
+ }
}
return url;
@@ -199,14 +210,20 @@ public final class ClassLoaderUtils
ClassLoader loader = getContextClassLoader();
if (loader != null)
- stream = loader.getResourceAsStream(name);
+ {
+ stream = loader.getResourceAsStream(name);
+ }
if (stream == null)
{
if (callerClassLoader != null)
- stream = callerClassLoader.getResourceAsStream(name);
+ {
+ stream = callerClassLoader.getResourceAsStream(name);
+ }
else
- stream = ClassLoader.getSystemResourceAsStream(name);
+ {
+ stream = ClassLoader.getSystemResourceAsStream(name);
+ }
}
return stream;
@@ -222,7 +239,8 @@ public final class ClassLoaderUtils
{
if (System.getSecurityManager() != null)
{
- try {
+ try
+ {
ClassLoader cl = AccessController.doPrivileged(new PrivilegedExceptionAction<ClassLoader>()
{
public ClassLoader run() throws PrivilegedActionException
@@ -287,7 +305,9 @@ public final class ClassLoaderUtils
{
String line = in.readLine();
if (line == null)
- break;
+ {
+ break;
+ }
String className = _parseLine(line);
@@ -314,7 +334,9 @@ public final class ClassLoaderUtils
while(urls.hasMoreElements());
if (services.size() == 1)
- return Collections.singletonList(services.get(0));
+ {
+ return Collections.singletonList(services.get(0));
+ }
return Collections.unmodifiableList(services);
}
@@ -335,7 +357,9 @@ public final class ClassLoaderUtils
// Eliminate any comments
int hashIndex = line.indexOf('#');
if (hashIndex >= 0)
- line = line.substring(0, hashIndex);
+ {
+ line = line.substring(0, hashIndex);
+ }
// and any whitespace
line = line.trim();
Modified: myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java?rev=1299845&r1=1299844&r2=1299845&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java (original)
+++ myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java Mon Mar 12 20:46:16 2012
@@ -126,7 +126,8 @@ public final class ClassUtils
//~ Methods ------------------------------------------------------------------------------------
- public synchronized static void addClassLoadingExtension(ClassLoaderExtension extension, boolean top) {
+ public synchronized static void addClassLoadingExtension(ClassLoaderExtension extension, boolean top)
+ {
/**
* now at the first look this looks somewhat strange
* but to get the best performance access we assign new native
@@ -138,11 +139,13 @@ public final class ClassUtils
ClassLoaderExtension [] retVal = new ClassLoaderExtension[classLoadingExtensions.length+1];
ArrayList extensions = new ArrayList(classLoadingExtensions.length+1);
- if(!top) {
+ if(!top)
+ {
extensions.addAll(Arrays.asList(classLoadingExtensions));
}
extensions.add(extension);
- if(top) {
+ if(top)
+ {
extensions.addAll(Arrays.asList(classLoadingExtensions));
}
@@ -168,16 +171,21 @@ public final class ClassUtils
ClassLoaderExtension [] loaderPlugins = classLoadingExtensions;
int plugins = loaderPlugins.length;
- for(int cnt = 0; cnt < loaderPlugins.length; cnt ++) {
+ for(int cnt = 0; cnt < loaderPlugins.length; cnt ++)
+ {
ClassLoaderExtension extension = loaderPlugins[cnt];
Class retVal = extension.forName(type);
- if(retVal != null) {
+ if(retVal != null)
+ {
return retVal;
}
}
- if (type == null) throw new NullPointerException("type");
+ if (type == null)
+ {
+ throw new NullPointerException("type");
+ }
try
{
// Try WebApp ClassLoader first
@@ -230,7 +238,10 @@ public final class ClassUtils
public static Class javaTypeToClass(String type)
throws ClassNotFoundException
{
- if (type == null) throw new NullPointerException("type");
+ if (type == null)
+ {
+ throw new NullPointerException("type");
+ }
// try common types and arrays of common types first
Class clazz = (Class) COMMON_TYPES.get(type);
@@ -297,7 +308,8 @@ public final class ClassUtils
/**
* @param resource Name of resource(s) to find in classpath
- * @param defaultObject The default object to use to determine the class loader (if none associated with current thread.)
+ * @param defaultObject The default object to use to determine the class loader
+ * (if none associated with current thread.)
* @return Iterator over URL Objects
*/
public static Iterator getResources(String resource, Object defaultObject)
@@ -323,7 +335,10 @@ public final class ClassUtils
public static Object newInstance(String type)
throws FacesException
{
- if (type == null) return null;
+ if (type == null)
+ {
+ return null;
+ }
return newInstance(simpleClassForName(type));
}
@@ -335,7 +350,9 @@ public final class ClassUtils
public static Object newInstance(String type, Class[] expectedTypes)
{
if (type == null)
- return null;
+ {
+ return null;
+ }
Class clazzForName = simpleClassForName(type);
@@ -404,7 +421,10 @@ public final class ClassUtils
public static Object convertToType(Object value, Class desiredClass)
{
- if (value == null) return null;
+ if (value == null)
+ {
+ return null;
+ }
try
{
@@ -424,7 +444,8 @@ public final class ClassUtils
* Gets the ClassLoader associated with the current thread. Returns the class loader associated with
* the specified default object if no context loader is associated with the current thread.
*
- * @param defaultObject The default object to use to determine the class loader (if none associated with current thread.)
+ * @param defaultObject The default object to use to determine the class loader
+ * (if none associated with current thread.)
* @return ClassLoader
*/
protected static ClassLoader getCurrentLoader(Object defaultObject)
@@ -460,7 +481,8 @@ public final class ClassUtils
* @param defaultObject The default implementation for the given ApplicationObject.
* @return
*/
- public static <T> T buildApplicationObject(Class<T> interfaceClass, Collection<String> classNamesIterator, T defaultObject)
+ public static <T> T buildApplicationObject(Class<T> interfaceClass,
+ Collection<String> classNamesIterator, T defaultObject)
{
return buildApplicationObject(interfaceClass, null, null, classNamesIterator, defaultObject);
}
Modified: myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java?rev=1299845&r1=1299844&r2=1299845&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java (original)
+++ myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java Mon Mar 12 20:46:16 2012
@@ -52,13 +52,17 @@ public final class LocaleUtils
{
Locale locale = Locale.getDefault();
if(log.isLoggable(Level.WARNING))
- log.warning("Locale name in faces-config.xml null or empty, setting locale to default locale : "+locale.toString());
+ {
+ log.warning("Locale name in faces-config.xml null or empty, setting locale to default locale : "
+ + locale.toString());
+ }
return locale;
}
int separatorCountry = localeString.indexOf('_');
char separator;
- if (separatorCountry >= 0) {
+ if (separatorCountry >= 0)
+ {
separator = '_';
}
else
@@ -67,11 +71,14 @@ public final class LocaleUtils
separator = '-';
}
- String language, country, variant;
+ String language;
+ String country;
+ String variant;
if (separatorCountry < 0)
{
language = localeString;
- country = variant = "";
+ country = "";
+ variant = "";
}
else
{
Modified: myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java?rev=1299845&r1=1299844&r2=1299845&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java (original)
+++ myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java Mon Mar 12 20:46:16 2012
@@ -200,7 +200,8 @@ public final class MessageUtils
String forClientId,
FacesContext facesContext)
{
- if(log.isLoggable(Level.FINEST)) {
+ if(log.isLoggable(Level.FINEST))
+ {
log.finest("adding message " + messageId + " for clientId " + forClientId);
}
facesContext.addMessage(forClientId,
@@ -214,7 +215,8 @@ public final class MessageUtils
String forClientId,
FacesContext facesContext)
{
- if(log.isLoggable(Level.FINEST)) {
+ if(log.isLoggable(Level.FINEST))
+ {
log.finest("adding message " + messageId + " for clientId " + forClientId);
}
facesContext.addMessage(forClientId,
@@ -233,7 +235,9 @@ public final class MessageUtils
{
String localizedStr = null;
if(params == null || msgtext == null)
+ {
return msgtext;
+ }
if(locale != null)
{
@@ -257,8 +261,11 @@ public final class MessageUtils
{
locale = context.getViewRoot().getLocale();
if(locale == null)
+ {
locale = Locale.getDefault();
- } else
+ }
+ }
+ else
{
locale = Locale.getDefault();
}
@@ -276,10 +283,12 @@ public final class MessageUtils
{
try
{
- bundle = ResourceBundle.getBundle(bundleName, locale, org.apache.myfaces.shared.util.ClassUtils.getCurrentLoader(bundleName));
+ bundle = ResourceBundle.getBundle(bundleName, locale,
+ org.apache.myfaces.shared.util.ClassUtils.getCurrentLoader(bundleName));
summary = bundle.getString(messageId);
}
- catch (MissingResourceException e) {
+ catch (MissingResourceException e)
+ {
// NoOp
}
}
@@ -288,14 +297,16 @@ public final class MessageUtils
{
try
{
- bundle = ResourceBundle.getBundle(DEFAULT_BUNDLE, locale, org.apache.myfaces.shared.util.ClassUtils.getCurrentLoader(DEFAULT_BUNDLE));
+ bundle = ResourceBundle.getBundle(DEFAULT_BUNDLE, locale,
+ org.apache.myfaces.shared.util.ClassUtils.getCurrentLoader(DEFAULT_BUNDLE));
if(bundle == null)
{
throw new NullPointerException();
}
summary = bundle.getString(messageId);
}
- catch(MissingResourceException e) {
+ catch(MissingResourceException e)
+ {
// NoOp
}
}
@@ -316,7 +327,8 @@ public final class MessageUtils
{
detail = bundle.getString(messageId + DETAIL_SUFFIX);
}
- catch(MissingResourceException e) {
+ catch(MissingResourceException e)
+ {
// NoOp
}
return new ParametrizableFacesMessage(summary, detail, params, locale);
@@ -329,14 +341,16 @@ public final class MessageUtils
detail = substituteParams(locale,
bundle.getString(messageId + DETAIL_SUFFIX), params);
}
- catch(MissingResourceException e) {
+ catch(MissingResourceException e)
+ {
// NoOp
}
return new FacesMessage(summary, detail);
}
}
- public static FacesMessage getMessageFromBundle(String bundleBaseName, FacesContext context, Locale locale, String messageId, Object params[])
+ public static FacesMessage getMessageFromBundle(String bundleBaseName,
+ FacesContext context, Locale locale, String messageId, Object params[])
{
String summary = null;
String detail = null;
@@ -347,10 +361,12 @@ public final class MessageUtils
{
try
{
- bundle = ResourceBundle.getBundle(bundleName, locale, org.apache.myfaces.shared.util.ClassUtils.getCurrentLoader(bundleName));
+ bundle = ResourceBundle.getBundle(bundleName, locale,
+ org.apache.myfaces.shared.util.ClassUtils.getCurrentLoader(bundleName));
summary = bundle.getString(messageId);
}
- catch (MissingResourceException e) {
+ catch (MissingResourceException e)
+ {
// NoOp
}
}
@@ -359,14 +375,16 @@ public final class MessageUtils
{
try
{
- bundle = ResourceBundle.getBundle(bundleBaseName, locale, org.apache.myfaces.shared.util.ClassUtils.getCurrentLoader(bundleBaseName));
+ bundle = ResourceBundle.getBundle(bundleBaseName, locale,
+ org.apache.myfaces.shared.util.ClassUtils.getCurrentLoader(bundleBaseName));
if(bundle == null)
{
throw new NullPointerException();
}
summary = bundle.getString(messageId);
}
- catch(MissingResourceException e) {
+ catch(MissingResourceException e)
+ {
// NoOp
}
}
@@ -375,14 +393,16 @@ public final class MessageUtils
{
try
{
- bundle = ResourceBundle.getBundle(DEFAULT_BUNDLE, locale, org.apache.myfaces.shared.util.ClassUtils.getCurrentLoader(DEFAULT_BUNDLE));
+ bundle = ResourceBundle.getBundle(DEFAULT_BUNDLE, locale,
+ org.apache.myfaces.shared.util.ClassUtils.getCurrentLoader(DEFAULT_BUNDLE));
if(bundle == null)
{
throw new NullPointerException();
}
summary = bundle.getString(messageId);
}
- catch(MissingResourceException e) {
+ catch(MissingResourceException e)
+ {
// NoOp
}
}
@@ -404,7 +424,8 @@ public final class MessageUtils
{
detail = bundle.getString(messageId + DETAIL_SUFFIX);
}
- catch(MissingResourceException e) {
+ catch(MissingResourceException e)
+ {
// NoOp
}
return new ParametrizableFacesMessage(summary, detail, params, locale);
@@ -417,7 +438,8 @@ public final class MessageUtils
detail = substituteParams(locale,
bundle.getString(messageId + DETAIL_SUFFIX), params);
}
- catch(MissingResourceException e) {
+ catch(MissingResourceException e)
+ {
// NoOp
}
return new FacesMessage(summary, detail);
@@ -442,17 +464,21 @@ public final class MessageUtils
*
* @return currently applicable Locale for this request.
*/
- public static Locale getCurrentLocale() {
+ public static Locale getCurrentLocale()
+ {
return getCurrentLocale(FacesContext.getCurrentInstance());
}
- public static Locale getCurrentLocale(FacesContext context) {
+ public static Locale getCurrentLocale(FacesContext context)
+ {
Locale locale;
if(context != null && context.getViewRoot() != null)
{
locale = context.getViewRoot().getLocale();
if(locale == null)
+ {
locale = Locale.getDefault();
+ }
}
else
{
@@ -469,7 +495,8 @@ public final class MessageUtils
* @param params parameters to set at localized message
* @return generated FacesMessage
*/
- public static FacesMessage getMessage(FacesMessage.Severity severity, String bundleBaseName, String messageId, Object params[])
+ public static FacesMessage getMessage(FacesMessage.Severity severity, String bundleBaseName,
+ String messageId, Object params[])
{
FacesMessage msg = getMessage(bundleBaseName, messageId, params);
msg.setSeverity(severity);
@@ -515,7 +542,8 @@ public final class MessageUtils
{
summary = bundle.getString(messageId);
}
- catch (MissingResourceException e) {
+ catch (MissingResourceException e)
+ {
// NoOp
}
@@ -532,7 +560,8 @@ public final class MessageUtils
detail = substituteParams(bundle.getLocale(),
bundle.getString(messageId + DETAIL_SUFFIX), params);
}
- catch(MissingResourceException e) {
+ catch(MissingResourceException e)
+ {
// NoOp
}
@@ -565,15 +594,20 @@ public final class MessageUtils
public static FacesMessage getMessage(FacesContext context, String messageId, Object params[])
{
if(context == null || messageId == null)
+ {
throw new NullPointerException(" context " + context + " messageId " + messageId);
+ }
Locale locale = getCurrentLocale(context);
if(null == locale)
+ {
throw new NullPointerException(" locale " + locale);
+ }
FacesMessage message = getMessage(locale, messageId, params);
if(message != null)
{
return message;
- } else
+ }
+ else
{
// TODO /FIX: Note that this has fallback behavior to default Locale for message,
// but similar behavior above does not. The methods should probably behave
@@ -582,18 +616,24 @@ public final class MessageUtils
}
}
- public static FacesMessage getMessage(String bundleBaseName, FacesContext context, String messageId, Object params[])
+ public static FacesMessage getMessage(String bundleBaseName, FacesContext context,
+ String messageId, Object params[])
{
if(context == null || messageId == null)
+ {
throw new NullPointerException(" context " + context + " messageId " + messageId);
+ }
Locale locale = getCurrentLocale(context);
if(null == locale)
+ {
throw new NullPointerException(" locale " + locale);
+ }
FacesMessage message = getMessageFromBundle(bundleBaseName, context, locale, messageId, params);
if(message != null)
{
return message;
- } else
+ }
+ else
{
// TODO /FIX: Note that this has fallback behavior to default Locale for message,
// but similar behavior above does not. The methods should probably behave
@@ -602,14 +642,19 @@ public final class MessageUtils
}
}
- public static Object getLabel(FacesContext facesContext, UIComponent component) {
+ public static Object getLabel(FacesContext facesContext, UIComponent component)
+ {
Object label = component.getAttributes().get("label");
if(label != null)
+ {
return label;
+ }
ValueExpression expression = component.getValueExpression("label");
if(expression != null)
+ {
return expression;
+ }
//If no label is not specified, use clientId
return component.getClientId( facesContext );
@@ -621,9 +666,11 @@ public final class MessageUtils
if(context != null)
{
return context.getApplication();
- } else
+ }
+ else
{
- ApplicationFactory afactory = (ApplicationFactory)FactoryFinder.getFactory("javax.faces.application.ApplicationFactory");
+ ApplicationFactory afactory = (ApplicationFactory)FactoryFinder.getFactory(
+ "javax.faces.application.ApplicationFactory");
return afactory.getApplication();
}
}
Modified: myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ParametrizableFacesMessage.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ParametrizableFacesMessage.java?rev=1299845&r1=1299844&r2=1299845&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ParametrizableFacesMessage.java (original)
+++ myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ParametrizableFacesMessage.java Mon Mar 12 20:46:16 2012
@@ -50,7 +50,10 @@ public class ParametrizableFacesMessage
String summary, String detail, Object[] args, Locale locale)
{
super(summary, detail);
- if(locale == null) throw new NullPointerException("locale");
+ if(locale == null)
+ {
+ throw new NullPointerException("locale");
+ }
_locale = locale;
_args = args;
}
@@ -59,7 +62,10 @@ public class ParametrizableFacesMessage
String summary, String detail, Object[] args, Locale locale)
{
super(severity, summary, detail);
- if(locale == null) throw new NullPointerException("locale");
+ if(locale == null)
+ {
+ throw new NullPointerException("locale");
+ }
_locale = locale;
_args = args;
}
Modified: myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/WebConfigParamUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/WebConfigParamUtils.java?rev=1299845&r1=1299844&r2=1299845&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/WebConfigParamUtils.java (original)
+++ myfaces/core/branches/2.0.x/shared-public/src/main/java/org/apache/myfaces/shared/util/WebConfigParamUtils.java Mon Mar 12 20:46:16 2012
@@ -70,7 +70,9 @@ public final class WebConfigParamUtils
public static String getStringInitParameter(ExternalContext context, String name, String defaultValue)
{
if (name == null)
+ {
throw new NullPointerException();
+ }
String param = context.getInitParameter(name);
@@ -89,13 +91,15 @@ public final class WebConfigParamUtils
}
/**
- * Gets the String init parameter value from the specified context. If the parameter is an empty String or a String
+ * Gets the String init parameter value from the specified context. If the parameter is an
+ * empty String or a String
* containing only white space, this method returns <code>null</code>
*
* @param context
* the application's external context
* @param names
- * the init parameter's names, the first one is scanned first. Usually used when a param has multiple aliases
+ * the init parameter's names, the first one is scanned first. Usually used when a
+ * param has multiple aliases
*
* @return the parameter if it was specified and was not empty, <code>null</code> otherwise
*
@@ -108,13 +112,14 @@ public final class WebConfigParamUtils
}
/**
- * Gets the String init parameter value from the specified context. If the parameter is an empty String or a String
- * containing only white space, this method returns <code>null</code>
+ * Gets the String init parameter value from the specified context. If the parameter is an empty
+ * String or a String containing only white space, this method returns <code>null</code>
*
* @param context
* the application's external context
* @param names
- * the init parameter's names, the first one is scanned first. Usually used when a param has multiple aliases
+ * the init parameter's names, the first one is scanned first. Usually used when a param has
+ * multiple aliases
* @param defaultValue
* the value by default if null or empty
*
@@ -126,14 +131,18 @@ public final class WebConfigParamUtils
public static String getStringInitParameter(ExternalContext context, String[] names, String defaultValue)
{
if (names == null)
+ {
throw new NullPointerException();
+ }
String param = null;
for (String name : names)
{
if (name == null)
+ {
throw new NullPointerException();
+ }
param = context.getInitParameter(name);
if (param != null)
@@ -200,7 +209,9 @@ public final class WebConfigParamUtils
public static boolean getBooleanInitParameter(ExternalContext context, String name, boolean defaultValue)
{
if (name == null)
+ {
throw new NullPointerException();
+ }
String param = getStringInitParameter(context, name);
if (param == null)
@@ -214,7 +225,8 @@ public final class WebConfigParamUtils
}
/**
- * Gets the boolean init parameter value from the specified context. If the parameter was not specified, the default
+ * Gets the boolean init parameter value from the specified context. If the parameter
+ * was not specified, the default
* value is used instead.
*
* @param context
@@ -235,10 +247,13 @@ public final class WebConfigParamUtils
* @throws NullPointerException
* if context or name is <code>null</code>
*/
- public static boolean getBooleanInitParameter(ExternalContext context, String name, boolean defaultValue, String [] valuesIgnoreCase, boolean returnOnValueEqualsIgnoreCase)
+ public static boolean getBooleanInitParameter(ExternalContext context, String name,
+ boolean defaultValue, String [] valuesIgnoreCase, boolean returnOnValueEqualsIgnoreCase)
{
if (name == null)
+ {
throw new NullPointerException();
+ }
String param = getStringInitParameter(context, name);
if (param == null)
@@ -266,8 +281,8 @@ public final class WebConfigParamUtils
}
/**
- * Gets the boolean init parameter value from the specified context. If the parameter was not specified, the default
- * value is used instead.
+ * Gets the boolean init parameter value from the specified context. If the parameter was not specified,
+ * the default value is used instead.
*
* @param context
* the application's external context
@@ -286,8 +301,8 @@ public final class WebConfigParamUtils
}
/**
- * Gets the boolean init parameter value from the specified context. If the parameter was not specified, the default
- * value is used instead.
+ * Gets the boolean init parameter value from the specified context. If the parameter was not specified,
+ * the default value is used instead.
*
* @param context
* the application's external context
@@ -304,13 +319,17 @@ public final class WebConfigParamUtils
public static boolean getBooleanInitParameter(ExternalContext context, String[] names, boolean defaultValue)
{
if (names == null)
+ {
throw new NullPointerException();
+ }
String param = null;
for (String name : names)
{
if (name == null)
+ {
throw new NullPointerException();
+ }
param = getStringInitParameter(context, name);
if (param != null)
@@ -329,8 +348,8 @@ public final class WebConfigParamUtils
}
/**
- * Gets the boolean init parameter value from the specified context. If the parameter was not specified, the default
- * value is used instead.
+ * Gets the boolean init parameter value from the specified context. If the parameter was not specified,
+ * the default value is used instead.
*
* @param context
* the application's external context
@@ -349,16 +368,21 @@ public final class WebConfigParamUtils
* if context or name is <code>null</code>
*/
- public static boolean getBooleanInitParameter(ExternalContext context, String[] names, boolean defaultValue, String [] valuesIgnoreCase, boolean returnOnValueEqualsIgnoreCase)
+ public static boolean getBooleanInitParameter(ExternalContext context, String[] names, boolean defaultValue,
+ String [] valuesIgnoreCase, boolean returnOnValueEqualsIgnoreCase)
{
if (names == null)
+ {
throw new NullPointerException();
+ }
String param = null;
for (String name : names)
{
if (name == null)
+ {
throw new NullPointerException();
+ }
param = getStringInitParameter(context, name);
if (param != null)
@@ -391,8 +415,8 @@ public final class WebConfigParamUtils
}
/**
- * Gets the int init parameter value from the specified context. If the parameter was not specified, the default
- * value is used instead.
+ * Gets the int init parameter value from the specified context. If the parameter was not
+ * specified, the default value is used instead.
*
* @param context
* the application's external context
@@ -414,8 +438,8 @@ public final class WebConfigParamUtils
}
/**
- * Gets the int init parameter value from the specified context. If the parameter was not specified, the default
- * value is used instead.
+ * Gets the int init parameter value from the specified context. If the parameter was not specified,
+ * the default value is used instead.
*
* @param context
* the application's external context
@@ -434,7 +458,9 @@ public final class WebConfigParamUtils
public static int getIntegerInitParameter(ExternalContext context, String name, int defaultValue)
{
if (name == null)
+ {
throw new NullPointerException();
+ }
String param = getStringInitParameter(context, name);
if (param == null)
@@ -448,8 +474,8 @@ public final class WebConfigParamUtils
}
/**
- * Gets the int init parameter value from the specified context. If the parameter was not specified, the default
- * value is used instead.
+ * Gets the int init parameter value from the specified context. If the parameter was not specified,
+ * the default value is used instead.
*
* @param context
* the application's external context
@@ -486,13 +512,17 @@ public final class WebConfigParamUtils
public static int getIntegerInitParameter(ExternalContext context, String[] names, int defaultValue)
{
if (names == null)
+ {
throw new NullPointerException();
+ }
String param = null;
for (String name : names)
{
if (name == null)
+ {
throw new NullPointerException();
+ }
param = getStringInitParameter(context, name);
if (param != null)
@@ -554,7 +584,9 @@ public final class WebConfigParamUtils
public static long getLongInitParameter(ExternalContext context, String name, long defaultValue)
{
if (name == null)
+ {
throw new NullPointerException();
+ }
String param = getStringInitParameter(context, name);
if (param == null)
@@ -607,13 +639,17 @@ public final class WebConfigParamUtils
public static long getLongInitParameter(ExternalContext context, String[] names, long defaultValue)
{
if (names == null)
+ {
throw new NullPointerException();
+ }
String param = null;
for (String name : names)
{
if (name == null)
+ {
throw new NullPointerException();
+ }
param = getStringInitParameter(context, name);
if (param != null)
@@ -632,8 +668,8 @@ public final class WebConfigParamUtils
}
/**
- * Gets the init parameter value from the specified context and instanciate it. If the parameter was not specified,
- * the default value is used instead.
+ * Gets the init parameter value from the specified context and instanciate it.
+ * If the parameter was not specified, the default value is used instead.
*
* @param context
* the application's external context
@@ -650,7 +686,8 @@ public final class WebConfigParamUtils
* if context or name is <code>null</code>
*/
@SuppressWarnings("unchecked")
- public static <T> T getInstanceInitParameter(ExternalContext context, String name, String deprecatedName, T defaultValue)
+ public static <T> T getInstanceInitParameter(ExternalContext context, String name,
+ String deprecatedName, T defaultValue)
{
String param = getStringInitParameter(context, name, deprecatedName);
if (param == null)