You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2018/10/21 12:23:23 UTC
[myfaces] branch master updated: unused code
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/master by this push:
new 262bd0b unused code
262bd0b is described below
commit 262bd0b514cc5d9856b38a53f21568dc52dfbfe3
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Sun Oct 21 14:23:17 2018 +0200
unused code
---
.../javax/faces/component/UIComponentBase.java | 7 +-
.../main/java/javax/faces/component/UIData.java | 7 -
.../main/java/javax/faces/component/UIForm.java | 3 -
.../java/javax/faces/component/UIViewAction.java | 2 +-
.../java/javax/faces/component/UIViewRoot.java | 6 -
.../java/javax/faces/component/_ClassUtils.java | 1 -
.../faces/component/_ComponentAttributesMap.java | 5 -
.../javax/faces/component/_DeltaStateHelper.java | 9 +-
.../faces/component/behavior/AjaxBehavior.java | 8 -
.../behavior/_AjaxBehaviorDeltaStateHelper.java | 6 -
.../component/behavior/_DeltaStateHelper.java | 6 -
.../javax/faces/component/html/_ClassUtils.java | 1 -
.../main/java/javax/faces/webapp/FacesServlet.java | 1 -
.../faces/webapp/UIComponentClassicTagBase.java | 5 -
.../myfaces/application/NavigationHandlerImpl.java | 1 -
.../myfaces/application/ResourceHandlerImpl.java | 1 -
.../cdi/converter/FacesConverterCDIWrapper.java | 3 +-
.../config/DefaultFacesConfigurationProvider.java | 2 -
.../DefaultLifecycleProviderFactory.java | 1 -
.../myfaces/flow/cdi/FlowScopedContextImpl.java | 10 +-
.../myfaces/lifecycle/CODIClientSideWindow.java | 14 --
.../org/apache/myfaces/lifecycle/ClientConfig.java | 5 -
.../lifecycle/DefaultRestoreViewSupport.java | 2 -
.../apache/myfaces/lifecycle/LifecycleImpl.java | 8 +-
.../myfaces/lifecycle/WindowContextConfig.java | 2 -
.../apache/myfaces/renderkit/ErrorPageWriter.java | 1 -
.../myfaces/renderkit/html/HtmlRenderKitImpl.java | 1 -
.../application/DefaultViewHandlerSupport.java | 1 -
.../shared/renderkit/_SharedRendererUtils.java | 1 -
.../renderkit/html/HtmlCheckboxRendererBase.java | 2 -
.../renderkit/html/HtmlFormRendererBase.java | 1 -
.../shared/renderkit/html/HtmlJavaScriptUtils.java | 163 +--------------------
.../renderkit/html/HtmlMenuRendererBase.java | 1 -
.../renderkit/html/HtmlMessageRendererBase.java | 1 -
.../renderkit/html/HtmlMessagesRendererBase.java | 1 -
.../shared/renderkit/html/HtmlRendererUtils.java | 43 ------
.../renderkit/html/HtmlResponseWriterImpl.java | 3 -
.../renderkit/html/HtmlTextRendererBase.java | 1 -
.../renderkit/html/util/JavascriptUtils.java | 22 ---
.../shared/resource/ClassLoaderResourceLoader.java | 50 -------
.../shared/taglib/UIComponentELTagBase.java | 1 -
.../shared/taglib/UIComponentELTagUtils.java | 2 +-
.../shared/taglib/core/SelectItemTagBase.java | 1 -
.../org/apache/myfaces/shared/util/ClassUtils.java | 1 -
.../myfaces/shared/util/ConcurrentLRUCache.java | 2 -
.../apache/myfaces/shared/util/LocaleUtils.java | 2 +-
.../apache/myfaces/shared/util/MessageUtils.java | 2 +-
.../org/apache/myfaces/shared/util/StateUtils.java | 2 -
.../myfaces/shared/util/StreamCharBuffer.java | 1 -
.../myfaces/shared/util/WebConfigParamUtils.java | 3 -
.../myfaces/shared/webapp/webxml/WebXml.java | 1 -
.../myfaces/shared/webapp/webxml/WebXmlParser.java | 8 -
.../spi/impl/DefaultInjectionProviderFactory.java | 1 -
.../myfaces/taglib/core/PhaseListenerTag.java | 1 -
.../facelets/FaceletViewDeclarationLanguage.java | 3 -
.../view/facelets/compiler/CompilationManager.java | 1 -
.../myfaces/view/facelets/compiler/Compiler.java | 1 -
.../view/facelets/compiler/TagLibraryConfig.java | 4 -
.../compiler/TagLibraryConfigUnmarshallerImpl.java | 2 -
.../myfaces/view/facelets/compiler/UILeaf.java | 2 -
.../view/facelets/el/ContextAwareELException.java | 5 -
.../el/ContextAwareMethodNotFoundException.java | 6 +-
.../el/ContextAwarePropertyNotFoundException.java | 5 -
.../view/facelets/el/VariableMapperWrapper.java | 4 +-
.../view/facelets/impl/DefaultFaceletContext.java | 4 -
.../view/facelets/impl/DefaultFaceletFactory.java | 7 +-
.../myfaces/view/facelets/tag/MetaRulesetImpl.java | 1 -
.../tag/composite/CompositeComponentRule.java | 1 -
.../tag/composite/CompositeMetaRulesetImpl.java | 1 -
.../view/facelets/tag/jsf/ComponentRule.java | 1 -
.../facelets/tag/jsf/html/DefaultTagDecorator.java | 1 -
.../behavior/AbstractClientBehaviorTestCase.java | 4 +-
.../shared/util/AbstractStateUtilsTest.java | 1 -
.../view/facelets/mock/MockServletContext.java | 1 -
.../org/apache/myfaces/test/mock/MockFlash.java | 2 -
.../test/mock/lifecycle/PhaseListenerManager.java | 3 +-
76 files changed, 15 insertions(+), 481 deletions(-)
diff --git a/api/src/main/java/javax/faces/component/UIComponentBase.java b/api/src/main/java/javax/faces/component/UIComponentBase.java
index c932828..e4ae049 100755
--- a/api/src/main/java/javax/faces/component/UIComponentBase.java
+++ b/api/src/main/java/javax/faces/component/UIComponentBase.java
@@ -77,7 +77,6 @@ import javax.faces.event.PhaseId;
desc = "backing bean property to bind to this component instance")
public abstract class UIComponentBase extends UIComponent
{
- //private static Log log = LogFactory.getLog(UIComponentBase.class);
private static Logger log = Logger.getLogger(UIComponentBase.class.getName());
private static final Iterator<UIComponent> _EMPTY_UICOMPONENT_ITERATOR = new _EmptyIterator<UIComponent>();
@@ -98,14 +97,10 @@ public abstract class UIComponentBase extends UIComponent
private String _id = null;
private UIComponent _parent = null;
private boolean _transient = false;
-
- //private boolean _isRendererTypeSet = false;
+
private String _rendererType;
private String _markCreated;
private String _facetName;
- //private boolean _addedByHandler = false;
- //private boolean _facetCreatedUIPanel = false;
- //private boolean _passthroughAttributesMapSet = false;
private int _capabilities = 0;
private final static int FLAG_IS_RENDERER_TYPE_SET = 1;
diff --git a/api/src/main/java/javax/faces/component/UIData.java b/api/src/main/java/javax/faces/component/UIData.java
index 7e7e691..b3f3d5b 100644
--- a/api/src/main/java/javax/faces/component/UIData.java
+++ b/api/src/main/java/javax/faces/component/UIData.java
@@ -155,7 +155,6 @@ public class UIData extends UIComponentBase implements NamingContainer, UniqueId
private static final int PROCESS_DECODES = 1;
private static final int PROCESS_VALIDATORS = 2;
private static final int PROCESS_UPDATES = 3;
- //private static final String SKIP_ITERATION_HINT = "javax.faces.visit.SKIP_ITERATION";
private static final Object[] LEAF_NO_STATE = new Object[]{null,null};
@@ -182,12 +181,6 @@ public class UIData extends UIComponentBase implements NamingContainer, UniqueId
private Object _initialDescendantFullComponentState = null;
- //private int _first;
- //private boolean _firstSet;
- //private int _rows;
- //private boolean _rowsSet;
- //private Object _value;
-
private static class FacesEventWrapper extends FacesEvent
{
private static final long serialVersionUID = 6648047974065628773L;
diff --git a/api/src/main/java/javax/faces/component/UIForm.java b/api/src/main/java/javax/faces/component/UIForm.java
index ad628a0..d3a3460 100755
--- a/api/src/main/java/javax/faces/component/UIForm.java
+++ b/api/src/main/java/javax/faces/component/UIForm.java
@@ -38,9 +38,6 @@ import java.util.Collection;
@JSFComponent(type = "javax.faces.Form", family = "javax.faces.Form")
public class UIForm extends UIComponentBase implements NamingContainer, UniqueIdVendor
{
- // private static final Log log = LogFactory.getLog(UIForm.class);
-
- //private boolean _submitted;
/**
*
diff --git a/api/src/main/java/javax/faces/component/UIViewAction.java b/api/src/main/java/javax/faces/component/UIViewAction.java
index 78b9dd6..7425c01 100644
--- a/api/src/main/java/javax/faces/component/UIViewAction.java
+++ b/api/src/main/java/javax/faces/component/UIViewAction.java
@@ -36,7 +36,7 @@ import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFPropert
@JSFComponent(name = "f:viewAction")
public class UIViewAction extends UIComponentBase implements ActionSource2
{
- //private static final Logger log = Logger.getLogger(UIViewAction.class.getName());
+
public static final String COMPONENT_FAMILY = "javax.faces.ViewAction";
public static final String COMPONENT_TYPE = "javax.faces.ViewAction";
diff --git a/api/src/main/java/javax/faces/component/UIViewRoot.java b/api/src/main/java/javax/faces/component/UIViewRoot.java
index 0251ad5..4a5540a 100644
--- a/api/src/main/java/javax/faces/component/UIViewRoot.java
+++ b/api/src/main/java/javax/faces/component/UIViewRoot.java
@@ -139,12 +139,6 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
}
}
- /**
- * The counter which will ensure a unique component id for every component instance in the tree that doesn't have an
- * id attribute set.
- */
- //private long _uniqueIdCounter = 0;
-
// todo: is it right to save the state of _events and _phaseListeners?
private List<FacesEvent> _events;
diff --git a/api/src/main/java/javax/faces/component/_ClassUtils.java b/api/src/main/java/javax/faces/component/_ClassUtils.java
index 0490b39..940a872 100755
--- a/api/src/main/java/javax/faces/component/_ClassUtils.java
+++ b/api/src/main/java/javax/faces/component/_ClassUtils.java
@@ -42,7 +42,6 @@ final class _ClassUtils
{
// ~ Static fields/initializers -----------------------------------------------------------------
- //private static final Log log = LogFactory.getLog(_ClassUtils.class);
private static final Logger log = Logger.getLogger(_ClassUtils.class.getName());
public static final Class<boolean[]> BOOLEAN_ARRAY_CLASS = boolean[].class;
diff --git a/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java b/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java
index ae58d9c..8018f83 100755
--- a/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java
+++ b/api/src/main/java/javax/faces/component/_ComponentAttributesMap.java
@@ -82,11 +82,6 @@ class _ComponentAttributesMap implements Map<String, Object>, Serializable
// The component that is read/written via this map.
private UIComponentBase _component;
- // We delegate instead of derive from HashMap, so that we can later
- // optimize Serialization
- // JSF 2.0 Changed getUnderlyingMap to point to StateHelper attributesMap
- //private Map<String, Object> _attributes = null;
-
// A cached hashmap of propertyName => PropertyDescriptor object for all
// the javabean properties of the associated component. This is built by
// introspection on the associated UIComponent. Don't serialize this as
diff --git a/api/src/main/java/javax/faces/component/_DeltaStateHelper.java b/api/src/main/java/javax/faces/component/_DeltaStateHelper.java
index 168f4ed..6950329 100644
--- a/api/src/main/java/javax/faces/component/_DeltaStateHelper.java
+++ b/api/src/main/java/javax/faces/component/_DeltaStateHelper.java
@@ -155,15 +155,8 @@ class _DeltaStateHelper implements StateHelper, TransientStateHelper, TransientS
private Map<Serializable, Object> _deltas;
private Map<Object, Object> _transientState;
-
- //private Map<Serializable, Object> _initialState;
+
private Object[] _initialState;
-
- /**
- * This map keep track of StateHolder keys, to be saved when
- * saveState is called.
- */
- //private Set<Serializable> _stateHolderKeys;
private boolean _transient = false;
diff --git a/api/src/main/java/javax/faces/component/behavior/AjaxBehavior.java b/api/src/main/java/javax/faces/component/behavior/AjaxBehavior.java
index 4aa3b8c..3dcbdd8 100644
--- a/api/src/main/java/javax/faces/component/behavior/AjaxBehavior.java
+++ b/api/src/main/java/javax/faces/component/behavior/AjaxBehavior.java
@@ -68,9 +68,6 @@ public class AjaxBehavior extends ClientBehaviorBase
//To enable delta state saving we need this one
private _DeltaStateHelper<AjaxBehavior> _stateHelper = null;
-
- //private Map<String, ValueExpression> _valueExpressions
- // = new HashMap<String, ValueExpression>();
public AjaxBehavior()
{
@@ -341,11 +338,6 @@ public class AjaxBehavior extends ClientBehaviorBase
}
}
- //private Map<String, ValueExpression> getValueExpressionMap()
- //{
- // return _valueExpressions;
- //}
-
/**
* Invokes eval on the getStateHelper() and tries to get a
* Collection out of the result.
diff --git a/api/src/main/java/javax/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java b/api/src/main/java/javax/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java
index 655babd..d2936aa 100644
--- a/api/src/main/java/javax/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java
+++ b/api/src/main/java/javax/faces/component/behavior/_AjaxBehaviorDeltaStateHelper.java
@@ -60,12 +60,6 @@ class _AjaxBehaviorDeltaStateHelper<A extends AjaxBehavior> implements StateHelp
*/
private Map<Serializable, Object> _deltas;
- /**
- * This map keep track of StateHolder keys, to be saved when
- * saveState is called.
- */
- //private Set<Serializable> _stateHolderKeys;
-
private boolean _transient = false;
public _AjaxBehaviorDeltaStateHelper(A component)
diff --git a/api/src/main/java/javax/faces/component/behavior/_DeltaStateHelper.java b/api/src/main/java/javax/faces/component/behavior/_DeltaStateHelper.java
index e521195..9ca9d1c 100644
--- a/api/src/main/java/javax/faces/component/behavior/_DeltaStateHelper.java
+++ b/api/src/main/java/javax/faces/component/behavior/_DeltaStateHelper.java
@@ -154,12 +154,6 @@ class _DeltaStateHelper <A extends AjaxBehavior> implements StateHelper
* This map only keep track of delta changes to be saved
*/
private Map<Serializable, Object> _deltas;
-
- /**
- * This map keep track of StateHolder keys, to be saved when
- * saveState is called.
- */
- //private Set<Serializable> _stateHolderKeys;
private boolean _transient = false;
diff --git a/api/src/main/java/javax/faces/component/html/_ClassUtils.java b/api/src/main/java/javax/faces/component/html/_ClassUtils.java
index c56b5c7..1e56944 100755
--- a/api/src/main/java/javax/faces/component/html/_ClassUtils.java
+++ b/api/src/main/java/javax/faces/component/html/_ClassUtils.java
@@ -42,7 +42,6 @@ final class _ClassUtils
{
// ~ Static fields/initializers -----------------------------------------------------------------
- //private static final Log log = LogFactory.getLog(_ClassUtils.class);
private static final Logger log = Logger.getLogger(_ClassUtils.class.getName());
public static final Class<boolean[]> BOOLEAN_ARRAY_CLASS = boolean[].class;
diff --git a/api/src/main/java/javax/faces/webapp/FacesServlet.java b/api/src/main/java/javax/faces/webapp/FacesServlet.java
index a957433..08e7eca 100755
--- a/api/src/main/java/javax/faces/webapp/FacesServlet.java
+++ b/api/src/main/java/javax/faces/webapp/FacesServlet.java
@@ -45,7 +45,6 @@ import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConf
@MultipartConfig
public final class FacesServlet implements Servlet
{
- //private static final Log log = LogFactory.getLog(FacesServlet.class);
private static final Logger log = Logger.getLogger(FacesServlet.class.getName());
/**
diff --git a/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java b/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java
index be91e09..3b7fb1f 100644
--- a/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java
+++ b/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java
@@ -890,11 +890,6 @@ public abstract class UIComponentClassicTagBase extends UIComponentTagBase imple
getStack(pageContext).add(this);
}
- //private boolean isIncludedOrForwarded() {
- // return getFacesContext().getExternalContext().getRequestMap().
- // containsKey("javax.servlet.include.request_uri");
- //}
-
/** Generate diagnostic output. */
private String getPathToComponent(UIComponent component)
{
diff --git a/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
index 8f102a9..2678364 100755
--- a/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
@@ -98,7 +98,6 @@ public class NavigationHandlerImpl
private static final String ASTERISK = "*";
private Map<String, Set<NavigationCase>> _navigationCases = null;
- //private List<String> _wildcardKeys = new ArrayList<String>();
private List<_WildcardPattern> _wildcardPatterns = new ArrayList<_WildcardPattern>();
private Boolean _developmentStage;
diff --git a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
index 231491c..96e3f02 100644
--- a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
@@ -116,7 +116,6 @@ public class ResourceHandlerImpl extends ResourceHandler
private Set<String> _viewSuffixes = null;
public final static String RENDERED_RESOURCES_SET = "org.apache.myfaces.RENDERED_RESOURCES_SET";
- private final static String MYFACES_LIBRARY_NAME = "org.apache.myfaces";
private static final String SHARED_STRING_BUILDER = ResourceHandlerImpl.class.getName() + ".SHARED_STRING_BUILDER";
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterCDIWrapper.java b/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterCDIWrapper.java
index 1126a32..68a84b0 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterCDIWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/converter/FacesConverterCDIWrapper.java
@@ -33,8 +33,7 @@ import org.apache.myfaces.cdi.util.CDIUtils;
public class FacesConverterCDIWrapper implements PartialStateHolder, Converter, FacesWrapper<Converter>
{
private transient Converter delegate;
-
- //private Class<? extends Converter> converterClass;
+
private Class<?> forClass;
private String converterId;
private boolean _transient;
diff --git a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
index 9f1fbb9..f74292f 100644
--- a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
@@ -86,8 +86,6 @@ public class DefaultFacesConfigurationProvider extends FacesConfigurationProvide
{
private static final String STANDARD_FACES_CONFIG_RESOURCE = "META-INF/standard-faces-config.xml";
-
- //private static final String META_INF_SERVICES_RESOURCE_PREFIX = "META-INF/services/";
private static final String DEFAULT_FACES_CONFIG = "/WEB-INF/faces-config.xml";
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java b/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
index bbf4ddd..0e919bd 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
@@ -42,7 +42,6 @@ import org.apache.myfaces.spi.ServiceProviderFinderFactory;
*/
public class DefaultLifecycleProviderFactory extends LifecycleProviderFactory
{
- //private static Log log = LogFactory.getLog(DefaultLifecycleProviderFactory.class);
private static Logger log = Logger.getLogger(DefaultLifecycleProviderFactory.class.getName());
/**
diff --git a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopedContextImpl.java b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopedContextImpl.java
index fa53395..8438d61 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopedContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopedContextImpl.java
@@ -59,8 +59,6 @@ public class FlowScopedContextImpl implements Context
private Map<Class, FlowReference> flowBeanReferences;
- //private FlowScopeBeanHolder flowScopeBeanHolder;
-
public FlowScopedContextImpl(BeanManager beanManager,
Map<Class, FlowReference> flowBeanReferences)
{
@@ -68,13 +66,7 @@ public class FlowScopedContextImpl implements Context
this.flowBeanReferences = flowBeanReferences;
this.passivatingScope = beanManager.isPassivatingScope(getScope());
}
-
- /*
- public void initFlowContext(FlowScopeBeanHolder flowScopeBeanHolder)
- {
- this.flowScopeBeanHolder = flowScopeBeanHolder;
- }*/
-
+
protected FlowScopeBeanHolder getFlowScopeBeanHolder()
{
return getFlowScopeBeanHolder(FacesContext.getCurrentInstance());
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/CODIClientSideWindow.java b/impl/src/main/java/org/apache/myfaces/lifecycle/CODIClientSideWindow.java
index e448ffa..ef636fa 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/CODIClientSideWindow.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/CODIClientSideWindow.java
@@ -41,18 +41,10 @@ import javax.servlet.http.HttpServletResponse;
public class CODIClientSideWindow extends ClientWindow
{
/**
- * Key for storing the window-id e.g. in URLs
- */
- //private static final String WINDOW_CONTEXT_ID_PARAMETER_KEY =
- // ResponseStateManager.CLIENT_WINDOW_URL_PARAM;
-
- /**
* Value which can be used as "window-id" by external clients which aren't aware of windows.
* It deactivates e.g. the redirect for the initial request.
*/
private static final String AUTOMATED_ENTRY_POINT_PARAMETER_KEY = "automatedEntryPoint";
-
- private static final long serialVersionUID = 5293942986187078113L;
private static final String WINDOW_ID_COOKIE_PREFIX = "jfwid-";
private static final String CODI_REQUEST_TOKEN = "mfRid";
@@ -74,12 +66,6 @@ public class CODIClientSideWindow extends ClientWindow
private Map<String,String> queryParamsMap;
- /*
- protected CODIClientSideWindow()
- {
- // needed for proxying
- }*/
-
protected CODIClientSideWindow(TokenGenerator clientWindowTokenGenerator,
WindowContextConfig windowContextConfig,
ClientConfig clientConfig)
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/ClientConfig.java b/impl/src/main/java/org/apache/myfaces/lifecycle/ClientConfig.java
index e9d491f..21b8142 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/ClientConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/ClientConfig.java
@@ -52,11 +52,6 @@ public class ClientConfig implements Serializable
private volatile String userAgent = null;
/**
- * The location of the default windowhandler resource
- */
- //private static final String DEFAULT_WINDOW_HANDLER_HTML_FILE = "static/windowhandler.html";
-
- /**
* Defaults to <code>true</code>.
* @return if the user has JavaScript enabled
*/
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java b/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
index 0ab9ac9..60ced7c 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
@@ -70,8 +70,6 @@ public class DefaultRestoreViewSupport implements RestoreViewSupport
private static final String CACHED_SERVLET_MAPPING =
DefaultRestoreViewSupport.class.getName() + ".CACHED_SERVLET_MAPPING";
-
- //private final Log log = LogFactory.getLog(DefaultRestoreViewSupport.class);
private final Logger log = Logger.getLogger(DefaultRestoreViewSupport.class.getName());
/**
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java b/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
index 9ce1c70..2b7231a 100755
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
@@ -84,13 +84,7 @@ public class LifecycleImpl extends Lifecycle
* note in this case the semantic of the variable must be preserved.
*/
private volatile boolean _firstRequestProcessed = false;
- /**
- * Lazy cache for returning _phaseListenerList as an Array.
- *
- * Replaced by _phaseListenerList CopyOnWriteArrayList
- */
- //private PhaseListener[] _phaseListenerArray = null;
-
+
private ClientWindowFactory clientWindowFactory;
public LifecycleImpl()
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/WindowContextConfig.java b/impl/src/main/java/org/apache/myfaces/lifecycle/WindowContextConfig.java
index 897e423..ee6cfb5 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/WindowContextConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/WindowContextConfig.java
@@ -24,8 +24,6 @@ package org.apache.myfaces.lifecycle;
*/
public class WindowContextConfig
{
- private static final long serialVersionUID = 8159770064249255686L;
-
protected WindowContextConfig()
{
}
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java b/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
index 512e03e..ebe1b52 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
@@ -231,7 +231,6 @@ public final class ErrorPageWriter
* attribute map.
*/
private static final String VISITED_FACET_COUNT_KEY = "org.apache.myfaces.debug.VISITED_FACET_COUNT";
- //private static Map<UIComponent, Integer> visitedFacetCount = new HashMap<UIComponent, Integer>();
/**
* Indicate if myfaces is responsible to handle errors.
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
index 8723e00..879776f 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
@@ -60,7 +60,6 @@ public class HtmlRenderKitImpl extends RenderKit implements LazyRenderKit
private Map<String, Map<String, Renderer>> _renderers;
private ResponseStateManager _responseStateManager;
- //private Map<String,Set<String>> _families;
private Map<String, ClientBehaviorRenderer> _clientBehaviorRenderers;
// ~ Constructors -------------------------------------------------------------------------------
diff --git a/impl/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java b/impl/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java
index ba8edab..c165a22 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java
@@ -49,7 +49,6 @@ public class DefaultViewHandlerSupport implements ViewHandlerSupport
private static final String CACHED_SERVLET_MAPPING =
DefaultViewHandlerSupport.class.getName() + ".CACHED_SERVLET_MAPPING";
- //private static final Log log = LogFactory.getLog(DefaultViewHandlerSupport.class);
private static final Logger log = Logger.getLogger(DefaultViewHandlerSupport.class.getName());
/**
diff --git a/impl/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java b/impl/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java
index ebc4d18..5669802 100755
--- a/impl/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/renderkit/_SharedRendererUtils.java
@@ -490,7 +490,6 @@ class _SharedRendererUtils
return converter;
}
- //private static final Log log = LogFactory.getLog(_SharedRendererUtils.class);
private static final Logger log = Logger.getLogger(_SharedRendererUtils.class.getName());
/**
diff --git a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
index 13da1dd..0d517ec 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
@@ -45,8 +45,6 @@ import org.apache.myfaces.shared.util.renderkit.HTML;
public class HtmlCheckboxRendererBase extends HtmlRenderer
{
- //private static final Log log = LogFactory
- // .getLog(HtmlCheckboxRendererBase.class);
private static final Logger log = Logger.getLogger(HtmlCheckboxRendererBase.class.getName());
private static final String PAGE_DIRECTION = "pageDirection";
diff --git a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java
index 6cf0d5e..b9b2728 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java
@@ -42,7 +42,6 @@ import org.apache.myfaces.shared.util.renderkit.HTML;
public class HtmlFormRendererBase
extends HtmlRenderer
{
- //private static final Log log = LogFactory.getLog(HtmlFormRenderer.class);
private static final String FORM_TARGET = HTML.FORM_ELEM;
private static final String HIDDEN_SUBMIT_INPUT_SUFFIX = "_SUBMIT";
private static final String HIDDEN_SUBMIT_INPUT_VALUE = "1";
diff --git a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java
index a9e4070..9078dd4 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java
@@ -24,28 +24,18 @@ import java.util.Map;
import java.util.Set;
import java.util.logging.Logger;
-import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import org.apache.myfaces.config.MyfacesConfig;
import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils.ScriptContext;
import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
import org.apache.myfaces.shared.util.renderkit.HTML;
public final class HtmlJavaScriptUtils
{
- private static final Logger log = Logger.getLogger(HtmlJavaScriptUtils.class
- .getName());
-
- private static final String AUTO_SCROLL_PARAM = "autoScroll";
- private static final String AUTO_SCROLL_FUNCTION = "getScrolling";
-
- private static final String SET_HIDDEN_INPUT_FN_NAME = "oamSetHiddenInput";
- private static final String SET_HIDDEN_INPUT_FN_NAME_JSF2 = "myfaces.oam.setHiddenInput";
+ private static final Logger log = Logger.getLogger(HtmlJavaScriptUtils.class.getName());
private static final String FIRST_SUBMIT_SCRIPT_ON_PAGE = "org.apache.MyFaces.FIRST_SUBMIT_SCRIPT_ON_PAGE";
- private static final String CLEAR_HIDDEN_INPUT_FN_NAME = "oamClearHiddenInput";
@SuppressWarnings("unchecked")
@@ -76,8 +66,6 @@ public final class HtmlJavaScriptUtils
throws IOException
{
ResponseWriter writer = facesContext.getResponseWriter();
- MyfacesConfig config = MyfacesConfig.getCurrentInstance(facesContext
- .getExternalContext());
ScriptContext script = new ScriptContext();
boolean autoSave = JavascriptUtils.isSaveFormSubmitLinkIE(facesContext
.getExternalContext());
@@ -97,155 +85,6 @@ public final class HtmlJavaScriptUtils
}
}
- public static void appendAutoScrollAssignment(StringBuilder onClickValue,
- String formName)
- {
- appendAutoScrollAssignment(FacesContext.getCurrentInstance(),
- new ScriptContext(onClickValue, false), formName);
- }
-
- /**
- * Adds the hidden form input value assignment that is necessary for the autoscroll
- * feature to an html link or button onclick attribute.
- */
- public static void appendAutoScrollAssignment(FacesContext context,
- StringBuilder onClickValue, String formName)
- {
- appendAutoScrollAssignment(context, new ScriptContext(onClickValue,
- false), formName);
- }
-
- private static void appendAutoScrollAssignment(FacesContext context,
- ScriptContext scriptContext, String formName)
- {
- String formNameStr = formName == null ? "formName" : (new StringBuilder(
- "'").append(formName).append("'").toString());
- String paramName = new StringBuilder().append("'")
- .append(AUTO_SCROLL_PARAM).append("'").toString();
- String value = new StringBuilder().append(AUTO_SCROLL_FUNCTION)
- .append("()").toString();
-
- scriptContext.prettyLine();
- scriptContext.append("if(typeof window." + AUTO_SCROLL_FUNCTION
- + "!='undefined')");
- scriptContext.append("{");
- scriptContext.append(SET_HIDDEN_INPUT_FN_NAME_JSF2);
- scriptContext.append("(").append(formNameStr).append(",")
- .append(paramName).append(",").append(value).append(");");
- scriptContext.append("}");
-
- }
-
- public static String getAutoScrollFunction(FacesContext facesContext)
- {
- ScriptContext script = new ScriptContext();
-
- script.prettyLineIncreaseIndent();
-
- script.append("function ");
- script.append(AUTO_SCROLL_FUNCTION);
- script.append("()");
- script.append("{");
- script.append("var x = 0; var y = 0;");
- script.append("if (self.pageXOffset || self.pageYOffset)");
- script.append("{");
- script.append("x = self.pageXOffset;");
- script.prettyLine();
- script.append("y = self.pageYOffset;");
- script.append("}");
- script.append(" else if ((document.documentElement && document.documentElement.scrollLeft)||"+
- "(document.documentElement && document.documentElement.scrollTop))");
- script.append("{");
- script.append("x = document.documentElement.scrollLeft;");
- script.prettyLine();
- script.append("y = document.documentElement.scrollTop;");
- script.append("}");
- script.append(" else if (document.body) ");
- script.append("{");
- script.append("x = document.body.scrollLeft;");
- script.prettyLine();
- script.append("y = document.body.scrollTop;");
- script.append("}");
- script.append("return x + \",\" + y;");
- script.append("}");
-
- ExternalContext externalContext = facesContext.getExternalContext();
- String oldViewId = JavascriptUtils.getOldViewId(externalContext);
- if (oldViewId != null
- && oldViewId.equals(facesContext.getViewRoot().getViewId()))
- {
- //ok, we stayed on the same page, so let's scroll it to the former place
- String scrolling = (String) externalContext
- .getRequestParameterMap().get(AUTO_SCROLL_PARAM);
- if (scrolling != null && scrolling.length() > 0)
- {
- double x = 0;
- double y = 0;
- int comma = scrolling.indexOf(',');
- if (comma == -1)
- {
- log.warning("Illegal autoscroll request parameter: "
- + scrolling);
- }
- else
- {
- try
- {
- //we convert to double against XSS vulnerability
- x = Double.parseDouble(scrolling.substring(0, comma));
- }
- catch (NumberFormatException e)
- {
- log.warning("Error getting x offset for autoscroll feature. Bad param value: "
- + scrolling);
- x = 0; //ignore false numbers
- }
-
- try
- {
- //we convert to int against XSS vulnerability
- y = Integer.parseInt(scrolling.substring(comma + 1));
- }
- catch (NumberFormatException e)
- {
- log.warning("Error getting y offset for autoscroll feature. Bad param value: "
- + scrolling);
- y = 0; //ignore false numbers
- }
- }
- script.append("window.scrollTo(").append(String.valueOf(x)).append(",")
- .append(String.valueOf(y)).append(");\n");
- }
- }
-
- return script.toString();
- }
-
- /**
- * Renders the hidden form input that is necessary for the autoscroll feature.
- */
- public static void renderAutoScrollHiddenInput(FacesContext facesContext,
- ResponseWriter writer) throws IOException
- {
- writer.startElement(HTML.INPUT_ELEM, null);
- writer.writeAttribute(HTML.TYPE_ATTR, "hidden", null);
- writer.writeAttribute(HTML.NAME_ATTR, AUTO_SCROLL_PARAM, null);
- writer.endElement(HTML.INPUT_ELEM);
- }
-
- /**
- * Renders the autoscroll javascript function.
- */
- public static void renderAutoScrollFunction(FacesContext facesContext,
- ResponseWriter writer) throws IOException
- {
- writer.startElement(HTML.SCRIPT_ELEM, null);
- writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR,
- HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
- writer.writeText(getAutoScrollFunction(facesContext), null);
- writer.endElement(HTML.SCRIPT_ELEM);
- }
-
public static void appendClearHiddenCommandFormParamsFunctionCall(
StringBuilder buf, String formName)
{
diff --git a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java
index c3dacff..ca36faa 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java
@@ -43,7 +43,6 @@ import org.apache.myfaces.shared.util.renderkit.HTML;
public class HtmlMenuRendererBase
extends HtmlSelectableRendererBase
{
- //private static final Log log = LogFactory.getLog(HtmlMenuRenderer.class);
public void encodeEnd(FacesContext facesContext, UIComponent component)
throws IOException
diff --git a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java
index e7a1ed7..702f794 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java
@@ -46,7 +46,6 @@ import org.apache.myfaces.shared.util.renderkit.HTML;
public abstract class HtmlMessageRendererBase
extends HtmlRenderer
{
- //private static final Log log = LogFactory.getLog(HtmlMessageRendererBase.class);
private static final Logger log = Logger.getLogger(HtmlMessageRendererBase.class.getName());
protected abstract String getSummary(FacesContext facesContext,
diff --git a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java
index 645b46d..b4da033 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java
@@ -49,7 +49,6 @@ import org.apache.myfaces.shared.util.renderkit.HTML;
public abstract class HtmlMessagesRendererBase
extends HtmlMessageRendererBase
{
- //private static final Log log = LogFactory.getLog(HtmlMessagesRendererBase.class);
private static final Logger log = Logger.getLogger(HtmlMessagesRendererBase.class.getName());
protected static final String LAYOUT_LIST = "list";
diff --git a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
index e8b4484..01c02af 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
@@ -1220,49 +1220,6 @@ public final class HtmlRendererUtils
HtmlJavaScriptUtils.renderFormSubmitScript(facesContext);
}
- /**
- * Adds the hidden form input value assignment that is necessary for the autoscroll
- * feature to an html link or button onclick attribute.
- */
- public static void appendAutoScrollAssignment(StringBuilder onClickValue,
- String formName)
- {
- HtmlJavaScriptUtils.appendAutoScrollAssignment(onClickValue, formName);
- }
-
- /**
- * Adds the hidden form input value assignment that is necessary for the autoscroll
- * feature to an html link or button onclick attribute.
- */
- public static void appendAutoScrollAssignment(FacesContext context,
- StringBuilder onClickValue, String formName)
- {
- HtmlJavaScriptUtils.appendAutoScrollAssignment(context, onClickValue, formName);
- }
-
- /**
- * Renders the hidden form input that is necessary for the autoscroll feature.
- */
- public static void renderAutoScrollHiddenInput(FacesContext facesContext,
- ResponseWriter writer) throws IOException
- {
- HtmlJavaScriptUtils.renderAutoScrollHiddenInput(facesContext, writer);
- }
-
- /**
- * Renders the autoscroll javascript function.
- */
- public static void renderAutoScrollFunction(FacesContext facesContext,
- ResponseWriter writer) throws IOException
- {
- HtmlJavaScriptUtils.renderAutoScrollFunction(facesContext, writer);
- }
-
- public static String getAutoScrollFunction(FacesContext facesContext)
- {
- return HtmlJavaScriptUtils.getAutoScrollFunction(facesContext);
- }
-
public static boolean isAllowedCdataSection(FacesContext fc)
{
Boolean value = null;
diff --git a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
index b7de577..6951a21 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
@@ -53,9 +53,6 @@ public class HtmlResponseWriterImpl
private static final String APPLICATION_XML_CONTENT_TYPE = "application/xml";
private static final String TEXT_XML_CONTENT_TYPE = "text/xml";
-
- //private boolean _writeDummyForm = false;
- //private Set _dummyFormParams = null;
/**
* The writer used as output, or in other words, the one passed on the constructor
diff --git a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java
index c8dd1d6..e568d54 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java
@@ -44,7 +44,6 @@ import org.apache.myfaces.shared.util.renderkit.HTML;
public class HtmlTextRendererBase
extends HtmlRenderer
{
- //private static final Log log = LogFactory.getLog(HtmlTextRendererBase.class);
private static final Logger log = Logger.getLogger(HtmlTextRendererBase.class.getName());
private static final String AUTOCOMPLETE_VALUE_OFF = "off";
diff --git a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
index 7ef559f..c8206c7 100755
--- a/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
@@ -22,7 +22,6 @@ import java.io.UnsupportedEncodingException;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import java.util.logging.Logger;
import javax.faces.context.ExternalContext;
@@ -30,17 +29,6 @@ import org.apache.myfaces.config.MyfacesConfig;
public final class JavascriptUtils
{
- //private static final Log log = LogFactory.getLog(JavascriptUtils.class);
- private static final Logger log = Logger.getLogger(JavascriptUtils.class.getName());
-
- public static final String JAVASCRIPT_DETECTED = JavascriptUtils.class.getName() + ".JAVASCRIPT_DETECTED";
-
- private static final String AUTO_SCROLL_PARAM = "autoScroll";
- private static final String AUTO_SCROLL_FUNCTION = "getScrolling()";
-
- private static final String OLD_VIEW_ID = JavascriptUtils.class + ".OLD_VIEW_ID";
-
-
private JavascriptUtils()
{
// utility class, do not instantiate
@@ -262,14 +250,4 @@ public final class JavascriptUtils
return false;
}
}
-
- public static void setOldViewId(ExternalContext externalContext, String viewId)
- {
- externalContext.getRequestMap().put(OLD_VIEW_ID, viewId);
- }
-
- public static String getOldViewId(ExternalContext externalContext)
- {
- return (String)externalContext.getRequestMap().get(OLD_VIEW_ID);
- }
}
diff --git a/impl/src/main/java/org/apache/myfaces/shared/resource/ClassLoaderResourceLoader.java b/impl/src/main/java/org/apache/myfaces/shared/resource/ClassLoaderResourceLoader.java
index 17ea38f..52cc351 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/resource/ClassLoaderResourceLoader.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/resource/ClassLoaderResourceLoader.java
@@ -18,8 +18,6 @@
*/
package org.apache.myfaces.shared.resource;
-import java.io.File;
-import java.io.FileFilter;
import java.io.InputStream;
import java.net.URL;
import java.util.Iterator;
@@ -34,54 +32,6 @@ import org.apache.myfaces.shared.util.ClassUtils;
*/
public class ClassLoaderResourceLoader extends ResourceLoader
{
- /**
- * It checks version like this: 1, 1_0, 1_0_0, 100_100
- *
- * Used on getLibraryVersion to filter resource directories
- **/
- //protected static Pattern VERSION_CHECKER = Pattern.compile("\\p{Digit}+(_\\p{Digit}*)*");
-
- /**
- * It checks version like this: /1.js, /1_0.js, /1_0_0.js, /100_100.js
- *
- * Used on getResourceVersion to filter resources
- **/
- //protected static Pattern RESOURCE_VERSION_CHECKER = Pattern.compile("/\\p{Digit}+(_\\p{Digit}*)*\\..*");
-
- /*
- private FileFilter _libraryFileFilter = new FileFilter()
- {
- public boolean accept(File pathname)
- {
- if (pathname.isDirectory() && VERSION_CHECKER.matcher(pathname.getName()).matches())
- {
- return true;
- }
- return false;
- }
- };*/
-
- /*
- private FileFilter _resourceFileFilter = new FileFilter()
- {
- public boolean accept(File pathname)
- {
- if (pathname.isDirectory() && RESOURCE_VERSION_CHECKER.matcher(pathname.getName()).matches())
- {
- return true;
- }
- return false;
- }
- };*/
-
- private FileFilter _resourceFileFilter = new FileFilter()
- {
- public boolean accept(File pathname)
- {
- return true;
- }
- };
-
public ClassLoaderResourceLoader(String prefix)
{
super(prefix);
diff --git a/impl/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagBase.java b/impl/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagBase.java
index 7324032..12b9383 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagBase.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagBase.java
@@ -27,7 +27,6 @@ import javax.faces.webapp.UIComponentELTag;
public abstract class UIComponentELTagBase extends UIComponentELTag
{
- //private static final Log log = LogFactory.getLog(UIComponentTagBase.class);
//UIComponent attributes
private ValueExpression _forceId;
diff --git a/impl/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java b/impl/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java
index b9be625..dd512e4 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java
@@ -43,7 +43,7 @@ import org.apache.myfaces.shared.util.renderkit.JSFAttr;
*/
public class UIComponentELTagUtils
{
- //private static final Log log = LogFactory.getLog(UIComponentELTagUtils.class);
+
private static final Logger log = Logger
.getLogger(UIComponentELTagUtils.class.getName());
diff --git a/impl/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java b/impl/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java
index 5cafe17..a208c51 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java
@@ -26,7 +26,6 @@ import javax.faces.component.UIComponent;
public class SelectItemTagBase
extends org.apache.myfaces.shared.taglib.UIComponentELTagBase
{
- //private static final Log log = LogFactory.getLog(SelectItemTag.class);
public String getComponentType()
{
diff --git a/impl/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java b/impl/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java
index 1225ff0..feea499 100755
--- a/impl/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/util/ClassUtils.java
@@ -43,7 +43,6 @@ public final class ClassUtils
{
//~ Static fields/initializers -----------------------------------------------------------------
- //private static final Log log = LogFactory.getLog(ClassUtils.class);
private static final Logger log = Logger.getLogger(ClassUtils.class.getName());
public static final Class BOOLEAN_ARRAY_CLASS = boolean[].class;
diff --git a/impl/src/main/java/org/apache/myfaces/shared/util/ConcurrentLRUCache.java b/impl/src/main/java/org/apache/myfaces/shared/util/ConcurrentLRUCache.java
index 095419b..f8514c7 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/util/ConcurrentLRUCache.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/util/ConcurrentLRUCache.java
@@ -44,8 +44,6 @@ import java.util.concurrent.locks.ReentrantLock;
*/
public class ConcurrentLRUCache<K, V>
{
- //private static Logger log = Logger.getLogger(ConcurrentLRUCache.class
- // .getName());
private final ConcurrentHashMap<Object, CacheEntry<K, V>> map;
private final int upperWaterMark;
diff --git a/impl/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java b/impl/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java
index 3d83d80..b5cc766e 100755
--- a/impl/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/util/LocaleUtils.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
public final class LocaleUtils
{
- //private static final Log log = LogFactory.getLog(LocaleUtils.class);
+
private static final Logger log = Logger.getLogger(LocaleUtils.class.getName());
/** Utility class, do not instatiate */
diff --git a/impl/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java b/impl/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
index 1944d64..419c38f 100755
--- a/impl/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
@@ -55,7 +55,7 @@ public final class MessageUtils
/** Suffix for message details (<code>_detail</code>)*/
private static final String DETAIL_SUFFIX = "_detail";
- //private static Log log = LogFactory.getLog(MessageUtils.class);
+
private static Logger log = Logger.getLogger(MessageUtils.class.getName());
/**
diff --git a/impl/src/main/java/org/apache/myfaces/shared/util/StateUtils.java b/impl/src/main/java/org/apache/myfaces/shared/util/StateUtils.java
index ee2fb8e..7359989 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/util/StateUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/util/StateUtils.java
@@ -89,8 +89,6 @@ import org.apache.myfaces.shared.util.serial.SerialFactory;
*/
public final class StateUtils
{
-
- //private static final Log log = LogFactory.getLog(StateUtils.class);
private static final Logger log = Logger.getLogger(StateUtils.class.getName());
public static final String ZIP_CHARSET = "ISO-8859-1";
diff --git a/impl/src/main/java/org/apache/myfaces/shared/util/StreamCharBuffer.java b/impl/src/main/java/org/apache/myfaces/shared/util/StreamCharBuffer.java
index f995c1f..659c172 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/util/StreamCharBuffer.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/util/StreamCharBuffer.java
@@ -222,7 +222,6 @@ public class StreamCharBuffer implements /*Writable,*/CharSequence,
Externalizable
{
static final long serialVersionUID = 5486972234419632945L;
- //private static final Log log=LogFactory.getLog(StreamCharBuffer.class);
private static final int DEFAULT_CHUNK_SIZE = Integer.getInteger(
"oam.streamcharbuffer.chunksize", 512);
diff --git a/impl/src/main/java/org/apache/myfaces/shared/util/WebConfigParamUtils.java b/impl/src/main/java/org/apache/myfaces/shared/util/WebConfigParamUtils.java
index 85f8ebd..22cd851 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/util/WebConfigParamUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/util/WebConfigParamUtils.java
@@ -28,9 +28,6 @@ import javax.faces.context.ExternalContext;
*/
public final class WebConfigParamUtils
{
- public final static String[] COMMON_TRUE_VALUES = {"true", "on", "yes"};
- public final static String[] COMMON_FALSE_VALUES = {"false", "off", "no"};
-
/**
* Gets the String init parameter value from the specified context. If the parameter is an empty String or a String
* containing only white space, this method returns <code>null</code>
diff --git a/impl/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java b/impl/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java
index 3397f5e..509fda1 100755
--- a/impl/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java
@@ -33,7 +33,6 @@ import org.apache.myfaces.config.MyfacesConfig;
public class WebXml
{
- //private static final Log log = LogFactory.getLog(WebXml.class);
private static final Logger log = Logger.getLogger(WebXml.class.getName());
diff --git a/impl/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java b/impl/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
index dddc3d0..badb3ae 100755
--- a/impl/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
+++ b/impl/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
@@ -39,16 +39,8 @@ import org.xml.sax.InputSource;
public class WebXmlParser
{
- //private static final Log log = LogFactory.getLog(WebXmlParser.class);
private static final Logger log = Logger.getLogger(WebXmlParser.class.getName());
- /*
- private static final String JAXP_SCHEMA_LANGUAGE =
- "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
- private static final String W3C_XML_SCHEMA =
- "http://www.w3.org/2001/XMLSchema";
- */
-
private static final String WEB_XML_PATH = "/WEB-INF/web.xml";
private static final String WEB_APP_2_2_J2EE_SYSTEM_ID = "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultInjectionProviderFactory.java b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultInjectionProviderFactory.java
index 5814501..b1eac57 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultInjectionProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultInjectionProviderFactory.java
@@ -45,7 +45,6 @@ import org.apache.myfaces.spi.ServiceProviderFinderFactory;
*/
public class DefaultInjectionProviderFactory extends InjectionProviderFactory
{
- //private static Log log = LogFactory.getLog(DefaultLifecycleProviderFactory.class);
private static Logger log = Logger.getLogger(DefaultInjectionProviderFactory.class.getName());
/**
diff --git a/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java b/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java
index 3ba326c..7273858 100644
--- a/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java
+++ b/impl/src/main/java/org/apache/myfaces/taglib/core/PhaseListenerTag.java
@@ -147,7 +147,6 @@ public class PhaseListenerTag extends TagSupport
private transient PhaseListener phaseListenerCache = null;
private ValueExpression type;
private ValueExpression binding;
- //private final Log log = LogFactory.getLog(PhaseListenerTag.class);
BindingPhaseListener(ValueExpression binding, ValueExpression type)
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
index 3cd699a..fa15464 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
@@ -224,9 +224,6 @@ public class FaceletViewDeclarationLanguage extends FaceletViewDeclarationLangua
private int _bufferSize;
- // This param evolve in jsf 2.0 to partial state saving
- //private boolean _buildBeforeRestore = false;
-
private ViewHandlerSupport _cachedViewHandlerSupport;
private String _defaultSuffix;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java
index 4f7e061..75a7fa0 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java
@@ -52,7 +52,6 @@ import org.apache.myfaces.view.facelets.tag.ui.UILibrary;
final class CompilationManager
{
- //private final static Logger log = Logger.getLogger("facelets.compiler");
private final static Logger log = Logger.getLogger(CompilationManager.class.getName());
private final Compiler compiler;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java
index 9f2501a..075cae0 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java
@@ -54,7 +54,6 @@ import org.apache.myfaces.view.facelets.util.ReflectionUtil;
public abstract class Compiler
{
- //protected final static Logger log = Logger.getLogger("facelets.compiler");
protected final static Logger log = Logger.getLogger(Compiler.class.getName());
public final static String EXPRESSION_FACTORY = "compiler.ExpressionFactory";
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java
index bc31ca8..efb475d 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java
@@ -62,10 +62,6 @@ import org.apache.myfaces.shared.util.Assert;
*/
public final class TagLibraryConfig
{
-
- //private final static String SUFFIX = ".taglib.xml";
-
- //protected final static Logger log = Logger.getLogger("facelets.compiler");
protected final static Logger log = Logger.getLogger(TagLibraryConfig.class.getName());
private static class TagLibraryImpl extends AbstractTagLibrary
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfigUnmarshallerImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfigUnmarshallerImpl.java
index 427c5b2..f1c84a3 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfigUnmarshallerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfigUnmarshallerImpl.java
@@ -156,10 +156,8 @@ public class TagLibraryConfigUnmarshallerImpl
private String functionName;
- //private Class<? extends TagHandler> handlerClass;
private String handlerClass;
- //private Class<?> functionClass;
private String functionClass;
private String functionSignature;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java
index 1e93a0f..419405d 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/UILeaf.java
@@ -291,8 +291,6 @@ class UILeaf extends UIComponent implements UntargetableComponent, Map<String, O
};
private UIComponent parent;
-
- //private _ComponentAttributesMap attributesMap;
@Override
public Map<String, Object> getAttributes()
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareELException.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareELException.java
index ec21e96..e98749e 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareELException.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareELException.java
@@ -38,16 +38,11 @@ public class ContextAwareELException extends ELException implements ContextAware
private static final long serialVersionUID = -2231893442274827689L;
private ContextAwareExceptionWrapper _delegate;
- //private Throwable _wrappedException;
- //private String _localizedMessage;
public ContextAwareELException(Location location, String expressionString,
String qName, Throwable wrapped)
{
super(wrapped);
- //super(wrapped.getMessage());
- //_localizedMessage = wrapped.getLocalizedMessage();
- //_wrappedException = wrapped;
_delegate = new DefaultContextAwareELException(location, expressionString, qName, wrapped);
}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareMethodNotFoundException.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareMethodNotFoundException.java
index 7cd3133..60e1b33 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareMethodNotFoundException.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareMethodNotFoundException.java
@@ -38,16 +38,12 @@ public class ContextAwareMethodNotFoundException extends MethodNotFoundException
private static final long serialVersionUID = -8172862923048615707L;
private ContextAwareExceptionWrapper _delegate;
- //private Throwable _wrappedException;
- //private String _localizedMessage;
+
public ContextAwareMethodNotFoundException(Location location,
String expressionString, String qName, Throwable wrapped)
{
super(wrapped);
- //super(wrapped.getMessage());
- //_localizedMessage = wrapped.getLocalizedMessage();
- //_wrappedException = wrapped;
_delegate = new DefaultContextAwareELException(location, expressionString, qName, wrapped);
}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotFoundException.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotFoundException.java
index 9f5a68a..5373748 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotFoundException.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwarePropertyNotFoundException.java
@@ -39,8 +39,6 @@ public class ContextAwarePropertyNotFoundException
private static final long serialVersionUID = -4194177998555929451L;
private ContextAwareExceptionWrapper _delegate;
- //private Throwable _wrappedException;
- //private String _localizedMessage;
public ContextAwarePropertyNotFoundException(Location location,
@@ -48,9 +46,6 @@ public class ContextAwarePropertyNotFoundException
Throwable wrapped)
{
super(wrapped);
- //super(wrapped.getMessage());
- //_localizedMessage = wrapped.getLocalizedMessage();
- //_wrappedException = wrapped;
_delegate = new DefaultContextAwareELException(location, expressionString, qName, wrapped);
}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/VariableMapperWrapper.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/VariableMapperWrapper.java
index 0d8afed..68bdaa8 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/VariableMapperWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/VariableMapperWrapper.java
@@ -42,9 +42,7 @@ public final class VariableMapperWrapper extends VariableMapperBase implements F
private final VariableMapperBase _targetBase;
private Map<String, ValueExpression> _vars;
-
- //private final boolean _checkTargetBase;
-
+
public boolean _trackResolveVariables;
public boolean _variableResolved;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java
index 8cd4eaf..3655e68 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java
@@ -79,14 +79,10 @@ final class DefaultFaceletContext extends AbstractFaceletContext
private FunctionMapper _fnMapper;
- //private final Map<String, Integer> _ids;
- //private final Map<Integer, Integer> _prefixes;
private String _prefix;
private StringBuilder _uniqueIdBuilder;
- //private final LinkedList<TemplateManager> _clients;
-
private final FaceletCompositionContext _mctx;
private LinkedList<AjaxHandler> _ajaxHandlerStack;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java
index 976a326..a5b5099 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java
@@ -58,17 +58,12 @@ public final class DefaultFaceletFactory extends FaceletFactory
private static final long INFINITE_DELAY = -1;
private static final long NO_CACHE_DELAY = 0;
- //protected final Log log = LogFactory.getLog(DefaultFaceletFactory.class);
protected final Logger log = Logger.getLogger(DefaultFaceletFactory.class.getName());
private URL _baseUrl;
private Compiler _compiler;
-
- //private Map<String, DefaultFacelet> _facelets;
-
- //private Map<String, DefaultFacelet> _viewMetadataFacelets;
-
+
private Map<String, DefaultFacelet> _compositeComponentMetadataFacelets;
private long _refreshPeriod;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaRulesetImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaRulesetImpl.java
index 5680d3e..7541713 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaRulesetImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaRulesetImpl.java
@@ -48,7 +48,6 @@ public final class MetaRulesetImpl extends MetaRuleset
{
private final static Metadata NONE = new NullMetadata();
- //private final static Logger log = Logger.getLogger("facelets.tag.meta");
private final static Logger log = Logger.getLogger(MetaRulesetImpl.class.getName());
/**
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentRule.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentRule.java
index d895b9b..a56b431 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentRule.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentRule.java
@@ -106,7 +106,6 @@ final class CompositeComponentRule extends MetaRule
}
}
- //private final static Logger log = Logger.getLogger("facelets.tag.component");
private final static Logger log = Logger.getLogger(CompositeComponentRule.class.getName());
public final static CompositeComponentRule INSTANCE = new CompositeComponentRule();
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetaRulesetImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetaRulesetImpl.java
index d2e507a..8d921fd 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetaRulesetImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetaRulesetImpl.java
@@ -45,7 +45,6 @@ public class CompositeMetaRulesetImpl extends MetaRuleset
{
private final static Metadata NONE = new NullMetadata();
- //private final static Logger log = Logger.getLogger("facelets.tag.meta");
private final static Logger log = Logger.getLogger(CompositeMetadataTargetImpl.class.getName());
private static final String METADATA_KEY
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentRule.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentRule.java
index de16749..d99d95c 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentRule.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentRule.java
@@ -74,7 +74,6 @@ final class ComponentRule extends MetaRule
}
}
- //private final static Logger log = Logger.getLogger("facelets.tag.component");
private final static Logger log = Logger.getLogger(ComponentRule.class.getName());
public final static ComponentRule INSTANCE = new ComponentRule();
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/DefaultTagDecorator.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/DefaultTagDecorator.java
index 4af40ec..8adcf8d 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/DefaultTagDecorator.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/html/DefaultTagDecorator.java
@@ -423,7 +423,6 @@ public class DefaultTagDecorator implements TagDecorator
private static class TagSelectorImpl extends TagSelector implements TagDecoratorExecutor
{
- //private String selector;
private String attributeQName;
private String attributeLocalName;
private String attributePrefix;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java
index 76e214f..f3ef772 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/behavior/AbstractClientBehaviorTestCase.java
@@ -42,9 +42,7 @@ public abstract class AbstractClientBehaviorTestCase extends FaceletTestCase
protected ResponseWriter writer;
protected FastWriter outputWriter;
protected ConfigParser parser;
-
- //protected abstract UIComponent getComponentToTest();
-
+
protected abstract HtmlRenderedClientEventAttr[] getClientBehaviorHtmlRenderedAttributes();
protected abstract UIComponent createComponentToTest();
diff --git a/impl/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java b/impl/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
index 1f65448..b2ef570 100644
--- a/impl/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/shared/util/AbstractStateUtilsTest.java
@@ -32,7 +32,6 @@ public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase impleme
super(name);
}
- //private static final Log log = LogFactory.getLog(StateUtilsAbstractCase.class);
protected String sensitiveString;
private static final String TEST_DATA = "This is the test data.";
// 76543210
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockServletContext.java b/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockServletContext.java
index fff380a..342dac0 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockServletContext.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/mock/MockServletContext.java
@@ -40,7 +40,6 @@ public class MockServletContext extends
org.apache.myfaces.test.mock.MockServletContext
{
- //private static Log log = LogFactory.getLog(MockServletContext.class);
private static Logger log = Logger.getLogger(MockServletContext.class.getName());
protected final URI base;
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockFlash.java b/test/src/main/java/org/apache/myfaces/test/mock/MockFlash.java
index cb592b4..c06493d 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockFlash.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockFlash.java
@@ -461,8 +461,6 @@ public class MockFlash extends Flash
}
}
- //private void _addPreviousToken
-
/**
* Retrieve the postback map key
*/
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseListenerManager.java b/test/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseListenerManager.java
index ca3a2b0..84a21aa 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseListenerManager.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseListenerManager.java
@@ -50,8 +50,7 @@ class PhaseListenerManager
// Tracks success in the beforePhase. Listeners that throw an exception
// in beforePhase or were never called because a previous listener threw
// an exception should not have its afterPhase called
- //private Map<PhaseId, boolean[]> listenerSuccessMap = new HashMap<PhaseId, boolean[]>();
- private Map listenerSuccessMap = new HashMap();
+ private Map<PhaseId, boolean[]> listenerSuccessMap = new HashMap<PhaseId, boolean[]>();
/** Creates a new instance of PhaseListenerManager */
PhaseListenerManager(Lifecycle lifecycle, FacesContext facesContext,