You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2011/10/24 19:09:41 UTC
svn commit: r1188235 [5/5] - in /myfaces/core/trunk:
api/src/main/java/javax/faces/application/
api/src/main/java/javax/faces/component/
api/src/main/java/javax/faces/component/behavior/
api/src/main/java/javax/faces/convert/ api/src/main/java/javax/fa...
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceMetaImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceMetaImpl.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceMetaImpl.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceMetaImpl.java Mon Oct 24 17:09:33 2011
@@ -80,25 +80,37 @@ public class ResourceMetaImpl extends Re
}
if (_libraryName != null)
{
- if (firstSlashAdded) builder.append('/');
+ if (firstSlashAdded)
+ {
+ builder.append('/');
+ }
builder.append(_libraryName);
firstSlashAdded = true;
}
if (_libraryVersion != null)
{
- if (firstSlashAdded) builder.append('/');
+ if (firstSlashAdded)
+ {
+ builder.append('/');
+ }
builder.append(_libraryVersion);
firstSlashAdded = true;
}
if (_resourceName != null)
{
- if (firstSlashAdded) builder.append('/');
+ if (firstSlashAdded)
+ {
+ builder.append('/');
+ }
builder.append(_resourceName);
firstSlashAdded = true;
}
if (_resourceVersion != null)
{
- if (firstSlashAdded) builder.append('/');
+ if (firstSlashAdded)
+ {
+ builder.append('/');
+ }
builder.append(_resourceVersion);
builder.append(
_resourceName.substring(_resourceName.lastIndexOf('.')));
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagBase.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagBase.java Mon Oct 24 17:09:33 2011
@@ -70,9 +70,18 @@ public abstract class UIComponentELTagBa
setBooleanProperty(component, org.apache.myfaces.shared.renderkit.JSFAttr.FORCE_ID_ATTR, _forceId);
setBooleanProperty(component, org.apache.myfaces.shared.renderkit.JSFAttr.FORCE_ID_INDEX_ATTR, _forceIdIndex, DEFAULT_FORCE_ID_INDEX_VALUE);
- if (_javascriptLocation != null) setStringProperty(component, JSFAttr.JAVASCRIPT_LOCATION, _javascriptLocation);
- if (_imageLocation != null) setStringProperty(component, JSFAttr.IMAGE_LOCATION, _imageLocation);
- if (_styleLocation != null) setStringProperty(component, JSFAttr.STYLE_LOCATION, _styleLocation);
+ if (_javascriptLocation != null)
+ {
+ setStringProperty(component, JSFAttr.JAVASCRIPT_LOCATION, _javascriptLocation);
+ }
+ if (_imageLocation != null)
+ {
+ setStringProperty(component, JSFAttr.IMAGE_LOCATION, _imageLocation);
+ }
+ if (_styleLocation != null)
+ {
+ setStringProperty(component, JSFAttr.STYLE_LOCATION, _styleLocation);
+ }
//rendererType already handled by UIComponentTag
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagBase.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagBase.java Mon Oct 24 17:09:33 2011
@@ -67,9 +67,18 @@ public abstract class UIComponentTagBase
setBooleanProperty(component, org.apache.myfaces.shared.renderkit.JSFAttr.FORCE_ID_ATTR, _forceId);
setBooleanProperty(component, org.apache.myfaces.shared.renderkit.JSFAttr.FORCE_ID_INDEX_ATTR, _forceIdIndex);
- if (_javascriptLocation != null) setStringProperty(component, JSFAttr.JAVASCRIPT_LOCATION, _javascriptLocation);
- if (_imageLocation != null) setStringProperty(component, org.apache.myfaces.shared.renderkit.JSFAttr.IMAGE_LOCATION, _imageLocation);
- if (_styleLocation != null) setStringProperty(component, JSFAttr.STYLE_LOCATION, _styleLocation);
+ if (_javascriptLocation != null)
+ {
+ setStringProperty(component, JSFAttr.JAVASCRIPT_LOCATION, _javascriptLocation);
+ }
+ if (_imageLocation != null)
+ {
+ setStringProperty(component, JSFAttr.IMAGE_LOCATION, _imageLocation);
+ }
+ if (_styleLocation != null)
+ {
+ setStringProperty(component, JSFAttr.STYLE_LOCATION, _styleLocation);
+ }
//rendererType already handled by UIComponentTag
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java Mon Oct 24 17:09:33 2011
@@ -98,7 +98,10 @@ public class ConvertDateTimeTagBase
Locale locale = null;
Object _value = null;
- if (value == null) return;
+ if (value == null)
+ {
+ return;
+ }
if (UIComponentTag.isValueReference(value))
{
ValueBinding vb = facesContext.getApplication().createValueBinding(value);
@@ -124,7 +127,10 @@ public class ConvertDateTimeTagBase
DateTimeConverter converter,
String value)
{
- if (value == null) return;
+ if (value == null)
+ {
+ return;
+ }
if (UIComponentTag.isValueReference(value))
{
ValueBinding vb = facesContext.getApplication().createValueBinding(value);
@@ -140,7 +146,10 @@ public class ConvertDateTimeTagBase
DateTimeConverter converter,
String value)
{
- if (value == null) return;
+ if (value == null)
+ {
+ return;
+ }
if (UIComponentTag.isValueReference(value))
{
ValueBinding vb = facesContext.getApplication().createValueBinding(value);
@@ -156,7 +165,10 @@ public class ConvertDateTimeTagBase
DateTimeConverter converter,
String value)
{
- if (value == null) return;
+ if (value == null)
+ {
+ return;
+ }
if (UIComponentTag.isValueReference(value))
{
ValueBinding vb = facesContext.getApplication().createValueBinding(value);
@@ -172,7 +184,10 @@ public class ConvertDateTimeTagBase
DateTimeConverter converter,
String value)
{
- if (value == null) return;
+ if (value == null)
+ {
+ return;
+ }
if (UIComponentTag.isValueReference(value))
{
ValueBinding vb = facesContext.getApplication().createValueBinding(value);
@@ -198,7 +213,10 @@ public class ConvertDateTimeTagBase
DateTimeConverter converter,
String value)
{
- if (value == null) return;
+ if (value == null)
+ {
+ return;
+ }
if (UIComponentTag.isValueReference(value))
{
ValueBinding vb = facesContext.getApplication().createValueBinding(value);
@@ -210,4 +228,4 @@ public class ConvertDateTimeTagBase
}
}
-}
\ No newline at end of file
+}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlDataTableELTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlDataTableELTagBase.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlDataTableELTagBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlDataTableELTagBase.java Mon Oct 24 17:09:33 2011
@@ -118,7 +118,9 @@ public abstract class HtmlDataTableELTag
setIntegerProperty(component, JSFAttr.FIRST_ATTR, _first);
if(_var != null)
+ {
component.getAttributes().put(JSFAttr.VAR_ATTR, _var);
+ }
}
public void setAlign(ValueExpression align)
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/test/ClassElementHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/test/ClassElementHandler.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/test/ClassElementHandler.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/test/ClassElementHandler.java Mon Oct 24 17:09:33 2011
@@ -74,7 +74,9 @@ public class ClassElementHandler extends
clazz = elementName.contains(qName);
if(clazz)
+ {
buffer = new StringBuffer();
+ }
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/Assert.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/Assert.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/Assert.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/Assert.java Mon Oct 24 17:09:33 2011
@@ -27,12 +27,16 @@ public class Assert
public static void notNull(Object value)
{
if (value == null)
+ {
throw new NullPointerException("The instance is null.");
+ }
}
public static void notNull(Object value, String fieldName)
{
if (value == null)
+ {
throw new NullPointerException(fieldName + " is null.");
+ }
}
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/ClassLoaderUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/ClassLoaderUtils.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/ClassLoaderUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/ClassLoaderUtils.java Mon Oct 24 17:09:33 2011
@@ -123,7 +123,9 @@ public final class ClassLoaderUtils
ClassLoader loader = getContextClassLoader();
if (loader != null)
- clazz = loader.loadClass(name);
+ {
+ clazz = loader.loadClass(name);
+ }
}
catch (ClassNotFoundException e)
{
@@ -134,9 +136,13 @@ public final class ClassLoaderUtils
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 +170,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 +211,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;
@@ -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/trunk/shared/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java Mon Oct 24 17:09:33 2011
@@ -177,7 +177,10 @@ public final class ClassUtils
}
- if (type == null) throw new NullPointerException("type");
+ if (type == null)
+ {
+ throw new NullPointerException("type");
+ }
try
{
// Try WebApp ClassLoader first
@@ -230,7 +233,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);
@@ -323,7 +329,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 +344,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 +415,10 @@ public final class ClassUtils
public static Object convertToType(Object value, Class desiredClass)
{
- if (value == null) return null;
+ if (value == null)
+ {
+ return null;
+ }
try
{
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java Mon Oct 24 17:09:33 2011
@@ -52,7 +52,9 @@ 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;
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java Mon Oct 24 17:09:33 2011
@@ -233,7 +233,9 @@ public final class MessageUtils
{
String localizedStr = null;
if(params == null || msgtext == null)
+ {
return msgtext;
+ }
if(locale != null)
{
@@ -257,7 +259,9 @@ public final class MessageUtils
{
locale = context.getViewRoot().getLocale();
if(locale == null)
+ {
locale = Locale.getDefault();
+ }
} else
{
locale = Locale.getDefault();
@@ -452,7 +456,9 @@ public final class MessageUtils
{
locale = context.getViewRoot().getLocale();
if(locale == null)
+ {
locale = Locale.getDefault();
+ }
}
else
{
@@ -565,10 +571,14 @@ 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)
{
@@ -585,10 +595,14 @@ public final class MessageUtils
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)
{
@@ -605,11 +619,15 @@ public final class MessageUtils
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 );
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/ParametrizableFacesMessage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/ParametrizableFacesMessage.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/ParametrizableFacesMessage.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/ParametrizableFacesMessage.java Mon Oct 24 17:09:33 2011
@@ -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/trunk/shared/src/main/java/org/apache/myfaces/shared/util/StateUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/StateUtils.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/StateUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/StateUtils.java Mon Oct 24 17:09:33 2011
@@ -202,10 +202,12 @@ public final class StateUtils {
if (algorithmParams != null && algorithmParams.startsWith("CBC") )
{
if(iv == null)
+ {
throw new FacesException(INIT_ALGORITHM_PARAM +
- " parameter has been set with CBC mode," +
- " but no initialization vector has been set " +
- " with " + INIT_ALGORITHM_IV);
+ " parameter has been set with CBC mode," +
+ " but no initialization vector has been set " +
+ " with " + INIT_ALGORITHM_IV);
+ }
}
}
@@ -213,7 +215,9 @@ public final class StateUtils {
public static boolean enableCompression(ExternalContext ctx)
{
if(ctx == null)
+ {
throw new NullPointerException("ExternalContext ctx");
+ }
return "true".equals(ctx.getInitParameter(COMPRESS_STATE_IN_CLIENT));
}
@@ -222,7 +226,9 @@ public final class StateUtils {
{
if(ctx == null)
+ {
throw new NullPointerException("ExternalContext ctx");
+ }
return ! "false".equals(ctx.getInitParameter(USE_ENCRYPTION));
}
@@ -234,9 +240,13 @@ public final class StateUtils {
public static final String construct(Object object, ExternalContext ctx){
byte[] bytes = getAsByteArray(object, ctx);
if( enableCompression(ctx) )
- bytes = compress(bytes);
+ {
+ bytes = compress(bytes);
+ }
if(isSecure(ctx))
- bytes = encrypt(bytes, ctx);
+ {
+ bytes = encrypt(bytes, ctx);
+ }
bytes = encode(bytes);
try
{
@@ -265,7 +275,9 @@ public final class StateUtils {
SerialFactory serialFactory = (SerialFactory) ctx.getApplicationMap().get(SERIAL_FACTORY);
if(serialFactory == null)
+ {
throw new NullPointerException("serialFactory");
+ }
try
{
@@ -288,7 +300,9 @@ public final class StateUtils {
{
if (ctx == null)
+ {
throw new NullPointerException("ExternalContext ctx");
+ }
testConfiguration(ctx);
@@ -370,14 +384,20 @@ public final class StateUtils {
try
{
if(log.isLoggable(Level.FINE))
- log.fine("Processing state : "+string);
+ {
+ log.fine("Processing state : " + string);
+ }
bytes = string.getBytes(ZIP_CHARSET);
bytes = decode(bytes);
if(isSecure(ctx))
+ {
bytes = decrypt(bytes, ctx);
+ }
if( enableCompression(ctx) )
+ {
bytes = decompress(bytes);
+ }
return getAsObject(bytes, ctx);
}
catch (Throwable e)
@@ -398,7 +418,9 @@ public final class StateUtils {
public static final byte[] decompress(byte[] bytes)
{
if(bytes == null)
+ {
throw new NullPointerException("byte[] bytes");
+ }
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -431,7 +453,9 @@ public final class StateUtils {
public static byte[] decrypt(byte[] secure, ExternalContext ctx)
{
if (ctx == null)
+ {
throw new NullPointerException("ExternalContext ctx");
+ }
testConfiguration(ctx);
@@ -518,7 +542,9 @@ public final class StateUtils {
SerialFactory serialFactory = (SerialFactory) ctx.getApplicationMap().get(SERIAL_FACTORY);
if(serialFactory == null)
+ {
throw new NullPointerException("serialFactory");
+ }
ObjectInputStream s = null;
Exception pendingException = null;
@@ -635,7 +661,9 @@ public final class StateUtils {
}
if (_iv != null)
+ {
iv = new Base64().decode(_iv.getBytes());
+ }
return iv;
}
@@ -715,10 +743,14 @@ public final class StateUtils {
public static void initSecret(ServletContext ctx){
if(ctx == null)
+ {
throw new NullPointerException("ServletContext ctx");
+ }
if (log.isLoggable(Level.FINE))
+ {
log.fine("Storing SecretKey @ " + INIT_SECRET_KEY_CACHE);
+ }
// Create and store SecretKey on application scope
String cache = ctx.getInitParameter(INIT_SECRET_KEY_CACHE);
@@ -736,7 +768,9 @@ public final class StateUtils {
}
if (log.isLoggable(Level.FINE))
+ {
log.fine("Storing SecretKey @ " + INIT_MAC_SECRET_KEY_CACHE);
+ }
String macCache = ctx.getInitParameter(INIT_MAC_SECRET_KEY_CACHE);
@@ -793,8 +827,10 @@ public final class StateUtils {
}
if( ! ( secretKey instanceof SecretKey ) )
+ {
throw new ClassCastException("Did not find an instance of SecretKey "
+ "in application scope using the key '" + INIT_SECRET_KEY_CACHE + "'");
+ }
return (SecretKey) secretKey;
@@ -835,7 +871,9 @@ public final class StateUtils {
bytes = kg.generateKey().getEncoded();
if(log.isLoggable(Level.FINE))
+ {
log.fine("generated random password of length " + bytes.length);
+ }
}
catch (NoSuchAlgorithmException e)
{
@@ -845,7 +883,9 @@ public final class StateUtils {
new Random().nextBytes(bytes);
if(log.isLoggable(Level.FINE))
+ {
log.fine("generated random password of length " + length);
+ }
}
}
else
@@ -938,8 +978,10 @@ public final class StateUtils {
}
if( ! ( secretKey instanceof SecretKey ) )
+ {
throw new ClassCastException("Did not find an instance of SecretKey "
+ "in application scope using the key '" + INIT_MAC_SECRET_KEY_CACHE + "'");
+ }
return (SecretKey) secretKey;
@@ -980,7 +1022,9 @@ public final class StateUtils {
bytes = kg.generateKey().getEncoded();
if(log.isLoggable(Level.FINE))
+ {
log.fine("generated random mac password of length " + bytes.length);
+ }
}
catch (NoSuchAlgorithmException e)
{
@@ -990,7 +1034,9 @@ public final class StateUtils {
new Random().nextBytes(bytes);
if(log.isLoggable(Level.FINE))
+ {
log.fine("generated random mac password of length " + length);
+ }
}
}
else
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/WebConfigParamUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/WebConfigParamUtils.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/WebConfigParamUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/WebConfigParamUtils.java Mon Oct 24 17:09:33 2011
@@ -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);
@@ -126,14 +128,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 +206,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)
@@ -238,7 +246,9 @@ public final class WebConfigParamUtils
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)
@@ -304,13 +314,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)
@@ -352,13 +366,17 @@ public final class WebConfigParamUtils
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)
@@ -434,7 +452,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)
@@ -486,13 +506,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 +578,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 +633,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)
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/el/ActionsMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/el/ActionsMap.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/el/ActionsMap.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/el/ActionsMap.java Mon Oct 24 17:09:33 2011
@@ -71,7 +71,9 @@ public abstract class ActionsMap impleme
public boolean containsValue(Object value) {
if( ! (value instanceof Boolean) )
+ {
return false;
+ }
return ((Boolean)value).booleanValue();
}
@@ -81,13 +83,17 @@ public abstract class ActionsMap impleme
public Boolean put(String key, Boolean value) {
if( value!=null && value.booleanValue() )
- performAction( key );
+ {
+ performAction(key);
+ }
return Boolean.FALSE;
}
public Object remove(Object key) {
if( keys.remove( key ) )
+ {
return Boolean.FALSE;
+ }
return null;
}
@@ -99,7 +105,9 @@ public abstract class ActionsMap impleme
Entry entry = (Entry) it.next();
Object obj = entry.getValue();
if( (obj instanceof Boolean) && ((Boolean) obj).booleanValue() )
- performAction( (String) entry.getKey() );
+ {
+ performAction((String) entry.getKey());
+ }
}
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/el/StringMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/el/StringMap.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/el/StringMap.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/el/StringMap.java Mon Oct 24 17:09:33 2011
@@ -41,7 +41,9 @@ public abstract class StringMap extends
public Object get(Object key) {
if( ! (key instanceof String) )
+ {
return null;
+ }
return getString( (String)key );
}
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/el/TestsMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/el/TestsMap.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/el/TestsMap.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/el/TestsMap.java Mon Oct 24 17:09:33 2011
@@ -40,7 +40,9 @@ public abstract class TestsMap extends G
public Object get(Object key) {
if( ! (key instanceof String) )
+ {
return null;
+ }
return Boolean.valueOf(getTest( (String)key ));
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/servlet/SourceCodeServlet.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/servlet/SourceCodeServlet.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/servlet/SourceCodeServlet.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/servlet/SourceCodeServlet.java Mon Oct 24 17:09:33 2011
@@ -56,7 +56,10 @@ public class SourceCodeServlet extends H
}
}
finally {
- if (in != null) in.close(); // very important
+ if (in != null)
+ {
+ in.close(); // very important
+ }
}
}
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/xml/MyFacesErrorHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/xml/MyFacesErrorHandler.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/xml/MyFacesErrorHandler.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/util/xml/MyFacesErrorHandler.java Mon Oct 24 17:09:33 2011
@@ -41,7 +41,10 @@ public class MyFacesErrorHandler
public void warning(SAXParseException exception)
{
- if (_log.isLoggable(Level.WARNING)) _log.log(Level.WARNING, getMessage(exception), exception);
+ if (_log.isLoggable(Level.WARNING))
+ {
+ _log.log(Level.WARNING, getMessage(exception), exception);
+ }
}
public void error(SAXParseException exception)
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/view/JspViewDeclarationLanguageBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/view/JspViewDeclarationLanguageBase.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/view/JspViewDeclarationLanguageBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/view/JspViewDeclarationLanguageBase.java Mon Oct 24 17:09:33 2011
@@ -124,7 +124,9 @@ public abstract class JspViewDeclaration
if (!view.isRendered())
{
if (log.isLoggable(Level.FINEST))
+ {
log.finest("View is not rendered");
+ }
return;
}
@@ -143,7 +145,9 @@ public abstract class JspViewDeclaration
String viewId = context.getViewRoot().getViewId();
if (log.isLoggable(Level.FINEST))
+ {
log.finest("Rendering JSP view: " + viewId);
+ }
// handle character encoding as of section 2.5.2.2 of JSF 1.1
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java Mon Oct 24 17:09:33 2011
@@ -113,7 +113,10 @@ public class WebXml
public List getFacesServletMappings()
{
- if (_facesServletMappings != null) return _facesServletMappings;
+ if (_facesServletMappings != null)
+ {
+ return _facesServletMappings;
+ }
List tempFacesServletMappings = new ArrayList();
for (Iterator it = _servlets.entrySet().iterator(); it.hasNext(); )
@@ -145,13 +148,18 @@ public class WebXml
servletClass,
urlpattern));
if (log.isLoggable(Level.FINEST))
+ {
log.finest("adding mapping for servlet + " + servletName + " urlpattern = " + urlpattern);
+ }
}
}
}
else
{
- if (log.isLoggable(Level.FINEST)) log.finest("ignoring servlet + " + servletName + " " + servletClass + " (no FacesServlet)");
+ if (log.isLoggable(Level.FINEST))
+ {
+ log.finest("ignoring servlet + " + servletName + " " + servletClass + " (no FacesServlet)");
+ }
}
}
@@ -167,7 +175,10 @@ public class WebXml
*/
public List getFacesExtensionsFilterMappings()
{
- if (_facesExtensionsFilterMappings != null) return _facesExtensionsFilterMappings;
+ if (_facesExtensionsFilterMappings != null)
+ {
+ return _facesExtensionsFilterMappings;
+ }
List tempExtensionsFilterMappings = new ArrayList();
for (Iterator it = _filters.entrySet().iterator(); it.hasNext(); )
@@ -193,7 +204,9 @@ public class WebXml
tempExtensionsFilterMappings.add(new org.apache.myfaces.shared.webapp.webxml.FilterMapping(
filterName, filterClass, urlpattern));
if (log.isLoggable(Level.FINEST))
+ {
log.finest("adding mapping for filter + " + filterName + " urlpattern = " + urlpattern);
+ }
}
}
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java Mon Oct 24 17:09:33 2011
@@ -123,7 +123,9 @@ public class WebXmlParser
try {
URL url = context.getResource(WEB_XML_PATH);
if (url != null)
+ {
return url.openConnection().getLastModified();
+ }
} catch (IOException e) {
log.log(Level.SEVERE, "Could not find web.xml in path " + WEB_XML_PATH);
}
@@ -227,7 +229,10 @@ public class WebXmlParser
}
else
{
- if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ }
}
}
}
@@ -256,12 +261,18 @@ public class WebXmlParser
}
else
{
- if (log.isLoggable(Level.FINE)) log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + servletElem.getNodeName() + "'.");
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + servletElem.getNodeName() + "'.");
+ }
}
}
else
{
- if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ }
}
}
_webXml.addServlet(servletName, servletClass);
@@ -288,12 +299,18 @@ public class WebXmlParser
}
else
{
- if (log.isLoggable(Level.FINE)) log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + servletMappingElem.getNodeName() + "'.");
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + servletMappingElem.getNodeName() + "'.");
+ }
}
}
else
{
- if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ }
}
}
urlPattern = urlPattern.trim();
@@ -324,12 +341,18 @@ public class WebXmlParser
}
else
{
- if (log.isLoggable(Level.FINE)) log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + filterElem.getNodeName() + "'.");
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + filterElem.getNodeName() + "'.");
+ }
}
}
else
{
- if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ }
}
}
_webXml.addFilter(filterName, filterClass);
@@ -360,12 +383,18 @@ public class WebXmlParser
}
else
{
- if (log.isLoggable(Level.FINE)) log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + filterMappingElem.getNodeName() + "'.");
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("Ignored element '" + n.getNodeName() + "' as child of '" + filterMappingElem.getNodeName() + "'.");
+ }
}
}
else
{
- if (log.isLoggable(Level.FINE)) log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("Ignored node '" + n.getNodeName() + "' of type " + n.getNodeType());
+ }
}
}
_webXml.addFilterMapping(filterName, urlPattern);