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

24
source/java/org/alfresco/repo/content/metadata/AbstractMetadataExtracter.java
View File

@@ -81,7 +81,7 @@ abstract public class AbstractMetadataExtracter implements MetadataExtracter, Be
/**
* Helper setter of the mimetype service. This is not always required.
*
* @param mimetypeService
* @param mimetypeService MimetypeService
*/
public void setMimetypeService(MimetypeService mimetypeService)
{
@@ -205,23 +205,23 @@ abstract public class AbstractMetadataExtracter implements MetadataExtracter, Be
/**
* {@inheritDoc}
* <p>
* A {@linkplain OverwritePolicy#PRAGMATIC pragmatic} overwrite policy will be applied.
* A {@code OverwritePolicy.PRAGMATIC} will be applied.
*/
public Map<QName, Serializable> extract(ContentReader reader, Map<QName, Serializable> destination)
{
return extract(reader, OverwritePolicy.PRAGMATIC, destination);
}
/**
* {@inheritDoc}
*
* @param reader
* @param overwritePolicy
* @param destination
*
* @see #extract(ContentReader, Map)
*/
public final Map<QName, Serializable> extract(
/**
* {@inheritDoc}
*
* @param reader
* @param overwritePolicy
* @param destination
*
* @see #extract(ContentReader, Map)
*/
public final Map<QName, Serializable> extract(
ContentReader reader,
OverwritePolicy overwritePolicy,
Map<QName, Serializable> destination) throws ContentIOException