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 [20/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-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtil.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtil.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerUtil.java Fri Nov 15 17:10:58 2013
@@ -40,7 +40,7 @@ public class ResourceManagerUtil {
* @deprecated please use {@link ResourceManagerUtils}
*/
@Deprecated
- public static String getProperty(FacesContext facesContext, String bundle, String key) {
+ public static String getProperty(final FacesContext facesContext, final String bundle, final String key) {
return ResourceManagerFactory.getResourceManager(facesContext).getProperty(facesContext, bundle, key);
}
@@ -48,8 +48,9 @@ public class ResourceManagerUtil {
* @deprecated please use {@link ResourceManagerUtils}
*/
@Deprecated
- public static String getPropertyNotNull(FacesContext facesContext, String bundle, String key) {
- String result = ResourceManagerFactory.getResourceManager(facesContext).getProperty(facesContext, bundle, key);
+ public static String getPropertyNotNull(final FacesContext facesContext, final String bundle, final String key) {
+ final String result
+ = ResourceManagerFactory.getResourceManager(facesContext).getProperty(facesContext, bundle, key);
if (result == null) {
return "???" + key + "???";
} else {
@@ -61,7 +62,7 @@ public class ResourceManagerUtil {
* Searches for an image and return it with the context path
* @deprecated please use {@link ResourceManagerUtils}
*/
- public static String getImageWithPath(FacesContext facesContext, String name) {
+ public static String getImageWithPath(final FacesContext facesContext, final String name) {
return facesContext.getExternalContext().getRequestContextPath()
+ ResourceManagerFactory.getResourceManager(facesContext).getImage(facesContext, name);
}
@@ -70,8 +71,10 @@ public class ResourceManagerUtil {
* Searches for an image and return it with the context path
* @deprecated please use {@link ResourceManagerUtils}
*/
- public static String getImageWithPath(FacesContext facesContext, String name, boolean ignoreMissing) {
- String image = ResourceManagerFactory.getResourceManager(facesContext).getImage(facesContext, name, ignoreMissing);
+ public static String getImageWithPath(
+ final FacesContext facesContext, final String name, final boolean ignoreMissing) {
+ final String image
+ = ResourceManagerFactory.getResourceManager(facesContext).getImage(facesContext, name, ignoreMissing);
if (image == null) {
return null;
} else {
@@ -83,9 +86,9 @@ public class ResourceManagerUtil {
* @deprecated please use {@link ResourceManagerUtils}
*/
@Deprecated
- public static List<String> getStyles(FacesContext facesContext, String name) {
- String contextPath = facesContext.getExternalContext().getRequestContextPath();
- String[] styles = ResourceManagerFactory.getResourceManager(facesContext).getStyles(facesContext, name);
+ public static List<String> getStyles(final FacesContext facesContext, final String name) {
+ final String contextPath = facesContext.getExternalContext().getRequestContextPath();
+ final String[] styles = ResourceManagerFactory.getResourceManager(facesContext).getStyles(facesContext, name);
return addContextPath(styles, contextPath);
}
@@ -93,9 +96,9 @@ public class ResourceManagerUtil {
* @deprecated please use {@link ResourceManagerUtils}
*/
@Deprecated
- private static List<String> addContextPath(String[] strings, String contextPath) {
- List<String> withContext = new ArrayList<String>(strings.length);
- for (String string : strings) {
+ private static List<String> addContextPath(final String[] strings, final String contextPath) {
+ final List<String> withContext = new ArrayList<String>(strings.length);
+ for (final String string : strings) {
withContext.add(contextPath + string);
}
return withContext;
@@ -105,9 +108,9 @@ public class ResourceManagerUtil {
* @deprecated please use {@link ResourceManagerUtils}
*/
@Deprecated
- public static List<String> getScripts(FacesContext facesContext, String name) {
- String contextPath = facesContext.getExternalContext().getRequestContextPath();
- String[] scripts = ResourceManagerFactory.getResourceManager(facesContext).getScripts(facesContext, name);
+ public static List<String> getScripts(final FacesContext facesContext, final String name) {
+ final String contextPath = facesContext.getExternalContext().getRequestContextPath();
+ final String[] scripts = ResourceManagerFactory.getResourceManager(facesContext).getScripts(facesContext, name);
return addContextPath(scripts, contextPath);
}
@@ -115,9 +118,9 @@ public class ResourceManagerUtil {
* @deprecated please use {@link ResourceManagerUtils}
*/
@Deprecated
- public static String getScriptsAsJSArray(FacesContext facesContext, String[] names) {
- List<String> fileNames = new ArrayList<String>();
- for (String name : names) {
+ public static String getScriptsAsJSArray(final FacesContext facesContext, final String[] names) {
+ final List<String> fileNames = new ArrayList<String>();
+ for (final String name : names) {
fileNames.addAll(getScripts(facesContext, name));
}
return toJSArray(fileNames);
@@ -127,9 +130,9 @@ public class ResourceManagerUtil {
* @deprecated please use {@link ResourceManagerUtils}
*/
@Deprecated
- public static String getStylesAsJSArray(FacesContext facesContext, String[] names) {
- List<String> fileNames = new ArrayList<String>();
- for (String name : names) {
+ public static String getStylesAsJSArray(final FacesContext facesContext, final String[] names) {
+ final List<String> fileNames = new ArrayList<String>();
+ for (final String name : names) {
fileNames.addAll(getStyles(facesContext, name));
}
return toJSArray(fileNames);
@@ -139,9 +142,9 @@ public class ResourceManagerUtil {
* @deprecated please use {@link ResourceManagerUtils}
*/
@Deprecated
- public static String toJSArray(List<String> list) {
- StringBuilder sb = new StringBuilder();
- for (String name : list) {
+ public static String toJSArray(final List<String> list) {
+ final StringBuilder sb = new StringBuilder();
+ for (final String name : list) {
if (sb.length() > 0) {
sb.append(", ");
}
@@ -156,8 +159,8 @@ public class ResourceManagerUtil {
* @deprecated please use {@link ResourceManagerUtils}
*/
@Deprecated
- public static String getDisabledImageWithPath(FacesContext facesContext, String image) {
- String filename = ResourceUtils.addPostfixToFilename(image, "Disabled");
+ public static String getDisabledImageWithPath(final FacesContext facesContext, final String image) {
+ final String filename = ResourceUtils.addPostfixToFilename(image, "Disabled");
return getImageWithPath(facesContext, filename, true);
}
@@ -165,7 +168,7 @@ public class ResourceManagerUtil {
* @deprecated please use {@link ResourceManagerUtils}
*/
@Deprecated
- public static String getBlankPage(FacesContext facesContext) {
+ public static String getBlankPage(final FacesContext facesContext) {
return ResourceManagerUtils.getBlankPage(facesContext);
}
@@ -173,7 +176,7 @@ public class ResourceManagerUtil {
* @deprecated please use {@link ResourceManagerUtils}
*/
@Deprecated
- public static String getPageWithoutContextPath(FacesContext facesContext, String name) {
+ public static String getPageWithoutContextPath(final FacesContext facesContext, final String name) {
return ResourceManagerFactory.getResourceManager(facesContext).getImage(facesContext, name);
}
@@ -181,7 +184,8 @@ public class ResourceManagerUtil {
* @deprecated please use {@link ResourceManagerUtils}
*/
@Deprecated
- public static Measure getThemeMeasure(FacesContext facesContext, Configurable configurable, String name) {
+ public static Measure getThemeMeasure(
+ final FacesContext facesContext, final Configurable configurable, final String name) {
return ResourceManagerUtils.getThemeMeasure(facesContext, configurable, name);
}
@@ -189,7 +193,7 @@ public class ResourceManagerUtil {
* @deprecated please use {@link ResourceManagerUtils}
*/
@Deprecated
- public static boolean isAbsoluteResource(String value) {
+ public static boolean isAbsoluteResource(final String value) {
return ResourceManagerUtils.isAbsoluteResource(value);
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java Fri Nov 15 17:10:58 2013
@@ -61,7 +61,7 @@ public class TobagoFacesContext extends
private boolean ajax;
- public TobagoFacesContext(FacesContext wrapped) {
+ public TobagoFacesContext(final FacesContext wrapped) {
this.wrapped = wrapped;
scriptFiles = SetUniqueList.decorate(new ArrayList());
scriptBlocks = new ListOrderedSet();
@@ -78,7 +78,7 @@ public class TobagoFacesContext extends
return ajax;
}
- public void setAjax(boolean ajax) {
+ public void setAjax(final boolean ajax) {
this.ajax = ajax;
}
@@ -86,7 +86,7 @@ public class TobagoFacesContext extends
return ajaxComponentId;
}
- public void setAjaxComponentId(String ajaxComponentId) {
+ public void setAjaxComponentId(final String ajaxComponentId) {
this.ajaxComponentId = ajaxComponentId;
}
@@ -94,7 +94,7 @@ public class TobagoFacesContext extends
return enctype;
}
- public void setEnctype(String enctype) {
+ public void setEnctype(final String enctype) {
this.enctype = enctype;
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/PageActionUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/PageActionUtil.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/PageActionUtil.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/PageActionUtil.java Fri Nov 15 17:10:58 2013
@@ -36,13 +36,13 @@ public class PageActionUtil {
static {
MAPPING = new HashMap<String, PageAction>();
- for (PageAction action : PageAction.values()) {
+ for (final PageAction action : PageAction.values()) {
MAPPING.put(action.getToken(), action);
}
}
- public static PageAction parse(String name) {
- PageAction value = MAPPING.get(name);
+ public static PageAction parse(final String name) {
+ final PageAction value = MAPPING.get(name);
if (value != null) {
return value;
} else {
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingPopupActionListener.java Fri Nov 15 17:10:58 2013
@@ -47,14 +47,14 @@ public class ValueBindingPopupActionList
public ValueBindingPopupActionListener() {
}
- public ValueBindingPopupActionListener(Object binding) {
+ public ValueBindingPopupActionListener(final Object binding) {
popupIdBinding = (ValueBinding) binding;
}
@Override
- protected AbstractUIPopup getPopup(ActionEvent actionEvent) {
- String id = (String) popupIdBinding.getValue(FacesContext.getCurrentInstance());
- UIComponent popup = FindComponentUtils.findComponent(actionEvent.getComponent(), id);
+ protected AbstractUIPopup getPopup(final ActionEvent actionEvent) {
+ final String id = (String) popupIdBinding.getValue(FacesContext.getCurrentInstance());
+ final UIComponent popup = FindComponentUtils.findComponent(actionEvent.getComponent(), id);
if (popup instanceof AbstractUIPopup) {
return (AbstractUIPopup) popup;
} else {
@@ -70,19 +70,19 @@ public class ValueBindingPopupActionList
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;
popupIdBinding = (ValueBinding) 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, popupIdBinding);
return values;
}
- public void setTransient(boolean newTransientValue) {
+ public void setTransient(final boolean newTransientValue) {
// ignore
}
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingResetInputActionListener.java Fri Nov 15 17:10:58 2013
@@ -48,13 +48,13 @@ public class ValueBindingResetInputActio
public ValueBindingResetInputActionListener() {
}
- public ValueBindingResetInputActionListener(Object binding) {
+ public ValueBindingResetInputActionListener(final Object binding) {
clientIdsBinding = (ValueBinding) binding;
}
- public void processAction(ActionEvent event) {
- Object obj = clientIdsBinding.getValue(FacesContext.getCurrentInstance());
- String [] clientIds;
+ public void processAction(final ActionEvent event) {
+ final Object obj = clientIdsBinding.getValue(FacesContext.getCurrentInstance());
+ final String [] clientIds;
if (obj instanceof String[]) {
clientIds = (String[]) obj;
} else if (obj instanceof String) {
@@ -63,8 +63,8 @@ public class ValueBindingResetInputActio
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);
}
@@ -75,18 +75,18 @@ public class ValueBindingResetInputActio
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;
clientIdsBinding = (ValueBinding) 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, clientIdsBinding);
return values;
}
- public void setTransient(boolean newTransientValue) {
+ public void setTransient(final boolean newTransientValue) {
// ignore
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/event/ValueBindingTabChangeListener.java Fri Nov 15 17:10:58 2013
@@ -39,13 +39,13 @@ public class ValueBindingTabChangeListen
public ValueBindingTabChangeListener() {
}
- public ValueBindingTabChangeListener(String type, ValueBinding valueBinding) {
+ public ValueBindingTabChangeListener(final String type, final ValueBinding valueBinding) {
this.type = type;
this.valueBinding = valueBinding;
}
- 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 {
@@ -53,15 +53,15 @@ public class ValueBindingTabChangeListen
}
}
- 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, valueBinding);
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;
valueBinding = (ValueBinding) UIComponentBase.restoreAttachedState(context, values[0]);
type = (String) values[1];
@@ -71,14 +71,14 @@ public class ValueBindingTabChangeListen
return false;
}
- public void setTransient(boolean newTransientValue) {
+ public void setTransient(final boolean newTransientValue) {
// ignore
}
private TabChangeListener getTabChangeListener() {
TabChangeListener handler = null;
if (valueBinding != null) {
- Object obj = valueBinding.getValue(FacesContext.getCurrentInstance());
+ final Object obj = valueBinding.getValue(FacesContext.getCurrentInstance());
if (obj != null && obj instanceof TabChangeListener) {
handler = (TabChangeListener) obj;
}
@@ -92,11 +92,11 @@ public class ValueBindingTabChangeListen
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-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/application/ViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/application/ViewHandlerImpl.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/application/ViewHandlerImpl.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/application/ViewHandlerImpl.java Fri Nov 15 17:10:58 2013
@@ -43,29 +43,29 @@ public class ViewHandlerImpl extends Vie
private ViewHandler base;
- public ViewHandlerImpl(ViewHandler base) {
+ public ViewHandlerImpl(final ViewHandler base) {
if (LOG.isInfoEnabled()) {
LOG.info("Hiding RI base implementation: " + base);
}
this.base = base;
}
- public Locale calculateLocale(FacesContext facesContext) {
+ public Locale calculateLocale(final FacesContext facesContext) {
return base.calculateLocale(facesContext);
}
- public String calculateRenderKitId(FacesContext facesContext) {
+ public String calculateRenderKitId(final FacesContext facesContext) {
return base.calculateRenderKitId(facesContext);
}
- public UIViewRoot createView(FacesContext facesContext, String viewId) {
+ public UIViewRoot createView(final FacesContext facesContext, final String viewId) {
if (LOG.isDebugEnabled()) {
LOG.debug("creating new view with viewId: '{}'", viewId);
}
return base.createView(facesContext, viewId);
}
- public String getActionURL(FacesContext facesContext, String viewId) {
+ public String getActionURL(final FacesContext facesContext, final String viewId) {
/*
if (PortletUtils.isRenderResponse(facesContext)) {
@@ -76,11 +76,11 @@ public class ViewHandlerImpl extends Vie
return base.getActionURL(facesContext, viewId);
}
- public String getResourceURL(FacesContext facesContext, String path) {
+ public String getResourceURL(final FacesContext facesContext, final String path) {
return base.getResourceURL(facesContext, path);
}
- public void renderView(FacesContext facesContext, UIViewRoot viewRoot)
+ public void renderView(final FacesContext facesContext, final UIViewRoot viewRoot)
throws IOException, FacesException {
// standard
base.renderView(facesContext, viewRoot);
@@ -91,18 +91,18 @@ public class ViewHandlerImpl extends Vie
}
}
- public UIViewRoot restoreView(FacesContext facesContext, String viewId) {
+ public UIViewRoot restoreView(final FacesContext facesContext, final String viewId) {
if (LOG.isDebugEnabled()) {
LOG.debug("restore view with viewId: '{}'", viewId);
}
// this is only needed in the first request, the later will be handled by faces
// TODO: maybe find a way to make this unneeded
RequestUtils.ensureEncoding(facesContext);
- UIViewRoot viewRoot = base.restoreView(facesContext, viewId);
+ final UIViewRoot viewRoot = base.restoreView(facesContext, viewId);
return viewRoot;
}
- public void writeState(FacesContext facesContext) throws IOException {
+ public void writeState(final FacesContext facesContext) throws IOException {
base.writeState(facesContext);
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ApplyRequestValuesExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ApplyRequestValuesExecutor.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ApplyRequestValuesExecutor.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ApplyRequestValuesExecutor.java Fri Nov 15 17:10:58 2013
@@ -34,7 +34,7 @@ import javax.faces.event.PhaseId;
@Deprecated
class ApplyRequestValuesExecutor implements PhaseExecutor {
- public boolean execute(FacesContext facesContext) {
+ public boolean execute(final FacesContext facesContext) {
facesContext.getViewRoot().processDecodes(facesContext);
return false;
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/InvokeApplicationExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/InvokeApplicationExecutor.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/InvokeApplicationExecutor.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/InvokeApplicationExecutor.java Fri Nov 15 17:10:58 2013
@@ -33,7 +33,7 @@ import javax.faces.event.PhaseId;
*/
@Deprecated
class InvokeApplicationExecutor implements PhaseExecutor {
- public boolean execute(FacesContext facesContext) {
+ public boolean execute(final FacesContext facesContext) {
facesContext.getViewRoot().processApplication(facesContext);
return false;
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseListenerManager.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseListenerManager.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseListenerManager.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/PhaseListenerManager.java Fri Nov 15 17:10:58 2013
@@ -34,7 +34,7 @@ import java.util.Map;
* This class encapsulates the logic used to call PhaseListeners. It was
* needed because of issue 9 of the JSF 1.2 spec. See section 11.3 for more
* details.
- *
+ * <p/>
* Not longer needed.
*
* @deprecated since Tobago 2.0.0
@@ -56,20 +56,21 @@ class PhaseListenerManager {
/**
* Creates a new instance of PhaseListenerManager
*/
- PhaseListenerManager(Lifecycle lifecycle, FacesContext facesContext, PhaseListener[] phaseListeners) {
+ PhaseListenerManager(
+ final Lifecycle lifecycle, final FacesContext facesContext, final PhaseListener[] phaseListeners) {
this.lifecycle = lifecycle;
this.facesContext = facesContext;
this.phaseListeners = phaseListeners;
}
- private boolean isListenerForThisPhase(PhaseListener phaseListener, PhaseId phaseId) {
- int listenerPhaseId = phaseListener.getPhaseId().getOrdinal();
+ private boolean isListenerForThisPhase(final PhaseListener phaseListener, final PhaseId phaseId) {
+ final int listenerPhaseId = phaseListener.getPhaseId().getOrdinal();
return (listenerPhaseId == PhaseId.ANY_PHASE.getOrdinal()
|| listenerPhaseId == phaseId.getOrdinal());
}
- void informPhaseListenersBefore(PhaseId phaseId) {
- boolean[] beforePhaseSuccess = new boolean[phaseListeners.length];
+ void informPhaseListenersBefore(final PhaseId phaseId) {
+ final boolean[] beforePhaseSuccess = new boolean[phaseListeners.length];
listenerSuccessMap.put(phaseId, beforePhaseSuccess);
if (phaseListeners.length == 0) {
@@ -78,12 +79,12 @@ class PhaseListenerManager {
final PhaseEvent event = new PhaseEvent(facesContext, phaseId, lifecycle);
for (int i = 0; i < phaseListeners.length; i++) {
- PhaseListener phaseListener = phaseListeners[i];
+ final PhaseListener phaseListener = phaseListeners[i];
if (isListenerForThisPhase(phaseListener, phaseId)) {
try {
phaseListener.beforePhase(event);
beforePhaseSuccess[i] = true;
- } catch (Exception e) {
+ } catch (final Exception e) {
beforePhaseSuccess[i] = false; // redundant - for clarity
LOG.error("Exception in PhaseListener " + phaseId.toString() + " beforePhase.", e);
return;
@@ -92,8 +93,8 @@ class PhaseListenerManager {
}
}
- void informPhaseListenersAfter(PhaseId phaseId) {
- boolean[] beforePhaseSuccess = listenerSuccessMap.get(phaseId);
+ void informPhaseListenersAfter(final PhaseId phaseId) {
+ final boolean[] beforePhaseSuccess = listenerSuccessMap.get(phaseId);
if (phaseListeners.length == 0) {
return;
@@ -101,12 +102,12 @@ class PhaseListenerManager {
final PhaseEvent event = new PhaseEvent(facesContext, phaseId, lifecycle);
for (int i = phaseListeners.length - 1; i >= 0; i--) {
- PhaseListener phaseListener = phaseListeners[i];
+ final PhaseListener phaseListener = phaseListeners[i];
if (isListenerForThisPhase(phaseListener, phaseId)
&& beforePhaseSuccess[i]) {
try {
phaseListener.afterPhase(event);
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.error("Exception in PhaseListener " + phaseId.toString() + " afterPhase", e);
}
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ProcessValidationsExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ProcessValidationsExecutor.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ProcessValidationsExecutor.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/ProcessValidationsExecutor.java Fri Nov 15 17:10:58 2013
@@ -33,7 +33,7 @@ import javax.faces.event.PhaseId;
@Deprecated
class ProcessValidationsExecutor implements PhaseExecutor {
- public boolean execute(FacesContext facesContext) {
+ public boolean execute(final FacesContext facesContext) {
facesContext.getViewRoot().processValidators(facesContext);
return false;
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RenderResponseExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RenderResponseExecutor.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RenderResponseExecutor.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RenderResponseExecutor.java Fri Nov 15 17:10:58 2013
@@ -40,23 +40,23 @@ import java.io.IOException;
@Deprecated
class RenderResponseExecutor implements PhaseExecutor {
- public boolean execute(FacesContext facesContext) {
- Application application = facesContext.getApplication();
- ViewHandler viewHandler = application.getViewHandler();
+ public boolean execute(final FacesContext facesContext) {
+ final Application application = facesContext.getApplication();
+ final ViewHandler viewHandler = application.getViewHandler();
try {
final UIViewRoot viewRoot = facesContext.getViewRoot();
if (viewRoot.getViewId() != null) {
viewHandler.renderView(facesContext, viewRoot);
} else {
- Object respObj = facesContext.getExternalContext().getResponse();
+ final Object respObj = facesContext.getExternalContext().getResponse();
if (respObj instanceof HttpServletResponse) {
- HttpServletResponse respHttp = (HttpServletResponse) respObj;
+ final HttpServletResponse respHttp = (HttpServletResponse) respObj;
respHttp.sendError(HttpServletResponse.SC_NOT_FOUND);
facesContext.responseComplete();
}
}
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new FacesException(e.getMessage(), e);
}
return false;
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RestoreViewExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RestoreViewExecutor.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RestoreViewExecutor.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/RestoreViewExecutor.java Fri Nov 15 17:10:58 2013
@@ -58,18 +58,18 @@ class RestoreViewExecutor implements Pha
private static final Logger LOG = LoggerFactory.getLogger(RestoreViewExecutor.class);
- public boolean execute(FacesContext facesContext) {
- ExternalContext externalContext = facesContext.getExternalContext();
+ public boolean execute(final FacesContext facesContext) {
+ final ExternalContext externalContext = facesContext.getExternalContext();
- Map sessionMap = externalContext.getSessionMap();
+ final Map sessionMap = externalContext.getSessionMap();
UIViewRoot viewRoot = (UIViewRoot) sessionMap.get(TobagoLifecycle.VIEW_ROOT_KEY);
if (viewRoot != null) {
facesContext.setViewRoot(viewRoot);
sessionMap.remove(TobagoLifecycle.VIEW_ROOT_KEY);
//noinspection unchecked
- List<Object[]> messageHolders = (List<Object[]>) sessionMap.get(TobagoLifecycle.FACES_MESSAGES_KEY);
+ final List<Object[]> messageHolders = (List<Object[]>) sessionMap.get(TobagoLifecycle.FACES_MESSAGES_KEY);
if (messageHolders != null) {
- for (Object[] messageHolder : messageHolders) {
+ for (final Object[] messageHolder : messageHolders) {
facesContext.addMessage((String) messageHolder[0], (FacesMessage) messageHolder[1]);
}
}
@@ -89,7 +89,7 @@ class RestoreViewExecutor implements Pha
}
// Derive view identifier
- String viewId = deriveViewId(facesContext);
+ final String viewId = deriveViewId(facesContext);
if (viewId == null) {
@@ -102,16 +102,16 @@ class RestoreViewExecutor implements Pha
externalContext.redirect(externalContext.getRequestServletPath() + "/");
facesContext.responseComplete();
return true;
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new FacesException("redirect failed", e);
}
}
}
- Application application = facesContext.getApplication();
- ViewHandler viewHandler = application.getViewHandler();
+ final Application application = facesContext.getApplication();
+ final ViewHandler viewHandler = application.getViewHandler();
- boolean postBack = isPostBack(facesContext);
+ final boolean postBack = isPostBack(facesContext);
if (postBack) {
viewRoot = viewHandler.restoreView(facesContext, viewId);
}
@@ -142,12 +142,12 @@ class RestoreViewExecutor implements Pha
return false;
}
- private boolean isPostBack(FacesContext facesContext) {
- Map requestParameterMap = facesContext.getExternalContext().getRequestParameterMap();
+ private boolean isPostBack(final FacesContext facesContext) {
+ final Map requestParameterMap = facesContext.getExternalContext().getRequestParameterMap();
return requestParameterMap.containsKey(ResponseStateManager.VIEW_STATE_PARAM);
}
- private boolean isSessionSecretValid(FacesContext facesContext) {
+ private boolean isSessionSecretValid(final FacesContext facesContext) {
if (TobagoConfig.getInstance(FacesContext.getCurrentInstance()).isCheckSessionSecret()) {
return Secret.check(facesContext);
} else {
@@ -159,8 +159,8 @@ class RestoreViewExecutor implements Pha
return PhaseId.RESTORE_VIEW;
}
- private static String deriveViewId(FacesContext facesContext) {
- ExternalContext externalContext = facesContext.getExternalContext();
+ private static String deriveViewId(final FacesContext facesContext) {
+ final ExternalContext externalContext = facesContext.getExternalContext();
/*
if (PortletUtils.isPortletRequest(facesContext)) {
@@ -173,22 +173,22 @@ class RestoreViewExecutor implements Pha
// No extra path info found, so it is probably extension mapping
viewId = externalContext.getRequestServletPath(); // getServletPath
if (viewId == null) {
- String msg = "RequestServletPath is null, cannot determine viewId of current page.";
+ final String msg = "RequestServletPath is null, cannot determine viewId of current page.";
LOG.error(msg);
throw new FacesException(msg);
}
// TODO: JSF Spec 2.2.1 - what do they mean by "if the default
// ViewHandler implementation is used..." ?
- String defaultSuffix = externalContext.getInitParameter(ViewHandler.DEFAULT_SUFFIX_PARAM_NAME);
- String suffix = defaultSuffix != null ? defaultSuffix : ViewHandler.DEFAULT_SUFFIX;
+ final String defaultSuffix = externalContext.getInitParameter(ViewHandler.DEFAULT_SUFFIX_PARAM_NAME);
+ final String suffix = defaultSuffix != null ? defaultSuffix : ViewHandler.DEFAULT_SUFFIX;
if (suffix.charAt(0) != '.') {
- String msg = "Default suffix must start with a dot!";
+ final String msg = "Default suffix must start with a dot!";
LOG.error(msg);
throw new FacesException(msg);
}
- int dot = viewId.lastIndexOf('.');
+ final int dot = viewId.lastIndexOf('.');
if (dot == -1) {
LOG.error("Assumed extension mapping, but there is no extension in " + viewId);
viewId = null;
@@ -202,24 +202,24 @@ class RestoreViewExecutor implements Pha
// next two methods are taken from 'org.apache.myfaces.shared.util.RestoreStateUtils'
- public static void recursivelyHandleComponentReferencesAndSetValid(FacesContext facesContext,
- UIComponent parent) {
- boolean forceHandle = false;
+ public static void recursivelyHandleComponentReferencesAndSetValid(final FacesContext facesContext,
+ final UIComponent parent) {
+ final boolean forceHandle = false;
- Method handleBindingsMethod = getBindingMethod(parent);
+ final Method handleBindingsMethod = getBindingMethod(parent);
if (handleBindingsMethod != null && !forceHandle) {
try {
handleBindingsMethod.invoke(parent, new Object[]{});
- } catch (Throwable th) {
+ } catch (final Throwable th) {
LOG.error("Exception while invoking handleBindings on component with client-id:"
+ parent.getClientId(facesContext), th);
}
} else {
- for (Iterator it = parent.getFacetsAndChildren(); it.hasNext();) {
- UIComponent component = (UIComponent) it.next();
+ for (final Iterator it = parent.getFacetsAndChildren(); it.hasNext();) {
+ final UIComponent component = (UIComponent) it.next();
- ValueBinding binding = component.getValueBinding("binding"); //TODO: constant
+ final ValueBinding binding = component.getValueBinding("binding"); //TODO: constant
if (binding != null && !binding.isReadOnly(facesContext)) {
binding.setValue(facesContext, component);
}
@@ -238,14 +238,14 @@ class RestoreViewExecutor implements Pha
*
* @return true if this component is bindingAware (e.g. aliasBean)
*/
- private static Method getBindingMethod(UIComponent parent) {
- Class[] interfaces = parent.getClass().getInterfaces();
+ private static Method getBindingMethod(final UIComponent parent) {
+ final Class[] interfaces = parent.getClass().getInterfaces();
- for (Class clazz : interfaces) {
+ for (final Class clazz : interfaces) {
if (clazz.getName().contains("BindingAware")) {
try {
return parent.getClass().getMethod("handleBindings", new Class[]{});
- } catch (NoSuchMethodException e) {
+ } catch (final NoSuchMethodException e) {
// return
}
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycle.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycle.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycle.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycle.java Fri Nov 15 17:10:58 2013
@@ -70,22 +70,23 @@ public class TobagoLifecycle extends Lif
renderExecutor = new RenderResponseExecutor();
}
- public void execute(FacesContext context) throws FacesException {
+ public void execute(final FacesContext context) throws FacesException {
- PhaseListenerManager phaseListenerMgr = new PhaseListenerManager(this, context, getPhaseListeners());
+ final PhaseListenerManager phaseListenerMgr = new PhaseListenerManager(this, context, getPhaseListeners());
// At very first ensure the requestEncoding, this MUST done before
// accessing request parameters, which can occur in custom phaseListeners.
RequestUtils.ensureEncoding(context);
- for (PhaseExecutor executor : lifecycleExecutors) {
+ for (final PhaseExecutor executor : lifecycleExecutors) {
if (executePhase(context, executor, phaseListenerMgr)) {
return;
}
}
}
- private boolean executePhase(FacesContext facesContext, PhaseExecutor executor, PhaseListenerManager phaseListenerMgr)
+ private boolean executePhase(
+ final FacesContext facesContext, final PhaseExecutor executor, final PhaseListenerManager phaseListenerMgr)
throws FacesException {
boolean skipFurtherProcessing = false;
@@ -125,7 +126,7 @@ public class TobagoLifecycle extends Lif
return skipFurtherProcessing;
}
- public void render(FacesContext facesContext) throws FacesException {
+ public void render(final FacesContext facesContext) throws FacesException {
// if the response is complete we should not be invoking the phase listeners
if (isResponseComplete(facesContext, renderExecutor.getPhase(), true)) {
return;
@@ -134,7 +135,7 @@ public class TobagoLifecycle extends Lif
LOG.trace("entering " + renderExecutor.getPhase() + " in " + TobagoLifecycle.class.getName());
}
- PhaseListenerManager phaseListenerMgr = new PhaseListenerManager(this, facesContext, getPhaseListeners());
+ final PhaseListenerManager phaseListenerMgr = new PhaseListenerManager(this, facesContext, getPhaseListeners());
try {
phaseListenerMgr.informPhaseListenersBefore(renderExecutor.getPhase());
@@ -154,7 +155,7 @@ public class TobagoLifecycle extends Lif
}
- private boolean isResponseComplete(FacesContext facesContext, PhaseId phase, boolean before) {
+ private boolean isResponseComplete(final FacesContext facesContext, final PhaseId phase, final boolean before) {
boolean flag = false;
if (facesContext.getResponseComplete()) {
if (LOG.isDebugEnabled()) {
@@ -167,7 +168,7 @@ public class TobagoLifecycle extends Lif
return flag;
}
- private boolean shouldRenderResponse(FacesContext facesContext, PhaseId phase, boolean before) {
+ private boolean shouldRenderResponse(final FacesContext facesContext, final PhaseId phase, final boolean before) {
boolean flag = false;
if (facesContext.getRenderResponse()) {
if (LOG.isDebugEnabled()) {
@@ -180,7 +181,7 @@ public class TobagoLifecycle extends Lif
return flag;
}
- public void addPhaseListener(PhaseListener phaseListener) {
+ public void addPhaseListener(final PhaseListener phaseListener) {
if (phaseListener == null) {
throw new NullPointerException("PhaseListener must not be null.");
}
@@ -190,7 +191,7 @@ public class TobagoLifecycle extends Lif
}
}
- public void removePhaseListener(PhaseListener phaseListener) {
+ public void removePhaseListener(final PhaseListener phaseListener) {
if (phaseListener == null) {
throw new NullPointerException("PhaseListener must not be null.");
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycleFactory.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycleFactory.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycleFactory.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/TobagoLifecycleFactory.java Fri Nov 15 17:10:58 2013
@@ -40,18 +40,18 @@ public class TobagoLifecycleFactory exte
private LifecycleFactory factory;
private TobagoLifecycle defaultLifecycle;
- public TobagoLifecycleFactory(LifecycleFactory factory) {
+ public TobagoLifecycleFactory(final LifecycleFactory factory) {
this.factory = factory;
defaultLifecycle = new TobagoLifecycle();
Deprecation.LOG.warn("new TobagoLifecycleFactory");
}
- public void addLifecycle(String lifecycleId, Lifecycle lifecycle) {
+ public void addLifecycle(final String lifecycleId, final Lifecycle lifecycle) {
factory.addLifecycle(lifecycleId, lifecycle);
Deprecation.LOG.warn("Lifecycle added : " + lifecycleId + " = " + lifecycle.getClass().getName() + "");
}
- public Lifecycle getLifecycle(String lifecycleId) {
+ public Lifecycle getLifecycle(final String lifecycleId) {
if (LifecycleFactory.DEFAULT_LIFECYCLE.equals(lifecycleId)) {
Deprecation.LOG.warn("getLifecycle(\"" + lifecycleId + "\") -> TobagoLifecycle");
return defaultLifecycle;
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/UpdateModelValuesExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/UpdateModelValuesExecutor.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/UpdateModelValuesExecutor.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/lifecycle/UpdateModelValuesExecutor.java Fri Nov 15 17:10:58 2013
@@ -34,7 +34,7 @@ import javax.faces.event.PhaseId;
class UpdateModelValuesExecutor implements PhaseExecutor {
- public boolean execute(FacesContext facesContext) {
+ public boolean execute(final FacesContext facesContext) {
facesContext.getViewRoot().processUpdates(facesContext);
return false;
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java Fri Nov 15 17:10:58 2013
@@ -59,7 +59,7 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setIntegerProperty(UIComponent component, String name, String value) {
+ public static void setIntegerProperty(final UIComponent component, final String name, String value) {
if (value != null) {
if (UIComponentTag.isValueReference(value)) {
component.setValueBinding(name, createValueBinding(value));
@@ -81,7 +81,7 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setBooleanProperty(UIComponent component, String name, String value) {
+ public static void setBooleanProperty(final UIComponent component, final String name, final String value) {
if (value != null) {
if (UIComponentTag.isValueReference(value)) {
component.setValueBinding(name, createValueBinding(value));
@@ -95,7 +95,7 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setStringProperty(UIComponent component, String name, String value) {
+ public static void setStringProperty(final UIComponent component, final String name, final String value) {
if (value != null) {
if (UIComponentTag.isValueReference(value)) {
component.setValueBinding(name, createValueBinding(value));
@@ -109,15 +109,15 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setConverterProperty(UIComponent component, String name, String value) {
+ public static void setConverterProperty(final UIComponent component, final String name, final String value) {
if (value != null && component instanceof ValueHolder) {
final FacesContext facesContext = FacesContext.getCurrentInstance();
final Application application = facesContext.getApplication();
if (UIComponentTag.isValueReference(value)) {
- ValueBinding valueBinding = application.createValueBinding(value);
+ final ValueBinding valueBinding = application.createValueBinding(value);
component.setValueBinding(name, valueBinding);
} else {
- Converter converter = application.createConverter(value);
+ final Converter converter = application.createConverter(value);
((ValueHolder) component).setConverter(converter);
}
}
@@ -127,7 +127,7 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setSeverityProperty(UIComponent component, String name, String value) {
+ public static void setSeverityProperty(final UIComponent component, final String name, final String value) {
setStringProperty(component, name, value);
}
@@ -135,7 +135,7 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setObjectProperty(UIComponent component, String name, String value) {
+ public static void setObjectProperty(final UIComponent component, final String name, final String value) {
setStringProperty(component, name, value);
}
@@ -143,7 +143,7 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setCharacterProperty(UIComponent component, String name, String value) {
+ public static void setCharacterProperty(final UIComponent component, final String name, final String value) {
setStringProperty(component, name, value);
}
@@ -151,7 +151,7 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static ValueBinding createValueBinding(String value) {
+ public static ValueBinding createValueBinding(final String value) {
return FacesContext.getCurrentInstance().getApplication().createValueBinding(value);
}
@@ -159,9 +159,11 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setStateChangeListenerMethodBinding(UIComponent component, String value, Class[] args) {
+ public static void setStateChangeListenerMethodBinding(
+ final UIComponent component, final String value, final Class[] args) {
if (value != null && UIComponentTag.isValueReference(value)) {
- MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication().createMethodBinding(value, args);
+ final MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication()
+ .createMethodBinding(value, args);
((SheetStateChangeSource) component).setStateChangeListener(methodBinding);
}
}
@@ -170,9 +172,11 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setSortActionListenerMethodBinding(UIComponent component, String value, Class[] args) {
+ public static void setSortActionListenerMethodBinding(
+ final UIComponent component, final String value, final Class[] args) {
if (value != null && UIComponentTag.isValueReference(value)) {
- MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication().createMethodBinding(value, args);
+ final MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication()
+ .createMethodBinding(value, args);
((SortActionSource) component).setSortActionListener(methodBinding);
}
}
@@ -181,9 +185,11 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setSuggestMethodMethodBinding(UIComponent component, String value, Class[] args) {
+ public static void setSuggestMethodMethodBinding(
+ final UIComponent component, final String value, final Class[] args) {
if (value != null && UIComponentTag.isValueReference(value)) {
- MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication().createMethodBinding(value, args);
+ final MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication()
+ .createMethodBinding(value, args);
((InputSuggest) component).setSuggestMethod(methodBinding);
}
}
@@ -192,9 +198,11 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setValueChangeListenerMethodBinding(UIComponent component, String value, Class[] args) {
+ public static void setValueChangeListenerMethodBinding(
+ final UIComponent component, final String value, final Class[] args) {
if (value != null && UIComponentTag.isValueReference(value)) {
- MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication().createMethodBinding(value, args);
+ final MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication()
+ .createMethodBinding(value, args);
((EditableValueHolder) component).setValueChangeListener(methodBinding);
}
}
@@ -203,9 +211,10 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setValidatorMethodBinding(UIComponent component, String value, Class[] args) {
+ public static void setValidatorMethodBinding(final UIComponent component, final String value, final Class[] args) {
if (value != null && UIComponentTag.isValueReference(value)) {
- MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication().createMethodBinding(value, args);
+ final MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication()
+ .createMethodBinding(value, args);
((EditableValueHolder) component).setValidator(methodBinding);
}
}
@@ -214,9 +223,11 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setActionListenerMethodBinding(UIComponent component, String value, Class[] args) {
+ public static void setActionListenerMethodBinding(
+ final UIComponent component, final String value, final Class[] args) {
if (value != null && UIComponentTag.isValueReference(value)) {
- MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication().createMethodBinding(value, args);
+ final MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication()
+ .createMethodBinding(value, args);
((ActionSource) component).setActionListener(methodBinding);
}
}
@@ -225,25 +236,27 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setActionMethodBinding(UIComponent component, String value, Class[] args) {
+ public static void setActionMethodBinding(final UIComponent component, final String value, final Class[] args) {
if (value != null) {
if (UIComponentTag.isValueReference(value)) {
- MethodBinding methodBinding =
+ final MethodBinding methodBinding =
FacesContext.getCurrentInstance().getApplication().createMethodBinding(value, args);
((ActionSource) component).setAction(methodBinding);
} else {
((ActionSource) component).setAction(new ConstantMethodBinding(value));
}
- }
+ }
}
/**
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setTabChangeListenerMethodBinding(UIComponent component, String value, Class[] args) {
+ public static void setTabChangeListenerMethodBinding(
+ final UIComponent component, final String value, final Class[] args) {
if (value != null && UIComponentTag.isValueReference(value)) {
- MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication().createMethodBinding(value, args);
+ final MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication()
+ .createMethodBinding(value, args);
((TabChangeSource) component).setTabChangeListener(methodBinding);
}
}
@@ -252,19 +265,19 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setStringArrayProperty(UIComponent component, String name, String value) {
+ public static void setStringArrayProperty(final UIComponent component, final String name, final String value) {
if (value != null) {
if (UIComponentTag.isValueReference(value)) {
component.setValueBinding(name, createValueBinding(value));
} else {
- String[] components = ComponentUtils.splitList(value);
+ final String[] components = ComponentUtils.splitList(value);
try {
PropertyUtils.setProperty(component, name, components);
- } catch (IllegalAccessException e) {
+ } catch (final IllegalAccessException e) {
LOG.error("Ignoring Property", e);
- } catch (InvocationTargetException e) {
+ } catch (final InvocationTargetException e) {
LOG.error("Ignoring Property", e);
- } catch (NoSuchMethodException e) {
+ } catch (final NoSuchMethodException e) {
LOG.error("Ignoring Property", e);
}
}
@@ -275,9 +288,9 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setValueBindingProperty(UIComponent component, String name, String value) {
+ public static void setValueBindingProperty(final UIComponent component, final String name, final String value) {
if (value != null && UIComponentTag.isValueReference(value)) {
- ValueBinding valueBinding = createValueBinding(value);
+ final ValueBinding valueBinding = createValueBinding(value);
component.setValueBinding(name, valueBinding);
}
}
@@ -286,7 +299,7 @@ public class TagUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setOrderByProperty(UIComponent component, String name, String value) {
+ public static void setOrderByProperty(final UIComponent component, final String name, final String value) {
if (value != null) {
if (UIComponentTag.isValueReference(value)) {
component.setValueBinding(name, createValueBinding(value));
@@ -302,7 +315,7 @@ public class TagUtils {
@Deprecated
public static String getValueFromEl(String script) {
if (UIComponentTag.isValueReference(script)) {
- ValueBinding valueBinding = createValueBinding(script);
+ final ValueBinding valueBinding = createValueBinding(script);
script = (String) valueBinding.getValue(FacesContext.getCurrentInstance());
}
return script;
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/model/DefaultMutableTreeNodeAnalyser.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/model/DefaultMutableTreeNodeAnalyser.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/model/DefaultMutableTreeNodeAnalyser.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/model/DefaultMutableTreeNodeAnalyser.java Fri Nov 15 17:10:58 2013
@@ -29,7 +29,7 @@ public class DefaultMutableTreeNodeAnaly
private DefaultMutableTreeNode node;
- public DefaultMutableTreeNodeAnalyser(DefaultMutableTreeNode node) {
+ public DefaultMutableTreeNodeAnalyser(final DefaultMutableTreeNode node) {
this.node = node;
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/RenderUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/RenderUtil.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/RenderUtil.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/RenderUtil.java Fri Nov 15 17:10:58 2013
@@ -42,12 +42,12 @@ public class RenderUtil {
// to prevent instantiation
}
- public static boolean contains(Object[] list, Object value) {
+ public static boolean contains(final Object[] list, final Object value) {
Deprecation.LOG.warn("Using deprecated API");
if (list == null) {
return false;
}
- for (Object aList : list) {
+ for (final Object aList : list) {
if (aList != null && aList.equals(value)) {
return true;
}
@@ -55,74 +55,79 @@ public class RenderUtil {
return false;
}
- public static void encodeChildren(FacesContext facesContext, UIComponent panel) throws IOException {
+ public static void encodeChildren(final FacesContext facesContext, final UIComponent panel) throws IOException {
Deprecation.LOG.warn("Using deprecated API");
RenderUtils.encodeChildren(facesContext, panel);
}
- public static void encodeChildrenWithoutLayout(FacesContext facesContext, UIComponent container) throws IOException {
+ public static void encodeChildrenWithoutLayout(final FacesContext facesContext, final UIComponent container)
+ throws IOException {
Deprecation.LOG.warn("Using deprecated API");
- for (UIComponent child : container.getChildren()) {
+ for (final UIComponent child : container.getChildren()) {
encode(facesContext, child);
}
}
- public static void encode(FacesContext facesContext, UIComponent component) throws IOException {
+ public static void encode(final FacesContext facesContext, final UIComponent component) throws IOException {
Deprecation.LOG.warn("Using deprecated API");
RenderUtils.encode(facesContext, component);
}
- public static void prepareRendererAll(FacesContext facesContext, UIComponent component) throws IOException {
+ public static void prepareRendererAll(final FacesContext facesContext, final UIComponent component)
+ throws IOException {
Deprecation.LOG.warn("Using deprecated API");
RenderUtils.prepareRendererAll(facesContext, component);
}
- public static String addMenuCheckToggle(String clientId, String onClick) {
+ public static String addMenuCheckToggle(final String clientId, final String onClick) {
Deprecation.LOG.error("No longer supported");
return "alert('Using deprecated API. Please check log file.');";
}
- public static String getFormattedValue(FacesContext facesContext, UIComponent component) {
+ public static String getFormattedValue(final FacesContext facesContext, final UIComponent component) {
Deprecation.LOG.warn("Using deprecated API");
return RenderUtils.getFormattedValue(facesContext, component);
}
// Copy from RendererBase
- public static String getFormattedValue(FacesContext context, UIComponent component, Object currentValue)
+ public static String getFormattedValue(
+ final FacesContext context, final UIComponent component, final Object currentValue)
throws ConverterException {
Deprecation.LOG.warn("Using deprecated API");
return RenderUtils.getFormattedValue(context, component, currentValue);
}
- public static Measure calculateStringWidth(FacesContext facesContext, UIComponent component, String text) {
+ public static Measure calculateStringWidth(
+ final FacesContext facesContext, final UIComponent component, final String text) {
Deprecation.LOG.warn("Using deprecated API");
return RenderUtils.calculateStringWidth(facesContext, component, text);
}
- public static Measure calculateStringWidth2(FacesContext facesContext, UIComponent component, String text) {
+ public static Measure calculateStringWidth2(
+ final FacesContext facesContext, final UIComponent component, final String text) {
Deprecation.LOG.warn("Using deprecated API");
return RenderUtils.calculateStringWidth2(facesContext, component, text);
}
- public static List<SelectItem> getItemsToRender(javax.faces.component.UISelectOne component) {
+ public static List<SelectItem> getItemsToRender(final javax.faces.component.UISelectOne component) {
return getItems(component);
}
- public static List<SelectItem> getItemsToRender(javax.faces.component.UISelectMany component) {
+ public static List<SelectItem> getItemsToRender(final javax.faces.component.UISelectMany component) {
return getItems(component);
}
- public static List<SelectItem> getItems(javax.faces.component.UIInput component) {
+ public static List<SelectItem> getItems(final javax.faces.component.UIInput component) {
Deprecation.LOG.warn("Using deprecated API");
return RenderUtils.getItems(component);
}
- public static String currentValue(UIComponent component) {
+ public static String currentValue(final UIComponent component) {
Deprecation.LOG.warn("Using deprecated API");
return RenderUtils.currentValue(component);
}
- public static List<SelectItem> getSelectItems(UIComponent component) {
+ public static List<SelectItem> getSelectItems(final UIComponent component) {
Deprecation.LOG.warn("Using deprecated API");
return RenderUtils.getSelectItems(component);
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoResponseStateManager.java Fri Nov 15 17:10:58 2013
@@ -43,18 +43,18 @@ public class TobagoResponseStateManager
public static final String VIEW_STATE_PARAM = "javax.faces.ViewState";
private static final String VIEWID_PARAM = "jsf_viewid";
- public Object getState(FacesContext context, String viewId) {
- Object treeStructure = getTreeStructureToRestore(context, viewId);
- Object componentStateToRestore = getComponentStateToRestore(context);
+ public Object getState(final FacesContext context, final String viewId) {
+ final Object treeStructure = getTreeStructureToRestore(context, viewId);
+ final Object componentStateToRestore = getComponentStateToRestore(context);
if (treeStructure != null && componentStateToRestore != null) {
return new Object[] {treeStructure, componentStateToRestore};
}
return null;
}
- public Object getTreeStructureToRestore(FacesContext facescontext, String viewId) {
- Map requestMap = facescontext.getExternalContext().getRequestParameterMap();
- Object requestViewId = requestMap.get(VIEWID_PARAM);
+ public Object getTreeStructureToRestore(final FacesContext facescontext, final String viewId) {
+ final Map requestMap = facescontext.getExternalContext().getRequestParameterMap();
+ final Object requestViewId = requestMap.get(VIEWID_PARAM);
if (requestViewId == null || !requestViewId.equals(viewId)) {
//no saved state or state of different viewId
return null;
@@ -64,16 +64,16 @@ public class TobagoResponseStateManager
}
- public Object getComponentStateToRestore(FacesContext facesContext) {
- Map requestMap = facesContext.getExternalContext().getRequestParameterMap();
+ public Object getComponentStateToRestore(final FacesContext facesContext) {
+ final Map requestMap = facesContext.getExternalContext().getRequestParameterMap();
return requestMap.get(VIEW_STATE_PARAM);
}
- public void writeState(FacesContext facesContext,
- StateManager.SerializedView serializedview) throws IOException {
- ResponseWriter responseWriter = facesContext.getResponseWriter();
- Object treeStruct = serializedview.getStructure();
- Object compStates = serializedview.getState();
+ public void writeState(final FacesContext facesContext,
+ final StateManager.SerializedView serializedview) throws IOException {
+ final ResponseWriter responseWriter = facesContext.getResponseWriter();
+ final Object treeStruct = serializedview.getStructure();
+ final Object compStates = serializedview.getState();
if (treeStruct != null) {
if (treeStruct instanceof String) {