You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2017/09/14 12:29:32 UTC
svn commit: r1808330 - in
/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view:
facelets/tag/ facelets/tag/jsf/html/ facelets/tag/jstl/core/
facelets/tag/jstl/fn/ facelets/tag/ui/ impl/ jsp/
Author: tandraschko
Date: Thu Sep 14 12:29:31 2017
New Revision: 1808330
URL: http://svn.apache.org/viewvc?rev=1808330&view=rev
Log:
MYFACES-4152 Add @Override
Modified:
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/AbstractHtmlLibrary.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/DefaultTagDecorator.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlComponentHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlDecorator.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlOutputScriptHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlOutputStylesheetHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/_HtmlOutputScript.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/_HtmlOutputStylesheet.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/CatchHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseOtherwiseHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseWhenHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ForEachHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IfHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IndexedValueExpression.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IteratedValueExpression.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatus.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatusExpression.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacyForEachHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacySetHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/MappedValueExpression.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFnLibrary.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/ComponentRef.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DebugPhaseListener.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DefineHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/InsertHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyCompositionHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyDecorateHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyIncludeHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyParamHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/ParamHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/RepeatHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/impl/DefaultViewScopeHandler.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguageStrategy.java
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java Thu Sep 14 12:29:31 2017
@@ -96,6 +96,7 @@ final class UserTagHandler extends TagHa
* @see javax.faces.view.facelets.FaceletHandler#apply(javax.faces.view.facelets.FaceletContext,
* javax.faces.component.UIComponent)
*/
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
@@ -169,6 +170,7 @@ final class UserTagHandler extends TagHa
}
}
+ @Override
public boolean apply(FaceletContext ctx, UIComponent parent, String name) throws IOException, FacesException,
FaceletException, ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/AbstractHtmlLibrary.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/AbstractHtmlLibrary.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/AbstractHtmlLibrary.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/AbstractHtmlLibrary.java Thu Sep 14 12:29:31 2017
@@ -27,9 +27,6 @@ import org.apache.myfaces.view.facelets.
public abstract class AbstractHtmlLibrary extends AbstractTagLibrary
{
- /**
- * @param namespace
- */
public AbstractHtmlLibrary(String namespace)
{
super(namespace);
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/DefaultTagDecorator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/DefaultTagDecorator.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/DefaultTagDecorator.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/DefaultTagDecorator.java Thu Sep 14 12:29:31 2017
@@ -181,6 +181,7 @@ public class DefaultTagDecorator impleme
private static final TagDecoratorExecutor NO_MATCH_SELECTOR = new TagSelectorImpl(null, "jsf:element");
+ @Override
public Tag decorate(Tag tag)
{
boolean jsfNamespaceFound = false;
@@ -504,6 +505,7 @@ public class DefaultTagDecorator impleme
}
}
+ @Override
public TagDecoratorExecutor getExecutorIfApplies(Tag tag)
{
if (attributeQName != null)
@@ -576,6 +578,7 @@ public class DefaultTagDecorator impleme
}
}
+ @Override
public Tag decorate(Tag orig, TagAttributes attributes)
{
return new Tag(orig.getLocation(), this.targetNamespace,
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlComponentHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlComponentHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlComponentHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlComponentHandler.java Thu Sep 14 12:29:31 2017
@@ -29,14 +29,12 @@ import javax.faces.view.facelets.MetaRul
public class HtmlComponentHandler extends ComponentHandler
{
- /**
- * @param config
- */
public HtmlComponentHandler(ComponentConfig config)
{
super(config);
}
+ @Override
protected MetaRuleset createMetaRuleset(Class type)
{
return super.createMetaRuleset(type).alias("class", "styleClass");
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlDecorator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlDecorator.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlDecorator.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlDecorator.java Thu Sep 14 12:29:31 2017
@@ -36,19 +36,12 @@ public final class HtmlDecorator impleme
public final static HtmlDecorator INSTANCE = new HtmlDecorator();
- /**
- *
- */
public HtmlDecorator()
{
super();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.myfaces.view.facelets.tag.TagDecorator#decorate(org.apache.myfaces.view.facelets.tag.Tag)
- */
+ @Override
public Tag decorate(Tag tag)
{
if (XHTML_NAMESPACE.equals(tag.getNamespace()))
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlOutputScriptHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlOutputScriptHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlOutputScriptHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlOutputScriptHandler.java Thu Sep 14 12:29:31 2017
@@ -48,6 +48,7 @@ public class HtmlOutputScriptHandler ext
super(config);
}
+ @Override
public UIComponent findChildByTagId(FaceletContext ctx, UIComponent parent,
String id)
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlOutputStylesheetHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlOutputStylesheetHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlOutputStylesheetHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/HtmlOutputStylesheetHandler.java Thu Sep 14 12:29:31 2017
@@ -48,6 +48,7 @@ public class HtmlOutputStylesheetHandler
super(config);
}
+ @Override
public UIComponent findChildByTagId(FaceletContext ctx, UIComponent parent,
String id)
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/_HtmlOutputScript.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/_HtmlOutputScript.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/_HtmlOutputScript.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/_HtmlOutputScript.java Thu Sep 14 12:29:31 2017
@@ -38,25 +38,12 @@ import org.apache.myfaces.buildtools.mav
abstract class _HtmlOutputScript extends UIOutput
{
- /**
- *
- * @return
- */
@JSFProperty
public abstract String getLibrary();
-
- /**
- *
- * @return
- */
@JSFProperty(required = true)
public abstract String getName();
- /**
- *
- * @return
- */
@JSFProperty
public abstract String getTarget();
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/_HtmlOutputStylesheet.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/_HtmlOutputStylesheet.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/_HtmlOutputStylesheet.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/_HtmlOutputStylesheet.java Thu Sep 14 12:29:31 2017
@@ -37,17 +37,10 @@ import org.apache.myfaces.buildtools.mav
defaultRendererType="javax.faces.resource.Stylesheet")
abstract class _HtmlOutputStylesheet extends UIOutput
{
- /**
- *
- * @return
- */
+
@JSFProperty
public abstract String getLibrary();
-
- /**
- *
- * @return
- */
+
@JSFProperty(required = true)
public abstract String getName();
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/CatchHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/CatchHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/CatchHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/CatchHandler.java Thu Sep 14 12:29:31 2017
@@ -60,6 +60,7 @@ public final class CatchHandler extends
this.var = this.getAttribute("var");
}
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseHandler.java Thu Sep 14 12:29:31 2017
@@ -84,6 +84,7 @@ public final class ChooseHandler extends
}
}
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseOtherwiseHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseOtherwiseHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseOtherwiseHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseOtherwiseHandler.java Thu Sep 14 12:29:31 2017
@@ -47,6 +47,7 @@ public final class ChooseOtherwiseHandle
super(config);
}
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseWhenHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseWhenHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseWhenHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseWhenHandler.java Thu Sep 14 12:29:31 2017
@@ -57,6 +57,7 @@ public final class ChooseWhenHandler ext
this.test = this.getRequiredAttribute("test");
}
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ForEachHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ForEachHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ForEachHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ForEachHandler.java Thu Sep 14 12:29:31 2017
@@ -78,16 +78,19 @@ public final class ForEachHandler extend
this.len = Array.getLength(src);
}
+ @Override
public boolean hasNext()
{
return this.i < this.len;
}
+ @Override
public Object next()
{
return Array.get(this.array, this.i++);
}
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
@@ -170,6 +173,7 @@ public final class ForEachHandler extend
}
}
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IfHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IfHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IfHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IfHandler.java Thu Sep 14 12:29:31 2017
@@ -78,6 +78,7 @@ public final class IfHandler extends Tag
this.var = this.getAttribute("var");
}
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, ELException
{
FaceletCompositionContext fcc = FaceletCompositionContext.getCurrentInstance(ctx);
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IndexedValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IndexedValueExpression.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IndexedValueExpression.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IndexedValueExpression.java Thu Sep 14 12:29:31 2017
@@ -28,29 +28,19 @@ import javax.el.ValueExpression;
public final class IndexedValueExpression extends ValueExpression
{
- /**
- *
- */
private static final long serialVersionUID = 1L;
private final Integer i;
private final ValueExpression orig;
- /**
- *
- */
public IndexedValueExpression(ValueExpression orig, int i)
{
this.i = Integer.valueOf(i);
this.orig = orig;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#getValue(javax.el.ELContext)
- */
+ @Override
public Object getValue(ELContext context)
{
Object base = this.orig.getValue(context);
@@ -62,11 +52,7 @@ public final class IndexedValueExpressio
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#setValue(javax.el.ELContext, java.lang.Object)
- */
+ @Override
public void setValue(ELContext context, Object value)
{
Object base = this.orig.getValue(context);
@@ -77,11 +63,7 @@ public final class IndexedValueExpressio
}
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#isReadOnly(javax.el.ELContext)
- */
+ @Override
public boolean isReadOnly(ELContext context)
{
Object base = this.orig.getValue(context);
@@ -93,11 +75,7 @@ public final class IndexedValueExpressio
return true;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#getType(javax.el.ELContext)
- */
+ @Override
public Class getType(ELContext context)
{
Object base = this.orig.getValue(context);
@@ -109,51 +87,31 @@ public final class IndexedValueExpressio
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#getExpectedType()
- */
+ @Override
public Class getExpectedType()
{
return Object.class;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.Expression#getExpressionString()
- */
+ @Override
public String getExpressionString()
{
return this.orig.getExpressionString();
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.Expression#equals(java.lang.Object)
- */
+ @Override
public boolean equals(Object obj)
{
return this.orig.equals(obj);
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.Expression#hashCode()
- */
+ @Override
public int hashCode()
{
return this.orig.hashCode();
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.Expression#isLiteralText()
- */
+ @Override
public boolean isLiteralText()
{
return false;
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IteratedValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IteratedValueExpression.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IteratedValueExpression.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IteratedValueExpression.java Thu Sep 14 12:29:31 2017
@@ -40,94 +40,58 @@ public final class IteratedValueExpressi
this.value = value;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#getValue(javax.el.ELContext)
- */
+ @Override
public Object getValue(ELContext context)
{
return value;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#setValue(javax.el.ELContext, java.lang.Object)
- */
+ @Override
public void setValue(ELContext context, Object value)
{
context.setPropertyResolved(false);
throw new PropertyNotWritableException();
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#isReadOnly(javax.el.ELContext)
- */
+ @Override
public boolean isReadOnly(ELContext context)
{
context.setPropertyResolved(false);
return true;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#getType(javax.el.ELContext)
- */
+ @Override
public Class getType(ELContext context)
{
context.setPropertyResolved(false);
return Object.class;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#getExpectedType()
- */
+ @Override
public Class getExpectedType()
{
return Object.class;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.Expression#getExpressionString()
- */
+ @Override
public String getExpressionString()
{
return this.orig.getExpressionString();
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.Expression#equals(java.lang.Object)
- */
+ @Override
public boolean equals(Object obj)
{
return this.orig.equals(obj);
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.Expression#hashCode()
- */
+ @Override
public int hashCode()
{
return this.orig.hashCode();
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.Expression#isLiteralText()
- */
+ @Override
public boolean isLiteralText()
{
return false;
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatus.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatus.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatus.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatus.java Thu Sep 14 12:29:31 2017
@@ -27,9 +27,6 @@ import java.io.Serializable;
public final class IterationStatus implements Serializable
{
- /**
- *
- */
private static final long serialVersionUID = 1L;
private final int index;
@@ -45,10 +42,7 @@ public final class IterationStatus imple
private final Integer step;
private final Object value;
-
- /**
- *
- */
+
public IterationStatus(boolean first, boolean last, int index, Integer begin, Integer end,
Integer step, Object value)
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatusExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatusExpression.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatusExpression.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IterationStatusExpression.java Thu Sep 14 12:29:31 2017
@@ -28,111 +28,70 @@ import javax.el.ValueExpression;
public final class IterationStatusExpression extends ValueExpression
{
- /**
- *
- */
private static final long serialVersionUID = 1L;
private final IterationStatus status;
- /**
- *
- */
public IterationStatusExpression(IterationStatus status)
{
this.status = status;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#getValue(javax.el.ELContext)
- */
+ @Override
public Object getValue(ELContext context)
{
return this.status;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#setValue(javax.el.ELContext, java.lang.Object)
- */
+ @Override
public void setValue(ELContext context, Object value)
{
throw new UnsupportedOperationException("Cannot set IterationStatus");
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#isReadOnly(javax.el.ELContext)
- */
+ @Override
public boolean isReadOnly(ELContext context)
{
return true;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#getType(javax.el.ELContext)
- */
+ @Override
public Class getType(ELContext context)
{
return IterationStatus.class;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#getExpectedType()
- */
+ @Override
public Class getExpectedType()
{
return IterationStatus.class;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.Expression#getExpressionString()
- */
+ @Override
public String getExpressionString()
{
return this.toString();
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.Expression#equals(java.lang.Object)
- */
+ @Override
public boolean equals(Object obj)
{
return this.status.equals(obj);
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.Expression#hashCode()
- */
+ @Override
public int hashCode()
{
return this.status.hashCode();
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.Expression#isLiteralText()
- */
+ @Override
public boolean isLiteralText()
{
return true;
}
+ @Override
public String toString()
{
return this.status.toString();
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacyForEachHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacyForEachHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacyForEachHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacyForEachHandler.java Thu Sep 14 12:29:31 2017
@@ -76,16 +76,19 @@ public final class LegacyForEachHandler
this.len = Array.getLength(src);
}
+ @Override
public boolean hasNext()
{
return this.i < this.len;
}
+ @Override
public Object next()
{
return Array.get(this.array, this.i++);
}
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
@@ -168,6 +171,7 @@ public final class LegacyForEachHandler
}
}
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacySetHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacySetHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacySetHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/LegacySetHandler.java Thu Sep 14 12:29:31 2017
@@ -96,6 +96,7 @@ public class LegacySetHandler extends Ta
this.property = this.getAttribute("property");
}
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/MappedValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/MappedValueExpression.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/MappedValueExpression.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/MappedValueExpression.java Thu Sep 14 12:29:31 2017
@@ -41,16 +41,19 @@ public final class MappedValueExpression
this.key = key;
}
+ @Override
public Object getKey()
{
return key;
}
+ @Override
public Object getValue()
{
return src.get(key);
}
+ @Override
public Object setValue(Object value)
{
return src.put(key, value);
@@ -58,29 +61,19 @@ public final class MappedValueExpression
}
- /**
- *
- */
private static final long serialVersionUID = 1L;
private final Object key;
private final ValueExpression orig;
- /**
- *
- */
public MappedValueExpression(ValueExpression orig, Map.Entry entry)
{
this.orig = orig;
this.key = entry.getKey();
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#getValue(javax.el.ELContext)
- */
+ @Override
public Object getValue(ELContext context)
{
Object base = this.orig.getValue(context);
@@ -93,11 +86,7 @@ public final class MappedValueExpression
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#setValue(javax.el.ELContext, java.lang.Object)
- */
+ @Override
public void setValue(ELContext context, Object value)
{
Object base = this.orig.getValue(context);
@@ -108,11 +97,7 @@ public final class MappedValueExpression
}
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#isReadOnly(javax.el.ELContext)
- */
+ @Override
public boolean isReadOnly(ELContext context)
{
Object base = this.orig.getValue(context);
@@ -124,11 +109,7 @@ public final class MappedValueExpression
return true;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#getType(javax.el.ELContext)
- */
+ @Override
public Class getType(ELContext context)
{
Object base = this.orig.getValue(context);
@@ -140,55 +121,33 @@ public final class MappedValueExpression
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.ValueExpression#getExpectedType()
- */
+ @Override
public Class getExpectedType()
{
return Object.class;
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.Expression#getExpressionString()
- */
+ @Override
public String getExpressionString()
{
return this.orig.getExpressionString();
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.Expression#equals(java.lang.Object)
- */
+ @Override
public boolean equals(Object obj)
{
return this.orig.equals(obj);
}
- /*
- * (non-Javadoc)
- *
- * @see javax.el.Expression#hashCode()
- */
+ @Override
public int hashCode()
{
- // TODO Auto-generated method stub
return 0;
}
- /*
- * (non-Javadoc)eturn new Map.Entry<K, V>
- *
- * @see javax.el.Expression#isLiteralText()
- */
+ @Override
public boolean isLiteralText()
{
- // TODO Auto-generated method stub
return false;
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/SetHandler.java Thu Sep 14 12:29:31 2017
@@ -96,6 +96,7 @@ public class SetHandler extends TagHandl
this.property = this.getAttribute("property");
}
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFnLibrary.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFnLibrary.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFnLibrary.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFnLibrary.java Thu Sep 14 12:29:31 2017
@@ -62,21 +62,25 @@ public class JstlFnLibrary implements Ta
}
}
+ @Override
public boolean containsNamespace(String ns)
{
return NAMESPACE.equals(ns) || ALIAS_NAMESPACE.equals(ns);
}
+ @Override
public boolean containsTagHandler(String ns, String localName)
{
return false;
}
+ @Override
public TagHandler createTagHandler(String ns, String localName, TagConfig tag) throws FacesException
{
return null;
}
+ @Override
public boolean containsFunction(String ns, String name)
{
if (NAMESPACE.equals(ns) || ALIAS_NAMESPACE.equals(ns))
@@ -87,6 +91,7 @@ public class JstlFnLibrary implements Ta
return false;
}
+ @Override
public Method createFunction(String ns, String name)
{
if (NAMESPACE.equals(ns) || ALIAS_NAMESPACE.equals(ns))
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/ComponentRef.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/ComponentRef.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/ComponentRef.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/ComponentRef.java Thu Sep 14 12:29:31 2017
@@ -35,6 +35,7 @@ public final class ComponentRef extends
super();
}
+ @Override
public String getFamily()
{
return COMPONENT_FAMILY;
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java Thu Sep 14 12:29:31 2017
@@ -117,6 +117,7 @@ public final class CompositionHandler ex
* @see javax.faces.view.facelets.FaceletHandler#apply(javax.faces.view.facelets.FaceletContext,
* javax.faces.component.UIComponent)
*/
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
@@ -162,6 +163,7 @@ public final class CompositionHandler ex
}
}
+ @Override
public boolean apply(FaceletContext ctx, UIComponent parent, String name) throws IOException, FacesException,
FaceletException, ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DebugPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DebugPhaseListener.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DebugPhaseListener.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DebugPhaseListener.java Thu Sep 14 12:29:31 2017
@@ -282,16 +282,19 @@ public class DebugPhaseListener implemen
private PhaseId _currentPhase;
private DebugVisitCallback _visitCallback = new DebugVisitCallback();
+ @Override
public void afterPhase(PhaseEvent event)
{
_doTreeVisit(event, true);
}
+ @Override
public void beforePhase(PhaseEvent event)
{
_doTreeVisit(event, false);
}
+ @Override
public PhaseId getPhaseId()
{
return PhaseId.ANY_PHASE;
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java Thu Sep 14 12:29:31 2017
@@ -62,7 +62,6 @@ import org.apache.myfaces.view.facelets.
public final class DecorateHandler extends TagHandler implements TemplateClient, ComponentContainerHandler
{
- //private static final Logger log = Logger.getLogger("facelets.tag.ui.decorate");
private static final Logger log = Logger.getLogger(DecorateHandler.class.getName());
/**
@@ -119,6 +118,7 @@ public final class DecorateHandler exten
* @see javax.faces.view.facelets.FaceletHandler#apply(javax.faces.view.facelets.FaceletContext,
* javax.faces.component.UIComponent)
*/
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
@@ -258,6 +258,7 @@ public final class DecorateHandler exten
}
}
+ @Override
public boolean apply(FaceletContext ctx, UIComponent parent, String name) throws IOException, FacesException,
FaceletException, ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DefineHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DefineHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DefineHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DefineHandler.java Thu Sep 14 12:29:31 2017
@@ -73,6 +73,7 @@ public final class DefineHandler extends
*
* @see javax.faces.view.facelets.FaceletHandler#apply(javax.faces.view.facelets.FaceletContext, javax.faces.component.UIComponent)
*/
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java Thu Sep 14 12:29:31 2017
@@ -107,6 +107,7 @@ public final class IncludeHandler extend
*
* @see javax.faces.view.facelets.FaceletHandler#apply(javax.faces.view.facelets.FaceletContext, javax.faces.component.UIComponent)
*/
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/InsertHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/InsertHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/InsertHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/InsertHandler.java Thu Sep 14 12:29:31 2017
@@ -83,6 +83,7 @@ public final class InsertHandler extends
*
* @see javax.faces.view.facelets.FaceletHandler#apply(javax.faces.view.facelets.FaceletContext, javax.faces.component.UIComponent)
*/
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyCompositionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyCompositionHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyCompositionHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyCompositionHandler.java Thu Sep 14 12:29:31 2017
@@ -52,7 +52,6 @@ import org.apache.myfaces.view.facelets.
public final class LegacyCompositionHandler extends TagHandler implements TemplateClient
{
- //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";
@@ -119,6 +118,7 @@ public final class LegacyCompositionHand
* @see javax.faces.view.facelets.FaceletHandler#apply(javax.faces.view.facelets.FaceletContext,
* javax.faces.component.UIComponent)
*/
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
@@ -153,6 +153,7 @@ public final class LegacyCompositionHand
}
}
+ @Override
public boolean apply(FaceletContext ctx, UIComponent parent, String name) throws IOException, FacesException,
FaceletException, ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyDecorateHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyDecorateHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyDecorateHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyDecorateHandler.java Thu Sep 14 12:29:31 2017
@@ -62,7 +62,6 @@ import org.apache.myfaces.view.facelets.
public final class LegacyDecorateHandler extends TagHandler implements TemplateClient
{
- //private static final Logger log = Logger.getLogger("facelets.tag.ui.decorate");
private static final Logger log = Logger.getLogger(DecorateHandler.class.getName());
/**
@@ -120,6 +119,7 @@ public final class LegacyDecorateHandler
* @see javax.faces.view.facelets.FaceletHandler#apply(javax.faces.view.facelets.FaceletContext,
* javax.faces.component.UIComponent)
*/
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
@@ -239,6 +239,7 @@ public final class LegacyDecorateHandler
}
}
+ @Override
public boolean apply(FaceletContext ctx, UIComponent parent, String name) throws IOException, FacesException,
FaceletException, ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyIncludeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyIncludeHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyIncludeHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyIncludeHandler.java Thu Sep 14 12:29:31 2017
@@ -110,6 +110,7 @@ public final class LegacyIncludeHandler
*
* @see javax.faces.view.facelets.FaceletHandler#apply(javax.faces.view.facelets.FaceletContext, javax.faces.component.UIComponent)
*/
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyParamHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyParamHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyParamHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyParamHandler.java Thu Sep 14 12:29:31 2017
@@ -78,6 +78,7 @@ public class LegacyParamHandler extends
* @see javax.faces.view.facelets.FaceletHandler#apply(javax.faces.view.facelets.FaceletContext,
* javax.faces.component.UIComponent)
*/
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/ParamHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/ParamHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/ParamHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/ParamHandler.java Thu Sep 14 12:29:31 2017
@@ -80,6 +80,7 @@ public class ParamHandler extends TagHan
* @see javax.faces.view.facelets.FaceletHandler#apply(javax.faces.view.facelets.FaceletContext,
* javax.faces.component.UIComponent)
*/
+ @Override
public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException,
ELException
{
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/RepeatHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/RepeatHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/RepeatHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/RepeatHandler.java Thu Sep 14 12:29:31 2017
@@ -44,6 +44,7 @@ public class RepeatHandler extends Compo
super(config);
}
+ @Override
protected MetaRuleset createMetaRuleset(Class type)
{
MetaRuleset meta = super.createMetaRuleset(type);
@@ -96,6 +97,7 @@ public class RepeatHandler extends Compo
_attrs = names.toArray(new String[names.size()]);
}
+ @Override
public void applyMetadata(FaceletContext ctx, Object instance)
{
UIComponent component = (UIComponent) instance;
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java Thu Sep 14 12:29:31 2017
@@ -72,11 +72,13 @@ public final class UIDebug extends UICom
setRendererType(null);
}
+ @Override
public String getFamily()
{
return COMPONENT_FAMILY;
}
+ @Override
public List<UIComponent> getChildren()
{
return new ArrayList<UIComponent>()
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/impl/DefaultViewScopeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/impl/DefaultViewScopeHandler.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/impl/DefaultViewScopeHandler.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/impl/DefaultViewScopeHandler.java Thu Sep 14 12:29:31 2017
@@ -99,6 +99,7 @@ public class DefaultViewScopeHandler ext
return Long.toString(nextToken, 36);
}
+ @Override
public void onSessionDestroyed()
{
FacesContext facesContext = FacesContext.getCurrentInstance();
@@ -128,6 +129,7 @@ public class DefaultViewScopeHandler ext
}
}
+ @Override
public Map<String, Object> createViewScopeMap(FacesContext facesContext, String viewScopeId)
{
String fullToken = VIEW_SCOPE_PREFIX_MAP + SEPARATOR_CHAR + viewScopeId + SEPARATOR_CHAR;
@@ -135,6 +137,7 @@ public class DefaultViewScopeHandler ext
return map;
}
+ @Override
public Map<String, Object> restoreViewScopeMap(FacesContext facesContext, String viewScopeId)
{
String fullToken = VIEW_SCOPE_PREFIX_MAP + SEPARATOR_CHAR + viewScopeId + SEPARATOR_CHAR;
@@ -150,6 +153,7 @@ public class DefaultViewScopeHandler ext
return new SubKeyMap<Object>(sessionMap, prefix);
}
+ @Override
public String generateViewScopeId(FacesContext facesContext)
{
// To ensure uniqueness in this part we use a counter that
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java Thu Sep 14 12:29:31 2017
@@ -54,7 +54,6 @@ import org.apache.myfaces.view.facelets.
*/
public class JspViewDeclarationLanguage extends JspViewDeclarationLanguageBase
{
- //private static final Log log = LogFactory.getLog(JspViewDeclarationLanguage.class);
public static final Logger log = Logger.getLogger(JspViewDeclarationLanguage.class.getName());
/**
@@ -246,6 +245,7 @@ public class JspViewDeclarationLanguage
}
}
+ @Override
public boolean viewExists(FacesContext facesContext, String viewId)
{
if (_strategy.handles(viewId))
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguageStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguageStrategy.java?rev=1808330&r1=1808329&r2=1808330&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguageStrategy.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguageStrategy.java Thu Sep 14 12:29:31 2017
@@ -56,6 +56,7 @@ public class JspViewDeclarationLanguageS
/**
* {@inheritDoc}
*/
+ @Override
public ViewDeclarationLanguage getViewDeclarationLanguage()
{
return _language;
@@ -64,6 +65,7 @@ public class JspViewDeclarationLanguageS
/**
* {@inheritDoc}
*/
+ @Override
public boolean handles(String viewId)
{
for (String suffix : _suffixes)