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/26 19:53:39 UTC
svn commit: r1189343 [1/2] - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces: renderkit/html/
taglib/core/ view/facelets/ view/facelets/compiler/ view/facelets/el/
view/facelets/impl/ view/facelets/tag/ view/facelets/tag/composite/
view/fa...
Author: struberg
Date: Wed Oct 26 17:53:36 2011
New Revision: 1189343
URL: http://svn.apache.org/viewvc?rev=1189343&view=rev
Log:
MYFACES-3368 fix codestyle
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateConverter.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFacelet.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/StateWriter.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationAware.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCacheFactoryImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCacheImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/PageContextImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/SectionUniqueIdCounter.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/TemplateContextImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/BeanPropertyTagRule.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaRulesetImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorRedirectBehaviorAttachedObjectHandlerWrapper.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorRedirectEventComponentWrapper.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentRule.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetaRulesetImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResouceWrapper.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertChildrenHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RenderFacetHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RetargetMethodExpressionRule.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ActionSourceRule.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentRule.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConvertHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/EditableValueHolderRule.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidateHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValueHolderRule.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/EventHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SelectItemsHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatus.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFnLibrary.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFunction.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/ComponentRefHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/RepeatHandler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UILibrary.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/Jsp20FacesInitializer.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/Jsp21FacesInitializer.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/StartupListener.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/StartupServletContextListener.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java Wed Oct 26 17:53:36 2011
@@ -173,7 +173,8 @@ public class HtmlRenderKitImpl extends R
}
else
{
- if (familyRendererMap.get(rendererType) != null) {
+ if (familyRendererMap.get(rendererType) != null)
+ {
// this is not necessarily an error, but users do need to be
// very careful about jar processing order when overriding
// some component's renderer with an alternate renderer.
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateConverter.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateConverter.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/DelegateConverter.java Wed Oct 26 17:53:36 2011
@@ -50,7 +50,8 @@ public class DelegateConverter implement
private ValueExpression _binding;
private String _converterIdString = null;
- public DelegateConverter(){
+ public DelegateConverter()
+ {
}
@@ -139,7 +140,8 @@ public class DelegateConverter implement
if (null != _converterIdString)
{
converter = facesContext.getApplication().createConverter(_converterIdString);
- } else
+ }
+ else
{
String converterId = (String) _converterId.getValue(elContext);
converter = facesContext.getApplication().createConverter(converterId);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFacelet.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFacelet.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFacelet.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFacelet.java Wed Oct 26 17:53:36 2011
@@ -28,7 +28,6 @@ import javax.faces.application.Resource;
import javax.faces.component.UIComponent;
import javax.faces.view.facelets.FaceletException;
-import org.apache.myfaces.view.facelets.impl.DefaultFaceletFactory;
/**
* @author Leonardo Uribe (latest modification by $Author$)
@@ -66,7 +65,7 @@ public abstract class AbstractFacelet ex
/**
* Grabs a DefaultFacelet from referenced DefaultFaceletFacotry
*
- * @see DefaultFaceletFactory#getFacelet(URL)
+ * @see org.apache.myfaces.view.facelets.impl.DefaultFaceletFactory#getFacelet(URL)
* @param ctx
* FaceletContext to pass to the included Facelet
* @param parent
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=1189343&r1=1189342&r2=1189343&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 Wed Oct 26 17:53:36 2011
@@ -1979,7 +1979,7 @@ public class FaceletViewDeclarationLangu
// -= Leonardo Uribe =- Add */* to the contentType is a fix done from FaceletViewHandler
// to make old RI versions work, but since this is for JSF 2.0 it is not necessary that code.
- ResponseWriter writer = renderKit.createResponseWriter(NullWriter.Instance, contentType, encoding);
+ ResponseWriter writer = renderKit.createResponseWriter(NullWriter.INSTANCE, contentType, encoding);
//ResponseWriter writer;
// append */* to the contentType so createResponseWriter will succeed no matter
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=1189343&r1=1189342&r2=1189343&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 Wed Oct 26 17:53:36 2011
@@ -428,14 +428,14 @@ public class FaceletViewHandler extends
// is really going to ask for
try
{
- writer = renderKit.createResponseWriter(NullWriter.Instance, contentType, encoding);
+ writer = renderKit.createResponseWriter(NullWriter.INSTANCE, contentType, encoding);
}
catch (IllegalArgumentException e)
{
// Added because of an RI bug prior to 1.2_05-b3. Might as well leave it in case other
// impls have the same problem. https://javaserverfaces.dev.java.net/issues/show_bug.cgi?id=613
log.fine("The impl didn't correctly handled '*/*' in the content type list. Trying '*/*' directly.");
- writer = renderKit.createResponseWriter(NullWriter.Instance, "*/*", encoding);
+ writer = renderKit.createResponseWriter(NullWriter.INSTANCE, "*/*", encoding);
}
// Override the JSF provided content type if necessary
@@ -879,7 +879,7 @@ public class FaceletViewHandler extends
protected static class NullWriter extends Writer
{
- static final NullWriter Instance = new NullWriter();
+ static final NullWriter INSTANCE = new NullWriter();
public void write(char[] buffer)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/StateWriter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/StateWriter.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/StateWriter.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/StateWriter.java Wed Oct 26 17:53:36 2011
@@ -101,7 +101,8 @@ public final class StateWriter extends W
{
this.writtenState = true;
this.writtenStateWithoutWrapper = false;
- this.out = this.fast = new FastWriter(this.initialSize);
+ this.fast = new FastWriter(this.initialSize);
+ this.out = this.fast;
}
}
@@ -176,4 +177,4 @@ public final class StateWriter extends W
setCurrentInstance(null);
}
-}
\ No newline at end of file
+}
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=1189343&r1=1189342&r2=1189343&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 Wed Oct 26 17:53:36 2011
@@ -450,13 +450,13 @@ final class CompilationManager
protected static boolean isRemove(String ns, String name)
{
- return UILibrary.Namespace.equals(ns) && "remove".equals(name);
+ return UILibrary.NAMESPACE.equals(ns) && "remove".equals(name);
}
protected static boolean isTrimmed(String ns, String name)
{
- return UILibrary.Namespace.equals(ns)
- && (CompositionHandler.Name.equals(name) || ComponentRefHandler.Name.equals(name));
+ return UILibrary.NAMESPACE.equals(ns)
+ && (CompositionHandler.NAME.equals(name) || ComponentRefHandler.NAME.equals(name));
}
protected static boolean isCompositeComponentInterface(String ns, String name)
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=1189343&r1=1189342&r2=1189343&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 Wed Oct 26 17:53:36 2011
@@ -100,7 +100,7 @@ public abstract class Compiler
TagLibraryConfig cfg = new TagLibraryConfig();
cfg.loadImplicit(this);
- if (!this.createTagLibrary().containsNamespace(UILibrary.Namespace))
+ if (!this.createTagLibrary().containsNamespace(UILibrary.NAMESPACE))
{
log
.severe("Missing Built-in Tag Libraries! Make sure they are included within the META-INF directory of Facelets' Jar");
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationAware.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationAware.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationAware.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationAware.java Wed Oct 26 17:53:36 2011
@@ -31,7 +31,8 @@ import javax.faces.view.Location;
*
* @author martinkoci
*/
-public interface LocationAware {
+public interface LocationAware
+{
/**
* @return the {@link Location} instance where this object exists/is related to
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java Wed Oct 26 17:53:36 2011
@@ -118,7 +118,8 @@ final class DefaultFacelet extends Abstr
{
FaceletCompositionContext myFaceletContext = null;
boolean faceletCompositionContextInitialized = false;
- if ( (myFaceletContext = FaceletCompositionContext.getCurrentInstance(facesContext)) == null)
+ myFaceletContext = FaceletCompositionContext.getCurrentInstance(facesContext);
+ if (myFaceletContext == null)
{
myFaceletContext = new FaceletCompositionContextImpl(_factory, facesContext);
myFaceletContext.init(facesContext);
@@ -343,8 +344,9 @@ final class DefaultFacelet extends Abstr
/**
* Used for delegation by the DefaultFaceletContext. First pulls the URL from {@link #getRelativePath(String)
- * getRelativePath(String)}, then calls {@link #include(FaceletContext, UIComponent, URL) include(FaceletContext,
- * UIComponent, URL)}.
+ * getRelativePath(String)}, then calls
+ * {@link #include(org.apache.myfaces.view.facelets.AbstractFaceletContext,
+ * javax.faces.component.UIComponent, java.net.URL)}.
*
* @see FaceletContext#includeFacelet(UIComponent, String)
* @param ctx
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java Wed Oct 26 17:53:36 2011
@@ -128,7 +128,8 @@ public final class DefaultFaceletFactory
// the code first check for "suppressAccessChecks" permission).
try
{
- Method setMemberFactoriesMethod = FaceletCache.class.getDeclaredMethod("setMemberFactories", new Class[]{FaceletCache.MemberFactory.class, FaceletCache.MemberFactory.class});
+ Method setMemberFactoriesMethod = FaceletCache.class.getDeclaredMethod("setMemberFactories",
+ new Class[]{FaceletCache.MemberFactory.class, FaceletCache.MemberFactory.class});
setMemberFactoriesMethod.setAccessible(true);
setMemberFactoriesMethod.invoke(_faceletCache, faceletFactory, viewMetadataFaceletFactory);
}
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=1189343&r1=1189342&r2=1189343&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 Wed Oct 26 17:53:36 2011
@@ -37,7 +37,8 @@ public class FaceletCacheFactoryImpl ext
{
private final static String PARAM_REFRESH_PERIOD_DEPRECATED = "facelets.REFRESH_PERIOD";
- private final static String[] PARAMS_REFRESH_PERIOD = {FaceletViewDeclarationLanguage.PARAM_REFRESH_PERIOD, PARAM_REFRESH_PERIOD_DEPRECATED};
+ private final static String[] PARAMS_REFRESH_PERIOD
+ = {FaceletViewDeclarationLanguage.PARAM_REFRESH_PERIOD, PARAM_REFRESH_PERIOD_DEPRECATED};
@Override
@@ -49,11 +50,13 @@ public class FaceletCacheFactoryImpl ext
long refreshPeriod;
if(context.isProjectStage(ProjectStage.Production))
{
- refreshPeriod = WebConfigParamUtils.getLongInitParameter(eContext, PARAMS_REFRESH_PERIOD, FaceletViewDeclarationLanguage.DEFAULT_REFRESH_PERIOD_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);
+ 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/FaceletCacheImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCacheImpl.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCacheImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCacheImpl.java Wed Oct 26 17:53:36 2011
@@ -47,7 +47,8 @@ import org.apache.myfaces.view.facelets.
* @since 2.1.0
*
*/
-class FaceletCacheImpl extends FaceletCache<DefaultFacelet> {
+class FaceletCacheImpl extends FaceletCache<DefaultFacelet>
+{
private static final long INFINITE_DELAY = -1;
private static final long NO_CACHE_DELAY = 0;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/PageContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/PageContextImpl.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/PageContextImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/PageContextImpl.java Wed Oct 26 17:53:36 2011
@@ -25,7 +25,8 @@ import javax.el.ValueExpression;
import org.apache.myfaces.view.facelets.PageContext;
-public class PageContextImpl extends PageContext {
+public class PageContextImpl extends PageContext
+{
private Map<String, ValueExpression> _attributes = null;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/SectionUniqueIdCounter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/SectionUniqueIdCounter.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/SectionUniqueIdCounter.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/SectionUniqueIdCounter.java Wed Oct 26 17:53:36 2011
@@ -133,7 +133,8 @@ public class SectionUniqueIdCounter
}
}
- private static class Section {
+ private static class Section
+ {
private String prefix;
private long counter;
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=1189343&r1=1189342&r2=1189343&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 Wed Oct 26 17:53:36 2011
@@ -257,7 +257,8 @@ public class TemplateContextImpl extends
}
@Override
- public void setParameter(String key, ValueExpression value) {
+ public void setParameter(String key, ValueExpression value)
+ {
if (_lastClient != null)
{
_lastClient.getParametersMap().put(key, value);
@@ -265,7 +266,8 @@ public class TemplateContextImpl extends
}
@Override
- public boolean isParameterEmpty() {
+ public boolean isParameterEmpty()
+ {
TemplateManagerImpl client;
Iterator<TemplateManagerImpl> itr = _clients.iterator();
while (itr.hasNext())
@@ -284,7 +286,8 @@ public class TemplateContextImpl extends
return new TemplateClientAttributeMap();
}
- private final class TemplateClientAttributeMap extends AbstractAttributeMap<ValueExpression> {
+ private final class TemplateClientAttributeMap extends AbstractAttributeMap<ValueExpression>
+ {
public TemplateClientAttributeMap()
{
@@ -379,8 +382,8 @@ public class TemplateContextImpl extends
public static final class InitialTemplateClient implements TemplateClient
{
public boolean apply(FaceletContext ctx, UIComponent parent, String name)
- throws IOException, FacesException, FaceletException,
- ELException {
+ throws IOException, FacesException, FaceletException, ELException
+ {
return false;
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/BeanPropertyTagRule.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/BeanPropertyTagRule.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/BeanPropertyTagRule.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/BeanPropertyTagRule.java Wed Oct 26 17:53:36 2011
@@ -35,7 +35,7 @@ import javax.faces.view.facelets.TagAttr
*/
public final class BeanPropertyTagRule extends MetaRule
{
- public final static BeanPropertyTagRule Instance = new BeanPropertyTagRule();
+ public final static BeanPropertyTagRule INSTANCE = new BeanPropertyTagRule();
public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaRulesetImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaRulesetImpl.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaRulesetImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaRulesetImpl.java Wed Oct 26 17:53:36 2011
@@ -59,7 +59,7 @@ public final class MetaRulesetImpl exten
* most certainly cause a memory leak! Furthermore we can manually cleanup the Map when
* the webapp is undeployed just by removing the Map for the current ClassLoader.
*/
- private final static WeakHashMap<ClassLoader, Map<String, MetadataTarget>> _metadata
+ private volatile static WeakHashMap<ClassLoader, Map<String, MetadataTarget>> metadata
= new WeakHashMap<ClassLoader, Map<String, MetadataTarget>>();
/**
@@ -67,7 +67,7 @@ public final class MetaRulesetImpl exten
*/
public static void clearMetadataTargetCache()
{
- _metadata.remove(ClassUtils.getContextClassLoader());
+ metadata.remove(ClassUtils.getContextClassLoader());
}
private static Map<String, MetadataTarget> getMetaData()
@@ -75,19 +75,19 @@ public final class MetaRulesetImpl exten
ClassLoader cl = ClassUtils.getContextClassLoader();
Map<String, MetadataTarget> metadata = (Map<String, MetadataTarget>)
- _metadata.get(cl);
+ MetaRulesetImpl.metadata.get(cl);
if (metadata == null)
{
// Ensure thread-safe put over _metadata, and only create one map
// per classloader to hold metadata.
- synchronized (_metadata)
+ synchronized (MetaRulesetImpl.metadata)
{
- metadata = (Map<String, MetadataTarget>) _metadata.get(cl);
+ metadata = (Map<String, MetadataTarget>) MetaRulesetImpl.metadata.get(cl);
if (metadata == null)
{
metadata = new HashMap<String, MetadataTarget>();
- _metadata.put(cl, metadata);
+ MetaRulesetImpl.metadata.put(cl, metadata);
}
}
}
@@ -120,7 +120,7 @@ public final class MetaRulesetImpl exten
}
// add default rules
- _rules.add(BeanPropertyTagRule.Instance);
+ _rules.add(BeanPropertyTagRule.INSTANCE);
}
public MetaRuleset add(Metadata mapper)
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java Wed Oct 26 17:53:36 2011
@@ -27,7 +27,6 @@ import java.util.Map;
import javax.el.ELException;
import javax.el.ValueExpression;
-import javax.el.VariableMapper;
import javax.faces.FacesException;
import javax.faces.component.UIComponent;
import javax.faces.view.facelets.FaceletContext;
@@ -88,7 +87,7 @@ final class UserTagHandler extends TagHa
* Facelet. Finally, replace the old VariableMapper.
*
* @see TagAttribute#getValueExpression(FaceletContext, Class)
- * @see VariableMapper
+ * @see javax.el.VariableMapper
* @see javax.faces.view.facelets.FaceletHandler#apply(javax.faces.view.facelets.FaceletContext, javax.faces.component.UIComponent)
*/
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorRedirectBehaviorAttachedObjectHandlerWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorRedirectBehaviorAttachedObjectHandlerWrapper.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorRedirectBehaviorAttachedObjectHandlerWrapper.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorRedirectBehaviorAttachedObjectHandlerWrapper.java Wed Oct 26 17:53:36 2011
@@ -24,13 +24,15 @@ import javax.faces.context.FacesContext;
import javax.faces.view.BehaviorHolderAttachedObjectHandler;
/**
- * This wrapper is used in FaceletViewDeclarationLanguage.retargetAttachedObjects(FacesContext, UIComponent, List<AttachedObjectHandler>)
+ * This wrapper is used in
+ * FaceletViewDeclarationLanguage#retargetAttachedObjects(FacesContext, UIComponent, List<AttachedObjectHandler>)
* to redirect the client behavior attached object when there is a chain of composite components.
*
* @author Leonardo Uribe (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class ClientBehaviorRedirectBehaviorAttachedObjectHandlerWrapper implements BehaviorHolderAttachedObjectHandler, FacesWrapper<BehaviorHolderAttachedObjectHandler>
+public class ClientBehaviorRedirectBehaviorAttachedObjectHandlerWrapper
+ implements BehaviorHolderAttachedObjectHandler, FacesWrapper<BehaviorHolderAttachedObjectHandler>
{
private final BehaviorHolderAttachedObjectHandler _delegate;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorRedirectEventComponentWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorRedirectEventComponentWrapper.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorRedirectEventComponentWrapper.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorRedirectEventComponentWrapper.java Wed Oct 26 17:53:36 2011
@@ -86,7 +86,10 @@ public class ClientBehaviorRedirectEvent
{
if (_sourceEvent.equals(eventName))
{
- ((ClientBehaviorHolder)_delegate).addClientBehavior(_targetEvent == null ? ((ClientBehaviorHolder)_delegate).getDefaultEventName(): _targetEvent , behavior);
+ String targetEventName = _targetEvent == null
+ ? ((ClientBehaviorHolder)_delegate).getDefaultEventName()
+ : _targetEvent;
+ ((ClientBehaviorHolder)_delegate).addClientBehavior(targetEventName , behavior);
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java Wed Oct 26 17:53:36 2011
@@ -389,25 +389,25 @@ public class CompositeComponentResourceT
m.ignore("binding").ignore("id");
// add auto wiring for attributes
- m.addRule(CompositeComponentRule.Instance);
+ m.addRule(CompositeComponentRule.INSTANCE);
// add retarget method expression rules
- m.addRule(RetargetMethodExpressionRule.Instance);
+ m.addRule(RetargetMethodExpressionRule.INSTANCE);
if (ActionSource.class.isAssignableFrom(type))
{
- m.addRule(ActionSourceRule.Instance);
+ m.addRule(ActionSourceRule.INSTANCE);
}
if (ValueHolder.class.isAssignableFrom(type))
{
- m.addRule(ValueHolderRule.Instance);
+ m.addRule(ValueHolderRule.INSTANCE);
if (EditableValueHolder.class.isAssignableFrom(type))
{
m.ignore("submittedValue");
m.ignore("valid");
- m.addRule(EditableValueHolderRule.Instance);
+ m.addRule(EditableValueHolderRule.INSTANCE);
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentRule.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentRule.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentRule.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentRule.java Wed Oct 26 17:53:36 2011
@@ -111,7 +111,7 @@ final class CompositeComponentRule exten
//private final static Logger log = Logger.getLogger("facelets.tag.component");
private final static Logger log = Logger.getLogger(CompositeComponentRule.class.getName());
- public final static CompositeComponentRule Instance = new CompositeComponentRule();
+ public final static CompositeComponentRule INSTANCE = new CompositeComponentRule();
public CompositeComponentRule()
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetaRulesetImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetaRulesetImpl.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetaRulesetImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetaRulesetImpl.java Wed Oct 26 17:53:36 2011
@@ -96,7 +96,7 @@ public class CompositeMetaRulesetImpl ex
}
// add default rules
- _rules.add(BeanPropertyTagRule.Instance);
+ _rules.add(BeanPropertyTagRule.INSTANCE);
try
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResouceWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResouceWrapper.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResouceWrapper.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResouceWrapper.java Wed Oct 26 17:53:36 2011
@@ -54,13 +54,13 @@ public final class CompositeResouceWrapp
super();
}
- public CompositeResouceWrapper(Resource _delegate)
+ public CompositeResouceWrapper(Resource delegate)
{
super();
- this._delegate = _delegate;
- setResourceName(_delegate.getResourceName());
- setLibraryName(_delegate.getLibraryName());
- setContentType(_delegate.getContentType());
+ this._delegate = delegate;
+ setResourceName(delegate.getResourceName());
+ setLibraryName(delegate.getLibraryName());
+ setContentType(delegate.getContentType());
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResourceLibrary.java Wed Oct 26 17:53:36 2011
@@ -65,7 +65,8 @@ public class CompositeResourceLibrary im
_extension = loadFaceletExtension(externalContext);
- String defaultSuffixes = WebConfigParamUtils.getStringInitParameter(externalContext, ViewHandler.DEFAULT_SUFFIX_PARAM_NAME, ViewHandler.DEFAULT_SUFFIX );
+ String defaultSuffixes = WebConfigParamUtils.getStringInitParameter(externalContext,
+ ViewHandler.DEFAULT_SUFFIX_PARAM_NAME, ViewHandler.DEFAULT_SUFFIX );
_defaultSuffixesArray = StringUtils.splitShortString(defaultSuffixes, ' ');
@@ -268,8 +269,9 @@ public class CompositeResourceLibrary im
}
return null;
}
-
- private static class ComponentConfigWrapper implements ComponentConfig {
+
+ private static class ComponentConfigWrapper implements ComponentConfig
+ {
protected final TagConfig parent;
@@ -278,29 +280,35 @@ public class CompositeResourceLibrary im
protected final String rendererType;
public ComponentConfigWrapper(TagConfig parent, String componentType,
- String rendererType) {
+ String rendererType)
+ {
this.parent = parent;
this.componentType = componentType;
this.rendererType = rendererType;
}
- public String getComponentType() {
+ public String getComponentType()
+ {
return this.componentType;
}
- public String getRendererType() {
+ public String getRendererType()
+ {
return this.rendererType;
}
- public FaceletHandler getNextHandler() {
+ public FaceletHandler getNextHandler()
+ {
return this.parent.getNextHandler();
}
- public Tag getTag() {
+ public Tag getTag()
+ {
return this.parent.getTag();
}
- public String getTagId() {
+ public String getTagId()
+ {
return this.parent.getTagId();
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertChildrenHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertChildrenHandler.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertChildrenHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertChildrenHandler.java Wed Oct 26 17:53:36 2011
@@ -42,7 +42,7 @@ public class InsertChildrenHandler exten
//public static String INSERT_CHILDREN_TARGET_ID = "org.apache.myfaces.INSERT_CHILDREN_TARGET_ID";
//public static String INSERT_CHILDREN_ORDERING = "org.apache.myfaces.INSERT_CHILDREN_ORDERING";
- public static String INSERT_CHILDREN_USED = "org.apache.myfaces.INSERT_CHILDREN_USED";
+ public static final String INSERT_CHILDREN_USED = "org.apache.myfaces.INSERT_CHILDREN_USED";
private static final Logger log = Logger.getLogger(InsertChildrenHandler.class.getName());
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/InsertFacetHandler.java Wed Oct 26 17:53:36 2011
@@ -54,13 +54,13 @@ public class InsertFacetHandler extends
//public static String INSERT_FACET_TARGET_ID = "org.apache.myfaces.INSERT_FACET_TARGET_ID.";
//public static String INSERT_FACET_ORDERING = "org.apache.myfaces.INSERT_FACET_ORDERING.";
- public static String INSERT_FACET_USED = "org.apache.myfaces.INSERT_FACET_USED";
+ public static final String INSERT_FACET_USED = "org.apache.myfaces.INSERT_FACET_USED";
/**
* Key used to save on bean descriptor a map containing the metadata
* information related to this tag. It will be used later to check "required" property.
*/
- public static String INSERT_FACET_KEYS = "org.apache.myfaces.INSERT_FACET_KEYS";
+ public static final String INSERT_FACET_KEYS = "org.apache.myfaces.INSERT_FACET_KEYS";
private static final Logger log = Logger.getLogger(InsertFacetHandler.class.getName());
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RenderFacetHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RenderFacetHandler.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RenderFacetHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RenderFacetHandler.java Wed Oct 26 17:53:36 2011
@@ -48,7 +48,7 @@ public class RenderFacetHandler extends
{
private static final Logger log = Logger.getLogger(RenderFacetHandler.class.getName());
- public static String RENDER_FACET_USED = "org.apache.myfaces.RENDER_FACET_USED";
+ public static final String RENDER_FACET_USED = "org.apache.myfaces.RENDER_FACET_USED";
/**
* The name that identify the current facet.
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RetargetMethodExpressionRule.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RetargetMethodExpressionRule.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RetargetMethodExpressionRule.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/RetargetMethodExpressionRule.java Wed Oct 26 17:53:36 2011
@@ -55,7 +55,7 @@ final class RetargetMethodExpressionRule
}
}
- public final static RetargetMethodExpressionRule Instance = new RetargetMethodExpressionRule();
+ public final static RetargetMethodExpressionRule INSTANCE = new RetargetMethodExpressionRule();
public RetargetMethodExpressionRule()
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ActionSourceRule.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ActionSourceRule.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ActionSourceRule.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ActionSourceRule.java Wed Oct 26 17:53:36 2011
@@ -43,18 +43,20 @@ public final class ActionSourceRule exte
public final static Class<?>[] ACTION_LISTENER_SIG = new Class<?>[] { ActionEvent.class };
- final static class ActionMapper extends Metadata {
+ final static class ActionMapper extends Metadata
+ {
private final TagAttribute attr;
- public ActionMapper(TagAttribute attr) {
+ public ActionMapper(TagAttribute attr)
+ {
this.attr = attr;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
+ public void applyMetadata(FaceletContext ctx, Object instance)
+ {
((ActionSource) instance).setAction(new LegacyMethodBinding(
- this.attr.getMethodExpression(ctx, null,
- ActionSourceRule.ACTION_SIG)));
+ this.attr.getMethodExpression(ctx, null, ActionSourceRule.ACTION_SIG)));
}
}
@@ -74,15 +76,18 @@ public final class ActionSourceRule exte
}
}
- final static class ActionListenerMapper extends Metadata {
+ final static class ActionListenerMapper extends Metadata
+ {
private final TagAttribute attr;
- public ActionListenerMapper(TagAttribute attr) {
+ public ActionListenerMapper(TagAttribute attr)
+ {
this.attr = attr;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
+ public void applyMetadata(FaceletContext ctx, Object instance)
+ {
((ActionSource) instance)
.setActionListener(new LegacyMethodBinding(this.attr
.getMethodExpression(ctx, null,
@@ -123,7 +128,7 @@ public final class ActionSourceRule exte
}
}
- public final static ActionSourceRule Instance = new ActionSourceRule();
+ public final static ActionSourceRule INSTANCE = new ActionSourceRule();
public ActionSourceRule()
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentHandler.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentHandler.java Wed Oct 26 17:53:36 2011
@@ -292,25 +292,25 @@ public class ComponentHandler extends Me
m.ignore("binding").ignore("id");
// add auto wiring for attributes
- m.addRule(ComponentRule.Instance);
+ m.addRule(ComponentRule.INSTANCE);
// if it's an ActionSource
if (ActionSource.class.isAssignableFrom(type))
{
- m.addRule(ActionSourceRule.Instance);
+ m.addRule(ActionSourceRule.INSTANCE);
}
// if it's a ValueHolder
if (ValueHolder.class.isAssignableFrom(type))
{
- m.addRule(ValueHolderRule.Instance);
+ m.addRule(ValueHolderRule.INSTANCE);
// if it's an EditableValueHolder
if (EditableValueHolder.class.isAssignableFrom(type))
{
m.ignore("submittedValue");
m.ignore("valid");
- m.addRule(EditableValueHolderRule.Instance);
+ m.addRule(EditableValueHolderRule.INSTANCE);
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentRule.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentRule.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentRule.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentRule.java Wed Oct 26 17:53:36 2011
@@ -77,7 +77,7 @@ final class ComponentRule extends MetaRu
//private final static Logger log = Logger.getLogger("facelets.tag.component");
private final static Logger log = Logger.getLogger(ComponentRule.class.getName());
- public final static ComponentRule Instance = new ComponentRule();
+ public final static ComponentRule INSTANCE = new ComponentRule();
public ComponentRule()
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java Wed Oct 26 17:53:36 2011
@@ -44,7 +44,6 @@ import javax.faces.view.facelets.Facelet
import javax.faces.view.facelets.MetaRuleset;
import javax.faces.view.facelets.TagAttribute;
import javax.faces.view.facelets.TagException;
-import javax.faces.view.facelets.TagHandler;
import javax.faces.view.facelets.TagHandlerDelegate;
import org.apache.myfaces.util.ExternalSpecifications;
@@ -150,17 +149,19 @@ public class ComponentTagHandlerDelegate
* <ol>
* <li>First determines this UIComponent's id by calling {@link #getId(FaceletContext) getId(FaceletContext)}.</li>
* <li>Search the parent for an existing UIComponent of the id we just grabbed</li>
- * <li>If found, {@link #FaceletCompositionContext.markForDeletion(UIComponent) mark} its children for deletion.</li>
+ * <li>If found, {@link FaceletCompositionContext#markForDeletion(UIComponent) mark} its children for deletion.</li>
* <li>If <i>not</i> found, call {@link #createComponent(FaceletContext) createComponent}.
* <ol>
- * <li>Only here do we apply {@link TagHandler#setAttributes(FaceletCompositionContext, Object) attributes}</li>
+ * <li>Only here do we apply
+ * {@link TagHandler#setAttributes(FaceletCompositionContext, Object) attributes}</li>
* <li>Set the UIComponent's id</li>
* <li>Set the RendererType of this instance</li>
* </ol>
* </li>
* <li>Now apply the nextHandler, passing the UIComponent we've created/found.</li>
* <li>Now add the UIComponent to the passed parent</li>
- * <li>Lastly, if the UIComponent already existed (found), then {@link #finalizeForDeletion(FaceletCompositionContext, UIComponent) finalize}
+ * <li>Lastly, if the UIComponent already existed (found),
+ * then {@link #finalizeForDeletion(FaceletCompositionContext, UIComponent) finalize}
* for deletion.</li>
* </ol>
*
@@ -572,25 +573,25 @@ public class ComponentTagHandlerDelegate
m.ignore("binding").ignore("id");
// add auto wiring for attributes
- m.addRule(ComponentRule.Instance);
+ m.addRule(ComponentRule.INSTANCE);
// if it's an ActionSource
if (ActionSource.class.isAssignableFrom(type))
{
- m.addRule(ActionSourceRule.Instance);
+ m.addRule(ActionSourceRule.INSTANCE);
}
// if it's a ValueHolder
if (ValueHolder.class.isAssignableFrom(type))
{
- m.addRule(ValueHolderRule.Instance);
+ m.addRule(ValueHolderRule.INSTANCE);
// if it's an EditableValueHolder
if (EditableValueHolder.class.isAssignableFrom(type))
{
m.ignore("submittedValue");
m.ignore("valid");
- m.addRule(EditableValueHolderRule.Instance);
+ m.addRule(EditableValueHolderRule.INSTANCE);
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConvertHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConvertHandler.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConvertHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConvertHandler.java Wed Oct 26 17:53:36 2011
@@ -145,9 +145,9 @@ public class ConvertHandler extends Meta
{
if (this.converterId == null)
{
- throw new TagException(
- this.tag,
- "Default behavior invoked of requiring a converter-id passed in the constructor, must override ConvertHandler(ConverterConfig)");
+ throw new TagException(this.tag,
+ "Default behavior invoked of requiring a converter-id passed in the constructor, "
+ + "must override ConvertHandler(ConverterConfig)");
}
return ctx.getFacesContext().getApplication().createConverter(this.converterId);
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ConverterTagHandlerDelegate.java Wed Oct 26 17:53:36 2011
@@ -112,9 +112,9 @@ public class ConverterTagHandlerDelegate
{
if (_delegate.getConverterId(ctx) == null)
{
- throw new TagException(
- _delegate.getTag(),
- "Default behavior invoked of requiring a converter-id passed in the constructor, must override ConvertHandler(ConverterConfig)");
+ throw new TagException(_delegate.getTag(),
+ "Default behavior invoked of requiring a converter-id passed in the "
+ + "constructor, must override ConvertHandler(ConverterConfig)");
}
return ctx.getFacesContext().getApplication().createConverter(_delegate.getConverterId(ctx));
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/EditableValueHolderRule.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/EditableValueHolderRule.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/EditableValueHolderRule.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/EditableValueHolderRule.java Wed Oct 26 17:53:36 2011
@@ -120,7 +120,7 @@ public final class EditableValueHolderRu
private final static Class<?>[] EMPTY_CLASS_ARRAY = new Class[0];
- public final static EditableValueHolderRule Instance = new EditableValueHolderRule();
+ public final static EditableValueHolderRule INSTANCE = new EditableValueHolderRule();
public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidateHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidateHandler.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidateHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValidateHandler.java Wed Oct 26 17:53:36 2011
@@ -126,7 +126,8 @@ public class ValidateHandler extends Met
{
throw new TagException(
this.tag,
- "Default behavior invoked of requiring a validator-id passed in the constructor, must override ValidateHandler(ValidatorConfig)");
+ "Default behavior invoked of requiring a validator-id passed in the "
+ + "constructor, must override ValidateHandler(ValidatorConfig)");
}
return ctx.getFacesContext().getApplication().createValidator(this.validatorId);
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValueHolderRule.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValueHolderRule.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValueHolderRule.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ValueHolderRule.java Wed Oct 26 17:53:36 2011
@@ -100,7 +100,7 @@ public final class ValueHolderRule exten
}
}
- public final static ValueHolderRule Instance = new ValueHolderRule();
+ public final static ValueHolderRule INSTANCE = new ValueHolderRule();
public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/AjaxHandler.java Wed Oct 26 17:53:36 2011
@@ -123,7 +123,8 @@ public class AjaxHandler extends TagHand
/**
*
*/
- @JSFFaceletAttribute(name = "listener", className = "javax.el.MethodExpression", deferredMethodSignature = "public void m(javax.faces.event.AjaxBehaviorEvent evt) throws javax.faces.event.AbortProcessingException")
+ @JSFFaceletAttribute(name = "listener", className = "javax.el.MethodExpression",
+ deferredMethodSignature = "public void m(javax.faces.event.AjaxBehaviorEvent evt) throws javax.faces.event.AbortProcessingException")
private final TagAttribute _listener;
/**
@@ -498,7 +499,8 @@ public class AjaxHandler extends TagHand
_expr = (MethodExpression) state;
}
- public Object saveState(FacesContext context) {
+ public Object saveState(FacesContext context)
+ {
if (initialStateMarked())
{
return null;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/EventHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/EventHandler.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/EventHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/EventHandler.java Wed Oct 26 17:53:36 2011
@@ -59,7 +59,8 @@ import org.apache.myfaces.view.facelets.
@JSFFaceletTag(
name = "f:event",
bodyContent = "empty")
-public final class EventHandler extends TagHandler {
+public final class EventHandler extends TagHandler
+{
private static final Class<?>[] COMPONENT_SYSTEM_EVENT_PARAMETER = new Class<?>[] { ComponentSystemEvent.class };
private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0];
@@ -427,7 +428,9 @@ public final class EventHandler extends
}
}
- _targetComponent.subscribeToEvent(eventClass, new CompositeComponentRelativeListener(methodExpOneArg, methodExpZeroArg, findComponentExpression));
+ _targetComponent.subscribeToEvent(eventClass,
+ new CompositeComponentRelativeListener(methodExpOneArg, methodExpZeroArg,
+ findComponentExpression));
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SelectItemsHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SelectItemsHandler.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SelectItemsHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/SelectItemsHandler.java Wed Oct 26 17:53:36 2011
@@ -50,7 +50,8 @@ public class SelectItemsHandler extends
@JSFFaceletAttribute(name = "noSelectionValue",
className = "javax.el.ValueExpression",
deferredValueType = "java.lang.Boolean")
- private boolean getNoSelectionValue() {
+ private boolean getNoSelectionValue()
+ {
return false;
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatus.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatus.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatus.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatus.java Wed Oct 26 17:53:36 2011
@@ -77,7 +77,8 @@ public final class IterationStatus imple
public Integer getCount()
{
- if ((step == null) || (step == 1)) {
+ if ((step == null) || (step == 1))
+ {
return (index + 1);
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java Wed Oct 26 17:53:36 2011
@@ -131,7 +131,9 @@ public class SetHandler extends TagHandl
ValueExpression expr = ctx.getExpressionFactory().createValueExpression(
elCtx, expStr.toString(), Object.class);
expr.setValue(elCtx, veObj.getValue(elCtx));
- } else {
+ }
+ else
+ {
//ctx.getVariableMapper().setVariable(varStr, veObj);
AbstractFaceletContext actx = ((AbstractFaceletContext) ctx);
actx.getPageContext().getAttributes().put(varStr, veObj);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFnLibrary.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFnLibrary.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFnLibrary.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFnLibrary.java Wed Oct 26 17:53:36 2011
@@ -37,7 +37,7 @@ import org.apache.myfaces.view.facelets.
*/
public class JstlFnLibrary implements TagLibrary
{
- public final static String Namespace = "http://java.sun.com/jsp/jstl/functions";
+ public final static String NAMESPACE = "http://java.sun.com/jsp/jstl/functions";
private final Map<String, Method> fns = new HashMap<String, Method>();
@@ -63,7 +63,7 @@ public class JstlFnLibrary implements Ta
public boolean containsNamespace(String ns)
{
- return Namespace.equals(ns);
+ return NAMESPACE.equals(ns);
}
public boolean containsTagHandler(String ns, String localName)
@@ -78,7 +78,7 @@ public class JstlFnLibrary implements Ta
public boolean containsFunction(String ns, String name)
{
- if (Namespace.equals(ns))
+ if (NAMESPACE.equals(ns))
{
return this.fns.containsKey(name);
}
@@ -88,7 +88,7 @@ public class JstlFnLibrary implements Ta
public Method createFunction(String ns, String name)
{
- if (Namespace.equals(ns))
+ if (NAMESPACE.equals(ns))
{
return (Method) this.fns.get(name);
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFunction.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFunction.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFunction.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFunction.java Wed Oct 26 17:53:36 2011
@@ -113,6 +113,7 @@ public final class JstlFunction
app = "&";
}
break;
+ default: // all fine
}
}
if (app != null)
@@ -122,7 +123,9 @@ public final class JstlFunction
sb = new StringBuilder(value.substring(0, i));
}
sb.append(app);
- } else {
+ }
+ else
+ {
if (sb != null)
{
sb.append(c);
@@ -258,7 +261,8 @@ public final class JstlFunction
}
String[] array = new String[numTokens];
int i = 0;
- while (st.hasMoreTokens()){
+ while (st.hasMoreTokens())
+ {
array[i] = st.nextToken();
i++;
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/ComponentRefHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/ComponentRefHandler.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/ComponentRefHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/ComponentRefHandler.java Wed Oct 26 17:53:36 2011
@@ -38,7 +38,7 @@ import org.apache.myfaces.buildtools.mav
public final class ComponentRefHandler extends ComponentHandler
{
- public final static String Name = "component";
+ public final static String NAME = "component";
public ComponentRefHandler(ComponentConfig config)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java Wed Oct 26 17:53:36 2011
@@ -53,7 +53,7 @@ public final class CompositionHandler ex
//private static final Logger log = Logger.getLogger("facelets.tag.ui.composition");
private static final Logger log = Logger.getLogger(CompositionHandler.class.getName());
- public final static String Name = "composition";
+ public final static String NAME = "composition";
/**
* The resolvable URI of the template to use. The content within the composition tag will
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/RepeatHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/RepeatHandler.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/RepeatHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/RepeatHandler.java Wed Oct 26 17:53:36 2011
@@ -48,7 +48,7 @@ public class RepeatHandler extends Compo
{
MetaRuleset meta = super.createMetaRuleset(type);
- if (!UILibrary.Namespace.equals(this.tag.getNamespace()))
+ if (!UILibrary.NAMESPACE.equals(this.tag.getNamespace()))
{
meta.add(new TagMetaData(type));
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java Wed Oct 26 17:53:36 2011
@@ -107,9 +107,12 @@ public final class UIDebug extends UICom
{
sb.append("//<![CDATA[\n");
}
- sb.append("function faceletsDebug(URL) { day = new Date(); id = day.getTime(); eval(\"page\" + id + \" = window.open(URL, '\" + id + \"', 'toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=800,height=600,left = 240,top = 212');\"); };");
- sb.append("var faceletsOrigKeyup = document.onkeyup; document.onkeyup = function(e) { if (window.event) e = window.event; if (String.fromCharCode(e.keyCode) == '"
- + this.getHotkey() + "' & e.shiftKey & e.ctrlKey) faceletsDebug('");
+ sb.append("function faceletsDebug(URL) { day = new Date(); id = day.getTime(); eval(\"page\" + id + \" "
+ + "= window.open(URL, '\" + id + \"', 'toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,"
+ + "resizable=1,width=800,height=600,left = 240,top = 212');\"); };");
+ sb.append("var faceletsOrigKeyup = document.onkeyup; document.onkeyup = function(e) { "
+ + "if (window.event) e = window.event; if (String.fromCharCode(e.keyCode) == '"
+ + this.getHotkey() + "' & e.shiftKey & e.ctrlKey) faceletsDebug('");
sb.append(actionId);
int index = actionId.indexOf ("?");
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UILibrary.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UILibrary.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UILibrary.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UILibrary.java Wed Oct 26 17:53:36 2011
@@ -28,13 +28,13 @@ import org.apache.myfaces.view.facelets.
public final class UILibrary extends AbstractTagLibrary
{
- public final static String Namespace = "http://java.sun.com/jsf/facelets";
+ public final static String NAMESPACE = "http://java.sun.com/jsf/facelets";
- public final static UILibrary Instance = new UILibrary();
+ public final static UILibrary INSTANCE = new UILibrary();
public UILibrary()
{
- super(Namespace);
+ super(NAMESPACE);
this.addTagHandler("include", IncludeHandler.class);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java?rev=1189343&r1=1189342&r2=1189343&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java Wed Oct 26 17:53:36 2011
@@ -79,11 +79,13 @@ public final class Classpath
JarFile jar = null;
if (conn instanceof JarURLConnection)
{
- try {
+ try
+ {
jar = ((JarURLConnection) conn).getJarFile();
}
- catch (Throwable e) {
+ catch (Throwable e)
+ {
// This can happen if the classloader provided us a URL that it thinks exists
// but really doesn't. In particular, if a JAR contains META-INF/MANIFEST.MF
// but not META-INF/, some classloaders may incorrectly report that META-INF/
@@ -310,28 +312,39 @@ public final class Classpath
}
}
}
-
- private static String decodeFilesystemUrl(String url) {
+
+ private static String decodeFilesystemUrl(String url)
+ {
//borrowed from commons-io FileUtils.
String decoded = url;
- if (url != null && url.indexOf('%') >= 0) {
+ if (url != null && url.indexOf('%') >= 0)
+ {
int n = url.length();
StringBuffer buffer = new StringBuffer();
ByteBuffer bytes = ByteBuffer.allocate(n);
- for (int i = 0; i < n;) {
- if (url.charAt(i) == '%') {
- try {
- do {
+ for (int i = 0; i < n; )
+ {
+ if (url.charAt(i) == '%')
+ {
+ try
+ {
+ do
+ {
byte octet = (byte) Integer.parseInt(url.substring(i + 1, i + 3), 16);
bytes.put(octet);
i += 3;
} while (i < n && url.charAt(i) == '%');
continue;
- } catch (RuntimeException e) {
+ }
+ catch (RuntimeException e)
+ {
// malformed percent-encoded octet, fall through and
// append characters literally
- } finally {
- if (bytes.position() > 0) {
+ }
+ finally
+ {
+ if (bytes.position() > 0)
+ {
bytes.flip();
buffer.append(UTF8.decode(bytes).toString());
bytes.clear();
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=1189343&r1=1189342&r2=1189343&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 Wed Oct 26 17:53:36 2011
@@ -143,9 +143,9 @@ public class JspViewDeclarationLanguage
{
// check facelets-only namespaces
String namespace = null;
- if (message.contains(UILibrary.Namespace))
+ if (message.contains(UILibrary.NAMESPACE))
{
- namespace = UILibrary.Namespace;
+ namespace = UILibrary.NAMESPACE;
}
else if (message.contains(CompositeLibrary.NAMESPACE))
{