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

Merged V3.1 to HEAD

Browse Source 
12999: Fixed read-only bootstrap of SiteAVMBootstrap and removed incorrect use of 'assert'
   13000: Added log4j to Eclipse classpath (unexported)
   13001: Merged V2.1-A to V3.1
      9127: Performance improvement to folder copy
      9151: *RECORD-ONLY* Fix index back up failing with missing files
   13002: Merged V2.1-A to V3.1
      9174: Further fixes for ACT-2588 (Lucene backup read-write locks)
      9279: Fix ADB-84. PHP module is not restricted by the upper version
      10191: Fix for ADB-77: Need to have as the sender's email address the email address of the user triggering the rule
   13006: Merged V2.1-A to V3.1
      10893: Fixes for ADB-78 & ADB-98
             - Fixed service getter/setter pattern as well
      10903: Fix for ADB-115 ACT-4355
   13010: Made AVMLockingBootstrap resilient to read-only mode
   13011: Better message for InvalidStoreRefException
   13013: Merged V2.1-A to V3.1
      9189: Composite Conditions Support Part 1 of 2 (repo)
      9190: Composite Conditions Support Part 1a of 2 ( missed file from repo)
   13015: Port of Adobe CIFS/FTP configuration changes
   13017: Convert avoids folders given by '--svn-status' option
   13018: Merge V2.1A to V3.1
      7746: (record-only) Added ability to specify a custom CIFS authenticator class
      8533: (record-only) Added the <disableNativeCode/> configuration tag, disable use of JNI code on Windows
      8700: (record-only) Update to prevent any native calls via configuration code
      8705: (record-only) Filer out the '0.0.0.0' bind address
      8864: (record-only) Added the getBean() method for custom authenticators to get access to beans
      9054: (record-only) Added the 'AIX' platform type for use in the platforms="..." attribute
      8863: (record-only) Fix passthru socket connection timeout, added 'protocolOrder' and 'offlineCheckInterval' config values
      12144: (record-only) CIFS virtual circuit fixes
   13020: Merged V2.1-A to V3.1 (Composite Actions)
      9191: Composite Conditions Support Part 2 of 2 (client)
      9243: Composite Conditions Support Part 1 of 2 (client)
      9245: Composite Conditions Support Part 2 of 2 (repo)
   13021: Merged V3.0 to V3.1
      13008: Merged V2.2 to V3.0
         12824: (record only) Change admin access to the web project staging store to be read-only in the virtualization view - ETWOTWO-933
   13024: Ported CIFS configuration changes from Adobe V2.1A, missed checkin.
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V2.1-A:r9127,9151,9174,9189-9191,9243,9245,9279,10191,10893,10903
      Merged /alfresco/BRANCHES/V3.1:r12999-13002,13006,13010-13011,13013,13015,13017-13018,13020-13021,13024


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13550 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-11 03:22:35 +00:00
parent e98e71fb6f
commit 6519945977
18 changed files with 2244 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
source/java/org/alfresco/web/bean/rules/EditRuleWizard.java
View File

