You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/11/15 18:11:10 UTC
svn commit: r1542331 [3/28] - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/
tobago-core/src/main/java/org/apache/myfaces/tobago/application/
tobago-core/src/main/java/org/apache/myfaces/tobago/compat/ tobago-core/s...
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeSelectedEvent.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeSelectedEvent.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeSelectedEvent.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TreeSelectedEvent.java Fri Nov 15 17:10:58 2013
@@ -30,17 +30,17 @@ public class TreeSelectedEvent extends F
private boolean oldSelected;
private boolean newSelected;
- public TreeSelectedEvent(UIComponent node, boolean oldSelected, boolean newSelected) {
+ public TreeSelectedEvent(final UIComponent node, final boolean oldSelected, final boolean newSelected) {
super(node);
this.oldSelected = oldSelected;
this.newSelected = newSelected;
}
- public boolean isAppropriateListener(FacesListener facesListener) {
+ public boolean isAppropriateListener(final FacesListener facesListener) {
return facesListener instanceof TreeSelectedListener;
}
- public void processListener(FacesListener facesListener) {
+ public void processListener(final FacesListener facesListener) {
if (facesListener instanceof TreeSelectedListener) {
if (oldSelected && !newSelected) {
((TreeSelectedListener) facesListener).treeSelected(this);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionPopupActionListener.java Fri Nov 15 17:10:58 2013
@@ -38,7 +38,7 @@ public class ValueExpressionPopupActionL
private ValueExpression popupIdExpression;
- public ValueExpressionPopupActionListener(ValueExpression expression) {
+ public ValueExpressionPopupActionListener(final ValueExpression expression) {
popupIdExpression = expression;
}
@@ -46,7 +46,7 @@ public class ValueExpressionPopupActionL
* @deprecated Since 2.0.0, please use the other constructor with explicit type
*/
@Deprecated
- public ValueExpressionPopupActionListener(Object expression) {
+ public ValueExpressionPopupActionListener(final Object expression) {
popupIdExpression = (ValueExpression) expression;
}
@@ -57,9 +57,9 @@ public class ValueExpressionPopupActionL
}
@Override
- protected AbstractUIPopup getPopup(ActionEvent actionEvent) {
- String id = (String) popupIdExpression.getValue(FacesContext.getCurrentInstance().getELContext());
- UIComponent popup = FindComponentUtils.findComponent(actionEvent.getComponent(), id);
+ protected AbstractUIPopup getPopup(final ActionEvent actionEvent) {
+ final String id = (String) popupIdExpression.getValue(FacesContext.getCurrentInstance().getELContext());
+ final UIComponent popup = FindComponentUtils.findComponent(actionEvent.getComponent(), id);
if (popup instanceof AbstractUIPopup) {
return (AbstractUIPopup) popup;
} else {
@@ -75,19 +75,19 @@ public class ValueExpressionPopupActionL
return false;
}
- public void restoreState(FacesContext context, Object state) {
- Object[] values = (Object[]) state;
+ public void restoreState(final FacesContext context, final Object state) {
+ final Object[] values = (Object[]) state;
popupIdExpression = (ValueExpression) UIComponentBase.restoreAttachedState(context, values[0]);
}
- public Object saveState(FacesContext context) {
- Object[] values = new Object[1];
+ public Object saveState(final FacesContext context) {
+ final Object[] values = new Object[1];
values[0] = UIComponentBase.saveAttachedState(context, popupIdExpression);
return values;
}
- public void setTransient(boolean newTransientValue) {
+ public void setTransient(final boolean newTransientValue) {
// ignore
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionResetInputActionListener.java Fri Nov 15 17:10:58 2013
@@ -44,13 +44,13 @@ public class ValueExpressionResetInputAc
public ValueExpressionResetInputActionListener() {
}
- public ValueExpressionResetInputActionListener(ValueExpression clientIdsExpression) {
+ public ValueExpressionResetInputActionListener(final ValueExpression clientIdsExpression) {
this.clientIdsExpression = clientIdsExpression;
}
- public void processAction(ActionEvent event) {
- Object obj = clientIdsExpression.getValue(FacesContext.getCurrentInstance().getELContext());
- String [] clientIds;
+ public void processAction(final ActionEvent event) {
+ final Object obj = clientIdsExpression.getValue(FacesContext.getCurrentInstance().getELContext());
+ final String [] clientIds;
if (obj instanceof String[]) {
clientIds = (String[]) obj;
} else if (obj instanceof String) {
@@ -59,8 +59,8 @@ public class ValueExpressionResetInputAc
LOG.error("Ignore unknown value of " + obj + " for reset.");
return;
}
- for (String clientId : clientIds) {
- UIComponent component = FindComponentUtils.findComponent(event.getComponent(), clientId);
+ for (final String clientId : clientIds) {
+ final UIComponent component = FindComponentUtils.findComponent(event.getComponent(), clientId);
if (component != null) {
resetChildren(component);
}
@@ -71,19 +71,19 @@ public class ValueExpressionResetInputAc
return false;
}
- public void restoreState(FacesContext context, Object state) {
- Object[] values = (Object[]) state;
+ public void restoreState(final FacesContext context, final Object state) {
+ final Object[] values = (Object[]) state;
clientIdsExpression = (ValueExpression) UIComponentBase.restoreAttachedState(context, values[0]);
}
- public Object saveState(FacesContext context) {
- Object[] values = new Object[1];
+ public Object saveState(final FacesContext context) {
+ final Object[] values = new Object[1];
values[0] = UIComponentBase.saveAttachedState(context, clientIdsExpression);
return values;
}
- public void setTransient(boolean newTransientValue) {
+ public void setTransient(final boolean newTransientValue) {
// ignore
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionSheetStateChangeListener.java Fri Nov 15 17:10:58 2013
@@ -37,13 +37,13 @@ public class ValueExpressionSheetStateCh
public ValueExpressionSheetStateChangeListener() {
}
- public ValueExpressionSheetStateChangeListener(String type, ValueExpression valueExpression) {
+ public ValueExpressionSheetStateChangeListener(final String type, final ValueExpression valueExpression) {
this.type = type;
this.valueExpression = valueExpression;
}
- public void processSheetStateChange(SheetStateChangeEvent sheetStateChangeEvent) {
- SheetStateChangeListener handler = getSheetStateChangeListener();
+ public void processSheetStateChange(final SheetStateChangeEvent sheetStateChangeEvent) {
+ final SheetStateChangeListener handler = getSheetStateChangeListener();
if (handler != null) {
handler.processSheetStateChange(sheetStateChangeEvent);
} else {
@@ -51,15 +51,15 @@ public class ValueExpressionSheetStateCh
}
}
- public Object saveState(FacesContext context) {
- Object[] state = new Object[2];
+ public Object saveState(final FacesContext context) {
+ final Object[] state = new Object[2];
state[0] = UIComponentBase.saveAttachedState(context, valueExpression);
state[1] = type;
return state;
}
- public void restoreState(FacesContext context, Object state) {
- Object[] values = (Object[]) state;
+ public void restoreState(final FacesContext context, final Object state) {
+ final Object[] values = (Object[]) state;
valueExpression = (ValueExpression) UIComponentBase.restoreAttachedState(context, values[0]);
type = (String) values[1];
@@ -69,14 +69,14 @@ public class ValueExpressionSheetStateCh
return false;
}
- public void setTransient(boolean newTransientValue) {
+ public void setTransient(final boolean newTransientValue) {
// ignore
}
private SheetStateChangeListener getSheetStateChangeListener() {
SheetStateChangeListener handler = null;
if (valueExpression != null) {
- Object obj = valueExpression.getValue(FacesContext.getCurrentInstance().getELContext());
+ final Object obj = valueExpression.getValue(FacesContext.getCurrentInstance().getELContext());
if (obj != null && obj instanceof SheetStateChangeListener) {
handler = (SheetStateChangeListener) obj;
}
@@ -90,11 +90,11 @@ public class ValueExpressionSheetStateCh
return handler;
}
- private SheetStateChangeListener createSheetStateChangeListener(String className) {
+ private SheetStateChangeListener createSheetStateChangeListener(final String className) {
try {
- Class clazz = getClass().getClassLoader().loadClass(className);
+ final Class clazz = getClass().getClassLoader().loadClass(className);
return ((SheetStateChangeListener) clazz.newInstance());
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.error("", e);
}
return null;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/ValueExpressionTabChangeListener.java Fri Nov 15 17:10:58 2013
@@ -37,13 +37,13 @@ public class ValueExpressionTabChangeLis
public ValueExpressionTabChangeListener() {
}
- public ValueExpressionTabChangeListener(String type, ValueExpression valueExpression) {
+ public ValueExpressionTabChangeListener(final String type, final ValueExpression valueExpression) {
this.type = type;
this.valueExpression = valueExpression;
}
- public void processTabChange(TabChangeEvent tabChangeEvent) {
- TabChangeListener handler = getTabChangeListener();
+ public void processTabChange(final TabChangeEvent tabChangeEvent) {
+ final TabChangeListener handler = getTabChangeListener();
if (handler != null) {
handler.processTabChange(tabChangeEvent);
} else {
@@ -51,15 +51,15 @@ public class ValueExpressionTabChangeLis
}
}
- public Object saveState(FacesContext context) {
- Object[] state = new Object[2];
+ public Object saveState(final FacesContext context) {
+ final Object[] state = new Object[2];
state[0] = UIComponentBase.saveAttachedState(context, valueExpression);
state[1] = type;
return state;
}
- public void restoreState(FacesContext context, Object state) {
- Object[] values = (Object[]) state;
+ public void restoreState(final FacesContext context, final Object state) {
+ final Object[] values = (Object[]) state;
valueExpression = (ValueExpression) UIComponentBase.restoreAttachedState(context, values[0]);
type = (String) values[1];
@@ -69,14 +69,14 @@ public class ValueExpressionTabChangeLis
return false;
}
- public void setTransient(boolean newTransientValue) {
+ public void setTransient(final boolean newTransientValue) {
// ignore
}
private TabChangeListener getTabChangeListener() {
TabChangeListener handler = null;
if (valueExpression != null) {
- Object obj = valueExpression.getValue(FacesContext.getCurrentInstance().getELContext());
+ final Object obj = valueExpression.getValue(FacesContext.getCurrentInstance().getELContext());
if (obj != null && obj instanceof TabChangeListener) {
handler = (TabChangeListener) obj;
}
@@ -90,11 +90,11 @@ public class ValueExpressionTabChangeLis
return handler;
}
- private TabChangeListener createTabChangeListener(String className) {
+ private TabChangeListener createTabChangeListener(final String className) {
try {
- Class clazz = getClass().getClassLoader().loadClass(className);
+ final Class clazz = getClass().getClassLoader().loadClass(className);
return ((TabChangeListener) clazz.newInstance());
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.error("", e);
}
return null;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java Fri Nov 15 17:10:58 2013
@@ -63,14 +63,14 @@ public final class AttributeHandler exte
private final TagAttribute mode;
- public AttributeHandler(TagConfig config) {
+ public AttributeHandler(final TagConfig config) {
super(config);
this.name = getRequiredAttribute(Attributes.NAME);
this.value = getRequiredAttribute(Attributes.VALUE);
this.mode = getAttribute(Attributes.MODE);
}
- public void apply(FaceletContext faceletContext, UIComponent parent) throws ELException {
+ public void apply(final FaceletContext faceletContext, final UIComponent parent) throws ELException {
if (parent == null) {
throw new TagException(tag, "Parent UIComponent was null");
}
@@ -84,7 +84,7 @@ public final class AttributeHandler exte
if (!value.isLiteral()) {
while (isSimpleExpression(expressionString)) {
if (isMethodOrValueExpression(expressionString)) {
- ValueExpression expression
+ final ValueExpression expression
= faceletContext.getVariableMapper().resolveVariable(removeElParenthesis(expressionString));
if (expression == null) {
result = true;
@@ -107,7 +107,7 @@ public final class AttributeHandler exte
if (!value.isLiteral()) {
while (isSimpleExpression(expressionString)) {
if (isMethodOrValueExpression(expressionString)) {
- ValueExpression expression
+ final ValueExpression expression
= faceletContext.getVariableMapper().resolveVariable(removeElParenthesis(expressionString));
if (expression == null) {
result = false;
@@ -128,7 +128,7 @@ public final class AttributeHandler exte
String expressionString = value.getValue();
while (isSimpleExpression(expressionString)) {
if (isMethodOrValueExpression(expressionString)) {
- ValueExpression expression
+ final ValueExpression expression
= faceletContext.getVariableMapper().resolveVariable(removeElParenthesis(expressionString));
if (expression == null) {
// when the action hasn't been set while using a composition.
@@ -145,8 +145,8 @@ public final class AttributeHandler exte
}
}
if (expressionString != null) {
- ExpressionFactory expressionFactory = faceletContext.getExpressionFactory();
- MethodExpression action = new TagMethodExpression(value, expressionFactory.createMethodExpression(
+ final ExpressionFactory expressionFactory = faceletContext.getExpressionFactory();
+ final MethodExpression action = new TagMethodExpression(value, expressionFactory.createMethodExpression(
faceletContext, expressionString, String.class, ComponentUtils.ACTION_ARGS));
((ActionSource2) parent).setActionExpression(action);
}
@@ -154,7 +154,7 @@ public final class AttributeHandler exte
String expressionString = value.getValue();
while (isSimpleExpression(expressionString)) {
if (isMethodOrValueExpression(expressionString)) {
- ValueExpression expression
+ final ValueExpression expression
= faceletContext.getVariableMapper().resolveVariable(removeElParenthesis(expressionString));
if (expression == null) {
if (LOG.isDebugEnabled()) {
@@ -173,21 +173,22 @@ public final class AttributeHandler exte
}
}
if (expressionString != null) {
- ExpressionFactory expressionFactory = faceletContext.getExpressionFactory();
- MethodExpression actionListener = new TagMethodExpression(value, expressionFactory.createMethodExpression(
+ final ExpressionFactory expressionFactory = faceletContext.getExpressionFactory();
+ final MethodExpression actionListener
+ = new TagMethodExpression(value, expressionFactory.createMethodExpression(
faceletContext, expressionString, null, ComponentUtils.ACTION_LISTENER_ARGS));
((ActionSource) parent).addActionListener(new MethodExpressionActionListener(actionListener));
}
} else if ("actionFromValue".equals(mode.getValue())) {
if (!value.isLiteral()) {
- String result = value.getValue(faceletContext);
+ final String result = value.getValue(faceletContext);
parent.getAttributes().put(name.getValue(), new ConstantMethodBinding(result));
}
} else if ("valueIfSet".equals(mode.getValue())) {
String expressionString = value.getValue();
String lastExpressionString = null;
while (isMethodOrValueExpression(expressionString) && isSimpleExpression(expressionString)) {
- ValueExpression expression
+ final ValueExpression expression
= faceletContext.getVariableMapper().resolveVariable(removeElParenthesis(expressionString));
if (expression != null) {
lastExpressionString = expressionString;
@@ -201,7 +202,7 @@ public final class AttributeHandler exte
if (expressionString != null) {
final String attributeName = name.getValue(faceletContext);
if (containsMethodOrValueExpression(expressionString)) {
- ValueExpression expression = value.getValueExpression(faceletContext, Object.class);
+ final ValueExpression expression = value.getValueExpression(faceletContext, Object.class);
parent.setValueExpression(attributeName, expression);
} else {
final Object literalValue = getValue(faceletContext, parent, expressionString, attributeName);
@@ -213,7 +214,7 @@ public final class AttributeHandler exte
}
} else {
- String nameValue = name.getValue(faceletContext);
+ final String nameValue = name.getValue(faceletContext);
if (Attributes.RENDERED.equals(nameValue)) {
if (value.isLiteral()) {
parent.setRendered(value.getBoolean(faceletContext));
@@ -224,7 +225,7 @@ public final class AttributeHandler exte
&& parent instanceof SupportsRenderedPartially) {
if (value.isLiteral()) {
- String[] components = ComponentUtils.splitList(value.getValue());
+ final String[] components = ComponentUtils.splitList(value.getValue());
((SupportsRenderedPartially) parent).setRenderedPartially(components);
} else {
parent.setValueExpression(nameValue, value.getValueExpression(faceletContext, Object.class));
@@ -237,20 +238,21 @@ public final class AttributeHandler exte
if (value.isLiteral()) {
((SupportsMarkup) parent).setMarkup(Markup.valueOf(value.getValue()));
} else {
- ValueExpression expression = value.getValueExpression(faceletContext, Object.class);
+ final ValueExpression expression = value.getValueExpression(faceletContext, Object.class);
parent.setValueExpression(nameValue, expression);
}
} else {
LOG.error("Component is not instanceof SupportsMarkup. Instance is: " + parent.getClass().getName());
}
} else if (parent instanceof EditableValueHolder && Attributes.VALIDATOR.equals(nameValue)) {
- MethodExpression methodExpression = getMethodExpression(faceletContext, null, ComponentUtils.VALIDATOR_ARGS);
+ final MethodExpression methodExpression
+ = getMethodExpression(faceletContext, null, ComponentUtils.VALIDATOR_ARGS);
if (methodExpression != null) {
((EditableValueHolder) parent).addValidator(new MethodExpressionValidator(methodExpression));
}
} else if (parent instanceof EditableValueHolder
&& Attributes.VALUE_CHANGE_LISTENER.equals(nameValue)) {
- MethodExpression methodExpression =
+ final MethodExpression methodExpression =
getMethodExpression(faceletContext, null, ComponentUtils.VALUE_CHANGE_LISTENER_ARGS);
if (methodExpression != null) {
((EditableValueHolder) parent).addValueChangeListener(
@@ -259,12 +261,13 @@ public final class AttributeHandler exte
} else if (parent instanceof ValueHolder && Attributes.CONVERTER.equals(nameValue)) {
setConverter(faceletContext, parent, nameValue);
} else if (parent instanceof ActionSource && Attributes.ACTION.equals(nameValue)) {
- MethodExpression action = getMethodExpression(faceletContext, String.class, ComponentUtils.ACTION_ARGS);
+ final MethodExpression action = getMethodExpression(faceletContext, String.class, ComponentUtils.ACTION_ARGS);
if (action != null) {
((ActionSource2) parent).setActionExpression(action);
}
} else if (parent instanceof ActionSource && Attributes.ACTION_LISTENER.equals(nameValue)) {
- MethodExpression action = getMethodExpression(faceletContext, null, ComponentUtils.ACTION_LISTENER_ARGS);
+ final MethodExpression action
+ = getMethodExpression(faceletContext, null, ComponentUtils.ACTION_LISTENER_ARGS);
if (action != null) {
((ActionSource) parent).addActionListener(new MethodExpressionActionListener(action));
}
@@ -279,35 +282,36 @@ public final class AttributeHandler exte
}
}
- private boolean isMethodOrValueExpression(String string) {
+ private boolean isMethodOrValueExpression(final String string) {
return (string.startsWith("${") || string.startsWith("#{")) && string.endsWith("}");
}
- private boolean containsMethodOrValueExpression(String string) {
+ private boolean containsMethodOrValueExpression(final String string) {
return (string.contains("${") || string.contains("#{")) && string.contains("}");
}
- private boolean isSimpleExpression(String string) {
+ private boolean isSimpleExpression(final String string) {
return string.indexOf('.') < 0 && string.indexOf('[') < 0;
}
- private String removeElParenthesis(String string) {
+ private String removeElParenthesis(final String string) {
return string.substring(2, string.length() - 1);
}
- private ValueExpression getExpression(FaceletContext faceletContext) {
- String myValue = removeElParenthesis(value.getValue());
+ private ValueExpression getExpression(final FaceletContext faceletContext) {
+ final String myValue = removeElParenthesis(value.getValue());
return faceletContext.getVariableMapper().resolveVariable(myValue);
}
- private MethodExpression getMethodExpression(FaceletContext faceletContext, Class returnType, Class[] args) {
+ private MethodExpression getMethodExpression(
+ final FaceletContext faceletContext, final Class returnType, final Class[] args) {
// in a composition may be we get the method expression string from the current variable mapper
// the expression can be empty
// in this case return nothing
if (value.getValue().startsWith("${")) {
- ValueExpression expression = getExpression(faceletContext);
+ final ValueExpression expression = getExpression(faceletContext);
if (expression != null) {
- ExpressionFactory expressionFactory = faceletContext.getExpressionFactory();
+ final ExpressionFactory expressionFactory = faceletContext.getExpressionFactory();
return new TagMethodExpression(value, expressionFactory.createMethodExpression(faceletContext,
expression.getExpressionString(), returnType, args));
} else {
@@ -319,26 +323,27 @@ public final class AttributeHandler exte
}
private Object getValue(
- FaceletContext faceletContext, UIComponent parent, String expressionString, String attributeName) {
+ final FaceletContext faceletContext, final UIComponent parent, final String expressionString,
+ final String attributeName) {
Class type = Object.class;
try {
type = PropertyUtils.getReadMethod(
new PropertyDescriptor(attributeName, parent.getClass())).getReturnType();
- } catch (IntrospectionException e) {
+ } catch (final IntrospectionException e) {
LOG.warn("Can't determine expected type", e);
}
- ExpressionFactory expressionFactory = faceletContext.getExpressionFactory();
+ final ExpressionFactory expressionFactory = faceletContext.getExpressionFactory();
final ValueExpression valueExpression = expressionFactory
.createValueExpression(faceletContext, expressionString, type);
return valueExpression.getValue(faceletContext);
}
- private void setConverter(FaceletContext faceletContext, UIComponent parent, String nameValue) {
+ private void setConverter(final FaceletContext faceletContext, final UIComponent parent, final String nameValue) {
// in a composition may be we get the converter expression string from the current variable mapper
// the expression can be empty
// in this case return nothing
if (value.getValue().startsWith("${")) {
- ValueExpression expression = getExpression(faceletContext);
+ final ValueExpression expression = getExpression(faceletContext);
if (expression != null) {
setConverter(faceletContext, parent, nameValue, expression);
}
@@ -348,9 +353,10 @@ public final class AttributeHandler exte
}
private void setConverter(
- FaceletContext faceletContext, UIComponent parent, String nameValue, ValueExpression expression) {
+ final FaceletContext faceletContext, final UIComponent parent, final String nameValue,
+ final ValueExpression expression) {
if (expression.isLiteralText()) {
- Converter converter =
+ final Converter converter =
faceletContext.getFacesContext().getApplication().createConverter(expression.getExpressionString());
((ValueHolder) parent).setConverter(converter);
} else {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ContentTypeRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ContentTypeRule.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ContentTypeRule.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ContentTypeRule.java Fri Nov 15 17:10:58 2013
@@ -32,7 +32,7 @@ public class ContentTypeRule extends Met
public static final ContentTypeRule INSTANCE = new ContentTypeRule();
- public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget metadataTarget) {
+ public Metadata applyRule(final String name, final TagAttribute attribute, final MetadataTarget metadataTarget) {
if ("contentType".equals(name)) {
return new ContentTypeRuleMapper(attribute);
}
@@ -43,12 +43,12 @@ public class ContentTypeRule extends Met
private final TagAttribute attribute;
- public ContentTypeRuleMapper(TagAttribute attribute) {
+ public ContentTypeRuleMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
- String[] components = ComponentUtils.splitList(attribute.getValue(ctx));
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
+ final String[] components = ComponentUtils.splitList(attribute.getValue(ctx));
((FileItemValidator) instance).setContentType(components);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ConverterHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ConverterHandler.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ConverterHandler.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ConverterHandler.java Fri Nov 15 17:10:58 2013
@@ -40,17 +40,17 @@ public class ConverterHandler extends Ta
private final TagAttribute binding;
- public ConverterHandler(TagConfig config) {
+ public ConverterHandler(final TagConfig config) {
super(config);
binding = getAttribute("binding");
converterId = getAttribute("type");
}
- public void apply(FaceletContext faceletContext, UIComponent parent)
+ public void apply(final FaceletContext faceletContext, final UIComponent parent)
throws IOException, ELException {
if (parent instanceof ValueHolder) {
if (ComponentHandler.isNew(parent)) {
- ValueHolder valueHolder = (ValueHolder) parent;
+ final ValueHolder valueHolder = (ValueHolder) parent;
Converter converter = null;
ValueExpression valueExpression = null;
if (binding != null) {
@@ -61,7 +61,7 @@ public class ConverterHandler extends Ta
try {
converter = FacesContext.getCurrentInstance().getApplication().createConverter(
(String) converterId.getValueExpression(faceletContext, String.class).getValue(faceletContext));
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new TagAttributeException(tag, converterId, e.getCause());
}
if (valueExpression != null) {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DataAttributeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DataAttributeHandler.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DataAttributeHandler.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DataAttributeHandler.java Fri Nov 15 17:10:58 2013
@@ -37,23 +37,23 @@ public final class DataAttributeHandler
private final TagAttribute value;
- public DataAttributeHandler(TagConfig config) {
+ public DataAttributeHandler(final TagConfig config) {
super(config);
this.name = getRequiredAttribute(Attributes.NAME);
this.value = getRequiredAttribute(Attributes.VALUE);
}
- public void apply(FaceletContext faceletContext, UIComponent parent) throws ELException {
+ public void apply(final FaceletContext faceletContext, final UIComponent parent) throws ELException {
if (parent == null) {
throw new TagException(tag, "Parent UIComponent was null");
}
if (ComponentHandler.isNew(parent)) {
- Object attributeName = name.isLiteral()
+ final Object attributeName = name.isLiteral()
? (Object) name.getValue(faceletContext)
: name.getValueExpression(faceletContext, Object.class);
- Object attributeValue = value.isLiteral()
+ final Object attributeValue = value.isLiteral()
? (Object) value.getValue(faceletContext)
: value.getValueExpression(faceletContext, Object.class);
ComponentUtils.putDataAttribute(parent, attributeName, attributeValue);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DefaultResourceResolver.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DefaultResourceResolver.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DefaultResourceResolver.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DefaultResourceResolver.java Fri Nov 15 17:10:58 2013
@@ -34,10 +34,10 @@ public class DefaultResourceResolver ext
super();
}
- public URL resolveUrl(String path) {
+ public URL resolveUrl(final String path) {
try {
return Resource.getResourceUrl(FacesContext.getCurrentInstance(), path);
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new FacesException(e);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DeprecatedDimensionRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DeprecatedDimensionRule.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DeprecatedDimensionRule.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DeprecatedDimensionRule.java Fri Nov 15 17:10:58 2013
@@ -35,7 +35,7 @@ public class DeprecatedDimensionRule ext
public static final DeprecatedDimensionRule INSTANCE = new DeprecatedDimensionRule();
- public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget metadataTarget) {
+ public Metadata applyRule(final String name, final TagAttribute attribute, final MetadataTarget metadataTarget) {
if (Attributes.WIDTH.equals(name)) {
return new WidthMapper(attribute);
}
@@ -48,15 +48,15 @@ public class DeprecatedDimensionRule ext
static final class WidthMapper extends Metadata {
private final TagAttribute attribute;
- WidthMapper(TagAttribute attribute) {
+ WidthMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
if (attribute.isLiteral()) {
((DeprecatedDimension) instance).setWidth(Measure.parse(attribute.getValue()));
} else {
- ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
+ final ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
((UIComponent) instance).setValueExpression(Attributes.WIDTH, expression);
}
}
@@ -65,15 +65,15 @@ public class DeprecatedDimensionRule ext
static final class HeightMapper extends Metadata {
private final TagAttribute attribute;
- HeightMapper(TagAttribute attribute) {
+ HeightMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
if (attribute.isLiteral()) {
((DeprecatedDimension) instance).setHeight(Measure.parse(attribute.getValue()));
} else {
- ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
+ final ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
((UIComponent) instance).setValueExpression(Attributes.HEIGHT, expression);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FixCharacterEncodingFilter.java Fri Nov 15 17:10:58 2013
@@ -28,12 +28,12 @@ import javax.servlet.FilterChain;
import java.io.IOException;
public class FixCharacterEncodingFilter implements Filter {
- public void init(FilterConfig filterConfig) throws ServletException {
+ public void init(final FilterConfig filterConfig) throws ServletException {
}
- public void doFilter(ServletRequest servletRequest,
- ServletResponse servletResponse, FilterChain filterChain)
+ public void doFilter(final ServletRequest servletRequest,
+ final ServletResponse servletResponse, final FilterChain filterChain)
throws IOException, ServletException {
if (servletRequest.getCharacterEncoding() == null) {
servletRequest.setCharacterEncoding("UTF-8");
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FlowLayoutRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FlowLayoutRule.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FlowLayoutRule.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/FlowLayoutRule.java Fri Nov 15 17:10:58 2013
@@ -34,7 +34,7 @@ public class FlowLayoutRule extends Meta
public static final FlowLayoutRule INSTANCE = new FlowLayoutRule();
- public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget metadataTarget) {
+ public Metadata applyRule(final String name, final TagAttribute attribute, final MetadataTarget metadataTarget) {
if (metadataTarget.isTargetInstanceOf(UIFlowLayout.class)) {
if (attribute.isLiteral()) {
if (Attributes.TEXT_ALIGN.equals(name)) {
@@ -63,12 +63,12 @@ public class FlowLayoutRule extends Meta
static final class TextAlignMapper extends Metadata {
private final TagAttribute attribute;
- TextAlignMapper(TagAttribute attribute) {
+ TextAlignMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
- UIFlowLayout gridLayout = (UIFlowLayout) instance;
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
+ final UIFlowLayout gridLayout = (UIFlowLayout) instance;
gridLayout.setTextAlign(TextAlign.parse(attribute.getValue()));
}
}
@@ -76,12 +76,12 @@ public class FlowLayoutRule extends Meta
static final class MarginLeftMapper extends Metadata {
private final TagAttribute attribute;
- MarginLeftMapper(TagAttribute attribute) {
+ MarginLeftMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
- UIFlowLayout gridLayout = (UIFlowLayout) instance;
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
+ final UIFlowLayout gridLayout = (UIFlowLayout) instance;
gridLayout.setMarginLeft(Measure.valueOf(attribute.getValue()));
}
}
@@ -89,12 +89,12 @@ public class FlowLayoutRule extends Meta
static final class MarginTopMapper extends Metadata {
private final TagAttribute attribute;
- MarginTopMapper(TagAttribute attribute) {
+ MarginTopMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
- UIFlowLayout gridLayout = (UIFlowLayout) instance;
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
+ final UIFlowLayout gridLayout = (UIFlowLayout) instance;
gridLayout.setMarginTop(Measure.valueOf(attribute.getValue()));
}
}
@@ -102,12 +102,12 @@ public class FlowLayoutRule extends Meta
static final class MarginRightMapper extends Metadata {
private final TagAttribute attribute;
- MarginRightMapper(TagAttribute attribute) {
+ MarginRightMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
- UIFlowLayout gridLayout = (UIFlowLayout) instance;
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
+ final UIFlowLayout gridLayout = (UIFlowLayout) instance;
gridLayout.setMarginRight(Measure.valueOf(attribute.getValue()));
}
}
@@ -115,12 +115,12 @@ public class FlowLayoutRule extends Meta
static final class MarginBottomMapper extends Metadata {
private final TagAttribute attribute;
- MarginBottomMapper(TagAttribute attribute) {
+ MarginBottomMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
- UIFlowLayout gridLayout = (UIFlowLayout) instance;
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
+ final UIFlowLayout gridLayout = (UIFlowLayout) instance;
gridLayout.setMarginBottom(Measure.valueOf(attribute.getValue()));
}
}
@@ -128,12 +128,12 @@ public class FlowLayoutRule extends Meta
static final class MarginMapper extends Metadata {
private final TagAttribute attribute;
- MarginMapper(TagAttribute attribute) {
+ MarginMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
- UIFlowLayout gridLayout = (UIFlowLayout) instance;
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
+ final UIFlowLayout gridLayout = (UIFlowLayout) instance;
gridLayout.setMargin(Measure.valueOf(attribute.getValue()));
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutConstraintHandler.java Fri Nov 15 17:10:58 2013
@@ -69,7 +69,7 @@ public class GridLayoutConstraintHandler
private final TagAttribute paddingTop;
private final TagAttribute paddingBottom;
- public GridLayoutConstraintHandler(TagConfig config) {
+ public GridLayoutConstraintHandler(final TagConfig config) {
super(config);
columnSpan = getAttribute(Attributes.COLUMN_SPAN);
rowSpan = getAttribute(Attributes.ROW_SPAN);
@@ -95,7 +95,7 @@ public class GridLayoutConstraintHandler
paddingBottom = getAttribute(Attributes.PADDING_BOTTOM);
}
- public void apply(FaceletContext faceletContext, UIComponent parent) throws IOException {
+ public void apply(final FaceletContext faceletContext, UIComponent parent) throws IOException {
if (parent.getParent() != null && parent.getParent() instanceof UIExtensionPanel) {
parent = parent.getParent();
} else if (parent.getAttributes().get("tobago.panel") != null
@@ -103,7 +103,7 @@ public class GridLayoutConstraintHandler
parent = (UIComponent) parent.getAttributes().get("tobago.panel");
}
if (parent instanceof LayoutBase) {
- LayoutBase component = (LayoutBase) parent;
+ final LayoutBase component = (LayoutBase) parent;
if (parent instanceof LayoutComponent && columnSpan != null) {
if (columnSpan.isLiteral()) {
@@ -236,7 +236,7 @@ public class GridLayoutConstraintHandler
}
if (parent instanceof LayoutContainer) {
- LayoutContainer container = (LayoutContainer) parent;
+ final LayoutContainer container = (LayoutContainer) parent;
if (borderLeft != null) {
if (borderLeft.isLiteral()) {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutRule.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutRule.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/GridLayoutRule.java Fri Nov 15 17:10:58 2013
@@ -33,7 +33,7 @@ public class GridLayoutRule extends Meta
public static final GridLayoutRule INSTANCE = new GridLayoutRule();
- public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget metadataTarget) {
+ public Metadata applyRule(final String name, final TagAttribute attribute, final MetadataTarget metadataTarget) {
if (metadataTarget.isTargetInstanceOf(UIGridLayout.class)) {
if (attribute.isLiteral()) {
if (Attributes.COLUMN_SPACING.equals(name)) {
@@ -68,12 +68,12 @@ public class GridLayoutRule extends Meta
static final class ColumnSpacingMapper extends Metadata {
private final TagAttribute attribute;
- ColumnSpacingMapper(TagAttribute attribute) {
+ ColumnSpacingMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
- UIGridLayout gridLayout = (UIGridLayout) instance;
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
+ final UIGridLayout gridLayout = (UIGridLayout) instance;
gridLayout.setColumnSpacing(Measure.parse(attribute.getValue()));
}
}
@@ -81,12 +81,12 @@ public class GridLayoutRule extends Meta
static final class RowSpacingMapper extends Metadata {
private final TagAttribute attribute;
- RowSpacingMapper(TagAttribute attribute) {
+ RowSpacingMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
- UIGridLayout gridLayout = (UIGridLayout) instance;
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
+ final UIGridLayout gridLayout = (UIGridLayout) instance;
gridLayout.setRowSpacing(Measure.parse(attribute.getValue()));
}
}
@@ -94,12 +94,12 @@ public class GridLayoutRule extends Meta
static final class CellspacingMapper extends Metadata {
private final TagAttribute attribute;
- CellspacingMapper(TagAttribute attribute) {
+ CellspacingMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
- UIGridLayout gridLayout = (UIGridLayout) instance;
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
+ final UIGridLayout gridLayout = (UIGridLayout) instance;
gridLayout.setCellspacing(Measure.parse(attribute.getValue()));
}
}
@@ -107,12 +107,12 @@ public class GridLayoutRule extends Meta
static final class MarginLeftMapper extends Metadata {
private final TagAttribute attribute;
- MarginLeftMapper(TagAttribute attribute) {
+ MarginLeftMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
- UIGridLayout gridLayout = (UIGridLayout) instance;
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
+ final UIGridLayout gridLayout = (UIGridLayout) instance;
gridLayout.setMarginLeft(Measure.valueOf(attribute.getValue()));
}
}
@@ -120,12 +120,12 @@ public class GridLayoutRule extends Meta
static final class MarginTopMapper extends Metadata {
private final TagAttribute attribute;
- MarginTopMapper(TagAttribute attribute) {
+ MarginTopMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
- UIGridLayout gridLayout = (UIGridLayout) instance;
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
+ final UIGridLayout gridLayout = (UIGridLayout) instance;
gridLayout.setMarginTop(Measure.valueOf(attribute.getValue()));
}
}
@@ -133,12 +133,12 @@ public class GridLayoutRule extends Meta
static final class MarginRightMapper extends Metadata {
private final TagAttribute attribute;
- MarginRightMapper(TagAttribute attribute) {
+ MarginRightMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
- UIGridLayout gridLayout = (UIGridLayout) instance;
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
+ final UIGridLayout gridLayout = (UIGridLayout) instance;
gridLayout.setMarginRight(Measure.valueOf(attribute.getValue()));
}
}
@@ -146,12 +146,12 @@ public class GridLayoutRule extends Meta
static final class MarginBottomMapper extends Metadata {
private final TagAttribute attribute;
- MarginBottomMapper(TagAttribute attribute) {
+ MarginBottomMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
- UIGridLayout gridLayout = (UIGridLayout) instance;
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
+ final UIGridLayout gridLayout = (UIGridLayout) instance;
gridLayout.setMarginBottom(Measure.valueOf(attribute.getValue()));
}
}
@@ -159,12 +159,12 @@ public class GridLayoutRule extends Meta
static final class MarginMapper extends Metadata {
private final TagAttribute attribute;
- MarginMapper(TagAttribute attribute) {
+ MarginMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
- UIGridLayout gridLayout = (UIGridLayout) instance;
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
+ final UIGridLayout gridLayout = (UIGridLayout) instance;
gridLayout.setMargin(Measure.valueOf(attribute.getValue()));
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java Fri Nov 15 17:10:58 2013
@@ -34,16 +34,16 @@ public class LoadBundleHandler extends T
private final TagAttribute var;
- public LoadBundleHandler(TagConfig config) {
+ public LoadBundleHandler(final TagConfig config) {
super(config);
this.basename = getRequiredAttribute("basename");
this.var = getRequiredAttribute("var");
}
- public void apply(FaceletContext faceletContext, UIComponent parent) throws IOException {
- String name = basename.getValue(faceletContext);
- BundleMapWrapper map = new BundleMapWrapper(name);
- FacesContext facesContext = faceletContext.getFacesContext();
+ public void apply(final FaceletContext faceletContext, final UIComponent parent) throws IOException {
+ final String name = basename.getValue(faceletContext);
+ final BundleMapWrapper map = new BundleMapWrapper(name);
+ final FacesContext facesContext = faceletContext.getFacesContext();
// TODO find a better way
facesContext.getExternalContext().
getSessionMap().put(var.getValue(faceletContext), map);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java Fri Nov 15 17:10:58 2013
@@ -38,19 +38,19 @@ public class PopupReferenceHandler exten
private final TagAttribute forComponent;
- public PopupReferenceHandler(TagConfig config) {
+ public PopupReferenceHandler(final TagConfig config) {
super(config);
forComponent = getAttribute(Attributes.FOR);
}
- public void apply(FaceletContext faceletContext, UIComponent parent) throws IOException {
+ public void apply(final FaceletContext faceletContext, final UIComponent parent) throws IOException {
if (parent instanceof ActionSource) {
if (ComponentHandler.isNew(parent)) {
- ActionSource actionSource = (ActionSource) parent;
+ final ActionSource actionSource = (ActionSource) parent;
if (forComponent.isLiteral()) {
actionSource.addActionListener(new PopupActionListener(forComponent.getValue()));
} else {
- ValueExpression forValueExpression = forComponent.getValueExpression(faceletContext, String.class);
+ final ValueExpression forValueExpression = forComponent.getValueExpression(faceletContext, String.class);
actionSource.addActionListener(new ValueExpressionPopupActionListener(forValueExpression));
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PositionRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PositionRule.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PositionRule.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/PositionRule.java Fri Nov 15 17:10:58 2013
@@ -35,7 +35,7 @@ public class PositionRule extends MetaRu
public static final PositionRule INSTANCE = new PositionRule();
- public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget metadataTarget) {
+ public Metadata applyRule(final String name, final TagAttribute attribute, final MetadataTarget metadataTarget) {
if (Attributes.LEFT.equals(name)) {
return new LeftMapper(attribute);
}
@@ -48,15 +48,15 @@ public class PositionRule extends MetaRu
static final class LeftMapper extends Metadata {
private final TagAttribute attribute;
- LeftMapper(TagAttribute attribute) {
+ LeftMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
if (attribute.isLiteral()) {
((Position) instance).setLeft(Measure.parse(attribute.getValue()));
} else {
- ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
+ final ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
((UIComponent) instance).setValueExpression(Attributes.LEFT, expression);
}
}
@@ -65,15 +65,15 @@ public class PositionRule extends MetaRu
static final class TopMapper extends Metadata {
private final TagAttribute attribute;
- TopMapper(TagAttribute attribute) {
+ TopMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
if (attribute.isLiteral()) {
((Position) instance).setTop(Measure.parse(attribute.getValue()));
} else {
- ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
+ final ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
((UIComponent) instance).setValueExpression(Attributes.TOP, expression);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ResetInputActionListenerHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ResetInputActionListenerHandler.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ResetInputActionListenerHandler.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ResetInputActionListenerHandler.java Fri Nov 15 17:10:58 2013
@@ -40,21 +40,21 @@ public class ResetInputActionListenerHan
private final TagAttribute execute;
- public ResetInputActionListenerHandler(TagConfig config) {
+ public ResetInputActionListenerHandler(final TagConfig config) {
super(config);
execute = getAttribute(Attributes.EXECUTE);
}
- public void apply(FaceletContext faceletContext, UIComponent parent) throws IOException {
+ public void apply(final FaceletContext faceletContext, final UIComponent parent) throws IOException {
if (parent instanceof ActionSource) {
if (ComponentHandler.isNew(parent)) {
- ActionSource actionSource = (ActionSource) parent;
+ final ActionSource actionSource = (ActionSource) parent;
if (execute == null) {
actionSource.addActionListener(new ResetFormActionListener());
} else if (execute.isLiteral()) {
actionSource.addActionListener(new ResetInputActionListener(ComponentUtils.splitList(execute.getValue())));
} else {
- ValueExpression forValueExpression = execute.getValueExpression(faceletContext, String.class);
+ final ValueExpression forValueExpression = execute.getValueExpression(faceletContext, String.class);
actionSource.addActionListener(new ValueExpressionResetInputActionListener(forValueExpression));
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java Fri Nov 15 17:10:58 2013
@@ -56,7 +56,7 @@ public final class Resource {
* @return an url representing the URL and on which getInputStream() can be called to get the resource
* @throws java.net.MalformedURLException
*/
- public static URL getResourceUrl(FacesContext ctx, String path) throws MalformedURLException {
+ public static URL getResourceUrl(final FacesContext ctx, final String path) throws MalformedURLException {
final ExternalContext externalContext = ctx.getExternalContext();
URL url = externalContext.getResource(path);
if (LOG.isTraceEnabled()) {
@@ -80,19 +80,19 @@ public final class Resource {
// This method could be used above to provide a 'fail fast' if a
// resource
// doesnt exist. Otherwise, the URL will fail on the first access.
- private static boolean resourceExist(ExternalContext externalContext, String path) {
+ private static boolean resourceExist(final ExternalContext externalContext, final String path) {
if ("/".equals(path)) {
// The root context exists always
return true;
}
- Object ctx = externalContext.getContext();
+ final Object ctx = externalContext.getContext();
if (ctx instanceof ServletContext) {
- ServletContext servletContext = (ServletContext) ctx;
- InputStream stream = servletContext.getResourceAsStream(path);
+ final ServletContext servletContext = (ServletContext) ctx;
+ final InputStream stream = servletContext.getResourceAsStream(path);
if (stream != null) {
try {
stream.close();
- } catch (IOException e) {
+ } catch (final IOException e) {
// Ignore here, since we donnot wanted to read from this
// resource anyway
}
@@ -104,10 +104,10 @@ public final class Resource {
// Construct URL with special URLStreamHandler for proxying
// ServletContext.getResourceAsStream()
- private static URL getUrlForResourceAsStream(final ExternalContext externalContext, String path)
+ private static URL getUrlForResourceAsStream(final ExternalContext externalContext, final String path)
throws MalformedURLException {
- URLStreamHandler handler = new URLStreamHandler() {
- protected URLConnection openConnection(URL u) throws IOException {
+ final URLStreamHandler handler = new URLStreamHandler() {
+ protected URLConnection openConnection(final URL u) throws IOException {
final String file = u.getFile();
return new URLConnection(u) {
public void connect() throws IOException {
@@ -117,14 +117,14 @@ public final class Resource {
if (LOG.isTraceEnabled()) {
LOG.trace("Opening internal url to " + file);
}
- Object ctx = externalContext.getContext();
+ final Object ctx = externalContext.getContext();
// Or maybe fetch the external context afresh ?
// Object ctx =
// FacesContext.getCurrentInstance().getExternalContext().getContext();
if (ctx instanceof ServletContext) {
- ServletContext servletContext = (ServletContext) ctx;
- InputStream stream = servletContext.getResourceAsStream(file);
+ final ServletContext servletContext = (ServletContext) ctx;
+ final InputStream stream = servletContext.getResourceAsStream(file);
if (stream == null) {
throw new FileNotFoundException("Cannot open resource " + file);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ScriptHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ScriptHandler.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ScriptHandler.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ScriptHandler.java Fri Nov 15 17:10:58 2013
@@ -31,11 +31,11 @@ import javax.faces.view.facelets.TextHan
public class ScriptHandler extends ComponentHandler {
- public ScriptHandler(ComponentConfig config) {
+ public ScriptHandler(final ComponentConfig config) {
super(config);
}
- public void onComponentCreated(FaceletContext context, UIComponent component, UIComponent parent) {
+ public void onComponentCreated(final FaceletContext context, final UIComponent component, final UIComponent parent) {
final FaceletHandler next = getComponentConfig().getNextHandler();
if (next instanceof TextHandler) {
final String script = ((TextHandler) next).getText(context);
@@ -45,6 +45,6 @@ public class ScriptHandler extends Compo
}
}
- public void applyNextHandler(FaceletContext ctx, UIComponent c) {
+ public void applyNextHandler(final FaceletContext ctx, final UIComponent c) {
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java Fri Nov 15 17:10:58 2013
@@ -35,7 +35,7 @@ public class SheetStateChangeSourceRule
public static final SheetStateChangeSourceRule INSTANCE = new SheetStateChangeSourceRule();
- public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget metadataTarget) {
+ public Metadata applyRule(final String name, final TagAttribute attribute, final MetadataTarget metadataTarget) {
if (metadataTarget.isTargetInstanceOf(SheetStateChangeSource.class)) {
if ("stateChangeListener".equals(name)) {
return new SheetStateChangeListenerMapper(attribute);
@@ -48,11 +48,11 @@ public class SheetStateChangeSourceRule
private final TagAttribute attribute;
- public SheetStateChangeListenerMapper(TagAttribute attribute) {
+ public SheetStateChangeListenerMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
((SheetStateChangeSource2) instance).setStateChangeListenerExpression(
attribute.getMethodExpression(ctx, null, SheetStateChangeSourceRule.ACTION_LISTENER));
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java Fri Nov 15 17:10:58 2013
@@ -35,8 +35,8 @@ public class SortActionSourceRule extend
public static final SortActionSourceRule INSTANCE = new SortActionSourceRule();
- public Metadata applyRule(String name, TagAttribute attribute,
- MetadataTarget metadataTarget) {
+ public Metadata applyRule(final String name, final TagAttribute attribute,
+ final MetadataTarget metadataTarget) {
if (metadataTarget.isTargetInstanceOf(SortActionSource.class)) {
if ("sortActionListener".equals(name)) {
return new SortActionListenerMapper(attribute);
@@ -49,11 +49,11 @@ public class SortActionSourceRule extend
private final TagAttribute attribute;
- public SortActionListenerMapper(TagAttribute attribute) {
+ public SortActionListenerMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
((SortActionSource2) instance).setSortActionListenerExpression(
attribute.getMethodExpression(ctx, null, SortActionSourceRule.ACTION_LISTENER));
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/StyleHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/StyleHandler.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/StyleHandler.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/StyleHandler.java Fri Nov 15 17:10:58 2013
@@ -31,11 +31,11 @@ import javax.faces.view.facelets.TextHan
public class StyleHandler extends ComponentHandler {
- public StyleHandler(ComponentConfig config) {
+ public StyleHandler(final ComponentConfig config) {
super(config);
}
- public void onComponentCreated(FaceletContext context, UIComponent component, UIComponent parent) {
+ public void onComponentCreated(final FaceletContext context, final UIComponent component, final UIComponent parent) {
final FaceletHandler next = getComponentConfig().getNextHandler();
if (next instanceof TextHandler) {
@@ -46,6 +46,6 @@ public class StyleHandler extends Compon
}
}
- public void applyNextHandler(FaceletContext ctx, UIComponent c) {
+ public void applyNextHandler(final FaceletContext ctx, final UIComponent c) {
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SuggestMethodRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SuggestMethodRule.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SuggestMethodRule.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SuggestMethodRule.java Fri Nov 15 17:10:58 2013
@@ -35,7 +35,7 @@ public class SuggestMethodRule extends M
public static final SuggestMethodRule INSTANCE = new SuggestMethodRule();
- public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget metadataTarget) {
+ public Metadata applyRule(final String name, final TagAttribute attribute, final MetadataTarget metadataTarget) {
if (metadataTarget.isTargetInstanceOf(InputSuggest2.class)) {
if ("suggestMethod".equals(name)) {
@@ -55,11 +55,11 @@ public class SuggestMethodRule extends M
static final class SuggestMethodMapper extends Metadata {
private final TagAttribute attribute;
- public SuggestMethodMapper(TagAttribute attribute) {
+ public SuggestMethodMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
((InputSuggest2) instance).setSuggestMethodExpression(
attribute.getMethodExpression(ctx, null, SuggestMethodRule.SUGGEST_METHOD));
}
@@ -68,11 +68,11 @@ public class SuggestMethodRule extends M
static final class SuggestFilterMapper extends Metadata {
private final TagAttribute attribute;
- SuggestFilterMapper(TagAttribute attribute) {
+ SuggestFilterMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
((AbstractUISuggest) instance).setFilter(SuggestFilter.parse(attribute.getValue()));
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java Fri Nov 15 17:10:58 2013
@@ -35,7 +35,7 @@ public class SupportsMarkupRule extends
public static final SupportsMarkupRule INSTANCE = new SupportsMarkupRule();
- public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget metadataTarget) {
+ public Metadata applyRule(final String name, final TagAttribute attribute, final MetadataTarget metadataTarget) {
if (metadataTarget.isTargetInstanceOf(SupportsMarkup.class)) {
if (Attributes.MARKUP.equals(name)) {
return new SupportsMarkupMapper(attribute);
@@ -48,15 +48,15 @@ public class SupportsMarkupRule extends
private final TagAttribute attribute;
- public SupportsMarkupMapper(TagAttribute attribute) {
+ public SupportsMarkupMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
if (attribute.isLiteral()) {
((SupportsMarkup) instance).setMarkup(Markup.valueOf(attribute.getValue()));
} else {
- ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
+ final ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
((UIComponent) instance).setValueExpression(Attributes.MARKUP, expression);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsRenderedPartiallyRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsRenderedPartiallyRule.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsRenderedPartiallyRule.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SupportsRenderedPartiallyRule.java Fri Nov 15 17:10:58 2013
@@ -35,7 +35,7 @@ public class SupportsRenderedPartiallyRu
public static final SupportsRenderedPartiallyRule INSTANCE = new SupportsRenderedPartiallyRule();
- public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget metadataTarget) {
+ public Metadata applyRule(final String name, final TagAttribute attribute, final MetadataTarget metadataTarget) {
if (metadataTarget.isTargetInstanceOf(SupportsRenderedPartially.class)) {
if (Attributes.RENDERED_PARTIALLY.equals(name)) {
return new SupportsRenderedPartiallyMapper(attribute);
@@ -48,16 +48,16 @@ public class SupportsRenderedPartiallyRu
private final TagAttribute attribute;
- public SupportsRenderedPartiallyMapper(TagAttribute attribute) {
+ public SupportsRenderedPartiallyMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
if (attribute.isLiteral()) {
- String[] components = ComponentUtils.splitList(attribute.getValue());
+ final String[] components = ComponentUtils.splitList(attribute.getValue());
((SupportsRenderedPartially) instance).setRenderedPartially(components);
} else {
- ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
+ final ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
((UIComponent) instance).setValueExpression(Attributes.RENDERED_PARTIALLY, expression);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java Fri Nov 15 17:10:58 2013
@@ -42,7 +42,7 @@ public class TabChangeListenerHandler ex
private final TagAttribute binding;
- public TabChangeListenerHandler(TagConfig config) {
+ public TabChangeListenerHandler(final TagConfig config) {
super(config);
binding = getAttribute("binding");
type = getAttribute("type");
@@ -52,17 +52,17 @@ public class TabChangeListenerHandler ex
}
try {
this.listenerType = Class.forName(type.getValue());
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new TagAttributeException(tag, type, e);
}
}
}
- public void apply(FaceletContext faceletContext, UIComponent parent) throws IOException {
+ public void apply(final FaceletContext faceletContext, final UIComponent parent) throws IOException {
if (parent instanceof TabChangeSource2) {
// only process if parent was just created
if (parent.getParent() == null) {
- TabChangeSource2 changeSource = (TabChangeSource2) parent;
+ final TabChangeSource2 changeSource = (TabChangeSource2) parent;
TabChangeListener listener = null;
ValueExpression valueExpression = null;
if (binding != null) {
@@ -72,7 +72,7 @@ public class TabChangeListenerHandler ex
if (listener == null) {
try {
listener = (TabChangeListener) listenerType.newInstance();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new TagAttributeException(tag, type, e.getCause());
}
if (valueExpression != null) {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java Fri Nov 15 17:10:58 2013
@@ -32,7 +32,7 @@ public class TabChangeSourceRule extends
static final Class[] ACTION_LISTENER = new Class[]{TabChangeEvent.class};
public static final TabChangeSourceRule INSTANCE = new TabChangeSourceRule();
- public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget metadataTarget) {
+ public Metadata applyRule(final String name, final TagAttribute attribute, final MetadataTarget metadataTarget) {
if (metadataTarget.isTargetInstanceOf(TabChangeSource2.class)) {
if ("tabChangeListener".equals(name)) {
return new TabChangeListenerMapper(attribute);
@@ -45,11 +45,11 @@ public class TabChangeSourceRule extends
private final TagAttribute attribute;
- public TabChangeListenerMapper(TagAttribute attribute) {
+ public TabChangeListenerMapper(final TagAttribute attribute) {
this.attribute = attribute;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
+ public void applyMetadata(final FaceletContext ctx, final Object instance) {
((TabChangeSource2) instance).setTabChangeListenerExpression(
attribute.getMethodExpression(ctx, null, TabChangeSourceRule.ACTION_LISTENER));
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TagMethodExpression.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TagMethodExpression.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TagMethodExpression.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TagMethodExpression.java Fri Nov 15 17:10:58 2013
@@ -51,31 +51,31 @@ public final class TagMethodExpression e
super();
}
- public TagMethodExpression(TagAttribute attr, MethodExpression orig) {
+ public TagMethodExpression(final TagAttribute attr, final MethodExpression orig) {
this.attr = attr.toString();
this.orig = orig;
}
- public MethodInfo getMethodInfo(ELContext context) {
+ public MethodInfo getMethodInfo(final ELContext context) {
try {
return this.orig.getMethodInfo(context);
- } catch (PropertyNotFoundException pnfe) {
+ } catch (final PropertyNotFoundException pnfe) {
throw new PropertyNotFoundException(this.attr + ": " + pnfe.getMessage(), pnfe.getCause());
- } catch (MethodNotFoundException mnfe) {
+ } catch (final MethodNotFoundException mnfe) {
throw new MethodNotFoundException(this.attr + ": " + mnfe.getMessage(), mnfe.getCause());
- } catch (ELException e) {
+ } catch (final ELException e) {
throw new ELException(this.attr + ": " + e.getMessage(), e.getCause());
}
}
- public Object invoke(ELContext context, Object[] params) {
+ public Object invoke(final ELContext context, final Object[] params) {
try {
return this.orig.invoke(context, params);
- } catch (PropertyNotFoundException pnfe) {
+ } catch (final PropertyNotFoundException pnfe) {
throw new PropertyNotFoundException(this.attr + ": " + pnfe.getMessage(), pnfe.getCause());
- } catch (MethodNotFoundException mnfe) {
+ } catch (final MethodNotFoundException mnfe) {
throw new MethodNotFoundException(this.attr + ": " + mnfe.getMessage(), mnfe.getCause());
- } catch (ELException e) {
+ } catch (final ELException e) {
throw new ELException(this.attr + ": " + e.getMessage(), e.getCause());
}
}
@@ -84,7 +84,7 @@ public final class TagMethodExpression e
return this.orig.getExpressionString();
}
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
return this.orig.equals(obj);
}
@@ -96,12 +96,12 @@ public final class TagMethodExpression e
return this.orig.isLiteralText();
}
- public void writeExternal(ObjectOutput out) throws IOException {
+ public void writeExternal(final ObjectOutput out) throws IOException {
out.writeObject(this.orig);
out.writeUTF(this.attr);
}
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
this.orig = (MethodExpression) in.readObject();
this.attr = in.readUTF();
}