Changeset 16536

Timestamp:

2008-07-24T15:25:52+12:00 (16 years ago)

Author:

oranfry

Message:

changed the way the descend option works, its now takes an address as a parameter

Location:

release-kits/shared/ant-tasks/orans

Files:

• TreeCallTarget.class (modified) ( previous)
• TreeCallTarget.java (modified) (1 diff)

release-kits/shared/ant-tasks/orans/TreeCallTarget.java

@@ -119 +119 @@
             //check that the target should be run given address,resume.mode, rusume.from and resume.to
             String resumeFrom = this.getProject().getProperty("resume.from");
+            String resumeDescend = this.getProject().getProperty("resume.descend");
             String resumeTo = this.getProject().getProperty("resume.to");
-            String resumeMode = this.getProject().getProperty("resume.mode");
-
-            boolean shouldExecOnFrom = false, shouldExecOnTo = false;
 
             //given resumeFrom, might we execute?
-            if ( resumeFrom == null ) {
-                shouldExecOnFrom = true;
-
-            } else {
-
-                //if the resumeFrom is a descendent of this, we must execute it no matter the Mode
-                if ( isDescendantOf(resumeFrom,address) ) {
-                        shouldExecOnFrom = true;
-
-                } else {
-
-                    if ( resumeMode == null ) {
-                        //fallthrough mode
-                        if ( isAfter(address,resumeFrom) ) {
-                            shouldExecOnFrom = true;
-                        } else {
-                            shouldExecOnFrom = false;
-                        }
-
-                    } else if ( resumeMode.equals("descend") ) {
-                        //descend mode
-                        if ( isDescendantOf(address,resumeFrom) ) {
-                            shouldExecOnFrom = true;
-                        } else {
-                            shouldExecOnFrom = false;
-                        }
-
-                    } else {
-                    throw new BuildException(
-                     "Only 'fallthrough' and 'descend' resume-modes are supported.",
-                       getLocation()
-                        );
-                    }
-                
-                }
-            
-            }
+            boolean shouldExecOnFrom = resumeFrom == null || isDescendantOf(resumeFrom,address) || isAfter(address,resumeFrom);
+
+            //given resumeDescend, might we execute?
+            boolean shouldExecuteOnDescend = resumeDescend == null || isDescendantOf(address,resumeFrom);
 
             //given resumeTo, might we execute?
-            if ( resumeTo == null ) {
-                shouldExecOnTo = true;
-            } else {
-                if ( !isAfter(address,resumeTo) ) {
-                    shouldExecOnTo = true;
-                } else {
-                    shouldExecOnTo = false;
-                }
-            }
-
-            //check that both are true
-            boolean execute = ( shouldExecOnFrom && shouldExecOnTo );
+            boolean shouldExecOnTo = resumeTo == null || !isAfter(address,resumeTo);
+
+            //check that all are true
+            boolean execute = shouldExecOnFrom && shouldExecuteOnDescend && shouldExecOnTo;
 
             if ( execute ) {