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/25 22:31:52 UTC
svn commit: r1188895 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces: config/
config/impl/ context/ context/servlet/ debug/ el/ el/convert/ el/unified/
Author: struberg
Date: Tue Oct 25 20:31:51 2011
New Revision: 1188895
URL: http://svn.apache.org/viewvc?rev=1188895&view=rev
Log:
MYFACES-3368 codestyle fixes
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/LogMetaInfUtils.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/NamedEventManager.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/RuntimeConfig.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/PartialResponseWriterImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/RequestViewContext.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImplBase.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/RequestHeaderValuesMap.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImplBase.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletFacesContextImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/ComponentAware.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/LocationAndTagAttributeAware.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/LocationAware.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/MyfacesLogKeyAware.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/MyfacesLogMessageAware.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/TagAttributeAware.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/TagAware.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/FlashELResolver.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/ELResolverToPropertyResolver.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/ELResolverBuilder.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/LogMetaInfUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/LogMetaInfUtils.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/LogMetaInfUtils.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/LogMetaInfUtils.java Tue Oct 25 20:31:51 2011
@@ -34,7 +34,8 @@ import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-class LogMetaInfUtils {
+class LogMetaInfUtils
+{
private static final Logger log = Logger.getLogger(LogMetaInfUtils.class.getName());
@@ -65,7 +66,8 @@ class LogMetaInfUtils {
@SuppressWarnings("unchecked")
protected static void logMetaInf()
{
- if (!log.isLoggable(Level.WARNING)) {
+ if (!log.isLoggable(Level.WARNING))
+ {
return;
}
@@ -134,7 +136,8 @@ class LogMetaInfUtils {
}
}
- protected static void addJarInfo(Map<String, List<JarInfo>> libs, URL url) {
+ protected static void addJarInfo(Map<String, List<JarInfo>> libs, URL url)
+ {
Matcher matcher = REGEX_LIBRARY_PATTERN.matcher(url.toString());
if (matcher.matches())
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java Tue Oct 25 20:31:51 2011
@@ -77,7 +77,8 @@ public class ManagedBeanBuilder
* REQUEST VIEW SESSION APPLICATION NONE
* @author Jakob Korherr
*/
- private final static Comparator<String> scopeComparator = new Comparator<String>()
+ private final static Comparator<String> scopeComparator
+ = new Comparator<String>()
{
public int compare(String o1, String o2)
@@ -167,7 +168,8 @@ public class ManagedBeanBuilder
e.getMessage()
+ " for bean '"
+ beanConfiguration.getManagedBeanName()
- + "' check the configuration to make sure all properties correspond with get/set methods", e);
+ + "' check the configuration to make sure all properties "
+ + "correspond with get/set methods", e);
}
break;
@@ -697,7 +699,8 @@ public class ManagedBeanBuilder
Object value = entry.getValue();
if (ContainerUtils.isValueReference((String) value))
{
- ValueExpression valueExpression = expFactory.createValueExpression(elContext, (String) value, Object.class);
+ ValueExpression valueExpression = expFactory.createValueExpression(elContext, (String) value,
+ Object.class);
value = valueExpression.getValue(elContext);
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/NamedEventManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/NamedEventManager.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/NamedEventManager.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/NamedEventManager.java Tue Oct 25 20:31:51 2011
@@ -34,7 +34,8 @@ import javax.faces.event.PreValidateEven
* annotated with @NamedEvent.
*/
-public class NamedEventManager {
+public class NamedEventManager
+{
//private static final NamedEventManager instance = new NamedEventManager();
private HashMap<String, Collection<Class<? extends ComponentSystemEvent>>> events;
@@ -72,13 +73,15 @@ public class NamedEventManager {
// Per the spec, if the short name is missing, generate one.
- if (shortName == null) {
+ if (shortName == null)
+ {
key = getFixedName (cls);
}
eventList = events.get (key);
- if (eventList == null) {
+ if (eventList == null)
+ {
// First event registered to this short name.
eventList = new LinkedList<Class<? extends ComponentSystemEvent>>();
@@ -120,13 +123,15 @@ public class NamedEventManager {
// Strip the trailing "event" off the class name if present.
- if (className.toLowerCase().endsWith ("event")) {
+ if (className.toLowerCase().endsWith ("event"))
+ {
className = className.substring (0, result.length() - 5);
}
// Prepend the package name.
- if (cls.getPackage() != null) {
+ if (cls.getPackage() != null)
+ {
result.append (cls.getPackage().getName());
result.append ('.');
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/RuntimeConfig.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/RuntimeConfig.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/RuntimeConfig.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/RuntimeConfig.java Tue Oct 25 20:31:51 2011
@@ -175,7 +175,8 @@ public class RuntimeConfig
public org.apache.myfaces.config.element.Converter getConverterConfiguration(String converterClassName)
{
- return (org.apache.myfaces.config.element.Converter)_converterClassNameToConfigurationMap.get(converterClassName);
+ return (org.apache.myfaces.config.element.Converter)
+ _converterClassNameToConfigurationMap.get(converterClassName);
}
private void checkNull(final Object param, final String paramName)
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java Tue Oct 25 20:31:51 2011
@@ -99,14 +99,16 @@ public class FacesConfigEntityResolver
}
else
{
- if (systemId.startsWith("file:")) {
+ if (systemId.startsWith("file:"))
+ {
systemId = systemId.substring(7); // remove file://
}
stream = _externalContext.getResourceAsStream(systemId);
}
}
- if (stream == null) {
+ if (stream == null)
+ {
return null;
}
InputSource is = new InputSource(stream);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java Tue Oct 25 20:31:51 2011
@@ -157,11 +157,13 @@ public class FacesContextFactoryImpl ext
FacesContext facesContext;
if (externalContext instanceof ReleaseableExternalContext)
{
- facesContext = new FacesContextImpl(externalContext, (ReleaseableExternalContext) externalContext, this);
+ facesContext = new FacesContextImpl(externalContext, (ReleaseableExternalContext) externalContext,
+ this);
}
else if (defaultExternalContext != null && defaultExternalContext instanceof ReleaseableExternalContext)
{
- facesContext = new FacesContextImpl(externalContext, (ReleaseableExternalContext) defaultExternalContext, this);
+ facesContext = new FacesContextImpl(externalContext,
+ (ReleaseableExternalContext) defaultExternalContext, this);
}
else
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java Tue Oct 25 20:31:51 2011
@@ -80,7 +80,7 @@ public class MyFacesExceptionHandlerWrap
_isErrorPagePresent = webConfigProvider.isErrorPagePresent(facesContext.getExternalContext());
_useMyFacesErrorHandling = WebConfigParamUtils.getBooleanInitParameter(facesContext.getExternalContext(),
- ErrorPageWriter.ERROR_HANDLING_PARAMETER, facesContext.isProjectStage(ProjectStage.Development) ? true : false);
+ ErrorPageWriter.ERROR_HANDLING_PARAMETER, facesContext.isProjectStage(ProjectStage.Development));
_inited = true;
}
}
@@ -98,7 +98,7 @@ public class MyFacesExceptionHandlerWrap
_isErrorPagePresent = webConfigProvider.isErrorPagePresent(facesContext.getExternalContext());
_useMyFacesErrorHandling = WebConfigParamUtils.getBooleanInitParameter(facesContext.getExternalContext(),
- ErrorPageWriter.ERROR_HANDLING_PARAMETER, facesContext.isProjectStage(ProjectStage.Development) ? true : false);
+ ErrorPageWriter.ERROR_HANDLING_PARAMETER, facesContext.isProjectStage(ProjectStage.Development));
_inited = true;
}
}
@@ -199,7 +199,8 @@ public class MyFacesExceptionHandlerWrap
{
FacesContext facesContext = FacesContext.getCurrentInstance();
// save current view in the request map to access it on the error page
- facesContext.getExternalContext().getRequestMap().put(ErrorPageWriter.VIEW_KEY, facesContext.getViewRoot());
+ facesContext.getExternalContext().getRequestMap().put(ErrorPageWriter.VIEW_KEY,
+ facesContext.getViewRoot());
}
try
{
@@ -301,7 +302,8 @@ public class MyFacesExceptionHandlerWrap
}
else if (throwableList.size() > 1)
{
- ErrorPageWriter.handle(facesContext, components, throwableList.toArray(new Throwable[throwableList.size()]));
+ ErrorPageWriter.handle(facesContext, components,
+ throwableList.toArray(new Throwable[throwableList.size()]));
}
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/PartialResponseWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/PartialResponseWriterImpl.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/PartialResponseWriterImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/PartialResponseWriterImpl.java Tue Oct 25 20:31:51 2011
@@ -128,7 +128,6 @@ public class PartialResponseWriterImpl e
private void openDoubleBuffer()
{
_doubleBuffer = new StringWriter();
- //_cdataDoubleBufferWriter = new HtmlResponseWriterImpl(_doubleBuffer, super.getContentType(), super.getCharacterEncoding());
_cdataDoubleBufferWriter = getWrapped().cloneWithWriter(_doubleBuffer);
StackEntry entry = new StackEntry(_cdataDoubleBufferWriter, _doubleBuffer);
@@ -237,30 +236,6 @@ public class PartialResponseWriterImpl e
while ((i = buffer.indexOf("]]>", i)) >= 0);
}
return buffer.toString();
- /*
- String resultString = buffer.toString();
- //section http://www.w3.org/TR/REC-xml/#sec-cdata-sect everything is parsed
- //until it hits a ]]> hence we need to do some mapping here
-
- //ok since our maximum string size is Integer.MAX_VALUE (most JVMs use char [] as
- //representations
- //we can work on strings directly, instead of having to go through streams
- //it is absolutely unlikely that we will ever have a buffered stream bigger than that
- //for our writer!
- if (resultString.contains("]]>")) {
-
- //we now first remove pending javascript CDATA blocks
- //the reason is if we leave them the ppr chokes on them
- //the syntax from the auto generated CDATA usually is //\s+<![CDATA[
- // -= Leonardo Uribe =- Do this cause a bug on the client side, because
- // scripts containing '&' will be considered invalid xml.
- //resultString = resultString.replaceAll("//\\s*((\\<\\!\\[CDATA\\[)|(\\]\\]\\>))", "");
-
- //now to fullfill the xml spec we have to replace all ]] with blocks of cdata
- resultString = resultString.replaceAll("\\]\\]\\>", "]]><![CDATA[]]]]><![CDATA[>");
- }
- return resultString;
- */
}
//--- we need to override ppr specifics to cover the case
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/RequestViewContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/RequestViewContext.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/RequestViewContext.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/RequestViewContext.java Tue Oct 25 20:31:51 2011
@@ -56,7 +56,8 @@ public class RequestViewContext
@SuppressWarnings("unchecked")
static public RequestViewContext getCurrentInstance(FacesContext ctx, UIViewRoot root)
{
- Map<UIViewRoot, RequestViewContext> map = (Map<UIViewRoot, RequestViewContext>) ctx.getAttributes().get(VIEW_CONTEXT_KEY);
+ Map<UIViewRoot, RequestViewContext> map
+ = (Map<UIViewRoot, RequestViewContext>) ctx.getAttributes().get(VIEW_CONTEXT_KEY);
RequestViewContext rvc = null;
if (map == null)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImplBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImplBase.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImplBase.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImplBase.java Tue Oct 25 20:31:51 2011
@@ -240,7 +240,8 @@ public abstract class FacesContextImplBa
{
throw new NullPointerException("viewRoot");
}
- // If the current UIViewRoot is non-null, and calling equals() on the argument root, passing the current UIViewRoot returns false
+ // If the current UIViewRoot is non-null, and calling equals() on the argument root,
+ // passing the current UIViewRoot returns false
// the clear method must be called on the Map returned from UIViewRoot.getViewMap().
if (_viewRoot != null && !_viewRoot.equals(viewRoot))
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/PartialViewContextImpl.java Tue Oct 25 20:31:51 2011
@@ -214,7 +214,8 @@ public class PartialViewContextImpl exte
!PartialViewContext.ALL_PARTIAL_PHASE_CLIENT_IDS.equals(executeMode))
{
- String[] clientIds = StringUtils.splitShortString(_replaceTabOrEnterCharactersWithSpaces(executeMode), ' ');
+ String[] clientIds
+ = StringUtils.splitShortString(_replaceTabOrEnterCharactersWithSpaces(executeMode), ' ');
//The collection must be mutable
List<String> tempList = new ArrayList<String>();
@@ -285,7 +286,8 @@ public class PartialViewContextImpl exte
//!PartialViewContext.NO_PARTIAL_PHASE_CLIENT_IDS.equals(renderMode) &&
!PartialViewContext.ALL_PARTIAL_PHASE_CLIENT_IDS.equals(renderMode))
{
- String[] clientIds = StringUtils.splitShortString(_replaceTabOrEnterCharactersWithSpaces(renderMode), ' ');
+ String[] clientIds
+ = StringUtils.splitShortString(_replaceTabOrEnterCharactersWithSpaces(renderMode), ' ');
//The collection must be mutable
List<String> tempList = new ArrayList<String>();
@@ -333,8 +335,10 @@ public class PartialViewContextImpl exte
// renderKitId on that view, this could be still an ajax redirect,
// so we have to try to calculate the renderKitId and return a
// RenderKit instance, to send the response.
- String renderKitId = _facesContext.getApplication().getViewHandler().calculateRenderKitId(_facesContext);
- RenderKitFactory rkf = (RenderKitFactory) FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
+ String renderKitId
+ = _facesContext.getApplication().getViewHandler().calculateRenderKitId(_facesContext);
+ RenderKitFactory rkf
+ = (RenderKitFactory) FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
renderKit = rkf.getRenderKit(_facesContext, renderKitId);
}
responseWriter = renderKit.createResponseWriter(
@@ -498,7 +502,8 @@ public class PartialViewContextImpl exte
}
VisitContext visitCtx = VisitContext.createVisitContext(_facesContext, renderIds, hints);
- viewRoot.visitTree(visitCtx, new PhaseAwareVisitCallback(_facesContext, phaseId, updatedComponents));
+ viewRoot.visitTree(visitCtx,
+ new PhaseAwareVisitCallback(_facesContext, phaseId, updatedComponents));
}
}
else if (!ExternalContextUtils.isPortlet(_facesContext.getExternalContext()) &&
@@ -688,7 +693,8 @@ public class PartialViewContextImpl exte
this._alreadyUpdatedComponents = null;
}
- public PhaseAwareVisitCallback(FacesContext facesContext, PhaseId phaseId, List<UIComponent> alreadyUpdatedComponents)
+ public PhaseAwareVisitCallback(FacesContext facesContext, PhaseId phaseId,
+ List<UIComponent> alreadyUpdatedComponents)
{
this._phaseId = phaseId;
this._facesContext = facesContext;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/RequestHeaderValuesMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/RequestHeaderValuesMap.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/RequestHeaderValuesMap.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/RequestHeaderValuesMap.java Tue Oct 25 20:31:51 2011
@@ -51,7 +51,8 @@ public final class RequestHeaderValuesMa
String[] ret = _valueCache.get(key);
if (ret == null)
{
- _valueCache.put(key, ret = toArray(_httpServletRequest.getHeaders(key)));
+ ret = toArray(_httpServletRequest.getHeaders(key));
+ _valueCache.put(key, ret);
}
return ret;
@@ -87,4 +88,4 @@ public final class RequestHeaderValuesMa
return ret.toArray(new String[ret.size()]);
}
-}
\ No newline at end of file
+}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java Tue Oct 25 20:31:51 2011
@@ -747,12 +747,15 @@ public final class ServletExternalContex
ArrayList<String> value = new ArrayList<String>(1);
try
{
- value.add(currentPair.length > 1 ? URLDecoder.decode(currentPair[1], getResponseCharacterEncoding()) : "");
+ value.add(currentPair.length > 1
+ ? URLDecoder.decode(currentPair[1], getResponseCharacterEncoding())
+ : "");
}
catch (UnsupportedEncodingException e)
{
//shouldn't ever get here
- throw new UnsupportedOperationException("Encoding type=" + getResponseCharacterEncoding() + " not supported", e);
+ throw new UnsupportedOperationException("Encoding type=" + getResponseCharacterEncoding()
+ + " not supported", e);
}
paramMap.put(currentPair[0], value);
}
@@ -800,7 +803,8 @@ public final class ServletExternalContex
catch (UnsupportedEncodingException e)
{
//shouldn't ever get here
- throw new UnsupportedOperationException("Encoding type=" + getResponseCharacterEncoding() + " not supported", e);
+ throw new UnsupportedOperationException("Encoding type=" + getResponseCharacterEncoding()
+ + " not supported", e);
}
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImplBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImplBase.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImplBase.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImplBase.java Tue Oct 25 20:31:51 2011
@@ -105,7 +105,8 @@ public abstract class ServletExternalCon
if (_initParameterMap == null)
{
// We cache it as an attribute in ServletContext itself (is this circular reference a problem?)
- if ((_initParameterMap = (Map<String, String>) _servletContext.getAttribute(INIT_PARAMETER_MAP_ATTRIBUTE)) == null)
+ _initParameterMap = (Map<String, String>) _servletContext.getAttribute(INIT_PARAMETER_MAP_ATTRIBUTE);
+ if (_initParameterMap == null)
{
_initParameterMap = new InitParameterMap(_servletContext);
_servletContext.setAttribute(INIT_PARAMETER_MAP_ATTRIBUTE, _initParameterMap);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletFacesContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletFacesContextImpl.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletFacesContextImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletFacesContextImpl.java Tue Oct 25 20:31:51 2011
@@ -25,7 +25,8 @@ import javax.servlet.ServletResponse;
@Deprecated
public final class ServletFacesContextImpl extends FacesContextImpl
{
- public ServletFacesContextImpl(ServletContext servletContext, ServletRequest servletRequest, ServletResponse servletResponse)
+ public ServletFacesContextImpl(ServletContext servletContext, ServletRequest servletRequest,
+ ServletResponse servletResponse)
{
super(servletContext, servletRequest, servletResponse);
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/ComponentAware.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/ComponentAware.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/ComponentAware.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/ComponentAware.java Tue Oct 25 20:31:51 2011
@@ -25,7 +25,8 @@ import javax.faces.component.UIComponent
*
* @author martinkoci
*/
-public interface ComponentAware {
+public interface ComponentAware
+{
UIComponent getComponent();
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/LocationAndTagAttributeAware.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/LocationAndTagAttributeAware.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/LocationAndTagAttributeAware.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/LocationAndTagAttributeAware.java Tue Oct 25 20:31:51 2011
@@ -18,28 +18,29 @@
*/
package org.apache.myfaces.debug;
-import javax.el.Expression;
-import javax.faces.view.Location;
-import javax.faces.view.facelets.TagAttribute;
/**
- * Identification inferface for types that know about {@link Location} and XML attribute name/value pair.
+ * Identification inferface for types that know about {@link javax.faces.view.Location}
+ * and XML attribute name/value pair.
*
* <ol>
* <li>Location - location instance - see {@link LocationAware}</li>
- * <li>expressionString - expression String {@link Expression#getExpressionString()}</li>
- * <li>qName - the qualified name for attribute {@link TagAttribute#getQName()}</li>
+ * <li>expressionString - expression String {@link javax.el.Expression#getExpressionString()}</li>
+ * <li>qName - the qualified name for attribute {@link javax.faces.view.facelets.TagAttribute#getQName()}</li>
* </ol>
*
- * If type implements this interface, we can say that it knows where instance implementing this interface is located in facelets view (line/column)
+ * If type implements this interface, we can say that it knows where instance implementing this
+ * interface is located in facelets view (line/column)
* and what XML attribute (name/value pair) makes it.
*
- * Also you can think about this type as about ligthweight version of {@link TagAttributeAware} for cases, where full TagAttribute instance is not available
+ * Also you can think about this type as about ligthweight version of {@link TagAttributeAware}
+ * for cases, where full TagAttribute instance is not available
*
* @author martinkoci
*/
-public interface LocationAndTagAttributeAware extends LocationAware {
+public interface LocationAndTagAttributeAware extends LocationAware
+{
/**
@@ -52,4 +53,4 @@ public interface LocationAndTagAttribute
*/
public abstract String getQName();
-}
\ No newline at end of file
+}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/LocationAware.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/LocationAware.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/LocationAware.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/LocationAware.java Tue Oct 25 20:31:51 2011
@@ -18,21 +18,23 @@
*/
package org.apache.myfaces.debug;
-import javax.faces.component.UIComponent;
import javax.faces.view.Location;
/**
* Identification inferface for types that know about {@link Location}.
*
- * If type implements this interface, we can say that it knows where instance implementing this interfaces is located in facelets view.
+ * If type implements this interface, we can say that it knows where
+ * instance implementing this interfaces is located in facelets view.
*
- * {@link UIComponent} is LocationAware-like, because it knows it's Location: {@link UIComponent#VIEW_LOCATION_KEY}
+ * {@link javax.faces.component.UIComponent} is LocationAware-like, because
+ * it knows it's Location: {@link javax.faces.component.UIComponent#VIEW_LOCATION_KEY}
*
* @author martinkoci
*
* @see Location
*/
-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/debug/MyfacesLogKeyAware.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/MyfacesLogKeyAware.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/MyfacesLogKeyAware.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/MyfacesLogKeyAware.java Tue Oct 25 20:31:51 2011
@@ -27,7 +27,8 @@ import org.apache.myfaces.logging.Myface
*
* @see MyfacesLogKey
*/
-public interface MyfacesLogKeyAware {
+public interface MyfacesLogKeyAware
+{
MyfacesLogKey getMyfacesLogKey();
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/MyfacesLogMessageAware.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/MyfacesLogMessageAware.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/MyfacesLogMessageAware.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/MyfacesLogMessageAware.java Tue Oct 25 20:31:51 2011
@@ -27,7 +27,8 @@ import org.apache.myfaces.logging.Myface
*
* @see MyfacesLogMessage
*/
-public interface MyfacesLogMessageAware {
+public interface MyfacesLogMessageAware
+{
MyfacesLogMessage getMyfacesLogMessage();
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/TagAttributeAware.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/TagAttributeAware.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/TagAttributeAware.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/TagAttributeAware.java Tue Oct 25 20:31:51 2011
@@ -27,7 +27,8 @@ import javax.faces.view.facelets.TagAttr
*
* @see TagAttribute
*/
-public interface TagAttributeAware {
+public interface TagAttributeAware
+{
TagAttribute getTagAttribute();
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/TagAware.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/TagAware.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/TagAware.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/debug/TagAware.java Tue Oct 25 20:31:51 2011
@@ -27,7 +27,8 @@ import javax.faces.view.facelets.Tag;
*
* @see Tag
*/
-public interface TagAware {
+public interface TagAware
+{
Tag getTag();
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/FlashELResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/FlashELResolver.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/FlashELResolver.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/FlashELResolver.java Tue Oct 25 20:31:51 2011
@@ -106,7 +106,8 @@ public class FlashELResolver extends ELR
context.setPropertyResolved(true);
return true;
}
- else if (base instanceof Flash) {
+ else if (base instanceof Flash)
+ {
context.setPropertyResolved(true);
}
@@ -277,7 +278,8 @@ public class FlashELResolver extends ELR
{
context.setPropertyResolved(true);
}
- else if (base instanceof Flash) {
+ else if (base instanceof Flash)
+ {
context.setPropertyResolved(true);
Object obj = ((Flash) base).get(property);
return (obj != null) ? obj.getClass() : null;
@@ -290,17 +292,18 @@ public class FlashELResolver extends ELR
public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context,
Object base)
{
- ArrayList<FeatureDescriptor> descriptors = new ArrayList<FeatureDescriptor>(
- 1);
+ ArrayList<FeatureDescriptor> descriptors = new ArrayList<FeatureDescriptor>(1);
descriptors.add(makeDescriptor(FLASH,
"Represents the current flash scope", Object.class));
- if (base instanceof Flash) {
+ if (base instanceof Flash)
+ {
Iterator itr = ((Flash) base).keySet().iterator();
Object key;
FeatureDescriptor desc;
- while (itr.hasNext()) {
+ while (itr.hasNext())
+ {
key = itr.next();
desc = makeDescriptor(key.toString(), key.toString(), key.getClass());
descriptors.add(desc);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/ELResolverToPropertyResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/ELResolverToPropertyResolver.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/ELResolverToPropertyResolver.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/ELResolverToPropertyResolver.java Tue Oct 25 20:31:51 2011
@@ -44,7 +44,8 @@ public final class ELResolverToPropertyR
}
@Override
- public boolean isReadOnly(final Object base, final int index) throws EvaluationException, PropertyNotFoundException
+ public boolean isReadOnly(final Object base, final int index)
+ throws EvaluationException, PropertyNotFoundException
{
try
@@ -63,7 +64,8 @@ public final class ELResolverToPropertyR
}
@Override
- public boolean isReadOnly(final Object base, final Object property) throws EvaluationException, PropertyNotFoundException
+ public boolean isReadOnly(final Object base, final Object property)
+ throws EvaluationException, PropertyNotFoundException
{
try
@@ -101,7 +103,8 @@ public final class ELResolverToPropertyR
}
@Override
- public Object getValue(final Object base, final Object property) throws EvaluationException, PropertyNotFoundException
+ public Object getValue(final Object base, final Object property)
+ throws EvaluationException, PropertyNotFoundException
{
try
@@ -137,7 +140,8 @@ public final class ELResolverToPropertyR
}
@Override
- public Class getType(final Object base, final Object property) throws EvaluationException, PropertyNotFoundException
+ public Class getType(final Object base, final Object property)
+ throws EvaluationException, PropertyNotFoundException
{
try
@@ -155,8 +159,8 @@ public final class ELResolverToPropertyR
}
@Override
- public void setValue(final Object base, final Object property, final Object value) throws EvaluationException,
- PropertyNotFoundException
+ public void setValue(final Object base, final Object property, final Object value)
+ throws EvaluationException, PropertyNotFoundException
{
try
@@ -174,7 +178,8 @@ public final class ELResolverToPropertyR
}
@Override
- public void setValue(final Object base, int index, final Object value) throws EvaluationException, PropertyNotFoundException
+ public void setValue(final Object base, int index, final Object value)
+ throws EvaluationException, PropertyNotFoundException
{
try
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java Tue Oct 25 20:31:51 2011
@@ -70,7 +70,8 @@ public final class PropertyResolverToELR
if (needsCoersion(base))
{
propertyResolver.setValue(base, coerceToInt(property), value);
- } else
+ }
+ else
{
propertyResolver.setValue(base, property, value);
}
@@ -97,8 +98,8 @@ public final class PropertyResolverToELR
}
@Override
- public boolean isReadOnly(final ELContext context, final Object base, final Object property) throws NullPointerException,
- PropertyNotFoundException, ELException
+ public boolean isReadOnly(final ELContext context, final Object base, final Object property)
+ throws NullPointerException, PropertyNotFoundException, ELException
{
if (base == null || property == null)
{
@@ -112,7 +113,8 @@ public final class PropertyResolverToELR
if (needsCoersion(base))
{
result = propertyResolver.isReadOnly(base, coerceToInt(property));
- } else
+ }
+ else
{
result = propertyResolver.isReadOnly(base, property);
}
@@ -140,8 +142,8 @@ public final class PropertyResolverToELR
}
@Override
- public Object getValue(final ELContext context, final Object base, final Object property) throws NullPointerException,
- PropertyNotFoundException, ELException
+ public Object getValue(final ELContext context, final Object base, final Object property)
+ throws NullPointerException, PropertyNotFoundException, ELException
{
if (base == null || property == null)
{
@@ -155,7 +157,8 @@ public final class PropertyResolverToELR
if (needsCoersion(base))
{
value = propertyResolver.getValue(base, coerceToInt(property));
- } else
+ }
+ else
{
value = propertyResolver.getValue(base, property);
}
@@ -184,8 +187,8 @@ public final class PropertyResolverToELR
}
@Override
- public Class<?> getType(final ELContext context, final Object base, final Object property) throws NullPointerException,
- PropertyNotFoundException, ELException
+ public Class<?> getType(final ELContext context, final Object base, final Object property)
+ throws NullPointerException, PropertyNotFoundException, ELException
{
if (base == null || property == null)
{
@@ -199,7 +202,8 @@ public final class PropertyResolverToELR
if (needsCoersion(base))
{
value = propertyResolver.getType(base, coerceToInt(property));
- } else
+ }
+ else
{
value = propertyResolver.getType(base, property);
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java Tue Oct 25 20:31:51 2011
@@ -49,7 +49,7 @@ public class ValueBindingToValueExpressi
private static final long serialVersionUID = 8071429285360496554L;
//private static final Log logger = LogFactory.getLog(ValueBindingToValueExpression.class);
- private static final Logger logger = Logger.getLogger(ValueBindingToValueExpression.class.getName());
+ private static final Logger log = Logger.getLogger(ValueBindingToValueExpression.class.getName());
private ValueBinding _valueBinding;
@@ -208,8 +208,9 @@ public class ValueBindingToValueExpressi
}
catch (Throwable e)
{
- logger.log(Level.WARNING, "Could not determine expected type for '" + _valueBinding.getExpressionString() + "': "
- + e.getMessage(), e);
+ log.log(Level.WARNING, "Could not determine expected type for '"
+ + _valueBinding.getExpressionString() + "': "
+ + e.getMessage(), e);
}
}
return null;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java Tue Oct 25 20:31:51 2011
@@ -34,7 +34,7 @@ import org.apache.myfaces.shared.util.Cl
* ATTENTION: If you make changes to this class, treat javax.faces.component.ValueExpressionToValueBinding accordingly.
*
* @author Stan Silvert
- * @see javax.faces.component.ValueExpressionToValueBinding
+ * @see ValueExpressionToValueBinding
*/
@SuppressWarnings("deprecation")
public class ValueExpressionToValueBinding extends ValueBinding implements StateHolder
@@ -212,7 +212,8 @@ public class ValueExpressionToValueBindi
else
{
Object[] stateArray = (Object[]) state;
- _valueExpression = (ValueExpression) ClassUtils.newInstance((String) stateArray[0], ValueExpression.class);
+ _valueExpression
+ = (ValueExpression) ClassUtils.newInstance((String) stateArray[0], ValueExpression.class);
((StateHolder) _valueExpression).restoreState(facesContext, stateArray[1]);
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/ELResolverBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/ELResolverBuilder.java?rev=1188895&r1=1188894&r2=1188895&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/ELResolverBuilder.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/ELResolverBuilder.java Tue Oct 25 20:31:51 2011
@@ -22,7 +22,8 @@ import javax.el.CompositeELResolver;
/**
* The ELResolverBuilder is responsible to build the el resolver which is used by the application through
- * {@link javax.faces.application.Application#getELResolver()} according to 1.2 spec section 5.6.2 or to be used as the el resolver for jsp
+ * {@link javax.faces.application.Application#getELResolver()} according to 1.2 spec
+ * section 5.6.2 or to be used as the el resolver for jsp
* according to 1.2 spec section 5.6.1
*
* @author Mathias Broekelmann (latest modification by $Author$)