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

RM-6836 updating variable beanname

Browse Source 
(cherry picked from commit 792e5912d5)
This commit is contained in:
Ross Gale
2019-05-03 16:04:01 +03:00
committed by cagache
parent 8aeb41d83d
commit a83fb57f68
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java
View File

@@ -43,7 +43,7 @@ public interface RecordsManagementActionCondition
*
* @return String action condition name
*/
String getName();
String getBeanName();
/**
* Get the label of the action condition

16
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java
View File

@@ -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;

4
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java
View File

@@ -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);
}
}