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 [4/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/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/DefaultFaceletsStateManagementHelper.java Mon Oct 24 17:09:33 2011
@@ -262,11 +262,17 @@ class DefaultFaceletsStateManagementHelp
protected Object serializeView(FacesContext context, Object serializedView)
{
- if (log.isLoggable(Level.FINEST)) log.finest("Entering serializeView");
+ if (log.isLoggable(Level.FINEST))
+ {
+ log.finest("Entering serializeView");
+ }
if(isSerializeStateInSession(context))
{
- if (log.isLoggable(Level.FINEST)) log.finest("Processing serializeView - serialize state in session");
+ if (log.isLoggable(Level.FINEST))
+ {
+ log.finest("Processing serializeView - serialize state in session");
+ }
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
try
@@ -274,14 +280,20 @@ class DefaultFaceletsStateManagementHelp
OutputStream os = baos;
if(isCompressStateInSession(context))
{
- if (log.isLoggable(Level.FINEST)) log.finest("Processing serializeView - serialize compressed");
+ if (log.isLoggable(Level.FINEST))
+ {
+ log.finest("Processing serializeView - serialize compressed");
+ }
os.write(COMPRESSED_FLAG);
os = new GZIPOutputStream(os, 1024);
}
else
{
- if (log.isLoggable(Level.FINEST)) log.finest("Processing serializeView - serialize uncompressed");
+ if (log.isLoggable(Level.FINEST))
+ {
+ log.finest("Processing serializeView - serialize uncompressed");
+ }
os.write(UNCOMPRESSED_FLAG);
}
@@ -294,7 +306,10 @@ class DefaultFaceletsStateManagementHelp
out.close();
baos.close();
- if (log.isLoggable(Level.FINEST)) log.finest("Exiting serializeView - serialized. Bytes : "+baos.size());
+ if (log.isLoggable(Level.FINEST))
+ {
+ log.finest("Exiting serializeView - serialized. Bytes : " + baos.size());
+ }
return baos.toByteArray();
}
catch (IOException e)
@@ -306,7 +321,9 @@ class DefaultFaceletsStateManagementHelp
if (log.isLoggable(Level.FINEST))
+ {
log.finest("Exiting serializeView - do not serialize state in session.");
+ }
return serializedView;
@@ -350,11 +367,17 @@ class DefaultFaceletsStateManagementHelp
protected Object deserializeView(Object state)
{
- if (log.isLoggable(Level.FINEST)) log.finest("Entering deserializeView");
+ if (log.isLoggable(Level.FINEST))
+ {
+ log.finest("Entering deserializeView");
+ }
if(state instanceof byte[])
{
- if (log.isLoggable(Level.FINEST)) log.finest("Processing deserializeView - deserializing serialized state. Bytes : "+((byte[]) state).length);
+ if (log.isLoggable(Level.FINEST))
+ {
+ log.finest("Processing deserializeView - deserializing serialized state. Bytes : " + ((byte[]) state).length);
+ }
try
{
@@ -413,7 +436,10 @@ class DefaultFaceletsStateManagementHelp
}
else if (state instanceof Object[])
{
- if (log.isLoggable(Level.FINEST)) log.finest("Exiting deserializeView - state not serialized.");
+ if (log.isLoggable(Level.FINEST))
+ {
+ log.finest("Exiting deserializeView - state not serialized.");
+ }
return state;
}
@@ -445,7 +471,10 @@ class DefaultFaceletsStateManagementHelp
Object key = new SerializedViewKey(context);
_serializedViews.put(key, state);
- while (_keys.remove(key));
+ while (_keys.remove(key))
+ {
+ ;
+ }
_keys.add(key);
int views = getNumberOfViewsInSession(context);
@@ -613,26 +642,40 @@ class DefaultFaceletsStateManagementHelp
public boolean equals(Object obj)
{
if (this == obj)
+ {
return true;
+ }
if (obj == null)
+ {
return false;
+ }
if (getClass() != obj.getClass())
+ {
return false;
+ }
final SerializedViewKey other = (SerializedViewKey) obj;
if (_sequenceId == null)
{
if (other._sequenceId != null)
+ {
return false;
+ }
}
else if (!_sequenceId.equals(other._sequenceId))
+ {
return false;
+ }
if (_viewId == null)
{
if (other._viewId != null)
+ {
return false;
+ }
}
else if (!_viewId.equals(other._viewId))
+ {
return false;
+ }
return true;
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java Mon Oct 24 17:09:33 2011
@@ -360,7 +360,9 @@ public class FaceletViewDeclarationLangu
public void buildView(FacesContext context, UIViewRoot view) throws IOException
{
if (isFilledView(context, view))
+ {
return;
+ }
// setup our viewId
String renderedViewId = getRenderedViewId(context, view.getViewId());
@@ -1075,8 +1077,10 @@ public class FaceletViewDeclarationLangu
if (required != null && required.booleanValue())
{
if (log.isLoggable(Level.SEVERE))
- log.severe("attributeValueExpression not found under the key \""+attributeName+
+ {
+ log.severe("attributeValueExpression not found under the key \"" + attributeName +
"\". Looking for the next attribute");
+ }
}
}
continue;
@@ -1500,7 +1504,10 @@ public class FaceletViewDeclarationLangu
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) ClassUtils.COMMON_TYPES.get(type);
@@ -1921,9 +1928,13 @@ public class FaceletViewDeclarationLangu
// refresh period
long refreshPeriod;
if(context.isProjectStage(ProjectStage.Production))
+ {
refreshPeriod = WebConfigParamUtils.getLongInitParameter(eContext, PARAMS_REFRESH_PERIOD, DEFAULT_REFRESH_PERIOD_PRODUCTION);
+ }
else
+ {
refreshPeriod = WebConfigParamUtils.getLongInitParameter(eContext, PARAMS_REFRESH_PERIOD, DEFAULT_REFRESH_PERIOD);
+ }
// resource resolver
ResourceResolver resolver = new DefaultResourceResolver();
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewHandler.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewHandler.java Mon Oct 24 17:09:33 2011
@@ -241,9 +241,13 @@ public class FaceletViewHandler extends
long refreshPeriod;
if(ctx.isProjectStage(ProjectStage.Production))
+ {
refreshPeriod = DEFAULT_REFRESH_PERIOD_PRODUCTION;
+ }
else
+ {
refreshPeriod = DEFAULT_REFRESH_PERIOD;
+ }
String userPeriod = ctx.getExternalContext().getInitParameter(PARAM_REFRESH_PERIOD);
if (userPeriod != null && userPeriod.length() > 0)
@@ -712,7 +716,9 @@ public class FaceletViewHandler extends
finally
{
if (stateWriter != null)
+ {
stateWriter.release();
+ }
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java Mon Oct 24 17:09:33 2011
@@ -160,7 +160,9 @@ final class CompilationManager
public void writeComment(String text)
{
if (this.compiler.isTrimmingComments())
+ {
return;
+ }
if (this.finished)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java Mon Oct 24 17:09:33 2011
@@ -91,7 +91,9 @@ public abstract class Compiler
private synchronized void initialize()
{
if (this.initialized)
+ {
return;
+ }
log.fine("Initializing");
try
{
@@ -120,7 +122,9 @@ public abstract class Compiler
FacesException
{
if (!this.initialized)
+ {
this.initialize();
+ }
return this.doCompile(src, alias);
}
@@ -128,7 +132,9 @@ public abstract class Compiler
FacesException
{
if (!this.initialized)
+ {
this.initialize();
+ }
return this.doCompileViewMetadata(src, alias);
}
@@ -136,7 +142,9 @@ public abstract class Compiler
FacesException
{
if (!this.initialized)
+ {
this.initialize();
+ }
return this.doCompileCompositeComponentMetadata(src, alias);
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java Mon Oct 24 17:09:33 2011
@@ -647,7 +647,9 @@ public final class TagLibraryConfig
finally
{
if (is != null)
+ {
is.close();
+ }
}
return t;
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java Mon Oct 24 17:09:33 2011
@@ -304,7 +304,9 @@ final class TextUnit extends Compilation
{
String s = this.buffer.toString();
if (child)
+ {
s = trimRight(s);
+ }
ELText txt = ELText.parse(s);
if (txt != null)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java Mon Oct 24 17:09:33 2011
@@ -581,7 +581,9 @@ public class UIRepeat extends UIComponen
{
// stop if not rendered
if (!isRendered())
+ {
return;
+ }
// validate attributes
_validateAttributes();
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultFunctionMapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultFunctionMapper.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultFunctionMapper.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultFunctionMapper.java Mon Oct 24 17:09:33 2011
@@ -173,7 +173,9 @@ public final class DefaultFunctionMapper
{
_prefix = in.readUTF();
if ("".equals(_prefix))
+ {
_prefix = null;
+ }
_localName = in.readUTF();
_owner = in.readUTF();
@@ -205,9 +207,13 @@ public final class DefaultFunctionMapper
if (_prefix != null)
{
if (prefix == null)
+ {
return false;
+ }
if (!_prefix.equals(prefix))
+ {
return false;
+ }
}
return _localName.equals(localName);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCacheFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCacheFactoryImpl.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCacheFactoryImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCacheFactoryImpl.java Mon Oct 24 17:09:33 2011
@@ -48,9 +48,13 @@ public class FaceletCacheFactoryImpl ext
// refresh period
long refreshPeriod;
if(context.isProjectStage(ProjectStage.Production))
+ {
refreshPeriod = WebConfigParamUtils.getLongInitParameter(eContext, PARAMS_REFRESH_PERIOD, FaceletViewDeclarationLanguage.DEFAULT_REFRESH_PERIOD_PRODUCTION);
+ }
else
+ {
refreshPeriod = WebConfigParamUtils.getLongInitParameter(eContext, PARAMS_REFRESH_PERIOD, FaceletViewDeclarationLanguage.DEFAULT_REFRESH_PERIOD);
+ }
return new FaceletCacheImpl(refreshPeriod);
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/TemplateContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/TemplateContextImpl.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/TemplateContextImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/TemplateContextImpl.java Mon Oct 24 17:09:33 2011
@@ -124,7 +124,9 @@ public class TemplateContextImpl extends
{
client = itr.next();
if (client.equals(owner))
+ {
continue;
+ }
found = client.apply(ctx, parent, name);
}
return found;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MethodRule.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MethodRule.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MethodRule.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MethodRule.java Mon Oct 24 17:09:33 2011
@@ -54,7 +54,9 @@ public final class MethodRule extends Me
public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta)
{
if (false == name.equals(this.methodName))
+ {
return null;
+ }
if (MethodExpression.class.equals(meta.getPropertyType(name)))
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/util/Path.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/util/Path.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/util/Path.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/util/Path.java Mon Oct 24 17:09:33 2011
@@ -28,7 +28,9 @@ public final class Path
public static final String normalize(String path)
{
if (path.length() == 0)
+ {
return path;
+ }
String n = path;
boolean abs = false;
while (n.indexOf('\\') >= 0)
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java Mon Oct 24 17:09:33 2011
@@ -67,7 +67,9 @@ public class JspViewDeclarationLanguage
public JspViewDeclarationLanguage()
{
if (log.isLoggable(Level.FINEST))
+ {
log.finest("New JspViewDeclarationLanguage instance created");
+ }
}
/**
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServlet.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServlet.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServlet.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/MyFacesServlet.java Mon Oct 24 17:09:33 2011
@@ -104,9 +104,15 @@ public class MyFacesServlet implements S
public void service(ServletRequest request, ServletResponse response)
throws IOException, ServletException
{
- if (log.isLoggable(Level.FINEST)) log.finest("MyFacesServlet service start");
+ if (log.isLoggable(Level.FINEST))
+ {
+ log.finest("MyFacesServlet service start");
+ }
delegate.service(request, response);
- if (log.isLoggable(Level.FINEST)) log.finest("MyFacesServlet service finished");
+ if (log.isLoggable(Level.FINEST))
+ {
+ log.finest("MyFacesServlet service finished");
+ }
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java Mon Oct 24 17:09:33 2011
@@ -199,7 +199,10 @@ public class StartupServletContextListen
if(pluginEntries == null) {
String plugins = (String) _servletContext.getInitParameter(FACES_INIT_PLUGINS);
- if(plugins == null) return;
+ if(plugins == null)
+ {
+ return;
+ }
log.info("MyFaces Plugins found");
pluginEntries = plugins.split(",");
_servletContext.setAttribute(FACES_INIT_PLUGINS, pluginEntries);
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextRendererTest.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextRendererTest.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextRendererTest.java Mon Oct 24 17:09:33 2011
@@ -153,9 +153,13 @@ public class HtmlTextRendererTest extend
throws ConverterException
{
if (value == null || "".equals(value))
+ {
return null;
+ }
else
+ {
return value;
+ }
}
public String getAsString(FacesContext context,
@@ -163,9 +167,13 @@ public class HtmlTextRendererTest extend
throws ConverterException
{
if (value == null)
+ {
return "";
+ }
else
+ {
return value.toString();
+ }
}
};
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/utils/HtmlCheckAttributesUtil.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/utils/HtmlCheckAttributesUtil.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/utils/HtmlCheckAttributesUtil.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/test/utils/HtmlCheckAttributesUtil.java Mon Oct 24 17:09:33 2011
@@ -93,7 +93,10 @@ public class HtmlCheckAttributesUtil
{
for(int i = 0; i < attrs.length; i++)
{
- if(!attrs[i].isRenderSuccessful()) return true;
+ if(!attrs[i].isRenderSuccessful())
+ {
+ return true;
+ }
}
return false;
}
Modified: myfaces/core/trunk/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java (original)
+++ myfaces/core/trunk/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java Mon Oct 24 17:09:33 2011
@@ -214,7 +214,9 @@ public class MyFacesContainerInitializer
{
// 1. A faces-config.xml file is found in WEB-INF
if (servletContext.getResource(FACES_CONFIG_RESOURCE) != null)
+ {
return true;
+ }
// 4. The javax.faces.CONFIG_FILES context param is declared in web.xml or web-fragment.xml.
// check for alternate faces-config files specified by javax.faces.CONFIG_FILES
@@ -225,7 +227,9 @@ public class MyFacesContainerInitializer
for (String file : configFiles)
{
if (servletContext.getResource(file.trim()) != null)
+ {
return true;
+ }
}
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java Mon Oct 24 17:09:33 2011
@@ -436,14 +436,18 @@ public class DefaultViewHandlerSupport i
builder.replace(candidateViewId.lastIndexOf('.'), candidateViewId.length(), mapping);
String tempViewId = builder.toString();
if(checkResourceExists(context,tempViewId))
+ {
return tempViewId;
+ }
}
}
}
// forced facelets mappings did not match or there were no entries in faceletsViewMappings array
if(checkResourceExists(context,candidateViewId))
+ {
return candidateViewId;
+ }
}
@@ -475,12 +479,16 @@ public class DefaultViewHandlerSupport i
String candidateViewId = builder.toString();
if(checkResourceExists(context,candidateViewId))
+ {
return candidateViewId;
+ }
}
// Otherwise, if a physical resource exists with the name requestViewId let that value be viewId.
if(checkResourceExists(context,requestViewId))
+ {
return requestViewId;
+ }
//Otherwise return null.
return null;
@@ -599,4 +607,4 @@ public class DefaultViewHandlerSupport i
return size() > maxCapacity;
}
}
-}
\ No newline at end of file
+}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/context/flash/SubKeyMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/context/flash/SubKeyMap.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/context/flash/SubKeyMap.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/context/flash/SubKeyMap.java Mon Oct 24 17:09:33 2011
@@ -46,9 +46,13 @@ final class SubKeyMap<V> extends Abstrac
public SubKeyMap(Map<String, Object> base, String prefix)
{
if (base == null)
+ {
throw new NullPointerException();
+ }
if (prefix == null)
+ {
throw new NullPointerException();
+ }
// Optimize the scenario where we're wrapping another SubKeyMap
if (base instanceof SubKeyMap)
@@ -94,7 +98,9 @@ final class SubKeyMap<V> extends Abstrac
public boolean containsKey(Object key)
{
if (!(key instanceof String))
+ {
return false;
+ }
return _base.containsKey(_getBaseKey(key));
}
@@ -103,14 +109,18 @@ final class SubKeyMap<V> extends Abstrac
public Set<Map.Entry<String, V>> entrySet()
{
if (_entrySet == null)
+ {
_entrySet = new Entries<V>();
+ }
return _entrySet;
}
private String _getBaseKey(Object key)
{
if (key == null)
+ {
throw new NullPointerException();
+ }
// Yes, I want a ClassCastException if it's not a String
return _prefix + ((String) key);
}
@@ -121,7 +131,9 @@ final class SubKeyMap<V> extends Abstrac
for (String key : _base.keySet())
{
if (key != null && key.startsWith(_prefix))
+ {
list.add(key);
+ }
}
return list;
@@ -154,7 +166,9 @@ final class SubKeyMap<V> extends Abstrac
for (String key : _base.keySet())
{
if (key != null && key.startsWith(_prefix))
+ {
size++;
+ }
}
return size;
@@ -170,7 +184,9 @@ final class SubKeyMap<V> extends Abstrac
// Short-circuit: the default implementation would always
// need to iterate to find the total size.
if (key != null && key.startsWith(_prefix))
+ {
return false;
+ }
}
return true;
@@ -213,7 +229,9 @@ final class SubKeyMap<V> extends Abstrac
public void remove()
{
if (_currentKey == null)
+ {
throw new IllegalStateException();
+ }
_base.remove(_currentKey);
@@ -234,7 +252,9 @@ final class SubKeyMap<V> extends Abstrac
public String getKey()
{
if (_key == null)
+ {
_key = _baseKey.substring(_prefix.length());
+ }
return _key;
}
@@ -253,7 +273,9 @@ final class SubKeyMap<V> extends Abstrac
public boolean equals(Object o)
{
if (!(o instanceof Map.Entry))
+ {
return false;
+ }
Map.Entry<String, V> e = (Map.Entry<String, V>) o;
return _equals(getKey(), e.getKey())
&& _equals(getValue(), e.getValue());
@@ -275,7 +297,9 @@ final class SubKeyMap<V> extends Abstrac
static private boolean _equals(Object a, Object b)
{
if (a == null)
+ {
return b == null;
+ }
return a.equals(b);
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java Mon Oct 24 17:09:33 2011
@@ -136,7 +136,9 @@ public final class RendererUtils
private static void getPathToComponent(UIComponent component, StringBuffer buf)
{
if(component == null)
+ {
return;
+ }
StringBuffer intBuf = new StringBuffer();
@@ -165,14 +167,19 @@ public final class RendererUtils
UIComponent child = container.findComponent(clientId);
if(child == null)
- return clientId;
+ {
+ return clientId;
+ }
return getConcatenatedId(context, child);
}
public static String getConcatenatedId(FacesContext context, UIComponent component)
{
- if (context == null) throw new NullPointerException("context");
+ if (context == null)
+ {
+ throw new NullPointerException("context");
+ }
StringBuffer idBuf = new StringBuffer();
@@ -278,7 +285,10 @@ public final class RendererUtils
Object submittedValue = ((EditableValueHolder)component).getSubmittedValue();
if (submittedValue != null)
{
- if (log.isLoggable(Level.FINE)) log.fine("returning 1 '" + submittedValue + "'");
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("returning 1 '" + submittedValue + "'");
+ }
return submittedValue.toString();
}
}
@@ -306,7 +316,10 @@ public final class RendererUtils
try
{
converter = facesContext.getApplication().createConverter(value.getClass());
- if (log.isLoggable(Level.FINE)) log.fine("the created converter is " + converter);
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("the created converter is " + converter);
+ }
}
catch (FacesException e)
{
@@ -319,16 +332,25 @@ public final class RendererUtils
{
if (value == null)
{
- if (log.isLoggable(Level.FINE)) log.fine("returning an empty string");
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("returning an empty string");
+ }
return "";
}
- if (log.isLoggable(Level.FINE)) log.fine("returning an .toString");
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("returning an .toString");
+ }
return value.toString();
}
- if (log.isLoggable(Level.FINE)) log.fine("returning converter get as string " + converter);
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("returning converter get as string " + converter);
+ }
return converter.getAsString(facesContext, component, value);
}
@@ -359,7 +381,9 @@ public final class RendererUtils
if (submittedValue != null)
{
if (log.isLoggable(Level.FINE))
+ {
log.fine("returning 1 '" + submittedValue + "'");
+ }
return submittedValue.toString();
}
}
@@ -394,7 +418,9 @@ public final class RendererUtils
converter = facesContext.getApplication().createConverter(
value.getClass());
if (log.isLoggable(Level.FINE))
+ {
log.fine("the created converter is " + converter);
+ }
}
catch (FacesException e)
{
@@ -416,13 +442,17 @@ public final class RendererUtils
}
if (log.isLoggable(Level.FINE))
+ {
log.fine("returning an .toString");
+ }
return value.toString();
}
if (log.isLoggable(Level.FINE))
+ {
log.fine("returning converter get as string " + converter);
+ }
return converter.getAsString(facesContext, component, value);
}
@@ -533,18 +563,27 @@ public final class RendererUtils
{
// If the component has an attached Converter, use it.
Converter converter = component.getConverter();
- if (converter != null) return converter;
+ if (converter != null)
+ {
+ return converter;
+ }
if (considerValueType)
{
// try to get a converter from the valueType attribute
converter = _SharedRendererUtils.getValueTypeConverter(facesContext, component);
- if (converter != null) return converter;
+ if (converter != null)
+ {
+ return converter;
+ }
}
//Try to find out by value expression
ValueExpression ve = component.getValueExpression("value");
- if (ve == null) return null;
+ if (ve == null)
+ {
+ return null;
+ }
// Try to get the type from the actual value or,
// if value == null, obtain the type from the ValueExpression
@@ -554,7 +593,10 @@ public final class RendererUtils
? value.getClass()
: ve.getType(facesContext.getELContext());
- if (valueType == null) return null;
+ if (valueType == null)
+ {
+ return null;
+ }
// a valueType of Object is also permitted, in order to support
// managed bean properties of type Object that resolve to null at this point
@@ -571,7 +613,10 @@ public final class RendererUtils
}
Class<?> arrayComponentType = valueType.getComponentType();
- if (String.class.equals(arrayComponentType)) return null; //No converter needed for String type
+ if (String.class.equals(arrayComponentType))
+ {
+ return null; //No converter needed for String type
+ }
if (Object.class.equals(arrayComponentType))
{
@@ -594,9 +639,13 @@ public final class RendererUtils
public static void checkParamValidity(FacesContext facesContext, UIComponent uiComponent, Class compClass)
{
if(facesContext == null)
+ {
throw new NullPointerException("facesContext may not be null");
+ }
if(uiComponent == null)
+ {
throw new NullPointerException("uiComponent may not be null");
+ }
//if (compClass != null && !(compClass.isAssignableFrom(uiComponent.getClass())))
// why isAssignableFrom with additional getClass method call if isInstance does the same?
@@ -841,7 +890,9 @@ public final class RendererUtils
HashSet set = new HashSet(HashMapUtils.calcCapacity(col.size()));
for (Iterator i = col.iterator(); i.hasNext();)
+ {
set.add(getConvertedStringValue(context, component, converter, i.next()));
+ }
return set;
@@ -1105,7 +1156,9 @@ public final class RendererUtils
UIComponent lookupComp = findComponent(comp, clazz);
if (lookupComp != null)
+ {
return lookupComp;
+ }
}
return null;
@@ -1175,9 +1228,13 @@ public final class RendererUtils
{
String trimedId = ids[i].trim();
if (trimedId.equals("none"))
+ {
li.add(trimedId);
+ }
else
+ {
li.add(RendererUtils.getClientId(facesContext, component, trimedId));
+ }
}
return li;
}
@@ -1237,12 +1294,16 @@ public final class RendererUtils
}
catch (FileNotFoundException e) {
if (log.isLoggable(Level.WARNING))
+ {
log.log(Level.WARNING, "no such file " + file, e);
+ }
content = null;
}
catch (IOException e) {
if (log.isLoggable(Level.WARNING))
+ {
log.log(Level.WARNING, "problems during processing resource " + file, e);
+ }
content = null;
}
finally
@@ -1302,7 +1363,9 @@ public final class RendererUtils
public static boolean isAdfOrTrinidadForm(UIComponent component) {
if (component == null)
+ {
return false;
+ }
return ADF_FORM_COMPONENT_FAMILY.equals(component.getFamily()) ||
TRINIDAD_FORM_COMPONENT_FAMILY.equals(component.getFamily());
}
@@ -1421,7 +1484,9 @@ public final class RendererUtils
static public String toResourceUri(FacesContext facesContext, Object o)
{
if (o == null)
- return null;
+ {
+ return null;
+ }
String uri = o.toString();
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java Mon Oct 24 17:09:33 2011
@@ -67,19 +67,27 @@ class _SharedRendererUtils
Converter converter = component.getConverter();
if (converter != null)
+ {
return converter;
+ }
//Try to find out by value expression
ValueExpression expression = component.getValueExpression("value");
if (expression == null)
+ {
return null;
+ }
Class valueType = expression.getType(facesContext.getELContext());
if (valueType == null)
+ {
return null;
+ }
if (Object.class.equals(valueType))
+ {
return null; //There is no converter for Object class
+ }
try
{
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java Mon Oct 24 17:09:33 2011
@@ -125,7 +125,9 @@ public class HtmlCheckboxRendererBase ex
}
if (!pageDirectionLayout)
+ {
writer.startElement(HTML.TR_ELEM, selectMany);
+ }
Converter converter = getConverter(facesContext, selectMany);
@@ -148,7 +150,9 @@ public class HtmlCheckboxRendererBase ex
}
if (!pageDirectionLayout)
+ {
writer.endElement(HTML.TR_ELEM);
+ }
writer.endElement(HTML.TABLE_ELEM);
}
@@ -188,7 +192,9 @@ public class HtmlCheckboxRendererBase ex
if (isSelectItemGroup)
{
if (pageDirectionLayout)
+ {
writer.startElement(HTML.TR_ELEM, selectMany);
+ }
writer.startElement(HTML.TD_ELEM, selectMany);
writer.write(selectItem.getLabel());
@@ -205,7 +211,9 @@ public class HtmlCheckboxRendererBase ex
writer.writeAttribute(HTML.BORDER_ATTR, "0", null);
if(!pageDirectionLayout)
+ {
writer.startElement(HTML.TR_ELEM, selectMany);
+ }
SelectItemGroup group = (SelectItemGroup) selectItem;
SelectItem[] selectItems = group.getSelectItems();
@@ -217,12 +225,16 @@ public class HtmlCheckboxRendererBase ex
}
if(!pageDirectionLayout)
+ {
writer.endElement(HTML.TR_ELEM);
+ }
writer.endElement(HTML.TABLE_ELEM);
writer.endElement(HTML.TD_ELEM);
if (pageDirectionLayout)
+ {
writer.endElement(HTML.TR_ELEM);
+ }
}
else
@@ -245,7 +257,9 @@ public class HtmlCheckboxRendererBase ex
writer.write("\t\t");
if (pageDirectionLayout)
+ {
writer.startElement(HTML.TR_ELEM, selectMany);
+ }
writer.startElement(HTML.TD_ELEM, selectMany);
boolean disabled = selectItem.isDisabled();
@@ -260,7 +274,9 @@ public class HtmlCheckboxRendererBase ex
writer.endElement(HTML.TD_ELEM);
if (pageDirectionLayout)
+ {
writer.endElement(HTML.TR_ELEM);
+ }
// we rendered one checkbox --> increment itemNum
itemNum++;
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java Mon Oct 24 17:09:33 2011
@@ -181,7 +181,10 @@ public class HtmlGridRendererBase
throws IOException
{
UIComponent facet = component.getFacet(header ? "header" : "footer");
- if (facet == null) return;
+ if (facet == null)
+ {
+ return;
+ }
HtmlRendererUtils.writePrettyLineSeparator(context);
writer.startElement(header ? org.apache.myfaces.shared.renderkit.html.HTML.THEAD_ELEM : HTML.TFOOT_ELEM, component);
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java Mon Oct 24 17:09:33 2011
@@ -95,8 +95,10 @@ public class HtmlImageRendererBase
}
else
{
- if (facesContext.isProjectStage(ProjectStage.Development) && log.isLoggable(Level.WARNING))
+ if (facesContext.isProjectStage(ProjectStage.Development) && log.isLoggable(Level.WARNING))
+ {
log.warning("Component UIGraphic " + uiComponent.getClientId(facesContext) + " has no attribute url, value, name or attribute resolves to null. Path to component " + RendererUtils.getPathToComponent(uiComponent));
+ }
}
/*
@@ -105,7 +107,9 @@ public class HtmlImageRendererBase
if (uiComponent.getAttributes().get(HTML.ALT_ATTR) == null)
{
if(!facesContext.isProjectStage(ProjectStage.Development) && log.isLoggable(Level.WARNING))
+ {
log.warning("Component UIGraphic " + uiComponent.getClientId(facesContext) + " has no attribute alt or attribute resolves to null. Path to component " + RendererUtils.getPathToComponent(uiComponent));
+ }
}
if (uiComponent instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java Mon Oct 24 17:09:33 2011
@@ -133,9 +133,13 @@ public abstract class HtmlMessagesRender
writer.startElement(HTML.SPAN_ELEM, null);
writer.writeAttribute(HTML.ID_ATTR,messages.getClientId(facesContext),null);
if(messages.getAttributes().get(JSFAttr.STYLE_CLASS_ATTR)!=null)
- writer.writeAttribute(HTML.CLASS_ATTR,messages.getAttributes().get(JSFAttr.STYLE_CLASS_ATTR),null);
+ {
+ writer.writeAttribute(HTML.CLASS_ATTR, messages.getAttributes().get(JSFAttr.STYLE_CLASS_ATTR), null);
+ }
if(messages.getAttributes().get(JSFAttr.STYLE_ATTR)!=null)
- writer.writeAttribute(HTML.STYLE_ATTR,messages.getAttributes().get(JSFAttr.STYLE_ATTR),null);
+ {
+ writer.writeAttribute(HTML.STYLE_ATTR, messages.getAttributes().get(JSFAttr.STYLE_ATTR), null);
+ }
writer.endElement(HTML.SPAN_ELEM);
}
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java Mon Oct 24 17:09:33 2011
@@ -109,7 +109,10 @@ public class HtmlRadioRendererBase
HtmlRendererUtils.writeIdIfNecessary(writer, selectOne, facesContext);
}
- if (!pageDirectionLayout) writer.startElement(HTML.TR_ELEM, selectOne);
+ if (!pageDirectionLayout)
+ {
+ writer.startElement(HTML.TR_ELEM, selectOne);
+ }
Converter converter;
List selectItemList = org.apache.myfaces.shared.renderkit.RendererUtils.getSelectItemList(selectOne, facesContext);
@@ -128,7 +131,10 @@ public class HtmlRadioRendererBase
converter, pageDirectionLayout, itemNum);
}
- if (!pageDirectionLayout) writer.endElement(HTML.TR_ELEM);
+ if (!pageDirectionLayout)
+ {
+ writer.endElement(HTML.TR_ELEM);
+ }
writer.endElement(HTML.TABLE_ELEM);
}
@@ -179,7 +185,9 @@ public class HtmlRadioRendererBase
if (isSelectItemGroup)
{
if (pageDirectionLayout)
+ {
writer.startElement(HTML.TR_ELEM, selectOne);
+ }
writer.startElement(HTML.TD_ELEM, selectOne);
writer.write(selectItem.getLabel());
@@ -195,7 +203,9 @@ public class HtmlRadioRendererBase
writer.writeAttribute(HTML.BORDER_ATTR, "0", null);
if(!pageDirectionLayout)
+ {
writer.startElement(HTML.TR_ELEM, selectOne);
+ }
SelectItemGroup group = (SelectItemGroup) selectItem;
SelectItem[] selectItems = group.getSelectItems();
@@ -207,12 +217,16 @@ public class HtmlRadioRendererBase
}
if(!pageDirectionLayout)
+ {
writer.endElement(HTML.TR_ELEM);
+ }
writer.endElement(HTML.TABLE_ELEM);
writer.endElement(HTML.TD_ELEM);
if (pageDirectionLayout)
+ {
writer.endElement(HTML.TR_ELEM);
+ }
}
else
@@ -237,7 +251,9 @@ public class HtmlRadioRendererBase
writer.write("\t\t");
if (pageDirectionLayout)
+ {
writer.startElement(HTML.TR_ELEM, selectOne);
+ }
writer.startElement(HTML.TD_ELEM, selectOne);
boolean itemDisabled = selectItem.isDisabled();
@@ -252,7 +268,9 @@ public class HtmlRadioRendererBase
writer.endElement(HTML.TD_ELEM);
if (pageDirectionLayout)
+ {
writer.endElement(HTML.TR_ELEM);
+ }
// we rendered one radio --> increment itemNum
itemNum++;
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRenderer.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRenderer.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRenderer.java Mon Oct 24 17:09:33 2011
@@ -114,11 +114,15 @@ public abstract class HtmlRenderer
// Otherwise, if ID isn't set, don't bother
if (id == null)
- return false;
+ {
+ return false;
+ }
// ... or if the ID was generated, don't bother
if (id.startsWith(UIViewRoot.UNIQUE_ID_PREFIX))
- return false;
+ {
+ return false;
+ }
return true;
}
@@ -130,7 +134,9 @@ public abstract class HtmlRenderer
static public String toUri(Object o)
{
if (o == null)
- return null;
+ {
+ return null;
+ }
String uri = o.toString();
if (uri.startsWith("/"))
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Mon Oct 24 17:09:33 2011
@@ -139,7 +139,9 @@ public final class HtmlRendererUtils {
String clientId = component.getClientId(facesContext);
if (isDisabledOrReadOnly(component))
+ {
return;
+ }
if (paramMap.containsKey(clientId)) {
((EditableValueHolder) component).setSubmittedValue(paramMap
@@ -166,7 +168,9 @@ public final class HtmlRendererUtils {
}
if (isDisabledOrReadOnly(component))
+ {
return;
+ }
Map paramMap = facesContext.getExternalContext()
.getRequestParameterMap();
@@ -208,7 +212,9 @@ public final class HtmlRendererUtils {
}
if (!(obj instanceof Boolean))
+ {
return false;
+ }
return ((Boolean) obj).booleanValue();
}
@@ -231,7 +237,9 @@ public final class HtmlRendererUtils {
String clientId = component.getClientId(facesContext);
if (isDisabledOrReadOnly(component))
+ {
return;
+ }
if (paramValuesMap.containsKey(clientId)) {
String[] reqValues = (String[]) paramValuesMap.get(clientId);
@@ -262,7 +270,9 @@ public final class HtmlRendererUtils {
}
if (isDisabledOrReadOnly(component))
+ {
return;
+ }
Map paramMap = facesContext.getExternalContext()
.getRequestParameterMap();
@@ -879,10 +889,14 @@ public final class HtmlRendererUtils {
if (lookupSet.contains(itemStrValue)) { //TODO/FIX: we always compare the String vales, better fill lookupSet with Strings only when useSubmittedValue==true, else use the real item value Objects
if (!isSelectOne)
+ {
writer.startElement(HTML.LI_ELEM, component);
+ }
writer.writeText(selectItem.getLabel(), null);
if (!isSelectOne)
+ {
writer.endElement(HTML.LI_ELEM);
+ }
if (isSelectOne) {
//take care of several choices with the same value; use only the first one
@@ -898,7 +912,10 @@ public final class HtmlRendererUtils {
UIComponent component)
throws IOException {
UIComponent captionFacet = component.getFacet("caption");
- if (captionFacet == null) return;
+ if (captionFacet == null)
+ {
+ return;
+ }
String captionClass;
String captionStyle;
@@ -937,7 +954,9 @@ public final class HtmlRendererUtils {
if (component instanceof org.apache.myfaces.shared.component.DisplayValueOnlyCapable) {
if (((org.apache.myfaces.shared.component.DisplayValueOnlyCapable) component).getDisplayValueOnlyStyleClass() != null)
- return ((org.apache.myfaces.shared.component.DisplayValueOnlyCapable) component).getDisplayValueOnlyStyleClass();
+ {
+ return ((DisplayValueOnlyCapable) component).getDisplayValueOnlyStyleClass();
+ }
UIComponent parent = component;
@@ -956,7 +975,9 @@ public final class HtmlRendererUtils {
if (component instanceof DisplayValueOnlyCapable) {
if (((org.apache.myfaces.shared.component.DisplayValueOnlyCapable) component).getDisplayValueOnlyStyle() != null)
- return ((org.apache.myfaces.shared.component.DisplayValueOnlyCapable) component).getDisplayValueOnlyStyle();
+ {
+ return ((DisplayValueOnlyCapable) component).getDisplayValueOnlyStyle();
+ }
UIComponent parent = component;
@@ -975,7 +996,9 @@ public final class HtmlRendererUtils {
if (component instanceof DisplayValueOnlyCapable) {
if (((DisplayValueOnlyCapable) component).isSetDisplayValueOnly())
- return ((org.apache.myfaces.shared.component.DisplayValueOnlyCapable) component).isDisplayValueOnly();
+ {
+ return ((DisplayValueOnlyCapable) component).isDisplayValueOnly();
+ }
UIComponent parent = component;
@@ -1906,7 +1929,9 @@ public final class HtmlRendererUtils {
if (contentTypeListString == null) {
if (log.isLoggable(Level.FINE))
+ {
log.fine("No content type list given, creating HtmlResponseWriterImpl with default content type.");
+ }
contentTypeListString = HTML_CONTENT_TYPE;
}
@@ -1983,21 +2008,27 @@ public final class HtmlRendererUtils {
public static String getJavascriptLocation(UIComponent component) {
if (component == null)
+ {
return null;
+ }
return (String) component.getAttributes().get(JSFAttr.JAVASCRIPT_LOCATION);
}
public static String getImageLocation(UIComponent component) {
if (component == null)
+ {
return null;
+ }
return (String) component.getAttributes().get(JSFAttr.IMAGE_LOCATION);
}
public static String getStyleLocation(UIComponent component) {
if (component == null)
+ {
return null;
+ }
return (String) component.getAttributes().get(JSFAttr.STYLE_LOCATION);
}
@@ -3052,7 +3083,9 @@ public final class HtmlRendererUtils {
currentIndentationLevel--;
if (currentIndentationLevel < 0)
+ {
currentIndentationLevel = 0;
+ }
}
public void prettyLine() {
@@ -3060,7 +3093,9 @@ public final class HtmlRendererUtils {
append(LINE_SEPARATOR);
for (int i = 0; i < getCurrentIndentationLevel(); i++)
+ {
append(TABULATOR);
+ }
}
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java Mon Oct 24 17:09:33 2011
@@ -143,7 +143,10 @@ public class HtmlResponseWriterImpl
_contentType = contentType;
if (_contentType == null)
{
- if (log.isLoggable(Level.FINE)) log.fine("No content type given, using default content type " + DEFAULT_CONTENT_TYPE);
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("No content type given, using default content type " + DEFAULT_CONTENT_TYPE);
+ }
_contentType = DEFAULT_CONTENT_TYPE;
}
_isXhtmlContentType = HtmlRendererUtils.isXHTMLContentType(_contentType);
@@ -153,7 +156,10 @@ public class HtmlResponseWriterImpl
if (characterEncoding == null)
{
- if (log.isLoggable(Level.FINE)) log.fine("No character encoding given, using default character encoding " + DEFAULT_CHARACTER_ENCODING);
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("No character encoding given, using default character encoding " + DEFAULT_CHARACTER_ENCODING);
+ }
_characterEncoding = DEFAULT_CHARACTER_ENCODING;
}
else
@@ -182,7 +188,9 @@ public class HtmlResponseWriterImpl
String supportedContentType = supportedContentTypes[i];
if(supportedContentType.indexOf(contentType)!=-1)
+ {
return true;
+ }
}
return false;
}
@@ -704,8 +712,14 @@ public class HtmlResponseWriterImpl
if (isScriptOrStyle())
{
// Don't bother encoding anything if chosen character encoding is UTF-8
- if (UTF8.equals(_characterEncoding)) _currentWriter.write(strValue);
- else _currentWriter.write(UnicodeEncoder.encode(strValue) );
+ if (UTF8.equals(_characterEncoding))
+ {
+ _currentWriter.write(strValue);
+ }
+ else
+ {
+ _currentWriter.write(UnicodeEncoder.encode(strValue));
+ }
}
else
{
@@ -730,8 +744,14 @@ public class HtmlResponseWriterImpl
{
String strValue = new String(cbuf, off, len);
// Don't bother encoding anything if chosen character encoding is UTF-8
- if (UTF8.equals(_characterEncoding)) _currentWriter.write(strValue);
- else _currentWriter.write(UnicodeEncoder.encode(strValue) );
+ if (UTF8.equals(_characterEncoding))
+ {
+ _currentWriter.write(strValue);
+ }
+ else
+ {
+ _currentWriter.write(UnicodeEncoder.encode(strValue));
+ }
}
else if (isTextarea())
{
@@ -840,8 +860,14 @@ public class HtmlResponseWriterImpl
closeStartTagIfNecessary();
String strValue = new String(cbuf, off, len);
// Don't bother encoding anything if chosen character encoding is UTF-8
- if (UTF8.equals(_characterEncoding)) _currentWriter.write(strValue);
- else _currentWriter.write(UnicodeEncoder.encode(strValue) );
+ if (UTF8.equals(_characterEncoding))
+ {
+ _currentWriter.write(strValue);
+ }
+ else
+ {
+ _currentWriter.write(UnicodeEncoder.encode(strValue));
+ }
}
public void write(int c) throws IOException
@@ -855,8 +881,14 @@ public class HtmlResponseWriterImpl
closeStartTagIfNecessary();
String strValue = new String(cbuf);
// Don't bother encoding anything if chosen character encoding is UTF-8
- if (UTF8.equals(_characterEncoding)) _currentWriter.write(strValue);
- else _currentWriter.write(UnicodeEncoder.encode(strValue) );
+ if (UTF8.equals(_characterEncoding))
+ {
+ _currentWriter.write(strValue);
+ }
+ else
+ {
+ _currentWriter.write(UnicodeEncoder.encode(strValue));
+ }
}
public void write(String str) throws IOException
@@ -867,8 +899,14 @@ public class HtmlResponseWriterImpl
if (str.length() > 0)
{
// Don't bother encoding anything if chosen character encoding is UTF-8
- if (UTF8.equals(_characterEncoding)) _currentWriter.write(str);
- else _currentWriter.write(UnicodeEncoder.encode(str) );
+ if (UTF8.equals(_characterEncoding))
+ {
+ _currentWriter.write(str);
+ }
+ else
+ {
+ _currentWriter.write(UnicodeEncoder.encode(str));
+ }
}
}
@@ -877,8 +915,14 @@ public class HtmlResponseWriterImpl
closeStartTagIfNecessary();
String strValue = str.substring(off, off+len);
// Don't bother encoding anything if chosen character encoding is UTF-8
- if (UTF8.equals(_characterEncoding)) _currentWriter.write(strValue);
- else _currentWriter.write(UnicodeEncoder.encode(strValue) );
+ if (UTF8.equals(_characterEncoding))
+ {
+ _currentWriter.write(strValue);
+ }
+ else
+ {
+ _currentWriter.write(UnicodeEncoder.encode(strValue));
+ }
}
/**
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java Mon Oct 24 17:09:33 2011
@@ -343,8 +343,13 @@ public class HtmlTableRendererBase exten
int newspaperColumns = getNewspaperColumns(component);
int newspaperRows;
if((last - first) % newspaperColumns == 0)
+ {
newspaperRows = (last - first) / newspaperColumns;
- else newspaperRows = ((last - first) / newspaperColumns) + 1;
+ }
+ else
+ {
+ newspaperRows = ((last - first) / newspaperColumns) + 1;
+ }
boolean newspaperHorizontalOrientation = isNewspaperHorizontalOrientation(component);
// get the row indizes for which a new TBODY element should be created
@@ -378,12 +383,19 @@ public class HtmlTableRendererBase exten
// the current row in the 'real' table
int currentRow;
if (newspaperHorizontalOrientation)
+ {
currentRow = nr * newspaperColumns + nc + first;
+ }
else
+ {
currentRow = nc * newspaperRows + nr + first;
+ }
// if this row is not to be rendered
- if(currentRow >= last) continue;
+ if(currentRow >= last)
+ {
+ continue;
+ }
// bail if any row does not exist
uiData.setRowIndex(currentRow);
@@ -427,19 +439,26 @@ public class HtmlTableRendererBase exten
boolean columnRendering = child instanceof UIColumn;
if (columnRendering)
+ {
beforeColumn(facesContext, uiData, j);
+ }
encodeColumnChild(facesContext, writer, uiData, child, styles, nc * uiData.getChildCount() + j);
if (columnRendering)
+ {
afterColumn(facesContext, uiData, j);
+ }
}
}
if (hasNewspaperTableSpacer(uiData))
{
// draw the spacer facet
- if(nc < newspaperColumns - 1) renderSpacerCell(facesContext, writer, uiData);
+ if(nc < newspaperColumns - 1)
+ {
+ renderSpacerCell(facesContext, writer, uiData);
+ }
}
}
if (rowStartRendered)
@@ -771,17 +790,25 @@ public class HtmlTableRendererBase exten
{
String headerStyleClass = getHeaderClass(component);
if (facet != null)
+ {
renderTableHeaderRow(facesContext, writer, component, facet, headerStyleClass, colspan);
+ }
if (hasColumnFacet)
+ {
renderColumnHeaderRow(facesContext, writer, component, headerStyleClass);
+ }
}
else
{
String footerStyleClass = getFooterClass(component);
if (hasColumnFacet)
+ {
renderColumnFooterRow(facesContext, writer, component, footerStyleClass);
+ }
if (facet != null)
+ {
renderTableFooterRow(facesContext, writer, component, facet, footerStyleClass, colspan);
+ }
}
if (elemName != null)
{
@@ -951,12 +978,16 @@ public class HtmlTableRendererBase exten
if (uiComponent.isRendered())
{
if (component instanceof UIData && uiComponent instanceof UIColumn)
- beforeColumnHeaderOrFooter(facesContext, (UIData)component, header, columnIndex);
+ {
+ beforeColumnHeaderOrFooter(facesContext, (UIData) component, header, columnIndex);
+ }
renderColumnChildHeaderOrFooterRow(facesContext, writer, uiComponent, styleClass, header);
if (component instanceof UIData && uiComponent instanceof UIColumn)
- afterColumnHeaderOrFooter(facesContext, (UIData)component, header, columnIndex);
+ {
+ afterColumnHeaderOrFooter(facesContext, (UIData) component, header, columnIndex);
+ }
}
columnIndex += 1;
}
@@ -964,7 +995,10 @@ public class HtmlTableRendererBase exten
if (hasNewspaperTableSpacer(component))
{
// draw the spacer facet
- if(nc < newspaperColumns - 1) renderSpacerCell(facesContext, writer, component);
+ if(nc < newspaperColumns - 1)
+ {
+ renderSpacerCell(facesContext, writer, component);
+ }
}
}
writer.endElement(HTML.TR_ELEM);
@@ -975,7 +1009,10 @@ public class HtmlTableRendererBase exten
*/
protected void renderSpacerCell(FacesContext facesContext, ResponseWriter writer, UIComponent component) throws IOException {
UIComponent spacer = getNewspaperTableSpacer(component);
- if(spacer == null) return;
+ if(spacer == null)
+ {
+ return;
+ }
writer.startElement(HTML.TD_ELEM, component);
//RendererUtils.renderChild(facesContext, spacer);
@@ -992,9 +1029,13 @@ public class HtmlTableRendererBase exten
if (uiComponent instanceof HtmlColumn) {
HtmlColumn column = (HtmlColumn)uiComponent;
if (isHeader && column.getHeaderClass()!=null)
+ {
styleClass = column.getHeaderClass();
+ }
else if (!isHeader && column.getFooterClass()!=null)
+ {
styleClass = column.getFooterClass();
+ }
}else{
//This code corrects MYFACES-1790, because HtmlColumnTag
//has as component type javax.faces.Column, so as side
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java Mon Oct 24 17:09:33 2011
@@ -90,7 +90,10 @@ public class HtmlTextRendererBase
{
String text = org.apache.myfaces.shared.renderkit.RendererUtils.getStringValue(facesContext, component);
- if (log.isLoggable(Level.FINE)) log.fine("renderOutput '" + text + "'");
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("renderOutput '" + text + "'");
+ }
boolean escape;
if (component instanceof HtmlOutputText || component instanceof EscapeCapable)
{
@@ -152,7 +155,10 @@ public class HtmlTextRendererBase
if (escape)
{
- if (log.isLoggable(Level.FINE)) log.fine("renderOutputText writing '" + text + "'");
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("renderOutputText writing '" + text + "'");
+ }
writer.writeText(text, org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR);
}
else
@@ -188,7 +194,10 @@ public class HtmlTextRendererBase
String clientId = component.getClientId(facesContext);
String value = org.apache.myfaces.shared.renderkit.RendererUtils.getStringValue(facesContext, component);
- if (log.isLoggable(Level.FINE)) log.fine("renderInput '" + value + "'");
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("renderInput '" + value + "'");
+ }
writer.startElement(HTML.INPUT_ELEM, component);
writer.writeAttribute(HTML.ID_ATTR, clientId, null);
writer.writeAttribute(HTML.NAME_ATTR, clientId, null);
@@ -357,7 +366,9 @@ public class HtmlTextRendererBase
if (escape)
{
if (log.isLoggable(Level.FINE))
+ {
log.fine("renderOutputText writing '" + text + "'");
+ }
writer.writeText(text,
org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR);
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java Mon Oct 24 17:09:33 2011
@@ -133,7 +133,10 @@ public final class JavascriptUtils
if (Character.isLetterOrDigit(c))
{
// allowed char
- if (buf != null) buf.append(c);
+ if (buf != null)
+ {
+ buf.append(c);
+ }
}
else
{
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/AliasResourceMetaImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/AliasResourceMetaImpl.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/AliasResourceMetaImpl.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/AliasResourceMetaImpl.java Mon Oct 24 17:09:33 2011
@@ -61,25 +61,37 @@ public class AliasResourceMetaImpl exten
}
if (getLibraryName() != null)
{
- if (firstSlashAdded) builder.append('/');
+ if (firstSlashAdded)
+ {
+ builder.append('/');
+ }
builder.append(getLibraryName());
firstSlashAdded = true;
}
if (getLibraryVersion() != null)
{
- if (firstSlashAdded) builder.append('/');
+ if (firstSlashAdded)
+ {
+ builder.append('/');
+ }
builder.append(getLibraryVersion());
firstSlashAdded = true;
}
if (getRealResourceName() != null)
{
- if (firstSlashAdded) builder.append('/');
+ if (firstSlashAdded)
+ {
+ builder.append('/');
+ }
builder.append(getRealResourceName());
firstSlashAdded = true;
}
if (getResourceVersion() != null)
{
- if (firstSlashAdded) builder.append('/');
+ if (firstSlashAdded)
+ {
+ builder.append('/');
+ }
builder.append(getResourceVersion());
builder.append(
getRealResourceName().substring(getRealResourceName().lastIndexOf('.')));
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ExternalContextResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ExternalContextResourceLoader.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ExternalContextResourceLoader.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ExternalContextResourceLoader.java Mon Oct 24 17:09:33 2011
@@ -64,7 +64,9 @@ public class ExternalContextResourceLoad
String resourceVersion = null;
Set<String> resourcePaths = this.getResourcePaths(path);
if (getPrefix() != null)
+ {
path = getPrefix() + '/' + path;
+ }
if (null != resourcePaths && !resourcePaths.isEmpty())
{
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceHandlerCache.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceHandlerCache.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceHandlerCache.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceHandlerCache.java Mon Oct 24 17:09:33 2011
@@ -59,11 +59,15 @@ public class ResourceHandlerCache
String contentType, String localePrefix)
{
if (!isResourceCachingEnabled() || _resourceCacheMap == null)
+ {
return null;
+ }
if (log.isLoggable(Level.FINE))
+ {
log.log(Level.FINE, "Attemping to get resource from cache for "
+ resourceName);
+ }
ResourceKey key = new ResourceKey(resourceName, libraryName, contentType, localePrefix);
@@ -73,7 +77,9 @@ public class ResourceHandlerCache
public boolean containsResource(String resourceName, String libraryName, String contentType, String localePrefix)
{
if (!isResourceCachingEnabled() || _resourceCacheMap == null)
+ {
return false;
+ }
ResourceKey key = new ResourceKey(resourceName, libraryName, contentType, localePrefix);
return _resourceCacheMap.containsKey(key);
@@ -83,16 +89,22 @@ public class ResourceHandlerCache
String contentType, String localePrefix, ResourceMeta resource, ResourceLoader loader)
{
if (!isResourceCachingEnabled())
+ {
return;
+ }
if (log.isLoggable(Level.FINE))
+ {
log.log(Level.FINE, "Attemping to put resource to cache for "
+ resourceName);
+ }
if (_resourceCacheMap == null)
{
if (log.isLoggable(Level.FINE))
+ {
log.log(Level.FINE, "Initializing resource cache map");
+ }
_resourceCacheMap = Collections
.synchronizedMap(new _ResourceMap<ResourceKey, ResourceValue>(
getMaxSize()));
@@ -116,7 +128,9 @@ public class ResourceHandlerCache
ExternalContext externalContext = facesContext.getExternalContext();
if (externalContext == null)
+ {
return false; //don't cache right now, but don't disable it yet either
+ }
//if in production, make sure that the cache is not explicitly disabled via context param
_resourceCacheEnabled = WebConfigParamUtils.getBooleanInitParameter(externalContext,
@@ -245,4 +259,4 @@ public class ResourceHandlerCache
return size() > maxCapacity;
}
}
-}
\ No newline at end of file
+}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceImpl.java?rev=1188235&r1=1188234&r2=1188235&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceImpl.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceImpl.java Mon Oct 24 17:09:33 2011
@@ -116,12 +116,18 @@ public class ResourceImpl extends Resour
{
int c1 = delegate.read();
- if (c1 == -1) return -1;
+ if (c1 == -1)
+ {
+ return -1;
+ }
if ( ((char)c1) == '#')
{
int c2 = delegate.read();
- if (c2 == -1) return -1;
+ if (c2 == -1)
+ {
+ return -1;
+ }
if (((char)c2) == '{')
{
//It is a value expression. We need
@@ -174,7 +180,9 @@ public class ResourceImpl extends Resour
Logger log = Logger.getLogger(ResourceImpl.class.getName());
if (log.isLoggable(Level.SEVERE))
- log.severe("Cannot evaluate EL expression "+convertToExpression(expressionList)+ " in resource " + getLibraryName()+":"+getResourceName());
+ {
+ log.severe("Cannot evaluate EL expression " + convertToExpression(expressionList) + " in resource " + getLibraryName() + ":" + getResourceName());
+ }
delegate.unread(c3);
for (int i = expressionList.size()-1; i >= 0; i--)