inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-07-02 16:13:03 +00:00
parent 4c30e52dc3
commit 7dd2291753
784 changed files with 5454 additions and 5487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/java/org/alfresco/repo/rendition/CompositeRenditionDefinitionImpl.java
View File

@@ -40,14 +40,14 @@ public class CompositeRenditionDefinitionImpl extends RenditionDefinitionImpl im
*/
private static final long serialVersionUID = -770880495976834168L;
private final ActionList<RenditionDefinition> actions = new ActionListImpl<RenditionDefinition>();
/**
* @param id - the action id
* @param renditionName - a unique name for the rendering action
*/
public CompositeRenditionDefinitionImpl(String id, QName renditionName)
{
private final ActionList<RenditionDefinition> actions = new ActionListImpl<RenditionDefinition>();
/**
* @param id - the action id
* @param renditionName - a unique name for the rendering action
*/
public CompositeRenditionDefinitionImpl(String id, QName renditionName)
{
super(id, renditionName, CompositeRenderingEngine.NAME);
}
@@ -71,8 +71,8 @@ public class CompositeRenditionDefinitionImpl extends RenditionDefinitionImpl im
}
/**
* @param index
* @param action
* @param index int
* @param action RenditionDefinition
* @see org.alfresco.service.cmr.action.ActionList#addAction(int,
* org.alfresco.service.cmr.action.Action)
*/
@@ -82,7 +82,7 @@ public class CompositeRenditionDefinitionImpl extends RenditionDefinitionImpl im
}
/**
* @param action
* @param action RenditionDefinition
* @see org.alfresco.service.cmr.action.ActionList#addAction(org.alfresco.service.cmr.action.Action)
*/
public void addAction(RenditionDefinition action)
@@ -91,8 +91,8 @@ public class CompositeRenditionDefinitionImpl extends RenditionDefinitionImpl im
}
/**
* @param index
* @return
* @param index int
* @return RenditionDefinition
* @see org.alfresco.service.cmr.action.ActionList#getAction(int)
*/
public RenditionDefinition getAction(int index)
@@ -101,7 +101,7 @@ public class CompositeRenditionDefinitionImpl extends RenditionDefinitionImpl im
}
/**
* @return
* @return List<RenditionDefinition>
* @see org.alfresco.service.cmr.action.ActionList#getActions()
*/
public List<RenditionDefinition> getActions()
@@ -110,7 +110,7 @@ public class CompositeRenditionDefinitionImpl extends RenditionDefinitionImpl im
}
/**
* @return
* @return boolean
* @see org.alfresco.service.cmr.action.ActionList#hasActions()
*/
public boolean hasActions()
@@ -119,8 +119,8 @@ public class CompositeRenditionDefinitionImpl extends RenditionDefinitionImpl im
}
/**
* @param action
* @return
* @param action RenditionDefinition
* @return int
* @see org.alfresco.service.cmr.action.ActionList#indexOfAction(org.alfresco.service.cmr.action.Action)
*/
public int indexOfAction(RenditionDefinition action)
@@ -129,7 +129,7 @@ public class CompositeRenditionDefinitionImpl extends RenditionDefinitionImpl im
}
/**
* @param action
* @param action RenditionDefinition
* @see org.alfresco.service.cmr.action.ActionList#removeAction(org.alfresco.service.cmr.action.Action)
*/
public void removeAction(RenditionDefinition action)
@@ -146,8 +146,8 @@ public class CompositeRenditionDefinitionImpl extends RenditionDefinitionImpl im
}
/**
* @param index
* @param action
* @param index int
* @param action RenditionDefinition
* @see org.alfresco.service.cmr.action.ActionList#setAction(int,
* org.alfresco.service.cmr.action.Action)
*/