diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java index e671096fc9..81755f456e 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java @@ -43,7 +43,7 @@ public interface RecordsManagementActionCondition * * @return String action condition name */ - String getName(); + String getBeanName(); /** * Get the label of the action condition diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java index ab3c4ada31..657599334c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java @@ -55,8 +55,8 @@ public abstract class RecordsManagementActionConditionEvaluatorAbstractBase exte /** File Plan Service */ private FilePlanService filePlanService; - /** bean name */ - private String name; + /** bean beanName */ + private String beanName; /** public condition */ private boolean publicCondition = true; @@ -145,16 +145,16 @@ public abstract class RecordsManagementActionConditionEvaluatorAbstractBase exte @Override public void setBeanName(String name) { - this.name = name; + this.beanName = name; super.setBeanName(name); } /** - * @see org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionCondition#getName() + * @see org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionCondition#getBeanName() */ - public String getName() + public String getBeanName() { - return this.name; + return this.beanName; } /** @@ -184,11 +184,11 @@ public abstract class RecordsManagementActionConditionEvaluatorAbstractBase exte { if (this.actionConditionDefinition == null) { - this.actionConditionDefinition = new RecordsManagementActionConditionDefinitionImpl(name); + this.actionConditionDefinition = new RecordsManagementActionConditionDefinitionImpl(beanName); ((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setTitleKey(getTitleKey()); ((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setDescriptionKey(getDescriptionKey()); ((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setAdhocPropertiesAllowed(getAdhocPropertiesAllowed()); - ((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setConditionEvaluator(name); + ((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setConditionEvaluator(beanName); ((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setLocalizedParameterDefinitions(getLocalizedParameterDefinitions()); } return this.actionConditionDefinition; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java index b86ea5e3b9..016bafafec 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java @@ -142,9 +142,9 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi public void register(RecordsManagementActionCondition rmCondition) { - if (!rmConditions.containsKey(rmCondition.getName())) + if (!rmConditions.containsKey(rmCondition.getBeanName())) { - rmConditions.put(rmCondition.getName(), rmCondition); + rmConditions.put(rmCondition.getBeanName(), rmCondition); } }