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.

NotesMergeConflictException.java 3.7KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111
  1. /*
  2. * Copyright (C) 2010, Sasa Zivkov <sasa.zivkov@sap.com>
  3. * and other copyright owners as documented in the project's IP log.
  4. *
  5. * This program and the accompanying materials are made available
  6. * under the terms of the Eclipse Distribution License v1.0 which
  7. * accompanies this distribution, is reproduced below, and is
  8. * available at http://www.eclipse.org/org/documents/edl-v10.php
  9. *
  10. * All rights reserved.
  11. *
  12. * Redistribution and use in source and binary forms, with or
  13. * without modification, are permitted provided that the following
  14. * conditions are met:
  15. *
  16. * - Redistributions of source code must retain the above copyright
  17. * notice, this list of conditions and the following disclaimer.
  18. *
  19. * - Redistributions in binary form must reproduce the above
  20. * copyright notice, this list of conditions and the following
  21. * disclaimer in the documentation and/or other materials provided
  22. * with the distribution.
  23. *
  24. * - Neither the name of the Eclipse Foundation, Inc. nor the
  25. * names of its contributors may be used to endorse or promote
  26. * products derived from this software without specific prior
  27. * written permission.
  28. *
  29. * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  30. * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  31. * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  32. * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  33. * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  34. * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  35. * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  36. * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  37. * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  38. * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  39. * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  40. * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  41. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  42. */
  43. package org.eclipse.jgit.notes;
  44. import java.io.IOException;
  45. import java.text.MessageFormat;
  46. import org.eclipse.jgit.internal.JGitText;
  47. /**
  48. * This exception will be thrown from the
  49. * {@link org.eclipse.jgit.notes.NoteMerger} when a conflict on Notes content is
  50. * found during merge.
  51. */
  52. public class NotesMergeConflictException extends IOException {
  53. private static final long serialVersionUID = 1L;
  54. /**
  55. * Construct a NotesMergeConflictException for the specified base, ours and
  56. * theirs note versions.
  57. *
  58. * @param base
  59. * note version
  60. * @param ours
  61. * note version
  62. * @param theirs
  63. * note version
  64. */
  65. public NotesMergeConflictException(Note base, Note ours, Note theirs) {
  66. super(MessageFormat.format(JGitText.get().mergeConflictOnNotes,
  67. noteOn(base, ours, theirs), noteData(base), noteData(ours),
  68. noteData(theirs)));
  69. }
  70. /**
  71. * Constructs a NotesMergeConflictException for the specified base, ours and
  72. * theirs versions of the root note tree.
  73. *
  74. * @param base
  75. * version of the root note tree
  76. * @param ours
  77. * version of the root note tree
  78. * @param theirs
  79. * version of the root note tree
  80. */
  81. public NotesMergeConflictException(NonNoteEntry base, NonNoteEntry ours,
  82. NonNoteEntry theirs) {
  83. super(MessageFormat.format(
  84. JGitText.get().mergeConflictOnNonNoteEntries, name(base),
  85. name(ours), name(theirs)));
  86. }
  87. private static String noteOn(Note base, Note ours, Note theirs) {
  88. if (base != null)
  89. return base.name();
  90. if (ours != null)
  91. return ours.name();
  92. return theirs.name();
  93. }
  94. private static String noteData(Note n) {
  95. if (n != null)
  96. return n.getData().name();
  97. return ""; //$NON-NLS-1$
  98. }
  99. private static String name(NonNoteEntry e) {
  100. return e != null ? e.name() : ""; //$NON-NLS-1$
  101. }
  102. }