mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Phase one of merge of EC multilingual work
These files are their changes plus adjustments for formatting and immediate clashes I anticipate that this will break the build, but there are too many changes coming to risk it. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -37,6 +37,7 @@ import org.alfresco.service.cmr.avmsync.AVMSyncService;
|
||||
import org.alfresco.service.cmr.coci.CheckOutCheckInService;
|
||||
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
||||
import org.alfresco.service.cmr.lock.LockService;
|
||||
import org.alfresco.service.cmr.ml.ContentFilterLanguagesService;
|
||||
import org.alfresco.service.cmr.model.FileFolderService;
|
||||
import org.alfresco.service.cmr.repository.ContentService;
|
||||
import org.alfresco.service.cmr.repository.CopyService;
|
||||
@@ -255,7 +256,7 @@ public class ServiceDescriptorRegistry
|
||||
*/
|
||||
public ActionService getActionService()
|
||||
{
|
||||
return (ActionService)getService(ACTION_SERVICE);
|
||||
return (ActionService)getService(ACTION_SERVICE);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
@@ -364,6 +365,14 @@ public class ServiceDescriptorRegistry
|
||||
return (AttributeService)getService(ATTRIBUTE_SERVICE);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.service.ServiceRegistry#getContentFilterLanguagesService()
|
||||
*/
|
||||
public ContentFilterLanguagesService getContentFilterLanguagesService()
|
||||
{
|
||||
return (ContentFilterLanguagesService) getService(CONTENT_FILTER_LANGUAGES_SERVICE);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.service.ServiceRegistry#getAVMLockingService()
|
||||
*/
|
||||
|
Reference in New Issue
Block a user