mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Fixed up merge issues + Eclipse classpath
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34373 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -91,7 +91,6 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
|
|||||||
private RetryingTransactionHelper transactionHelper;
|
private RetryingTransactionHelper transactionHelper;
|
||||||
private ApplicationContext applicationContext;
|
private ApplicationContext applicationContext;
|
||||||
protected TransformerDebug transformerDebug;
|
protected TransformerDebug transformerDebug;
|
||||||
private MimetypeService mimetypeService;
|
|
||||||
|
|
||||||
|
|
||||||
/** a registry of all available content transformers */
|
/** a registry of all available content transformers */
|
||||||
@@ -190,15 +189,6 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
|
|||||||
this.transformerDebug = transformerDebug;
|
this.transformerDebug = transformerDebug;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Helper setter of the mimetypeService.
|
|
||||||
* @param mimetypeService
|
|
||||||
*/
|
|
||||||
public void setMimetypeService(MimetypeService mimetypeService)
|
|
||||||
{
|
|
||||||
this.mimetypeService = mimetypeService;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Service initialise
|
* Service initialise
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user