Author: jorgeuriarte
Date: 2007-10-19 05:34:04-0700
New Revision: 10461
Modified:
trunk/src/java/org/tigris/scarab/om/Condition.java
trunk/src/java/org/tigris/scarab/om/Issue.java
trunk/src/java/org/tigris/scarab/workflow/CheapWorkflow.java
Log:
SCB2393: Isolating current condition evaluation, so it can be evolved under the hood later.
Modified: trunk/src/java/org/tigris/scarab/om/Condition.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/Condition.java?view=diff&rev=10461&p1=trunk/src/java/org/tigris/scarab/om/Condition.java&p2=trunk/src/java/org/tigris/scarab/om/Condition.java&r1=10460&r2=10461
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/Condition.java (original)
+++ trunk/src/java/org/tigris/scarab/om/Condition.java 2007-10-19 05:34:04-0700
@@ -46,6 +46,7 @@
package org.tigris.scarab.om;
+import java.util.Map;
import org.apache.torque.om.Persistent;
/**
@@ -92,4 +93,31 @@
{
return this.equals((Condition)obj);
}
+
+ /**
+ * Evaluates the current condition against the user and issue passed.
+ */
+ public boolean evaluate(ScarabUser user, Issue issue) {
+ boolean bEval = false;
+ try {
+ if (this.getAttributeOption() != null) {
+ // Old-style condition (tied to any of the attribute-options
+ // being selected)
+ Attribute requiredAttribute = this.getAttributeOption().getAttribute();
+ Integer optionId = this.getOptionId();
+ AttributeValue av = issue.getAttributeValue(requiredAttribute);
+ if (av != null) {
+ Integer issueOptionId = av.getOptionId();
+ if (issueOptionId != null && issueOptionId.equals(optionId)) {
+ bEval = true;
+ }
+ }
+ } else {
+ // New-style condition (driven by an evaluated script)
+ }
+ } catch (Exception e) {
+ this.getLog().debug("evaluate: Failed to evaluate, will return false. ", e);
+ }
+ return bEval;
+ }
}
Modified: trunk/src/java/org/tigris/scarab/om/Issue.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/Issue.java?view=diff&rev=10461&p1=trunk/src/java/org/tigris/scarab/om/Issue.java&p2=trunk/src/java/org/tigris/scarab/om/Issue.java&r1=10460&r2=10461
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/Issue.java (original)
+++ trunk/src/java/org/tigris/scarab/om/Issue.java 2007-10-19 05:34:04-0700
@@ -3923,17 +3923,8 @@
for (Iterator it = blockingConditions.iterator(); !isBlockingConditionTrue && it.hasNext(); )
{
final Condition cond = (Condition)it.next();
- final Integer conditionOptionId = cond.getOptionId();
- final Attribute attr = cond.getAttributeOption().getAttribute();
- final AttributeValue attrVal = this.getAttributeValue(attr);
- if (attrVal != null)
- {
- final Integer issueOptionId = attrVal.getOptionId();
- if (issueOptionId != null && issueOptionId.equals(conditionOptionId))
- {
- isBlockingConditionTrue = true;
- }
- }
+ isBlockingConditionTrue = cond.evaluate(null, this);
+ // Will exit as soon as any evaluates true!
}
return isBlockingConditionTrue;
}
Modified: trunk/src/java/org/tigris/scarab/workflow/CheapWorkflow.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/workflow/CheapWorkflow.java?view=diff&rev=10461&p1=trunk/src/java/org/tigris/scarab/workflow/CheapWorkflow.java&p2=trunk/src/java/org/tigris/scarab/workflow/CheapWorkflow.java&r1=10460&r2=10461
==============================================================================
--- trunk/src/java/org/tigris/scarab/workflow/CheapWorkflow.java (original)
+++ trunk/src/java/org/tigris/scarab/workflow/CheapWorkflow.java 2007-10-19 05:34:04-0700
@@ -470,54 +470,51 @@
* @return
* @throws TorqueException
*/
- public List filterConditionalTransitions(List transitions, Issue issue) throws TorqueException
- {
- try
- {
+ public List filterConditionalTransitions(List transitions, Issue issue) throws TorqueException {
+ try {
boolean blockedIssue = issue.isBlocked();
- if (transitions != null)
- {
- for (int i=transitions.size()-1; i>=0; i--)
- {
- Transition tran = (Transition)transitions.get(i);
- if (blockedIssue && tran.getDisabledIfBlocked())
- {
- transitions.remove(i);
- continue;
-
- }
- List conditions = tran.getConditions();
- if (null != conditions && conditions.size() > 0)
- {
- boolean bRemove = true;
- for (Iterator itReq = conditions.iterator(); bRemove && itReq.hasNext(); )
- {
- Condition cond = (Condition)itReq.next();
- Attribute requiredAttribute = cond.getAttributeOption().getAttribute();
- Integer optionId = cond.getOptionId();
- AttributeValue av = issue.getAttributeValue(requiredAttribute);
- if (av != null)
- {
- Integer issueOptionId = av.getOptionId();
- if (issueOptionId != null && issueOptionId.equals(optionId))
- {
- bRemove = false;
- }
- }
- }
- if (bRemove)
- {
- transitions.remove(i);
- }
- }
- }
- }
- }
- catch (Exception e)
- {
- Log.get().error("filterConditionalTransitions: " + e);
- }
-
+ if (transitions != null) {
+ for (int i=transitions.size()-1; i>=0; i--) {
+ Transition tran = (Transition)transitions.get(i);
+ if (blockedIssue && tran.getDisabledIfBlocked()) {
+ transitions.remove(i);
+ continue;
+
+ }
+ List conditions = tran.getConditions();
+ if (null != conditions && conditions.size() > 0) {
+ boolean bRemove = true;
+ for (Iterator itReq = conditions.iterator(); bRemove && itReq.hasNext(); ) {
+ Condition cond = (Condition)itReq.next();
+ bRemove = !evaluate(cond, issue);
+ }
+ if (bRemove) {
+ transitions.remove(i);
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ Log.get().error("filterConditionalTransitions: " + e);
+ }
+
return transitions;
}
+
+ /**
+ * Evaluates a Condition within the scope of a given Issue
+ */
+ private boolean evaluate(final Condition cond, final Issue issue) throws TorqueException {
+ boolean bEval = false;
+ Attribute requiredAttribute = cond.getAttributeOption().getAttribute();
+ Integer optionId = cond.getOptionId();
+ AttributeValue av = issue.getAttributeValue(requiredAttribute);
+ if (av != null) {
+ Integer issueOptionId = av.getOptionId();
+ if (issueOptionId != null && issueOptionId.equals(optionId)) {
+ bEval = true;
+ }
+ }
+ return bEval;
+ }
}
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.