myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tandrasc...@apache.org
Subject [myfaces] branch master updated: removed unused code
Date Tue, 18 Dec 2018 16:57:12 GMT
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 f0d0b3b  removed unused code
f0d0b3b is described below

commit f0d0b3b4a504c2e97f9a36543882750edf0851eb
Author: Thomas Andraschko <tandraschko@apache.org>
AuthorDate: Tue Dec 18 17:57:06 2018 +0100

    removed unused code
---
 .../view/facelets/FaceletCompositionContext.java   |  64 +----------
 .../impl/FaceletCompositionContextImpl.java        | 121 ---------------------
 2 files changed, 1 insertion(+), 184 deletions(-)

diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletCompositionContext.java
b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletCompositionContext.java
index 8044a15..c65a614 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletCompositionContext.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletCompositionContext.java
@@ -137,73 +137,11 @@ abstract public class FaceletCompositionContext
     public abstract void popUniqueIdVendorToStack();
     
     /**
-     * Gets the top of the validationGroups stack.
-     * @return
-     * @since 2.0.1
-     */
-    @Deprecated
-    public abstract String getFirstValidationGroupFromStack();
-    
-    /**
-     * Removes top of stack.
-     * @since 2.0.1
-     */
-    @Deprecated
-    public abstract void popValidationGroupsToStack();
-    
-    /**
-     * Pushes validationGroups to the stack.
-     * @param validationGroups
-     * @since 2.0.1
-     */
-    @Deprecated
-    public abstract void pushValidationGroupsToStack(String validationGroups);
-    
-    /**
-     * Gets all validationIds on the stack.
-     * @return
-     * @since 2.0.1
-     */
-    @Deprecated
-    public abstract Iterator<String> getExcludedValidatorIds();
-    
-    /**
-     * Removes top of stack.
-     * @since 2.0.1
-     */
-    @Deprecated
-    public abstract void popExcludedValidatorIdToStack();
-    
-    /**
-     * Pushes validatorId to the stack of excluded validatorIds.
-     * @param validatorId
-     * @since 2.0.1
-     */
-    @Deprecated
-    public abstract void pushExcludedValidatorIdToStack(String validatorId);
-    
-    /**
-     * Gets all validationIds on the stack.
-     * @return
-     * @since 2.0.1
-     */
-    @Deprecated
-    public abstract Iterator<String> getEnclosingValidatorIds();
-    
-    /**
      * Removes top of stack.
      * @since 2.0.1
      */
     public abstract void popEnclosingValidatorIdToStack();
-    
-    /**
-     * Pushes validatorId to the stack of all enclosing validatorIds.
-     * @param validatorId
-     * @since 2.0.1
-     */
-    @Deprecated
-    public abstract void pushEnclosingValidatorIdToStack(String validatorId);
-    
+        
     /**
      * Pushes validatorId to the stack of all enclosing validatorIds.
      * 
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java
b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java
index 8b91a91..eec3adc 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java
@@ -97,10 +97,6 @@ public class FaceletCompositionContextImpl extends FaceletCompositionContext
     
     private LinkedList<UniqueIdVendor> _uniqueIdVendorStack;
     
-    private LinkedList<String> _validationGroupsStack; 
-    
-    private LinkedList<String> _excludedValidatorIdsStack;
-    
     private LinkedList<Map.Entry<String, EditableValueHolderAttachedObjectHandler>>
_enclosingValidatorIdsStack;
     
     private Boolean _isRefreshingTransientBuild;
@@ -279,9 +275,7 @@ public class FaceletCompositionContextImpl extends FaceletCompositionContext
         _facesContext = null;
         _compositeComponentStack = null;
         _enclosingValidatorIdsStack = null;
-        _excludedValidatorIdsStack = null;
         _uniqueIdVendorStack = null;
-        _validationGroupsStack = null;
         _componentsMarkedForDeletion = null;
         _relocatableResourceForDeletion = null;
         _sectionUniqueIdCounter = null;
@@ -363,110 +357,6 @@ public class FaceletCompositionContextImpl extends FaceletCompositionContext
     }
     
     /**
-     * Gets the top of the validationGroups stack.
-     * @return
-     * @since 2.0
-     */
-    @Override
-    public String getFirstValidationGroupFromStack()
-    {
-        if (_validationGroupsStack != null && !_validationGroupsStack.isEmpty())
-        {
-            return _validationGroupsStack.getFirst(); // top-of-stack
-        }
-        return null;
-    }
-    
-    /**
-     * Removes top of stack.
-     * @since 2.0
-     */
-    @Override
-    public void popValidationGroupsToStack()
-    {
-        if (_validationGroupsStack != null && !_validationGroupsStack.isEmpty())
-        {
-            _validationGroupsStack.removeFirst();
-        }
-    }
-    
-    /**
-     * Pushes validationGroups to the stack.
-     * @param validationGroups
-     * @since 2.0
-     */
-    @Override
-    public void pushValidationGroupsToStack(String validationGroups)
-    {
-        if (_validationGroupsStack == null)
-        {
-            _validationGroupsStack = new LinkedList<String>();
-        }
-
-        _validationGroupsStack.addFirst(validationGroups);
-    }
-    
-    /**
-     * Gets all validationIds on the stack.
-     * @return
-     * @since 2.0
-     */
-    @Override
-    public Iterator<String> getExcludedValidatorIds()
-    {
-        if (_excludedValidatorIdsStack != null && !_excludedValidatorIdsStack.isEmpty())
-        {
-            return _excludedValidatorIdsStack.iterator();
-        }
-        return null;
-    }
-    
-    /**
-     * Removes top of stack.
-     * @since 2.0
-     */
-    @Override
-    public void popExcludedValidatorIdToStack()
-    {
-        if (_excludedValidatorIdsStack != null && !_excludedValidatorIdsStack.isEmpty())
-        {
-            _excludedValidatorIdsStack.removeFirst();
-        }
-    }
-    
-    /**
-     * Pushes validatorId to the stack of excluded validatorIds.
-     * @param validatorId
-     * @since 2.0
-     */
-    @Override
-    public void pushExcludedValidatorIdToStack(String validatorId)
-    {
-        if (_excludedValidatorIdsStack == null)
-        {
-            _excludedValidatorIdsStack = new LinkedList<String>();
-        }
-
-        _excludedValidatorIdsStack.addFirst(validatorId);
-    }
-    
-    /**
-     * Gets all validationIds on the stack.
-     * @return
-     * @since 2.0
-     */
-    @Override
-    public Iterator<String> getEnclosingValidatorIds()
-    {
-        if (_enclosingValidatorIdsStack != null && !_enclosingValidatorIdsStack.isEmpty())
-        {
-            return new KeyEntryIterator<String, EditableValueHolderAttachedObjectHandler>
-                (_enclosingValidatorIdsStack.iterator()); 
-        }
-        return null;
-    }
-    
-    /**
      * Removes top of stack.
      * @since 2.0
      */
@@ -479,17 +369,6 @@ public class FaceletCompositionContextImpl extends FaceletCompositionContext
         }
     }
     
-    /**
-     * Pushes validatorId to the stack of all enclosing validatorIds.
-     * @param validatorId
-     * @since 2.0
-     */
-    @Override
-    public void pushEnclosingValidatorIdToStack(String validatorId)
-    {
-        pushEnclosingValidatorIdToStack(validatorId, null);
-    }
-    
     @Override
     public void pushEnclosingValidatorIdToStack(String validatorId, 
             EditableValueHolderAttachedObjectHandler attachedObjectHandler)


Mime
View raw message