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/27 20:36:30 UTC
svn commit: r1189926 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces: config/
config/annotation/ util/ view/facelets/ view/facelets/compiler/
view/facelets/impl/ view/facelets/tag/jsf/core/ view/facelets/tag/jsf/html/
view/facelets/tag/j...
Author: struberg
Date: Thu Oct 27 18:36:29 2011
New Revision: 1189926
URL: http://svn.apache.org/viewvc?rev=1189926&view=rev
Log:
MYFACES-3368 fix codestyle
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/AbstractThreadSafeAttributeMap.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/compiler/SAXCompiler.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.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/jsf/core/CoreLibrary.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlDecorator.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlLibrary.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/JstlCoreLibrary.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
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=1189926&r1=1189925&r2=1189926&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 Thu Oct 27 18:36:29 2011
@@ -77,7 +77,7 @@ public class ManagedBeanBuilder
* REQUEST VIEW SESSION APPLICATION NONE
* @author Jakob Korherr
*/
- private final static Comparator<String> scopeComparator
+ private final static Comparator<String> SCOPE_COMPARATOR
= new Comparator<String>()
{
@@ -324,6 +324,8 @@ public class ManagedBeanBuilder
}
value = property.getRuntimeValue(facesContext);
break;
+ default:
+ throw new FacesException("unknown ManagedProperty type: "+ property.getType());
}
Class<?> propertyClass = null;
@@ -441,7 +443,7 @@ public class ManagedBeanBuilder
}
// the target scope needs to have a shorter (or equal) lifetime than the value scope
- return (scopeComparator.compare(targetScope, valueScope) <= 0);
+ return (SCOPE_COMPARATOR.compare(targetScope, valueScope) <= 0);
}
/**
@@ -466,7 +468,7 @@ public class ManagedBeanBuilder
}
// we have found at least one valid scope at this point
scopeFound = true;
- if (scopeComparator.compare(valueScope, narrowestScope) < 0)
+ if (SCOPE_COMPARATOR.compare(valueScope, narrowestScope) < 0)
{
narrowestScope = valueScope;
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java?rev=1189926&r1=1189925&r2=1189926&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java Thu Oct 27 18:36:29 2011
@@ -503,10 +503,11 @@ public class AnnotationConfigurator
fields.put(field.getName(), field);
}
}
+ clazz = clazz.getSuperclass();
}
- while ((clazz = clazz.getSuperclass()) != Object.class);
+ while (clazz != Object.class);
- return (Field[]) fields.values().toArray(new Field[fields.size()]);
+ return fields.values().toArray(new Field[fields.size()]);
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/AbstractThreadSafeAttributeMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/AbstractThreadSafeAttributeMap.java?rev=1189926&r1=1189925&r2=1189926&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/AbstractThreadSafeAttributeMap.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/AbstractThreadSafeAttributeMap.java Thu Oct 27 18:36:29 2011
@@ -122,9 +122,9 @@ public abstract class AbstractThreadSafe
@Override
public final V remove(final Object key)
{
- final String key_ = key.toString();
- final V retval = getAttribute(key_);
- removeAttribute(key_);
+ final String keyString = key.toString();
+ final V retval = getAttribute(keyString);
+ removeAttribute(keyString);
return retval;
}
@@ -224,7 +224,8 @@ public abstract class AbstractThreadSafe
public E next()
{
- return getValue(_currentKey = _i.next());
+ _currentKey = _i.next();
+ return getValue(_currentKey);
}
protected abstract E getValue(String attributeName);
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=1189926&r1=1189925&r2=1189926&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 Thu Oct 27 18:36:29 2011
@@ -962,8 +962,7 @@ public class FaceletViewDeclarationLangu
}
@Override
- public void retargetMethodExpressions(FacesContext context,
- UIComponent topLevelComponent)
+ public void retargetMethodExpressions(FacesContext context, UIComponent topLevelComponent)
{
checkNull(context, "context");
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java?rev=1189926&r1=1189925&r2=1189926&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java Thu Oct 27 18:36:29 2011
@@ -354,7 +354,7 @@ public final class SAXCompiler extends C
{
this.unit.popTag();
}
- if (CoreLibrary.Namespace.equals(uri) && "metadata".equals(localName))
+ if (CoreLibrary.NAMESPACE.equals(uri) && "metadata".equals(localName))
{
this.inMetadata=false;
}
@@ -433,7 +433,7 @@ public final class SAXCompiler extends C
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException
{
- if (CoreLibrary.Namespace.equals(uri) && "metadata".equals(localName))
+ if (CoreLibrary.NAMESPACE.equals(uri) && "metadata".equals(localName))
{
this.inMetadata=true;
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java?rev=1189926&r1=1189925&r2=1189926&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java Thu Oct 27 18:36:29 2011
@@ -48,7 +48,7 @@ import org.apache.commons.collections.it
class UILeaf extends UIComponentBase
{
- private final static Map<String, UIComponent> facets = new HashMap<String, UIComponent>()
+ private static Map<String, UIComponent> facets = new HashMap<String, UIComponent>()
{
@Override
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java?rev=1189926&r1=1189925&r2=1189926&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java Thu Oct 27 18:36:29 2011
@@ -742,6 +742,13 @@ final class DefaultFaceletContext extend
return this._owner == o || this._target == o;
}
+ @Override
+ public int hashCode()
+ {
+ int result = _owner != null ? _owner.hashCode() : 0;
+ result = 31 * result + (_target != null ? _target.hashCode() : 0);
+ return result;
+ }
}
@Override
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=1189926&r1=1189925&r2=1189926&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 Thu Oct 27 18:36:29 2011
@@ -208,8 +208,6 @@ public class TemplateContextImpl extends
public boolean equals(Object o)
{
- // System.out.println(this.owner.getAlias() + " == " +
- // ((DefaultFacelet) o).getAlias());
if (this._owner != null)
{
return this._owner == o || this._target == o;
@@ -220,6 +218,14 @@ public class TemplateContextImpl extends
}
}
+ @Override
+ public int hashCode()
+ {
+ int result = _owner != null ? _owner.hashCode() : 0;
+ result = 31 * result + (_target != null ? _target.hashCode() : 0);
+ return result;
+ }
+
public boolean isRoot()
{
return this._root;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/CoreLibrary.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/CoreLibrary.java?rev=1189926&r1=1189925&r2=1189926&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/CoreLibrary.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/CoreLibrary.java Thu Oct 27 18:36:29 2011
@@ -43,13 +43,13 @@ import org.apache.myfaces.view.facelets.
public final class CoreLibrary extends AbstractTagLibrary
{
- public final static String Namespace = "http://java.sun.com/jsf/core";
+ public final static String NAMESPACE = "http://java.sun.com/jsf/core";
- public final static CoreLibrary Instance = new CoreLibrary();
+ public final static CoreLibrary INSTANCE = new CoreLibrary();
public CoreLibrary()
{
- super(Namespace);
+ super(NAMESPACE);
this.addTagHandler("actionListener", ActionListenerHandler.class);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlDecorator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlDecorator.java?rev=1189926&r1=1189925&r2=1189926&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlDecorator.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlDecorator.java Thu Oct 27 18:36:29 2011
@@ -32,9 +32,9 @@ import org.apache.myfaces.view.facelets.
public final class HtmlDecorator implements TagDecorator
{
- public final static String XhtmlNamespace = "http://www.w3.org/1999/xhtml";
+ public final static String XHTML_NAMESPACE = "http://www.w3.org/1999/xhtml";
- public final static HtmlDecorator Instance = new HtmlDecorator();
+ public final static HtmlDecorator INSTANCE = new HtmlDecorator();
/**
*
@@ -51,17 +51,17 @@ public final class HtmlDecorator impleme
*/
public Tag decorate(Tag tag)
{
- if (XhtmlNamespace.equals(tag.getNamespace()))
+ if (XHTML_NAMESPACE.equals(tag.getNamespace()))
{
String n = tag.getLocalName();
if ("a".equals(n))
{
- return new Tag(tag.getLocation(), HtmlLibrary.Namespace, "commandLink", tag.getQName(), tag
+ return new Tag(tag.getLocation(), HtmlLibrary.NAMESPACE, "commandLink", tag.getQName(), tag
.getAttributes());
}
if ("form".equals(n))
{
- return new Tag(tag.getLocation(), HtmlLibrary.Namespace, "form", tag.getQName(), tag.getAttributes());
+ return new Tag(tag.getLocation(), HtmlLibrary.NAMESPACE, "form", tag.getQName(), tag.getAttributes());
}
if ("input".equals(n))
{
@@ -72,19 +72,19 @@ public final class HtmlDecorator impleme
TagAttributes na = removeType(tag.getAttributes());
if ("text".equals(t))
{
- return new Tag(tag.getLocation(), HtmlLibrary.Namespace, "inputText", tag.getQName(), na);
+ return new Tag(tag.getLocation(), HtmlLibrary.NAMESPACE, "inputText", tag.getQName(), na);
}
if ("password".equals(t))
{
- return new Tag(tag.getLocation(), HtmlLibrary.Namespace, "inputSecret", tag.getQName(), na);
+ return new Tag(tag.getLocation(), HtmlLibrary.NAMESPACE, "inputSecret", tag.getQName(), na);
}
if ("hidden".equals(t))
{
- return new Tag(tag.getLocation(), HtmlLibrary.Namespace, "inputHidden", tag.getQName(), na);
+ return new Tag(tag.getLocation(), HtmlLibrary.NAMESPACE, "inputHidden", tag.getQName(), na);
}
if ("submit".equals(t))
{
- return new Tag(tag.getLocation(), HtmlLibrary.Namespace, "commandButton", tag.getQName(), na);
+ return new Tag(tag.getLocation(), HtmlLibrary.NAMESPACE, "commandButton", tag.getQName(), na);
}
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlLibrary.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlLibrary.java?rev=1189926&r1=1189925&r2=1189926&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlLibrary.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlLibrary.java Thu Oct 27 18:36:29 2011
@@ -25,13 +25,13 @@ package org.apache.myfaces.view.facelets
public final class HtmlLibrary extends AbstractHtmlLibrary
{
- public final static String Namespace = "http://java.sun.com/jsf/html";
+ public final static String NAMESPACE = "http://java.sun.com/jsf/html";
- public final static HtmlLibrary Instance = new HtmlLibrary();
+ public final static HtmlLibrary INSTANCE = new HtmlLibrary();
public HtmlLibrary()
{
- super(Namespace);
+ super(NAMESPACE);
this.addHtmlComponent ("body", "javax.faces.OutputBody", "javax.faces.Body");
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/JstlCoreLibrary.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/JstlCoreLibrary.java?rev=1189926&r1=1189925&r2=1189926&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/JstlCoreLibrary.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/JstlCoreLibrary.java Thu Oct 27 18:36:29 2011
@@ -27,13 +27,13 @@ import org.apache.myfaces.view.facelets.
public final class JstlCoreLibrary extends AbstractTagLibrary
{
- public final static String Namespace = "http://java.sun.com/jsp/jstl/core";
+ public final static String NAMESPACE = "http://java.sun.com/jsp/jstl/core";
- public final static JstlCoreLibrary Instance = new JstlCoreLibrary();
+ public final static JstlCoreLibrary INSTANCE = new JstlCoreLibrary();
public JstlCoreLibrary()
{
- super(Namespace);
+ super(NAMESPACE);
this.addTagHandler("if", IfHandler.class);
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=1189926&r1=1189925&r2=1189926&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 Thu Oct 27 18:36:29 2011
@@ -111,7 +111,7 @@ public class JspViewDeclarationLanguage
// does the message contain "f" (prefix f of tags)
// or the related uri http://java.sun.com/jsf/core
if (message.contains("\"f\"")
- || message.contains("\"" + CoreLibrary.Namespace + "\""))
+ || message.contains("\"" + CoreLibrary.NAMESPACE + "\""))
{
// check facelets-only f tags
for (String tag : FACELETS_ONLY_F_TAGS)
@@ -126,7 +126,7 @@ public class JspViewDeclarationLanguage
}
}
else if (message.contains("\"h\"")
- || message.contains("\"" + HtmlLibrary.Namespace + "\""))
+ || message.contains("\"" + HtmlLibrary.NAMESPACE + "\""))
{
// check facelets-only h tags
for (String tag : FACELETS_ONLY_H_TAGS)