You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

MergeChunk.java 4.8KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142
  1. /*
  2. * Copyright (C) 2009, Christian Halstrick <christian.halstrick@sap.com>
  3. * Copyright (C) 2010, Google Inc.
  4. * and other copyright owners as documented in the project's IP log.
  5. *
  6. * This program and the accompanying materials are made available
  7. * under the terms of the Eclipse Distribution License v1.0 which
  8. * accompanies this distribution, is reproduced below, and is
  9. * available at http://www.eclipse.org/org/documents/edl-v10.php
  10. *
  11. * All rights reserved.
  12. *
  13. * Redistribution and use in source and binary forms, with or
  14. * without modification, are permitted provided that the following
  15. * conditions are met:
  16. *
  17. * - Redistributions of source code must retain the above copyright
  18. * notice, this list of conditions and the following disclaimer.
  19. *
  20. * - Redistributions in binary form must reproduce the above
  21. * copyright notice, this list of conditions and the following
  22. * disclaimer in the documentation and/or other materials provided
  23. * with the distribution.
  24. *
  25. * - Neither the name of the Eclipse Foundation, Inc. nor the
  26. * names of its contributors may be used to endorse or promote
  27. * products derived from this software without specific prior
  28. * written permission.
  29. *
  30. * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  31. * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  32. * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  33. * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  34. * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  35. * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  36. * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  37. * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  38. * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  39. * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  40. * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  41. * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  42. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  43. */
  44. package org.eclipse.jgit.merge;
  45. /**
  46. * One chunk from a merge result. Each chunk contains a range from a
  47. * single sequence. In case of conflicts multiple chunks are reported for one
  48. * conflict. The conflictState tells when conflicts start and end.
  49. */
  50. public class MergeChunk {
  51. /**
  52. * A state telling whether a MergeChunk belongs to a conflict or not. The
  53. * first chunk of a conflict is reported with a special state to be able to
  54. * distinguish the border between two consecutive conflicts
  55. */
  56. public enum ConflictState {
  57. /**
  58. * This chunk does not belong to a conflict
  59. */
  60. NO_CONFLICT,
  61. /**
  62. * This chunk does belong to a conflict and is the first one of the
  63. * conflicting chunks
  64. */
  65. FIRST_CONFLICTING_RANGE,
  66. /**
  67. * This chunk does belong to a conflict but is not the first one of the
  68. * conflicting chunks. It's a subsequent one.
  69. */
  70. NEXT_CONFLICTING_RANGE
  71. }
  72. private final int sequenceIndex;
  73. private final int begin;
  74. private final int end;
  75. private final ConflictState conflictState;
  76. /**
  77. * Creates a new empty MergeChunk
  78. *
  79. * @param sequenceIndex
  80. * determines to which sequence this chunks belongs to. Same as
  81. * in {@link org.eclipse.jgit.merge.MergeResult#add}
  82. * @param begin
  83. * the first element from the specified sequence which should be
  84. * included in the merge result. Indexes start with 0.
  85. * @param end
  86. * specifies the end of the range to be added. The element this
  87. * index points to is the first element which not added to the
  88. * merge result. All elements between begin (including begin) and
  89. * this element are added.
  90. * @param conflictState
  91. * the state of this chunk. See {@link ConflictState}
  92. */
  93. protected MergeChunk(int sequenceIndex, int begin, int end,
  94. ConflictState conflictState) {
  95. this.sequenceIndex = sequenceIndex;
  96. this.begin = begin;
  97. this.end = end;
  98. this.conflictState = conflictState;
  99. }
  100. /**
  101. * @return the index of the sequence to which sequence this chunks belongs
  102. * to. Same as in {@link org.eclipse.jgit.merge.MergeResult#add}
  103. */
  104. public int getSequenceIndex() {
  105. return sequenceIndex;
  106. }
  107. /**
  108. * @return the first element from the specified sequence which should be
  109. * included in the merge result. Indexes start with 0.
  110. */
  111. public int getBegin() {
  112. return begin;
  113. }
  114. /**
  115. * @return the end of the range of this chunk. The element this index
  116. * points to is the first element which not added to the merge
  117. * result. All elements between begin (including begin) and this
  118. * element are added.
  119. */
  120. public int getEnd() {
  121. return end;
  122. }
  123. /**
  124. * @return the state of this chunk. See {@link ConflictState}
  125. */
  126. public ConflictState getConflictState() {
  127. return conflictState;
  128. }
  129. }