ModuleIteration now returns correct iterations for a custom first iteration.

Previously, ModuleIteration always returned the custom first iteration on every call to getIteration(). We now only do so for the very first iteration.
This commit is contained in:
Oliver Gierke
2014-05-02 13:22:41 +02:00
parent 9c1ce457c3
commit e77f9b087c
2 changed files with 6 additions and 1 deletions

View File

@@ -66,6 +66,10 @@ public class Iteration {
return next.equals(iteration);
}
public boolean isInitialIteration() {
return this.equals(M1);
}
public int getBugfixValue() {
return name.startsWith("SR") ? Integer.parseInt(name.substring(2)) : 0;
}

View File

@@ -52,7 +52,8 @@ public class ModuleIteration implements IterationVersion {
* @see org.springframework.data.release.model.IterationVersion#getIteration()
*/
public Iteration getIteration() {
return module.hasCustomFirstIteration() ? module.getCustomFirstIteration() : this.iteration;
return this.iteration.isInitialIteration() && this.module.hasCustomFirstIteration() ? module
.getCustomFirstIteration() : this.iteration;
}
public String getJiraVersionName() {