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 (5.1) to 5.1.N (5.1.1)

Browse Source 
119450 mcozma: Merged BRANCHES/DEV/VF_REP_INT_51 to HEAD
   ACE-4716 Can't rename a document in a virtual context from CMIS
   ACE-4752 Type virtualization method does not work
   ACE-4717 Document name is renamed when making "Check in" for a document edited in Google Docs
   ACE-4700 Can't upload to a virtual folder when filename starts with a number and includes dashes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2015-12-04 09:10:57 +00:00
parent 38ab389189
commit f187db02f3
29 changed files with 1228 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
source/java/org/alfresco/repo/virtual/bundle/VirtualFileFolderServiceExtension.java
View File

@@ -48,10 +48,10 @@ import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.model.FileNotFoundException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.traitextender.SpringBeanExtension;
import org.alfresco.util.Pair;
public class VirtualFileFolderServiceExtension extends SpringBeanExtension<FileFolderServiceExtension, FileFolderServiceTrait>
public class VirtualFileFolderServiceExtension
extends VirtualSpringBeanExtension<FileFolderServiceExtension, FileFolderServiceTrait>
implements FileFolderServiceExtension
{
private VirtualStore virtualStore;
@@ -154,17 +154,16 @@ public class VirtualFileFolderServiceExtension extends SpringBeanExtension<FileF
Set<QName>[] searchAndIgnore = (Set<QName>[]) Array.newInstance(Set.class,
3);
Pair<Set<QName>, Set<QName>> searchTypesAndIgnoreAspects = getTrait()
.buildSearchTypesAndIgnoreAspects(files,
folders,
ignoreQNames);
Pair<Set<QName>, Set<QName>> searchTypesAndIgnoreAspects = getTrait().buildSearchTypesAndIgnoreAspects(files,
folders,
ignoreQNames);
if (searchTypesAndIgnoreAspects != null)
{
Set<QName> searchTypesQNames = searchTypesAndIgnoreAspects.getFirst();
Set<QName> ignoreAspectsQNames = searchTypesAndIgnoreAspects.getSecond();
Set<QName> ignoreTypesQNames = null;
if ((searchTypesQNames != null || ignoreAspectsQNames != null) && ignoreQNames!=null)
if ((searchTypesQNames != null || ignoreAspectsQNames != null) && ignoreQNames != null)
{
ignoreTypesQNames = new HashSet<>(ignoreQNames);
if (searchTypesQNames != null)
@@ -235,8 +234,8 @@ public class VirtualFileFolderServiceExtension extends SpringBeanExtension<FileF
}
};
FileInfoPropsComparator comparator = (sortProps != null && !sortProps.isEmpty()) ? new FileInfoPropsComparator(sortProps)
: null;
FileInfoPropsComparator comparator = (sortProps != null && !sortProps.isEmpty())
? new FileInfoPropsComparator(sortProps) : null;
try
{
@@ -287,8 +286,8 @@ public class VirtualFileFolderServiceExtension extends SpringBeanExtension<FileF
}
public PagingResults<FileInfo> asFileInfoResults(ActualEnvironment environment,
final PagingResults<Reference> results, VirtualStore store) throws ReferenceEncodingException,
VirtualizationException
final PagingResults<Reference> results, VirtualStore store)
throws ReferenceEncodingException, VirtualizationException
{
List<Reference> virtualPage = results.getPage();
@@ -487,10 +486,23 @@ public class VirtualFileFolderServiceExtension extends SpringBeanExtension<FileF
}
@Override
public FileInfo rename(NodeRef sourceNodeRef, String newName) throws FileExistsException, FileNotFoundException
public FileInfo rename(NodeRef sourceNodeRef, String newName) throws FileExistsException, FileNotFoundException
{
return getTrait().rename(virtualStore.materializeIfPossible(sourceNodeRef),
newName);
}
@Override
public PagingResults<FileInfo> list(NodeRef contextNodeRef, boolean files, boolean folders, Set<QName> ignoreQNames,
List<Pair<QName, Boolean>> sortProps, PagingRequest pagingRequest)
{
return VirtualFileFolderServiceExtension.this.list(contextNodeRef,
files,
folders,
null,
ignoreQNames,
sortProps,
pagingRequest);
}
}