/** * Combines this merge range and the given <code>range</code> into a single one. * * <p/> * Combining may only occur if {@link #canCombine(SVNMergeRange, boolean)} returns <span class="javakeyword">true</span> * for the specified parameters. * * <p/> * Note: combining changes the state of this object. * * @param range range to combine with this range * @param considerInheritance whether inheritance information should be taken into account * @return if combining occurs, returns this object which is now a combination * of the two ranges; otherwise returns <code>range</code> */ public SVNMergeRange combine(SVNMergeRange range, boolean considerInheritance) { if (canCombine(range, considerInheritance)) { myStartRevision = Math.min(myStartRevision, range.getStartRevision()); myEndRevision = Math.max(myEndRevision, range.getEndRevision()); myIsInheritable = myIsInheritable || range.myIsInheritable; return this; } return range; }
/** * Combines this merge range and the given <code>range</code> into a single one. * * <p/> * Combining may only occur if {@link #canCombine(SVNMergeRange, boolean)} returns <span class="javakeyword">true</span> * for the specified parameters. * * <p/> * Note: combining changes the state of this object. * * @param range range to combine with this range * @param considerInheritance whether inheritance information should be taken into account * @return if combining occurs, returns this object which is now a combination * of the two ranges; otherwise returns <code>range</code> */ public SVNMergeRange combine(SVNMergeRange range, boolean considerInheritance) { if (canCombine(range, considerInheritance)) { myStartRevision = Math.min(myStartRevision, range.getStartRevision()); myEndRevision = Math.max(myEndRevision, range.getEndRevision()); myIsInheritable = myIsInheritable || range.myIsInheritable; return this; } return range; }
/** * Combines this merge range and the given <code>range</code> into a single one. * * <p/> * Combining may only occur if {@link #canCombine(SVNMergeRange, boolean)} returns <span class="javakeyword">true</span> * for the specified parameters. * * <p/> * Note: combining changes the state of this object. * * @param range range to combine with this range * @param considerInheritance whether inheritance information should be taken into account * @return if combining occurs, returns this object which is now a combination * of the two ranges; otherwise returns <code>range</code> */ public SVNMergeRange combine(SVNMergeRange range, boolean considerInheritance) { if (canCombine(range, considerInheritance)) { myStartRevision = Math.min(myStartRevision, range.getStartRevision()); myEndRevision = Math.max(myEndRevision, range.getEndRevision()); myIsInheritable = myIsInheritable || range.myIsInheritable; return this; } return range; }
j++; } else { if (remove && !(lastRange != null && lastRange.canCombine(range1, considerInheritance))) { lastRange = range1.dup(); ranges.add(lastRange);
j++; } else { if (remove && !(lastRange != null && lastRange.canCombine(range1, considerInheritance))) { lastRange = range1.dup(); ranges.add(lastRange);
j++; } else { if (remove && !(lastRange != null && lastRange.canCombine(range1, considerInheritance))) { lastRange = range1.dup(); ranges.add(lastRange);