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 [11/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/...
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/WizardStep.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/WizardStep.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/WizardStep.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/WizardStep.java Fri Nov 15 17:10:58 2013
@@ -25,7 +25,7 @@ public class WizardStep {
private String title;
private int index;
- public WizardStep(int index) {
+ public WizardStep(final int index) {
this.index = index;
}
@@ -33,7 +33,7 @@ public class WizardStep {
return outcome;
}
- public void setOutcome(String outcome) {
+ public void setOutcome(final String outcome) {
this.outcome = outcome;
}
@@ -41,7 +41,7 @@ public class WizardStep {
return title;
}
- public void setTitle(String title) {
+ public void setTitle(final String title) {
this.title = title;
}
@@ -49,12 +49,12 @@ public class WizardStep {
return index;
}
- public void setIndex(int index) {
+ public void setIndex(final int index) {
this.index = index;
}
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("#");
builder.append(index);
builder.append(" outcome='");
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/portlet/PortletUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/portlet/PortletUtils.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/portlet/PortletUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/portlet/PortletUtils.java Fri Nov 15 17:10:58 2013
@@ -32,7 +32,7 @@ public final class PortletUtils {
boolean result;
try {
result = PortletRequest.class != null;
- } catch (NoClassDefFoundError e) {
+ } catch (final NoClassDefFoundError e) {
result = false;
}
PORTLET_API_AVAILABLE = result;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractAjaxRendererBaseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractAjaxRendererBaseWrapper.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractAjaxRendererBaseWrapper.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractAjaxRendererBaseWrapper.java Fri Nov 15 17:10:58 2013
@@ -28,7 +28,7 @@ import java.io.IOException;
public abstract class AbstractAjaxRendererBaseWrapper extends AbstractLayoutableRendererBaseWrapper
implements AjaxRenderer {
- public void encodeAjax(FacesContext context, UIComponent component) throws IOException {
+ public void encodeAjax(final FacesContext context, final UIComponent component) throws IOException {
((AjaxRenderer) getRenderer(context)).encodeAjax(context, component);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutRendererWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutRendererWrapper.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutRendererWrapper.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutRendererWrapper.java Fri Nov 15 17:10:58 2013
@@ -28,27 +28,27 @@ import javax.faces.context.FacesContext;
public abstract class AbstractLayoutRendererWrapper
extends AbstractLayoutableRendererBaseWrapper implements LayoutRenderer, SpacingValues, MarginValues {
- public Measure getColumnSpacing(FacesContext facesContext, Configurable component) {
+ public Measure getColumnSpacing(final FacesContext facesContext, final Configurable component) {
return ((SpacingValues) getRenderer(facesContext)).getColumnSpacing(facesContext, component);
}
- public Measure getRowSpacing(FacesContext facesContext, Configurable component) {
+ public Measure getRowSpacing(final FacesContext facesContext, final Configurable component) {
return ((SpacingValues) getRenderer(facesContext)).getRowSpacing(facesContext, component);
}
- public Measure getMarginLeft(FacesContext facesContext, Configurable component) {
+ public Measure getMarginLeft(final FacesContext facesContext, final Configurable component) {
return ((MarginValues) getRenderer(facesContext)).getMarginLeft(facesContext, component);
}
- public Measure getMarginRight(FacesContext facesContext, Configurable component) {
+ public Measure getMarginRight(final FacesContext facesContext, final Configurable component) {
return ((MarginValues) getRenderer(facesContext)).getMarginRight(facesContext, component);
}
- public Measure getMarginTop(FacesContext facesContext, Configurable component) {
+ public Measure getMarginTop(final FacesContext facesContext, final Configurable component) {
return ((MarginValues) getRenderer(facesContext)).getMarginTop(facesContext, component);
}
- public Measure getMarginBottom(FacesContext facesContext, Configurable component) {
+ public Measure getMarginBottom(final FacesContext facesContext, final Configurable component) {
return ((MarginValues) getRenderer(facesContext)).getMarginBottom(facesContext, component);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutableRendererBaseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutableRendererBaseWrapper.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutableRendererBaseWrapper.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractLayoutableRendererBaseWrapper.java Fri Nov 15 17:10:58 2013
@@ -28,91 +28,91 @@ import javax.faces.context.FacesContext;
public abstract class AbstractLayoutableRendererBaseWrapper extends AbstractRendererBaseWrapper
implements LayoutComponentRenderer {
- public Measure getCustomMeasure(FacesContext facesContext, Configurable component, String name) {
+ public Measure getCustomMeasure(final FacesContext facesContext, final Configurable component, final String name) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getCustomMeasure(facesContext, component, name);
}
- public Measure getWidth(FacesContext facesContext, Configurable component) {
+ public Measure getWidth(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getWidth(facesContext, component);
}
- public Measure getHeight(FacesContext facesContext, Configurable component) {
+ public Measure getHeight(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getHeight(facesContext, component);
}
- public Measure getMinimumWidth(FacesContext facesContext, Configurable component) {
+ public Measure getMinimumWidth(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getMinimumWidth(facesContext, component);
}
- public Measure getMinimumHeight(FacesContext facesContext, Configurable component) {
+ public Measure getMinimumHeight(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getMinimumHeight(facesContext, component);
}
- public Measure getPreferredWidth(FacesContext facesContext, Configurable component) {
+ public Measure getPreferredWidth(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getPreferredWidth(facesContext, component);
}
- public Measure getPreferredHeight(FacesContext facesContext, Configurable component) {
+ public Measure getPreferredHeight(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getPreferredHeight(facesContext, component);
}
- public Measure getMaximumWidth(FacesContext facesContext, Configurable component) {
+ public Measure getMaximumWidth(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getMaximumWidth(facesContext, component);
}
- public Measure getMaximumHeight(FacesContext facesContext, Configurable component) {
+ public Measure getMaximumHeight(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getMaximumHeight(facesContext, component);
}
- public Measure getMarginLeft(FacesContext facesContext, Configurable component) {
+ public Measure getMarginLeft(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getMarginLeft(facesContext, component);
}
- public Measure getMarginRight(FacesContext facesContext, Configurable component) {
+ public Measure getMarginRight(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getMarginRight(facesContext, component);
}
- public Measure getMarginTop(FacesContext facesContext, Configurable component) {
+ public Measure getMarginTop(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getMarginTop(facesContext, component);
}
- public Measure getMarginBottom(FacesContext facesContext, Configurable component) {
+ public Measure getMarginBottom(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getMarginBottom(facesContext, component);
}
- public Measure getBorderLeft(FacesContext facesContext, Configurable component) {
+ public Measure getBorderLeft(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getBorderLeft(facesContext, component);
}
- public Measure getBorderRight(FacesContext facesContext, Configurable component) {
+ public Measure getBorderRight(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getBorderRight(facesContext, component);
}
- public Measure getBorderTop(FacesContext facesContext, Configurable component) {
+ public Measure getBorderTop(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getBorderTop(facesContext, component);
}
- public Measure getBorderBottom(FacesContext facesContext, Configurable component) {
+ public Measure getBorderBottom(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getBorderBottom(facesContext, component);
}
- public Measure getPaddingLeft(FacesContext facesContext, Configurable component) {
+ public Measure getPaddingLeft(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getPaddingLeft(facesContext, component);
}
- public Measure getPaddingRight(FacesContext facesContext, Configurable component) {
+ public Measure getPaddingRight(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getPaddingRight(facesContext, component);
}
- public Measure getPaddingTop(FacesContext facesContext, Configurable component) {
+ public Measure getPaddingTop(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getPaddingTop(facesContext, component);
}
- public Measure getPaddingBottom(FacesContext facesContext, Configurable component) {
+ public Measure getPaddingBottom(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getPaddingBottom(facesContext, component);
}
- public Measure getVerticalScrollbarWeight(FacesContext facesContext, Configurable component) {
+ public Measure getVerticalScrollbarWeight(final FacesContext facesContext, final Configurable component) {
return ((LayoutComponentRenderer) getRenderer(facesContext)).getVerticalScrollbarWeight(facesContext, component);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java Fri Nov 15 17:10:58 2013
@@ -35,12 +35,13 @@ public abstract class AbstractRendererBa
private static final Logger LOG = LoggerFactory.getLogger(AbstractRendererBaseWrapper.class);
@Override
- public final void onComponentCreated(FacesContext facesContext, UIComponent component, UIComponent parent) {
+ public final void onComponentCreated(
+ final FacesContext facesContext, final UIComponent component, final UIComponent parent) {
getRenderer(facesContext).onComponentCreated(facesContext, component, parent);
}
@Override
- public final void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
+ public final void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
getRenderer(facesContext).prepareRender(facesContext, component);
}
@Override
@@ -48,7 +49,7 @@ public abstract class AbstractRendererBa
return getRenderer(FacesContext.getCurrentInstance()).getPrepareRendersChildren();
}
@Override
- public final void prepareRendersChildren(FacesContext context, UIComponent component) throws IOException {
+ public final void prepareRendersChildren(final FacesContext context, final UIComponent component) throws IOException {
getRenderer(context).prepareRendersChildren(context, component);
}
@@ -58,58 +59,59 @@ public abstract class AbstractRendererBa
}
@Override
- public final void decode(FacesContext facesContext, UIComponent component) {
+ public final void decode(final FacesContext facesContext, final UIComponent component) {
getRenderer(facesContext).decode(facesContext, component);
}
@Override
- protected final Object getCurrentValueAsObject(UIInput input) {
+ protected final Object getCurrentValueAsObject(final UIInput input) {
return getRenderer(FacesContext.getCurrentInstance()).getCurrentValueAsObject(input);
}
@Override
- protected final String getCurrentValue(FacesContext facesContext, UIComponent component) {
+ protected final String getCurrentValue(final FacesContext facesContext, final UIComponent component) {
return getRenderer(facesContext).getCurrentValue(facesContext, component);
}
@Override
- protected final Object getValue(UIComponent component) {
+ protected final Object getValue(final UIComponent component) {
return getRenderer(FacesContext.getCurrentInstance()).getValue(component);
}
@Override
- public final Converter getConverter(FacesContext facesContext, UIComponent component) {
+ public final Converter getConverter(final FacesContext facesContext, final UIComponent component) {
return getRenderer(facesContext).getConverter(facesContext, component);
}
@Override
- public final Object getConvertedValue(FacesContext facesContext, UIComponent component, Object submittedValue)
+ public final Object getConvertedValue(
+ final FacesContext facesContext, final UIComponent component, final Object submittedValue)
throws ConverterException {
return getRenderer(facesContext).getConvertedValue(facesContext, component, submittedValue);
}
@Override
- public final void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
+ public final void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
getRenderer(facesContext).encodeBegin(facesContext, component);
}
@Override
- public final void encodeChildren(FacesContext facesContext, UIComponent component) throws IOException {
+ public final void encodeChildren(final FacesContext facesContext, final UIComponent component) throws IOException {
getRenderer(facesContext).encodeChildren(facesContext, component);
}
@Override
- public final void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public final void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
getRenderer(facesContext).encodeEnd(facesContext, component);
}
@Override
- public final String convertClientId(FacesContext facesContext, String clientId) {
+ public final String convertClientId(final FacesContext facesContext, final String clientId) {
return getRenderer(facesContext).convertClientId(facesContext, clientId);
}
- protected final RendererBase getRenderer(FacesContext facesContext) {
- RendererBase renderer = (RendererBase) ResourceManagerFactory.
+ protected final RendererBase getRenderer(final FacesContext facesContext) {
+ final RendererBase renderer = (RendererBase) ResourceManagerFactory.
getResourceManager(facesContext).getRenderer(facesContext.getViewRoot(), getRendererType());
if (renderer == null) {
throw new RuntimeException("No renderer found for rendererType='"+ getRendererType()
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java Fri Nov 15 17:10:58 2013
@@ -33,8 +33,8 @@ public final class HtmlUtils {
private HtmlUtils() {
}
- public static String generateAttribute(String name, Object value) {
- String stringValue;
+ public static String generateAttribute(final String name, final Object value) {
+ final String stringValue;
if (value == null) {
stringValue = null;
} else if (value instanceof String) {
@@ -47,15 +47,15 @@ public final class HtmlUtils {
: "";
}
- public static String appendAttribute(UIComponent component, String name,
- String appendValue) {
- Object attribute = component.getAttributes().get(name);
+ public static String appendAttribute(final UIComponent component, final String name,
+ final String appendValue) {
+ final Object attribute = component.getAttributes().get(name);
return attribute != null
? attribute.toString() + " " + appendValue : appendValue;
}
- public static String generateOnchange(UIInput component,
- FacesContext facesContext) {
+ public static String generateOnchange(final UIInput component,
+ final FacesContext facesContext) {
/*Validator[] validators = component.getValidators();
for (int i = 0; i < validators.length; i++) {
@@ -74,7 +74,7 @@ public final class HtmlUtils {
}
} */
- Object onchange = component.getAttributes().get(Attributes.ONCHANGE);
+ final Object onchange = component.getAttributes().get(Attributes.ONCHANGE);
if (onchange != null) {
return onchange.toString();
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/InputRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/InputRendererBase.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/InputRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/InputRendererBase.java Fri Nov 15 17:10:58 2013
@@ -34,7 +34,7 @@ public class InputRendererBase extends L
private static final Logger LOG = LoggerFactory.getLogger(InputRendererBase.class);
- public void decode(FacesContext context, UIComponent component) {
+ public void decode(final FacesContext context, final UIComponent component) {
final UIInput uiInput;
if (component instanceof UIInput) {
uiInput = (UIInput) component;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java Fri Nov 15 17:10:58 2013
@@ -38,13 +38,13 @@ public final class LabelWithAccessKey {
public static final char INDICATOR = '_';
public static final String ESCAPED_INDICATOR = "__";
- public LabelWithAccessKey(String label) {
+ public LabelWithAccessKey(final String label) {
text = label;
setup(text);
}
- public LabelWithAccessKey(UIComponent component) {
- Object value;
+ public LabelWithAccessKey(final UIComponent component) {
+ final Object value;
if (RendererTypes.LABEL.equals(component.getRendererType())) {
value = component.getAttributes().get(Attributes.VALUE);
} else {
@@ -54,7 +54,7 @@ public final class LabelWithAccessKey {
setup(text);
}
- private void findIndicator(String label, int index, int escapedIndicatorCount) {
+ private void findIndicator(final String label, int index, int escapedIndicatorCount) {
index = label.indexOf(INDICATOR, index);
if (index == -1) {
text = label;
@@ -74,7 +74,7 @@ public final class LabelWithAccessKey {
}
}
- public void setup(String label) {
+ public void setup(final String label) {
if (label != null) {
findIndicator(label, 0, 0);
text = StringUtils.replace(text, ESCAPED_INDICATOR, String.valueOf(INDICATOR));
@@ -104,11 +104,11 @@ public final class LabelWithAccessKey {
return pos;
}
- public void setText(String text) {
+ public void setText(final String text) {
this.text = text;
}
- public void setAccessKey(Character accessKey) {
+ public void setAccessKey(final Character accessKey) {
if (!isPermitted(accessKey)) {
LOG.warn("Ignoring illegal access key: " + accessKey);
}
@@ -119,7 +119,7 @@ public final class LabelWithAccessKey {
* Ensures, that no illegal character will be write out.
* (If this is changed from only allowing letters, the renderers may change the escaping)
*/
- private boolean isPermitted(Character accessKey) {
+ private boolean isPermitted(final Character accessKey) {
return accessKey >= 'a' && accessKey <= 'z' || accessKey >= 'A' && accessKey <= 'Z';
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRendererBase.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutComponentRendererBase.java Fri Nov 15 17:10:58 2013
@@ -29,91 +29,91 @@ import javax.faces.context.FacesContext;
public abstract class LayoutComponentRendererBase extends RendererBase implements LayoutComponentRenderer {
- public Measure getCustomMeasure(FacesContext facesContext, Configurable component, String name) {
+ public Measure getCustomMeasure(final FacesContext facesContext, final Configurable component, final String name) {
return getResourceManager().getThemeMeasure(facesContext, component, name);
}
- public Measure getWidth(FacesContext facesContext, Configurable component) {
+ public Measure getWidth(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.WIDTH);
}
- public Measure getHeight(FacesContext facesContext, Configurable component) {
+ public Measure getHeight(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.HEIGHT);
}
- public Measure getMinimumWidth(FacesContext facesContext, Configurable component) {
+ public Measure getMinimumWidth(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.MINIMUM_WIDTH);
}
- public Measure getMinimumHeight(FacesContext facesContext, Configurable component) {
+ public Measure getMinimumHeight(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.MINIMUM_HEIGHT);
}
- public Measure getPreferredWidth(FacesContext facesContext, Configurable component) {
+ public Measure getPreferredWidth(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.PREFERRED_WIDTH);
}
- public Measure getPreferredHeight(FacesContext facesContext, Configurable component) {
+ public Measure getPreferredHeight(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.PREFERRED_HEIGHT);
}
- public Measure getMaximumWidth(FacesContext facesContext, Configurable component) {
+ public Measure getMaximumWidth(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.MAXIMUM_WIDTH);
}
- public Measure getMaximumHeight(FacesContext facesContext, Configurable component) {
+ public Measure getMaximumHeight(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.MAXIMUM_HEIGHT);
}
- public Measure getMarginLeft(FacesContext facesContext, Configurable component) {
+ public Measure getMarginLeft(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.MARGIN_LEFT);
}
- public Measure getMarginRight(FacesContext facesContext, Configurable component) {
+ public Measure getMarginRight(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.MARGIN_RIGHT);
}
- public Measure getMarginTop(FacesContext facesContext, Configurable component) {
+ public Measure getMarginTop(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.MARGIN_TOP);
}
- public Measure getMarginBottom(FacesContext facesContext, Configurable component) {
+ public Measure getMarginBottom(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.MARGIN_BOTTOM);
}
- public Measure getBorderLeft(FacesContext facesContext, Configurable component) {
+ public Measure getBorderLeft(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.BORDER_LEFT);
}
- public Measure getBorderRight(FacesContext facesContext, Configurable component) {
+ public Measure getBorderRight(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.BORDER_RIGHT);
}
- public Measure getBorderTop(FacesContext facesContext, Configurable component) {
+ public Measure getBorderTop(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.BORDER_TOP);
}
- public Measure getBorderBottom(FacesContext facesContext, Configurable component) {
+ public Measure getBorderBottom(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.BORDER_BOTTOM);
}
- public Measure getPaddingLeft(FacesContext facesContext, Configurable component) {
+ public Measure getPaddingLeft(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.PADDING_LEFT);
}
- public Measure getPaddingRight(FacesContext facesContext, Configurable component) {
+ public Measure getPaddingRight(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.PADDING_RIGHT);
}
- public Measure getPaddingTop(FacesContext facesContext, Configurable component) {
+ public Measure getPaddingTop(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.PADDING_TOP);
}
- public Measure getPaddingBottom(FacesContext facesContext, Configurable component) {
+ public Measure getPaddingBottom(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.PADDING_BOTTOM);
}
- public Measure getVerticalScrollbarWeight(FacesContext facesContext, Configurable component) {
+ public Measure getVerticalScrollbarWeight(final FacesContext facesContext, final Configurable component) {
final ClientProperties clientProperties = VariableResolverUtils.resolveClientProperties(facesContext);
final Measure weight = clientProperties.getVerticalScrollbarWeight();
if (weight != null) {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java Fri Nov 15 17:10:58 2013
@@ -38,54 +38,55 @@ public class PageRendererBase extends La
private static final Logger LOG = LoggerFactory.getLogger(PageRendererBase.class);
- public void decode(FacesContext facesContext, UIComponent component) {
+ public void decode(final FacesContext facesContext, final UIComponent component) {
if (component instanceof AbstractUIPage) {
- AbstractUIPage page = (AbstractUIPage) component;
+ final AbstractUIPage page = (AbstractUIPage) component;
decodeActionPosition(facesContext, page);
decodePageState(facesContext, page);
}
}
- private void decodeActionPosition(FacesContext facesContext, AbstractUIPage page) {
- String actionIdName = page.getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "form-action";
- String newActionId = (String) facesContext.getExternalContext().getRequestParameterMap().get(actionIdName);
+ private void decodeActionPosition(final FacesContext facesContext, final AbstractUIPage page) {
+ final String actionIdName = page.getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "form-action";
+ final String newActionId = (String) facesContext.getExternalContext().getRequestParameterMap().get(actionIdName);
if (LOG.isDebugEnabled()) {
LOG.debug("action = " + newActionId);
}
page.setActionId(newActionId);
FacesContextUtils.setActionId(facesContext, newActionId);
try {
- String actionPositionName = page.getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "action-position";
- String actionPositionString = (String)
- facesContext.getExternalContext().getRequestParameterMap().get(actionPositionName);
+ final String actionPositionName
+ = page.getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "action-position";
+ final String actionPositionString
+ = facesContext.getExternalContext().getRequestParameterMap().get(actionPositionName);
if (LOG.isDebugEnabled()) {
LOG.debug("actionPosition='" + actionPositionString + "'");
}
if (StringUtils.isNotEmpty(actionPositionString)) {
- Box actionPosition = new Box(actionPositionString);
+ final Box actionPosition = new Box(actionPositionString);
page.setActionPosition(actionPosition);
} else {
page.setActionPosition(null);
}
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.warn("Can't analyse parameter for action-position", e);
}
}
@SuppressWarnings("unchecked")
- private void decodePageState(FacesContext facesContext, AbstractUIPage page) {
- String name;
+ private void decodePageState(final FacesContext facesContext, final AbstractUIPage page) {
+ final String name;
String value = null;
try {
name = page.getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "form-clientDimension";
value = facesContext.getExternalContext().getRequestParameterMap().get(name);
if (StringUtils.isNotBlank(value)) {
- StringTokenizer tokenizer = new StringTokenizer(value, ";");
+ final StringTokenizer tokenizer = new StringTokenizer(value, ";");
final Measure width = Measure.valueOf(tokenizer.nextToken());
final Measure height = Measure.valueOf(tokenizer.nextToken());
// XXX remove me later
- PageState pageState = page.getPageState(facesContext);
+ final PageState pageState = page.getPageState(facesContext);
if (pageState != null) {
pageState.setClientWidth(width.getPixel());
pageState.setClientHeight(height.getPixel());
@@ -94,7 +95,7 @@ public class PageRendererBase extends La
clientProperties.setPageWidth(width);
clientProperties.setPageHeight(height);
}
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.error("Error in decoding state: value='" + value + "'", e);
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java Fri Nov 15 17:10:58 2013
@@ -51,11 +51,11 @@ public class RendererBase extends Render
/**
* Hook to e. g. register resources, etc.
*/
- public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
+ public void prepareRender(final FacesContext facesContext, final UIComponent component) throws IOException {
if (component instanceof SupportsMarkup) {
final SupportsMarkup supportsMarkup = (SupportsMarkup) component;
- Markup markup = ComponentUtils.updateMarkup(component, supportsMarkup.getMarkup());
+ final Markup markup = ComponentUtils.updateMarkup(component, supportsMarkup.getMarkup());
supportsMarkup.setCurrentMarkup(markup);
}
}
@@ -64,14 +64,14 @@ public class RendererBase extends Render
return false;
}
- public void prepareRendersChildren(FacesContext context, UIComponent component) throws IOException {
+ public void prepareRendersChildren(final FacesContext context, final UIComponent component) throws IOException {
}
/**
* @deprecated todo: should be done in the StyleClasses class.
*/
@Deprecated
- protected String getRendererName(String rendererType) {
+ protected String getRendererName(final String rendererType) {
return rendererType.substring(0, 1).toLowerCase(Locale.ENGLISH) + rendererType.substring(1);
}
@@ -79,36 +79,36 @@ public class RendererBase extends Render
* @deprecated since 1.5.0, please use getResourceManager().getThemeMeasure()
*/
@Deprecated
- public int getConfiguredValue(FacesContext facesContext, UIComponent component, String key) {
+ public int getConfiguredValue(final FacesContext facesContext, final UIComponent component, final String key) {
return getResourceManager().getThemeMeasure(facesContext, (Configurable) component, key).getPixel();
}
- protected Object getCurrentValueAsObject(UIInput input) {
- Object submittedValue = input.getSubmittedValue();
+ protected Object getCurrentValueAsObject(final UIInput input) {
+ final Object submittedValue = input.getSubmittedValue();
if (submittedValue != null) {
return submittedValue;
}
return getValue(input);
}
- protected String getCurrentValue(FacesContext facesContext, UIComponent component) {
+ protected String getCurrentValue(final FacesContext facesContext, final UIComponent component) {
if (component instanceof EditableValueHolder) {
- EditableValueHolder editableValueHolder = (EditableValueHolder) component;
- Object submittedValue = editableValueHolder.getSubmittedValue();
+ final EditableValueHolder editableValueHolder = (EditableValueHolder) component;
+ final Object submittedValue = editableValueHolder.getSubmittedValue();
if (submittedValue != null || !editableValueHolder.isValid()) {
return (String) submittedValue;
}
}
String currentValue = null;
- Object currentObj = getValue(component);
+ final Object currentObj = getValue(component);
if (currentObj != null) {
currentValue = getFormattedValue(facesContext, component, currentObj);
}
return currentValue;
}
- protected String getFormattedValue(FacesContext context, UIComponent component, Object currentValue)
+ protected String getFormattedValue(final FacesContext context, final UIComponent component, final Object currentValue)
throws ConverterException {
if (currentValue == null) {
@@ -128,7 +128,7 @@ public class RendererBase extends Render
if (currentValue instanceof Measure) {
return ((Measure) currentValue).serialize();
}
- Class converterType = currentValue.getClass();
+ final Class converterType = currentValue.getClass();
converter = context.getApplication().createConverter(converterType);
}
@@ -139,7 +139,7 @@ public class RendererBase extends Render
}
}
- protected Object getValue(UIComponent component) {
+ protected Object getValue(final UIComponent component) {
if (component instanceof ValueHolder) {
return ((ValueHolder) component).getValue();
} else {
@@ -147,22 +147,22 @@ public class RendererBase extends Render
}
}
- public Converter getConverter(FacesContext context, UIComponent component) {
+ public Converter getConverter(final FacesContext context, final UIComponent component) {
Converter converter = null;
if (component instanceof ValueHolder) {
converter = ((ValueHolder) component).getConverter();
}
if (converter == null) {
- ValueExpression valueExpression = component.getValueExpression("value");
+ final ValueExpression valueExpression = component.getValueExpression("value");
if (valueExpression != null) {
- Class converterType = valueExpression.getType(context.getELContext());
+ final Class converterType = valueExpression.getType(context.getELContext());
if (converterType == null || converterType == String.class
|| converterType == Object.class) {
return null;
}
try {
converter = context.getApplication().createConverter(converterType);
- } catch (FacesException e) {
+ } catch (final FacesException e) {
LOG.error("No Converter found for type " + converterType);
}
}
@@ -171,12 +171,12 @@ public class RendererBase extends Render
}
@Override
- public Object getConvertedValue(FacesContext context, UIComponent component, Object submittedValue)
+ public Object getConvertedValue(final FacesContext context, final UIComponent component, final Object submittedValue)
throws ConverterException {
if (!(submittedValue instanceof String)) {
return submittedValue;
}
- Converter converter = getConverter(context, component);
+ final Converter converter = getConverter(context, component);
if (converter != null) {
return converter.getAsObject(context, component, (String) submittedValue);
} else {
@@ -184,7 +184,8 @@ public class RendererBase extends Render
}
}
- public void onComponentCreated(FacesContext facesContext, UIComponent component, UIComponent parent) {
+ public void onComponentCreated(
+ final FacesContext facesContext, final UIComponent component, final UIComponent parent) {
}
protected synchronized ResourceManager getResourceManager() {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBaseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBaseWrapper.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBaseWrapper.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBaseWrapper.java Fri Nov 15 17:10:58 2013
@@ -28,35 +28,35 @@ import java.io.IOException;
public class RendererBaseWrapper extends LayoutComponentRendererBase {
private Renderer renderer;
- public RendererBaseWrapper(Renderer renderer) {
+ public RendererBaseWrapper(final Renderer renderer) {
this.renderer = renderer;
}
- public void prepareRender(FacesContext facesContext, UIComponent component) {
+ public void prepareRender(final FacesContext facesContext, final UIComponent component) {
}
- public Object getConvertedValue(FacesContext context, UIComponent component, Object submittedValue)
+ public Object getConvertedValue(final FacesContext context, final UIComponent component, final Object submittedValue)
throws ConverterException {
return renderer.getConvertedValue(context, component, submittedValue);
}
- public void decode(FacesContext facesContext, UIComponent component) {
+ public void decode(final FacesContext facesContext, final UIComponent component) {
renderer.decode(facesContext, component);
}
- public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
+ public void encodeBegin(final FacesContext context, final UIComponent component) throws IOException {
renderer.encodeBegin(context, component);
}
- public void encodeChildren(FacesContext context, UIComponent component) throws IOException {
+ public void encodeChildren(final FacesContext context, final UIComponent component) throws IOException {
renderer.encodeChildren(context, component);
}
- public void encodeEnd(FacesContext context, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext context, final UIComponent component) throws IOException {
renderer.encodeEnd(context, component);
}
- public String convertClientId(FacesContext context, String clientId) {
+ public String convertClientId(final FacesContext context, final String clientId) {
return renderer.convertClientId(context, clientId);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java Fri Nov 15 17:10:58 2013
@@ -40,12 +40,12 @@ public class SelectManyRendererBase exte
private static final Logger LOG = LoggerFactory.getLogger(SelectManyRendererBase.class);
- public void decode(FacesContext facesContext, UIComponent component) {
+ public void decode(final FacesContext facesContext, final UIComponent component) {
if (ComponentUtils.isOutputOnly(component)) {
return;
}
if (component instanceof UISelectMany) {
- UISelectMany uiSelectMany = (UISelectMany) component;
+ final UISelectMany uiSelectMany = (UISelectMany) component;
String[] newValues = (String[])
facesContext.getExternalContext().getRequestParameterValuesMap().get(uiSelectMany.getClientId(facesContext));
@@ -54,7 +54,7 @@ public class SelectManyRendererBase exte
+ "' value='" + Arrays.toString(newValues) + "'");
LOG.debug("size ... '" + (newValues != null ? newValues.length : -1) + "'");
if (newValues != null) {
- for (String newValue : newValues) {
+ for (final String newValue : newValues) {
LOG.debug("newValues[i] = '" + newValue + "'");
}
}
@@ -68,7 +68,8 @@ public class SelectManyRendererBase exte
}
// the following is copied from myfaces shared RendererUtils
- public Object getConvertedValue(FacesContext facesContext, UIComponent component, Object submittedValue)
+ public Object getConvertedValue(
+ final FacesContext facesContext, final UIComponent component, final Object submittedValue)
throws ConverterException {
if (submittedValue == null) {
@@ -82,9 +83,9 @@ public class SelectManyRendererBase exte
return getConvertedUISelectManyValue(facesContext, (UISelectMany) component, (String[]) submittedValue);
}
- private Object getConvertedUISelectManyValue(FacesContext facesContext,
- UISelectMany component,
- String[] submittedValue)
+ private Object getConvertedUISelectManyValue(final FacesContext facesContext,
+ final UISelectMany component,
+ final String[] submittedValue)
throws ConverterException {
// Attention!
// This code is duplicated in jsfapi component package.
@@ -94,7 +95,7 @@ public class SelectManyRendererBase exte
throw new NullPointerException("submittedValue");
}
- ValueBinding vb = component.getValueBinding("value");
+ final ValueBinding vb = component.getValueBinding("value");
Class valueType = null;
Class arrayComponentType = null;
if (vb != null) {
@@ -132,7 +133,7 @@ public class SelectManyRendererBase exte
try {
converter = facesContext.getApplication().createConverter(arrayComponentType);
- } catch (FacesException e) {
+ } catch (final FacesException e) {
LOG.error("No Converter for type " + arrayComponentType.getName() + " found", e);
return submittedValue;
}
@@ -150,8 +151,8 @@ public class SelectManyRendererBase exte
if (valueType == null) {
// ...but have no idea of expected type
// --> so let's convert it to an Object array
- int len = submittedValue.length;
- Object[] convertedValues = (Object[]) Array.newInstance(
+ final int len = submittedValue.length;
+ final Object[] convertedValues = (Object[]) Array.newInstance(
arrayComponentType == null ? Object.class : arrayComponentType, len);
for (int i = 0; i < len; i++) {
convertedValues[i]
@@ -164,8 +165,8 @@ public class SelectManyRendererBase exte
// Curious case: According to specs we should assume, that the element type
// of this List is java.lang.String. But there is a Converter set for this
// component. Because the user must know what he is doing, we will convert the values.
- int length = submittedValue.length;
- List<Object> list = new ArrayList<Object>(length);
+ final int length = submittedValue.length;
+ final List<Object> list = new ArrayList<Object>(length);
for (int i = 0; i < length; i++) {
list.add(converter.getAsObject(facesContext, component, submittedValue[i]));
}
@@ -178,8 +179,8 @@ public class SelectManyRendererBase exte
if (arrayComponentType.isPrimitive()) {
// primitive array
- int len = submittedValue.length;
- Object convertedValues = Array.newInstance(arrayComponentType, len);
+ final int len = submittedValue.length;
+ final Object convertedValues = Array.newInstance(arrayComponentType, len);
for (int i = 0; i < len; i++) {
Array.set(convertedValues, i,
converter.getAsObject(facesContext, component, submittedValue[i]));
@@ -187,8 +188,8 @@ public class SelectManyRendererBase exte
return convertedValues;
} else {
// Object array
- int length = submittedValue.length;
- List<Object> convertedValues = new ArrayList<Object>(length);
+ final int length = submittedValue.length;
+ final List<Object> convertedValues = new ArrayList<Object>(length);
for (int i = 0; i < length; i++) {
convertedValues.add(i, converter.getAsObject(facesContext, component, submittedValue[i]));
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java Fri Nov 15 17:10:58 2013
@@ -31,15 +31,15 @@ public abstract class SelectOneRendererB
private static final Logger LOG = LoggerFactory.getLogger(SelectOneRendererBase.class);
- public void decode(FacesContext facesContext, UIComponent component) {
+ public void decode(final FacesContext facesContext, final UIComponent component) {
if (ComponentUtils.isOutputOnly(component)) {
return;
}
if (component instanceof UISelectOne) {
- UISelectOne uiSelectOne = (UISelectOne) component;
+ final UISelectOne uiSelectOne = (UISelectOne) component;
- String clientId = uiSelectOne.getClientId(facesContext);
- Object newValue =
+ final String clientId = uiSelectOne.getClientId(facesContext);
+ final Object newValue =
facesContext.getExternalContext().getRequestParameterMap().get(clientId);
if (LOG.isDebugEnabled()) {
LOG.debug("decode: key='" + clientId + "' value='" + newValue + "'");
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java Fri Nov 15 17:10:58 2013
@@ -62,10 +62,10 @@ public class TobagoRenderKit extends Ren
}
@Override
- public Renderer getRenderer(String family, String rendererType) {
+ public Renderer getRenderer(final String family, final String rendererType) {
Renderer renderer = renderers.get(new Key(family, rendererType));
if (renderer == null) {
- RenderKit renderKit = getHtmlBasicRenderKit();
+ final RenderKit renderKit = getHtmlBasicRenderKit();
renderer = renderKit.getRenderer(family, rendererType);
if (renderer != null) {
renderer = new RendererBaseWrapper(renderer);
@@ -82,7 +82,7 @@ public class TobagoRenderKit extends Ren
private RenderKit getHtmlBasicRenderKit() {
if (htmlBasicRenderKit == null) {
- RenderKitFactory rkFactory = (RenderKitFactory) FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
+ final RenderKitFactory rkFactory = (RenderKitFactory) FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
htmlBasicRenderKit =
rkFactory.getRenderKit(FacesContext.getCurrentInstance(), RenderKitFactory.HTML_BASIC_RENDER_KIT);
}
@@ -91,9 +91,9 @@ public class TobagoRenderKit extends Ren
@Override
public ResponseWriter createResponseWriter(
- Writer writer, String contentTypeList, String characterEncoding) {
+ final Writer writer, final String contentTypeList, final String characterEncoding) {
String contentType;
- FacesContext facesContext = FacesContext.getCurrentInstance();
+ final FacesContext facesContext = FacesContext.getCurrentInstance();
if (AjaxUtils.isAjaxRequest(facesContext)) {
return new JsonResponseWriter(writer, "application/json", characterEncoding);
}
@@ -142,7 +142,7 @@ public class TobagoRenderKit extends Ren
}
@Override
- public void addRenderer(String family, String rendererType, Renderer renderer) {
+ public void addRenderer(final String family, final String rendererType, final Renderer renderer) {
renderers.put(new Key(family, rendererType), renderer);
}
@@ -152,7 +152,7 @@ public class TobagoRenderKit extends Ren
}
@Override
- public ResponseStream createResponseStream(OutputStream outputStream) {
+ public ResponseStream createResponseStream(final OutputStream outputStream) {
return getHtmlBasicRenderKit().createResponseStream(outputStream);
}
@@ -160,12 +160,12 @@ public class TobagoRenderKit extends Ren
private final String family;
private final String rendererType;
- private Key(String family, String rendererType) {
+ private Key(final String family, final String rendererType) {
this.family = family;
this.rendererType = rendererType;
}
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
@@ -173,7 +173,7 @@ public class TobagoRenderKit extends Ren
return false;
}
- Key key = (Key) o;
+ final Key key = (Key) o;
if (!family.equals(key.family)) {
return false;
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Classes.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Classes.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Classes.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Classes.java Fri Nov 15 17:10:58 2013
@@ -100,7 +100,7 @@ public final class Classes {
return value;
}
- private Classes(final String rendererName, final Markup markup, final String sub, boolean ignoreMarkupCheck) {
+ private Classes(final String rendererName, final Markup markup, final String sub, final boolean ignoreMarkupCheck) {
assert sub == null || StringUtils.isAlphanumeric(sub) : "Invalid sub element name: '" + sub + "'";
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Overflow.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Overflow.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Overflow.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Overflow.java Fri Nov 15 17:10:58 2013
@@ -27,7 +27,7 @@ public enum Overflow {
private String value;
- Overflow(String value) {
+ Overflow(final String value) {
this.value = value;
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Position.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Position.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Position.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Position.java Fri Nov 15 17:10:58 2013
@@ -28,7 +28,7 @@ public enum Position {
private String value;
- Position(String value) {
+ Position(final String value) {
this.value = value;
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Style.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Style.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Style.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Style.java Fri Nov 15 17:10:58 2013
@@ -59,7 +59,7 @@ public class Style implements Serializab
public Style() {
}
- public Style(Style map) {
+ public Style(final Style map) {
this.width = map.width;
this.height = map.height;
this.left = map.left;
@@ -83,9 +83,9 @@ public class Style implements Serializab
this.textAlign = map.textAlign;
}
- public Style(FacesContext facesContext, LayoutBase layout) {
+ public Style(final FacesContext facesContext, final LayoutBase layout) {
- String rendererType = layout.getRendererType();
+ final String rendererType = layout.getRendererType();
width = layout.getCurrentWidth();
if (width != null) {
@@ -140,7 +140,7 @@ public class Style implements Serializab
}
public String encode() {
- StringBuilder buf = new StringBuilder();
+ final StringBuilder buf = new StringBuilder();
if (width != null) {
buf.append("width:");
buf.append(width.serialize());
@@ -251,7 +251,7 @@ public class Style implements Serializab
}
public String encodeJson() {
- StringBuilder buf = new StringBuilder("{");
+ final StringBuilder buf = new StringBuilder("{");
if (width != null) {
buf.append("\"width\":\"");
buf.append(width.serialize());
@@ -370,7 +370,7 @@ public class Style implements Serializab
return width;
}
- public void setWidth(Measure width) {
+ public void setWidth(final Measure width) {
this.width = width;
}
@@ -378,7 +378,7 @@ public class Style implements Serializab
return height;
}
- public void setHeight(Measure height) {
+ public void setHeight(final Measure height) {
this.height = height;
}
@@ -386,7 +386,7 @@ public class Style implements Serializab
return left;
}
- public void setLeft(Measure left) {
+ public void setLeft(final Measure left) {
this.left = left;
}
@@ -394,7 +394,7 @@ public class Style implements Serializab
return top;
}
- public void setTop(Measure top) {
+ public void setTop(final Measure top) {
this.top = top;
}
@@ -402,7 +402,7 @@ public class Style implements Serializab
return display;
}
- public void setDisplay(Display display) {
+ public void setDisplay(final Display display) {
this.display = display;
}
@@ -410,7 +410,7 @@ public class Style implements Serializab
return position;
}
- public void setPosition(Position position) {
+ public void setPosition(final Position position) {
this.position = position;
}
@@ -418,7 +418,7 @@ public class Style implements Serializab
return overflowX;
}
- public void setOverflowX(Overflow overflowX) {
+ public void setOverflowX(final Overflow overflowX) {
this.overflowX = overflowX;
}
@@ -426,7 +426,7 @@ public class Style implements Serializab
return overflowY;
}
- public void setOverflowY(Overflow overflowY) {
+ public void setOverflowY(final Overflow overflowY) {
this.overflowY = overflowY;
}
@@ -434,7 +434,7 @@ public class Style implements Serializab
return marginLeft;
}
- public void setMarginLeft(Measure marginLeft) {
+ public void setMarginLeft(final Measure marginLeft) {
this.marginLeft = marginLeft;
}
@@ -442,7 +442,7 @@ public class Style implements Serializab
return marginRight;
}
- public void setMarginRight(Measure marginRight) {
+ public void setMarginRight(final Measure marginRight) {
this.marginRight = marginRight;
}
@@ -450,7 +450,7 @@ public class Style implements Serializab
return marginTop;
}
- public void setMarginTop(Measure marginTop) {
+ public void setMarginTop(final Measure marginTop) {
this.marginTop = marginTop;
}
@@ -458,7 +458,7 @@ public class Style implements Serializab
return marginBottom;
}
- public void setMarginBottom(Measure marginBottom) {
+ public void setMarginBottom(final Measure marginBottom) {
this.marginBottom = marginBottom;
}
@@ -466,7 +466,7 @@ public class Style implements Serializab
return margin;
}
- public void setMargin(Measure margin) {
+ public void setMargin(final Measure margin) {
this.margin = margin;
}
@@ -474,7 +474,7 @@ public class Style implements Serializab
return paddingLeft;
}
- public void setPaddingLeft(Measure paddingLeft) {
+ public void setPaddingLeft(final Measure paddingLeft) {
this.paddingLeft = paddingLeft;
}
@@ -482,7 +482,7 @@ public class Style implements Serializab
return paddingRight;
}
- public void setPaddingRight(Measure paddingRight) {
+ public void setPaddingRight(final Measure paddingRight) {
this.paddingRight = paddingRight;
}
@@ -490,7 +490,7 @@ public class Style implements Serializab
return paddingTop;
}
- public void setPaddingTop(Measure paddingTop) {
+ public void setPaddingTop(final Measure paddingTop) {
this.paddingTop = paddingTop;
}
@@ -498,7 +498,7 @@ public class Style implements Serializab
return paddingBottom;
}
- public void setPaddingBottom(Measure paddingBottom) {
+ public void setPaddingBottom(final Measure paddingBottom) {
this.paddingBottom = paddingBottom;
}
@@ -506,7 +506,7 @@ public class Style implements Serializab
return padding;
}
- public void setPadding(Measure padding) {
+ public void setPadding(final Measure padding) {
this.padding = padding;
}
@@ -514,7 +514,7 @@ public class Style implements Serializab
return backgroundImage;
}
- public void setBackgroundImage(String backgroundImage) {
+ public void setBackgroundImage(final String backgroundImage) {
this.backgroundImage = backgroundImage;
}
@@ -522,7 +522,7 @@ public class Style implements Serializab
return zIndex;
}
- public void setZIndex(Integer zIndex) {
+ public void setZIndex(final Integer zIndex) {
this.zIndex = zIndex;
}
@@ -530,7 +530,7 @@ public class Style implements Serializab
return textAlign;
}
- public void setTextAlign(TextAlign textAlign) {
+ public void setTextAlign(final TextAlign textAlign) {
this.textAlign = textAlign;
}
}
Added: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/util/EncodeUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/util/EncodeUtils.java?rev=1542331&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/util/EncodeUtils.java (added)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/util/EncodeUtils.java Fri Nov 15 17:10:58 2013
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.tobago.renderkit.util;
+
+import org.apache.myfaces.tobago.renderkit.RendererBase;
+import org.apache.myfaces.tobago.util.ComponentUtils;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import java.io.IOException;
+import java.util.Iterator;
+
+public class EncodeUtils {
+
+ public static void prepareRendererAll(final FacesContext facesContext, final UIComponent component)
+ throws IOException {
+ if (!component.isRendered()) {
+ return;
+ }
+ final RendererBase renderer = ComponentUtils.getRenderer(facesContext, component);
+ boolean prepareRendersChildren = false;
+ if (renderer != null) {
+ renderer.prepareRender(facesContext, component);
+ prepareRendersChildren = renderer.getPrepareRendersChildren();
+ }
+ if (prepareRendersChildren) {
+ renderer.prepareRendersChildren(facesContext, component);
+ } else {
+ final Iterator it = component.getFacetsAndChildren();
+ while (it.hasNext()) {
+ final UIComponent child = (UIComponent) it.next();
+ prepareRendererAll(facesContext, child);
+ }
+ }
+ }
+}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/NonFacesRequestServlet.java Fri Nov 15 17:10:58 2013
@@ -43,17 +43,18 @@ public abstract class NonFacesRequestSer
private static final Logger LOG = LoggerFactory.getLogger(NonFacesRequestServlet.class);
@Override
- protected void service(HttpServletRequest request, HttpServletResponse response)
+ protected void service(final HttpServletRequest request, final HttpServletResponse response)
throws ServletException, IOException {
- LifecycleFactory lFactory = (LifecycleFactory) FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY);
- Lifecycle lifecycle = lFactory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE);
- FacesContextFactory fcFactory = (FacesContextFactory) FactoryFinder.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
- FacesContext facesContext = fcFactory.getFacesContext(getServletContext(), request, response, lifecycle);
+ final LifecycleFactory lFactory = (LifecycleFactory) FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY);
+ final Lifecycle lifecycle = lFactory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE);
+ final FacesContextFactory fcFactory
+ = (FacesContextFactory) FactoryFinder.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
+ final FacesContext facesContext = fcFactory.getFacesContext(getServletContext(), request, response, lifecycle);
try {
// invoke application
- String outcome = invokeApplication(facesContext);
+ final String outcome = invokeApplication(facesContext);
if (facesContext.getResponseComplete()) {
return;
@@ -62,12 +63,12 @@ public abstract class NonFacesRequestSer
LOG.debug("outcome = '" + outcome + "'");
}
- Application application = facesContext.getApplication();
+ final Application application = facesContext.getApplication();
if (facesContext.getViewRoot() == null) {
facesContext.setViewRoot(createViewRoot(facesContext));
}
- NavigationHandler navigationHandler = application.getNavigationHandler();
+ final NavigationHandler navigationHandler = application.getNavigationHandler();
navigationHandler.handleNavigation(facesContext, null, outcome);
@@ -77,7 +78,7 @@ public abstract class NonFacesRequestSer
}
}
- protected UIViewRoot createViewRoot(FacesContext facesContext) {
+ protected UIViewRoot createViewRoot(final FacesContext facesContext) {
return facesContext.getApplication().getViewHandler().createView(facesContext, getFromViewId());
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java Fri Nov 15 17:10:58 2013
@@ -76,43 +76,43 @@ public class ResourceServlet extends Htt
private Set<String> resourceDirs = new HashSet<String>();
@Override
- public void init(ServletConfig servletConfig) throws ServletException {
+ public void init(final ServletConfig servletConfig) throws ServletException {
super.init(servletConfig);
- TobagoConfig tobagoConfig = TobagoConfig.getInstance(servletConfig.getServletContext());
+ final TobagoConfig tobagoConfig = TobagoConfig.getInstance(servletConfig.getServletContext());
if (tobagoConfig != null && tobagoConfig.getProjectStage() == ProjectStage.Production) {
expires = 24 * 60 * 60 * 1000L;
}
- Theme defaultTheme = tobagoConfig.getDefaultTheme();
+ final Theme defaultTheme = tobagoConfig.getDefaultTheme();
addResourceDir(defaultTheme.getFallbackList());
addResourceDir(tobagoConfig.getSupportedThemes());
- String expiresString = servletConfig.getInitParameter("expires");
+ final String expiresString = servletConfig.getInitParameter("expires");
if (expiresString != null) {
try {
expires = new Long(expiresString) * 1000;
- } catch (NumberFormatException e) {
+ } catch (final NumberFormatException e) {
LOG.error("Caught: " + e.getMessage(), e);
}
}
- String bufferSizeString = servletConfig.getInitParameter("bufferSize");
+ final String bufferSizeString = servletConfig.getInitParameter("bufferSize");
bufferSize = 1024 * 4;
if (bufferSizeString != null) {
try {
bufferSize = Integer.parseInt(bufferSizeString);
- } catch (NumberFormatException e) {
+ } catch (final NumberFormatException e) {
LOG.error("Caught: " + e.getMessage(), e);
}
}
}
- private void addResourceDir(List<Theme> themes) {
- for (Theme theme : themes) {
+ private void addResourceDir(final List<Theme> themes) {
+ for (final Theme theme : themes) {
addResourceDir(theme);
}
}
- private void addResourceDir(Theme theme) {
- String dir = theme.getResourcePath();
+ private void addResourceDir(final Theme theme) {
+ final String dir = theme.getResourcePath();
if (dir.startsWith("/")) {
resourceDirs.add(dir.substring(1));
} else {
@@ -122,12 +122,12 @@ public class ResourceServlet extends Htt
@Override
protected void doGet(
- HttpServletRequest request, HttpServletResponse response)
+ final HttpServletRequest request, final HttpServletResponse response)
throws ServletException, IOException {
- String requestURI = request.getRequestURI();
+ final String requestURI = request.getRequestURI();
String resource = requestURI.substring(request.getContextPath().length() + 1);
- for (String resourceDir : resourceDirs) {
+ for (final String resourceDir : resourceDirs) {
if (resource.startsWith(resourceDir)) {
if (Character.isDigit(resource.charAt(resourceDir.length()+1))) {
resource = resourceDir + resource.substring(resource.indexOf('/', resourceDir.length() + 1));
@@ -140,11 +140,11 @@ public class ResourceServlet extends Htt
response.setHeader("Cache-Control", "Public, max-age=" + expires);
response.setDateHeader("Expires", System.currentTimeMillis() + expires);
}
- String contentType = MimeTypeUtils.getMimeTypeForFile(requestURI);
+ final String contentType = MimeTypeUtils.getMimeTypeForFile(requestURI);
if (contentType != null) {
response.setContentType(contentType);
} else {
- String message = "Unsupported mime type of resource='" + resource + "'";
+ final String message = "Unsupported mime type of resource='" + resource + "'";
LOG.warn(message + " (because of security reasons)");
response.sendError(HttpServletResponse.SC_FORBIDDEN, message);
return;
@@ -152,7 +152,7 @@ public class ResourceServlet extends Htt
InputStream inputStream = null;
try {
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
// meta inf (like in servlet 3.0)
inputStream = classLoader.getResourceAsStream("META-INF/resources/" + resource);
@@ -165,7 +165,7 @@ public class ResourceServlet extends Htt
if (inputStream != null) {
copy(inputStream, response.getOutputStream());
} else {
- String message = "Resource '" + resource + "' not found!";
+ final String message = "Resource '" + resource + "' not found!";
LOG.warn(message);
response.sendError(HttpServletResponse.SC_NOT_FOUND, message);
}
@@ -175,7 +175,7 @@ public class ResourceServlet extends Htt
}
@Override
- protected long getLastModified(HttpServletRequest request) {
+ protected long getLastModified(final HttpServletRequest request) {
if (expires != null) {
return 0;
} else {
@@ -183,8 +183,8 @@ public class ResourceServlet extends Htt
}
}
- private void copy(InputStream inputStream, OutputStream outputStream) throws IOException {
- byte[] buffer = new byte[bufferSize];
+ private void copy(final InputStream inputStream, final OutputStream outputStream) throws IOException {
+ final byte[] buffer = new byte[bufferSize];
int count;
while (-1 != (count = inputStream.read(buffer))) {
outputStream.write(buffer, 0, count);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ApplyRequestValuesCallback.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ApplyRequestValuesCallback.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ApplyRequestValuesCallback.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ApplyRequestValuesCallback.java Fri Nov 15 17:10:58 2013
@@ -37,15 +37,15 @@ public class ApplyRequestValuesCallback
@SuppressWarnings("UnusedDeclaration")
private static final Logger LOG = LoggerFactory.getLogger(ApplyRequestValuesCallback.class);
- public void invokeContextCallback(FacesContext context, UIComponent component) {
+ public void invokeContextCallback(final FacesContext context, final UIComponent component) {
if (FacesContextUtils.isAjax(context)) {
final String ajaxId = FacesContextUtils.getAjaxComponentId(context);
- UIComponent reload = component.getFacet(Facets.RELOAD);
+ final UIComponent reload = component.getFacet(Facets.RELOAD);
if (ajaxId != null && ajaxId.equals(component.getClientId(context)) && reload != null && reload.isRendered()
&& ajaxId.equals(FacesContextUtils.getActionId(context))) {
- Boolean immediate = (Boolean) reload.getAttributes().get(Attributes.IMMEDIATE);
+ final Boolean immediate = (Boolean) reload.getAttributes().get(Attributes.IMMEDIATE);
if (immediate != null && immediate) {
- Boolean update = (Boolean) reload.getAttributes().get(Attributes.UPDATE);
+ final Boolean update = (Boolean) reload.getAttributes().get(Attributes.UPDATE);
if (update != null && !update) {
final Object response = context.getExternalContext().getResponse();
if (response instanceof HttpServletResponse) {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java Fri Nov 15 17:10:58 2013
@@ -34,21 +34,21 @@ public class BeanComparator extends Comp
private String property;
- public BeanComparator(String property) {
+ public BeanComparator(final String property) {
this.property = property;
}
- public BeanComparator(String property, boolean reverse) {
+ public BeanComparator(final String property, final boolean reverse) {
super(reverse);
this.property = property;
}
- public BeanComparator(String property, Comparator comparator) {
+ public BeanComparator(final String property, final Comparator comparator) {
super(comparator);
this.property = property;
}
- public BeanComparator(String property, Comparator comparator, boolean reverse) {
+ public BeanComparator(final String property, final Comparator comparator, final boolean reverse) {
super(reverse, comparator);
this.property = property;
}
@@ -57,7 +57,7 @@ public class BeanComparator extends Comp
* @param param1 <description>
* @return <description>
*/
- public boolean equals(Object param1) {
+ public boolean equals(final Object param1) {
if (this == param1) {
return true;
}
@@ -82,14 +82,14 @@ public class BeanComparator extends Comp
* @param param2 <description>
* @return <description>
*/
- public int compare(Object param1, Object param2) {
- Object obj1;
- Object obj2;
+ public int compare(final Object param1, final Object param2) {
+ final Object obj1;
+ final Object obj2;
try {
obj1 = PropertyUtils.getProperty(param1, property);
obj2 = PropertyUtils.getProperty(param2, property);
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.error(e.getMessage(), e);
return 0;
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BundleMapWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BundleMapWrapper.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BundleMapWrapper.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BundleMapWrapper.java Fri Nov 15 17:10:58 2013
@@ -31,7 +31,7 @@ public class BundleMapWrapper implements
private String basename;
- public BundleMapWrapper(String basename) {
+ public BundleMapWrapper(final String basename) {
this.basename = basename;
}
@@ -39,16 +39,16 @@ public class BundleMapWrapper implements
throw new UnsupportedOperationException();
}
- public boolean containsKey(Object key) {
+ public boolean containsKey(final Object key) {
if (null == key) {
return false;
}
- String value = ResourceManagerUtils.getPropertyNotNull(
+ final String value = ResourceManagerUtils.getPropertyNotNull(
FacesContext.getCurrentInstance(), basename, key.toString());
return value != null;
}
- public boolean containsValue(Object value) {
+ public boolean containsValue(final Object value) {
throw new UnsupportedOperationException();
}
@@ -56,7 +56,7 @@ public class BundleMapWrapper implements
throw new UnsupportedOperationException();
}
- public Object get(Object key) {
+ public Object get(final Object key) {
if (null == key) {
return null;
}
@@ -68,14 +68,14 @@ public class BundleMapWrapper implements
return basename.hashCode();
}
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
- BundleMapWrapper that = (BundleMapWrapper) o;
+ final BundleMapWrapper that = (BundleMapWrapper) o;
return basename.equals(that.basename);
}
@@ -87,15 +87,15 @@ public class BundleMapWrapper implements
throw new UnsupportedOperationException();
}
- public Object put(Object k, Object v) {
+ public Object put(final Object k, final Object v) {
throw new UnsupportedOperationException();
}
- public void putAll(Map t) {
+ public void putAll(final Map t) {
throw new UnsupportedOperationException();
}
- public Object remove(Object k) {
+ public Object remove(final Object k) {
throw new UnsupportedOperationException();
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java Fri Nov 15 17:10:58 2013
@@ -33,20 +33,20 @@ public abstract class ComparatorBase imp
protected ComparatorBase() {
}
- protected ComparatorBase(boolean reverse, Comparator comparator) {
+ protected ComparatorBase(final boolean reverse, final Comparator comparator) {
this.comparator = comparator;
this.reverse = reverse;
}
- protected ComparatorBase(boolean reverse) {
+ protected ComparatorBase(final boolean reverse) {
this.reverse = reverse;
}
- protected ComparatorBase(Comparator comparator) {
+ protected ComparatorBase(final Comparator comparator) {
this.comparator = comparator;
}
- protected int internalCompare(Object obj1, Object obj2) {
+ protected int internalCompare(final Object obj1, final Object obj2) {
if (obj1 == null || obj2 == null) {
if (obj1 == null && obj2 == null) {
@@ -64,13 +64,13 @@ public abstract class ComparatorBase imp
+ obj2.getClass().getName());
}
- int result;
+ final int result;
if (comparator instanceof Collator) {
- CollationKey collationKey1
+ final CollationKey collationKey1
= ((Collator) comparator).getCollationKey(obj1.toString());
- CollationKey collationKey2
+ final CollationKey collationKey2
= ((Collator) comparator).getCollationKey(obj2.toString());
result = collationKey1.compareTo(collationKey2);
@@ -109,7 +109,7 @@ public abstract class ComparatorBase imp
return (comparator != null ? comparator.hashCode() : 0);
} */
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (o == null) {
return false;
}