Пример #1
0
 public NotePresenter(IXmlChangeReport report, IRetrieveFileVersionsFromRepository fileRetriever)
 {
     Guard.AgainstNull(report,"report");
     _fileRetriever = fileRetriever;
     _report = report;// as XmlAdditionChangeReport;
      _annotation = new Annotation(XElement.Parse(report.ChildNode.OuterXml));
 }
Пример #2
0
 public NotePresenter(IXmlChangeReport report, IRetrieveFileVersionsFromRepository fileRetriever)
 {
     Guard.AgainstNull(report, "report");
     _fileRetriever = fileRetriever;
     _report        = report;     // as XmlAdditionChangeReport;
     _annotation    = new Annotation(XElement.Parse(report.ChildNode.OuterXml));
 }
Пример #3
0
 public ConflictPresenter(IXmlChangeReport report, IRetrieveFileVersionsFromRepository fileRetriever)
 {
     _fileRetriever = fileRetriever;
     _report        = report;     // as XmlAdditionChangeReport;
     if (_report == null)
     {
         _conflict = new UnreadableConflict(null);
     }
     else
     {
         if (_report.ChildNode.Name == "conflict")                 // old style situation, only on Tok Pisin before Oct 2009
         {
             _conflict = Conflict.CreateFromConflictElement(_report.ChildNode);
         }
         else
         {
             var conflictNode = _report.ChildNode.SelectSingleNode("data/conflict");
             if (conflictNode != null)
             {
                 _conflict = Conflict.CreateFromConflictElement(conflictNode);
             }
             else
             {
                 _conflict = new UnreadableConflict(_report.ChildNode);
             }
         }
     }
 }
Пример #4
0
 public ConflictPresenter(IXmlChangeReport report, IRetrieveFileVersionsFromRepository fileRetriever)
 {
     _fileRetriever = fileRetriever;
     _report = report;// as XmlAdditionChangeReport;
     if (_report == null)
     {
         _conflict = new UnreadableConflict(report.ChildNode);
     }
     else
     {
         if (_report.ChildNode.Name == "conflict") // old style situation, only on Tok Pisin before Oct 2009
         {
             _conflict = Conflict.CreateFromConflictElement(_report.ChildNode);
         }
         else
         {
             var conflictNode = _report.ChildNode.SelectSingleNode("data/conflict");
             if (conflictNode != null)
             {
                 _conflict = Conflict.CreateFromConflictElement(conflictNode);
             }
             else
             {
                 _conflict = new UnreadableConflict(_report.ChildNode);
             }
         }
     }
 }
 public override string GetConflictingRecordOutOfSourceControl(IRetrieveFileVersionsFromRepository fileRetriever, ThreeWayMergeSources.Source mergeSource)
 {
     throw new NotImplementedException();
 }
Пример #6
0
 public override string GetConflictingRecordOutOfSourceControl(IRetrieveFileVersionsFromRepository fileRetriever, ThreeWayMergeSources.Source mergeSource)
 {
     throw new NotImplementedException();
 }
Пример #7
0
 public override string GetConflictingRecordOutOfSourceControl(IRetrieveFileVersionsFromRepository fileRetriever, ThreeWayMergeSources.Source mergeSource)
 {
     return("a record");
 }
Пример #8
0
 public override string GetConflictingRecordOutOfSourceControl(IRetrieveFileVersionsFromRepository fileRetriever, ThreeWayMergeSources.Source mergeSource)
 {
     return "a record";
 }