@@ -25,6 +25,7 @@
package org.alfresco.web.bean.rules;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -37,20 +38,21 @@ import org.alfresco.service.cmr.action.ActionCondition;
import org.alfresco.service.cmr.action.ActionConditionDefinition;
import org.alfresco.service.cmr.action.ActionDefinition;
import org.alfresco.service.cmr.action.CompositeAction;
import org.alfresco.service.cmr.action.CompositeActionCondition;
import org.alfresco.service.cmr.rule.Rule;
import org.alfresco.web.bean.actions.IHandler;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.rules.handlers.BaseConditionHandler;
import org.alfresco.web.bean.rules.handlers.CompositeConditionHandler;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* Bean implementation for the "Edit Rule" wizard
*
* @author gavinc
*/
public class EditRuleWizard extends CreateRuleWizard
public class EditRuleWizard extends CreateCompositeRuleWizard
{
private static final long serialVersionUID = -7222762769396254445L;
@@ -59,6 +61,8 @@ public class EditRuleWizard extends CreateRuleWizard
// ------------------------------------------------------------------------------
// Wizard implementation
/* Loads up conditions and actions from the repository
*/
@Override
public void init(Map<String, String> parameters)
{
@@ -84,42 +88,20 @@ public class EditRuleWizard extends CreateRuleWizard
// Get the composite action
CompositeAction compositeAction = getCompositeAction(rule);
// populate the conditions list with maps of properties representing each condition
List<ActionCondition> conditions = compositeAction.getActionConditions();
for (ActionCondition condition : conditions)
{
this.currentConditionProperties = new HashMap<String, Serializable>(3);
this.condition = condition.getActionConditionDefinitionName();
this.currentConditionProperties.put(PROP_CONDITION_NAME, this.condition);
this.currentConditionProperties.put(BaseConditionHandler.PROP_CONDITION_NOT,
Boolean.valueOf(condition.getInvertCondition()));
IHandler handler = this.conditionHandlers.get(this.condition);
if (handler != null)
{
// use the handler to populate the properties and summary
handler.prepareForEdit(this.currentConditionProperties,
condition.getParameterValues());
this.currentConditionProperties.put(PROP_CONDITION_SUMMARY,
handler.generateSummary(context, this, this.currentConditionProperties));
}
else
{
// there's no handler, so we presume it is a no-paramter
// condition, use the condition title as the summary
ActionConditionDefinition conditionDef = this.getActionService().
getActionConditionDefinition(this.condition);
this.currentConditionProperties.put(PROP_CONDITION_SUMMARY,
conditionDef.getTitle());
// add the no params marker so we can disable the edit action
this.currentConditionProperties.put(NO_PARAMS_MARKER, "no-params");
}
// add the populated currentConditionProperties to the list
this.allConditionsProperties.add(this.currentConditionProperties);
}
populateConditions(context, compositeAction);
populateActions(context, compositeAction);
// reset the current condition
this.selectedCondition = null;
// reset the current action
this.action = null;
}
protected void populateActions(FacesContext context, CompositeAction compositeAction)
{
// populate the actions list with maps of properties representing each action
List<Action> actions = compositeAction.getActions();
for (Action action : actions)
@@ -133,28 +115,98 @@ public class EditRuleWizard extends CreateRuleWizard
{
// use the handler to populate the properties and summary
handler.prepareForEdit(this.currentActionProperties, action.getParameterValues());
this.currentActionProperties.put(PROP_ACTION_SUMMARY,
handler.generateSummary(context, this, this.currentActionProperties));
this.currentActionProperties.put(PROP_ACTION_SUMMARY, handler.generateSummary(context, this,
this.currentActionProperties));
}
else
{
// there's no handler, so we presume it is a no-paramter
// there's no handler, so we presume it is a no-parameter
// action, use the action title as the summary
ActionDefinition actionDef = this.getActionService().getActionDefinition(this.action);
this.currentActionProperties.put(PROP_ACTION_SUMMARY, actionDef.getTitle());
// add the no params marker so we can disable the edit action
this.currentActionProperties.put(NO_PARAMS_MARKER, "no-params");
}
// add the populated currentActionProperties to the list
this.allActionsProperties.add(this.currentActionProperties);
}
// reset the current condition
this.condition = null;
// reset the current action
this.action = null;
}
protected void populateConditions(FacesContext context, CompositeAction compositeAction)
{
// populate the conditions list with maps of properties representing each condition
List<ActionCondition> conditions = compositeAction.getActionConditions();
for (ActionCondition toplevel_condition : conditions)
{
this.selectedCondition = toplevel_condition.getActionConditionDefinitionName();
this.currentConditionProperties = new HashMap<String, Serializable>();
if (logger.isDebugEnabled())
logger.debug("Preparing for Edit Condition " + this.selectedCondition);
if (toplevel_condition instanceof CompositeActionCondition)
{
if (logger.isDebugEnabled())
logger.debug("\tDetected CompositeCondition");
CompositeActionCondition compositeCondition = (CompositeActionCondition) toplevel_condition;
this.currentCompositeConditionPropertiesList = new ArrayList<Map<String, Serializable>>();
//TODO: add OR property
for (ActionCondition subcondition : compositeCondition.getActionConditions())
{
if (logger.isDebugEnabled())
logger.debug("\tSetting ... SubConditions " + subcondition.getActionConditionDefinitionName());
this.selectedCondition = subcondition.getActionConditionDefinitionName();
Map<String, Serializable> subConditionProperties = new HashMap<String, Serializable>();
populateProperties(context, subcondition, subConditionProperties);
this.currentCompositeConditionPropertiesList.add(subConditionProperties);
}
this.selectedCondition = CompositeConditionHandler.NAME;
this.currentConditionProperties.put(CompositeConditionHandler.PROP_COMPOSITE_CONDITION,
(Serializable) this.currentCompositeConditionPropertiesList);
populateProperties(context, compositeCondition, currentConditionProperties);
} else
populateProperties(context, toplevel_condition, this.currentConditionProperties);
// add the populated currentConditionProperties to the list
this.allConditionsPropertiesList.add(this.currentConditionProperties);
printConditionState();
}
}
protected void populateProperties(FacesContext context, ActionCondition condition,
Map<String, Serializable> uiConditionProperties)
{
uiConditionProperties.put(PROP_CONDITION_NAME, this.selectedCondition);
uiConditionProperties.put(BaseConditionHandler.PROP_CONDITION_NOT, Boolean.valueOf(condition.getInvertCondition()));
IHandler handler = this.conditionHandlers.get(this.selectedCondition);
if (handler != null)
{
// use the handler to populate the properties and summary
handler.prepareForEdit(uiConditionProperties, condition.getParameterValues());
uiConditionProperties.put(PROP_CONDITION_SUMMARY, handler
.generateSummary(context, this, uiConditionProperties));
} else
{
// there's no handler, so we presume it is a no-parameter
// condition, use the condition title as the summary
ActionConditionDefinition conditionDef = this.getActionService().getActionConditionDefinition(this.selectedCondition);
uiConditionProperties.put(PROP_CONDITION_SUMMARY, conditionDef.getTitle());
// add the no params marker so we can disable the edit action
uiConditionProperties.put(NO_PARAMS_MARKER, "no-params");
}
}
@Override