Example #1
0
  public MergeConflictsBuilder(SModel base, SModel mine, SModel repository) {
    // should be invoked from read action
    myBaseModel = base;
    myMyModel = mine;

    myRepositoryModel = repository;
    myMineChangeSet = ChangeSetBuilder.buildChangeSet(base, mine);
    myRepositoryChangeSet = ChangeSetBuilder.buildChangeSet(base, repository);

    collectConflicts();
  }
Example #2
0
 private void buildAndAddChanges(
     _FunctionTypes._void_P1_E0<? super ChangeSetBuilder> buildAction) {
   ChangeSet cs = myDifference.getChangeSet();
   ChangeSetBuilder builder = ChangeSetBuilder.createBuilder(cs);
   buildAction.invoke(builder);
   ListSequence.fromList(builder.getNewChanges())
       .visitAll(
           new IVisitor<ModelChange>() {
             public void visit(ModelChange ch) {
               addChange(ch);
             }
           });
 }
 /*package*/ void rebuildChangeSets() {
   ChangeSetBuilder.rebuildChangeSet(myChangeSet);
   ChangeSetBuilder.rebuildChangeSet(myMetadataChangeSet);
   myTree.rebuildLater();
 }