Merging DEV_TEMPORARY to HEAD (RenditionService)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/service/cmr/action/CompositeAction.java

@@ -16,79 +16,15 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.service.cmr.action;
 
-import java.util.List;
+package org.alfresco.service.cmr.action;
 
 /**
  * Composite action
  * 
  * @author Roy Wetherall
  */
-public interface CompositeAction extends Action
+public interface CompositeAction extends Action, ActionList<Action>
 {
-	/**
-	 * Indicates whether there are any actions
-	 * 
-	 * @return  true if there are actions, false otherwise
-	 */
-	boolean hasActions();
-	
-	/**
-	 * Add an action to the end of the list
-	 * 
-	 * @param action  the action
-	 */
-	void addAction(Action action);
-	
-	/**
-	 * Add an action to the list at the index specified
-	 * 
-	 * @param index		the index
-	 * @param action	the action
-	 */
-	void addAction(int index, Action action);
-	
-	/**
-	 * Replace the action at the specfied index with the passed action.
-	 * 
-	 * @param index		the index
-	 * @param action	the action
-	 */
-	void setAction(int index, Action action);
-	
-	/**
-	 * Gets the index of an action
-	 * 
-	 * @param action	the action
-	 * @return			the index
-	 */
-	int indexOfAction(Action action);
-	
-	/**
-	 * Get list containing the actions in their current order
-	 * 
-	 * @return  the list of actions
-	 */
-	List<Action> getActions();
-	
-	/**
-	 * Get an action at a given index
-	 * 
-	 * @param index		the index
-	 * @return			the action
-	 */
-	Action getAction(int index);
-	
-	/**
-	 * Remove an action from the list
-	 * 
-	 * @param action  the action
-	 */
-	void removeAction(Action action);
-	
-	/**
-	 * Remove all actions from the list
-	 */
-	void removeAllActions();
+
 }