inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed minor issues ("Collapsible If Statements") reported in Sonar

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@71949 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2014-05-27 21:09:29 +00:00
parent a5c415e3b3
commit f50e604b7e
6 changed files with 56 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
View File

@@ -444,12 +444,9 @@ public class DispositionServiceImpl extends ServiceBaseImpl
result.add(item);
}
}
else if (filePlanService.isRecordCategory(item))
else if (filePlanService.isRecordCategory(item) && getAssociatedDispositionScheduleImpl(item) == null)
{
if (getAssociatedDispositionScheduleImpl(item) == null)
{
result.addAll(getDisposableItemsImpl(isRecordLevelDisposition, item));
}
result.addAll(getDisposableItemsImpl(isRecordLevelDisposition, item));
}
}
return result;

17
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/property/DispositionProperty.java
View File

@@ -203,18 +203,15 @@ public class DispositionProperty extends BaseBehaviourBean
if (dispositionAction != null)
{
DispositionActionDefinition daDefinition = dispositionAction.getDispositionActionDefinition();
if (daDefinition != null)
// check whether the next disposition action matches this disposition property
if (daDefinition != null && propertyName.equals(daDefinition.getPeriodProperty()))
{
// check whether the next disposition action matches this disposition property
if (propertyName.equals(daDefinition.getPeriodProperty()))
{
Period period = daDefinition.getPeriod();
Date updatedAsOf = period.getNextDate(updatedDateValue);
Period period = daDefinition.getPeriod();
Date updatedAsOf = period.getNextDate(updatedDateValue);
// update asOf date on the disposition action based on the new property value
NodeRef daNodeRef = dispositionAction.getNodeRef();
nodeService.setProperty(daNodeRef, PROP_DISPOSITION_AS_OF, updatedAsOf);
}
// update asOf date on the disposition action based on the new property value
NodeRef daNodeRef = dispositionAction.getNodeRef();
nodeService.setProperty(daNodeRef, PROP_DISPOSITION_AS_OF, updatedAsOf);
}
}
}

11
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
View File

@@ -148,15 +148,12 @@ public class FilePlanServiceImpl extends ServiceBaseImpl
SiteService siteService = getSiteService();
SiteInfo siteInfo = siteService.getSite(siteId);
if (siteInfo != null)
if (siteInfo != null && siteService.hasContainer(siteId, FILE_PLAN_CONTAINER))
{
if (siteService.hasContainer(siteId, FILE_PLAN_CONTAINER))
NodeRef nodeRef = siteService.getContainer(siteId, FILE_PLAN_CONTAINER);
if (instanceOf(nodeRef, TYPE_FILE_PLAN))
{
NodeRef nodeRef = siteService.getContainer(siteId, FILE_PLAN_CONTAINER);
if (instanceOf(nodeRef, TYPE_FILE_PLAN))
{
filePlan = nodeRef;
}
filePlan = nodeRef;
}
}

20
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java
View File

@@ -345,18 +345,16 @@ public class RecordsManagementNodeFormFilter extends RecordsManagementFormFilter
// as read only
QName qname = QName.createQName(prefixName, namespaceService);
Serializable value = nodeService.getProperty(nodeRef, qname);
if (value != null)
if (value != null &&
(prefixName.equals("cm:title") ||
prefixName.equals("cm:author") ||
prefixName.equals("dod:originator") ||
prefixName.equals("dod:publicationDate") ||
prefixName.equals("dod:dateReceived") ||
prefixName.equals("dod:address") ||
prefixName.equals("dod:otherAddress")))
{
if (prefixName.equals("cm:title") ||
prefixName.equals("cm:author") ||
prefixName.equals("dod:originator") ||
prefixName.equals("dod:publicationDate") ||
prefixName.equals("dod:dateReceived") ||
prefixName.equals("dod:address") ||
prefixName.equals("dod:otherAddress"))
{
fieldDef.setProtectedField(true);
}
fieldDef.setProtectedField(true);
}
}

13
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java
View File

@@ -326,15 +326,12 @@ public class FilePlanPermissionServiceImpl extends ServiceBaseImpl
for (AccessPermission perm : origionalRecordPerms)
{
if (!ExtendedReaderDynamicAuthority.EXTENDED_READER.equals(perm.getAuthority()) &&
!ExtendedWriterDynamicAuthority.EXTENDED_WRITER.equals(perm.getAuthority()))
!ExtendedWriterDynamicAuthority.EXTENDED_WRITER.equals(perm.getAuthority()) &&
(perm.getPermission().equals(RMPermissionModel.FILING) || perm.getPermission().equals(RMPermissionModel.FILE_RECORDS)) &&
!origionalParentPerms.contains(perm))
{
if ((perm.getPermission().equals(RMPermissionModel.FILING) ||
perm.getPermission().equals(RMPermissionModel.FILE_RECORDS)) &&
!origionalParentPerms.contains(perm))
{
// then we can assume this is a permission we want to preserve
keepPerms.add(perm);
}
// then we can assume this is a permission we want to preserve
keepPerms.add(perm);
}
}

7
rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmDictionaryWebServiceUtils.java
View File

@@ -46,12 +46,9 @@ public final class RmDictionaryWebServiceUtils
if (StringUtils.isNotBlank(siteId))
{
SiteInfo site = siteService.getSite(siteId);
if (site != null)
if (site != null && site.getSitePreset().equals(SITE_PRESET))
{
if (site.getSitePreset().equals(SITE_PRESET))
{
isRmSite = true;
}
isRmSite = true;
}
}
return isRmSite;