From 81a71c041e88a78fe147cee07d14247f8ca74a00 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Tue, 27 May 2014 22:42:15 +0000
Subject: [PATCH] Fixed major issues ("Simplify Boolean Expression") reported
 in Sonar

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@71962 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../v22/RMv22GhostOnDestroyDispositionActionPatch.java    | 4 ++--
 .../security/RMMethodSecurityInterceptor.java             | 4 ++--
 .../transfer/TransferServiceImpl.java                     | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22GhostOnDestroyDispositionActionPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22GhostOnDestroyDispositionActionPatch.java
index 965e455d3e..f1fc3f79e4 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22GhostOnDestroyDispositionActionPatch.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22GhostOnDestroyDispositionActionPatch.java
@@ -130,14 +130,14 @@ public class RMv22GhostOnDestroyDispositionActionPatch extends AbstractModulePat
      */
     private void getDispositionSchedules(NodeRef nodeRef, Set<DispositionSchedule> dispositionSchedules)
     {
-        if (filePlanService.isRecordCategory(nodeRef) == true)
+        if (filePlanService.isRecordCategory(nodeRef))
         {
             DispositionSchedule dispositionSchedule = this.dispositionService.getDispositionSchedule(nodeRef);
             if (dispositionSchedule != null)
             {
                 dispositionSchedules.add(dispositionSchedule);
             }
-    
+
             List<ChildAssociationRef> children = nodeService.getChildAssocs(nodeRef, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL);
             for (ChildAssociationRef childAssoc : children)
             {
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityInterceptor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityInterceptor.java
index 9a0d831ee2..2108c2bd66 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityInterceptor.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityInterceptor.java
@@ -123,7 +123,7 @@ public class RMMethodSecurityInterceptor extends MethodSecurityInterceptor
         if (logger.isDebugEnabled())
         {
             CapabilityReport capability = getCapabilityReport(name);
-            if (expected == false)
+            if (!expected)
             {
                 conditionName = "!" + conditionName;
             }
@@ -155,7 +155,7 @@ public class RMMethodSecurityInterceptor extends MethodSecurityInterceptor
                         for (Map.Entry<String, Boolean> entry : capability.conditions.entrySet())
                         {
                             buffer.append("    - ").append(entry.getKey()).append(" (");
-                            if (entry.getValue() == true)
+                            if (entry.getValue())
                             {
                                 buffer.append("passed");
                             }
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java
index 836186636d..039cbc0246 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java
@@ -53,7 +53,7 @@ import org.springframework.extensions.surf.util.ParameterCheck;
  * @author Tuna Aksoy
  * @since 2.2
  */
-public class TransferServiceImpl extends ServiceBaseImpl 
+public class TransferServiceImpl extends ServiceBaseImpl
                                  implements TransferService, RecordsManagementModel
 {
     /** Transfer node reference key */
@@ -176,14 +176,14 @@ public class TransferServiceImpl extends ServiceBaseImpl
         setPDFIndicationFlag(transferNodeRef, nodeRef);
 
         // Set the transferring indicator aspect
-        nodeService.addAspect(nodeRef, ASPECT_TRANSFERRING, null);        
-        if (isRecordFolder(nodeRef) == true)
+        nodeService.addAspect(nodeRef, ASPECT_TRANSFERRING, null);
+        if (isRecordFolder(nodeRef))
         {
             // add the transferring indicator aspect to all the child records
             for (NodeRef record : recordService.getRecords(nodeRef))
             {
                 nodeService.addAspect(record, ASPECT_TRANSFERRING, null);
-            }            
+            }
         }
 
         return transferNodeRef;