Examples of IDiff

Examples of org.eclipse.core.databinding.observable.IDiff

38
39
40
41
42
43
44
45
46
47
48
  public void propertyChange(java.beans.PropertyChangeEvent evt) {
    if (evt.getPropertyName() == null
        || propertyDescriptor.getName().equals(evt.getPropertyName())) {
      Object oldValue = evt.getOldValue();
      Object newValue = evt.getNewValue();
      IDiff diff;
      if (evt.getPropertyName() == null || oldValue == null
          || newValue == null)
        diff = null;
      else
        diff = computeDiff(oldValue, newValue);
View Full Code Here

Examples of org.eclipse.core.databinding.observable.IDiff

42
43
44
45
46
47
48
49
50
51
52
  public void propertyChange(java.beans.PropertyChangeEvent evt) {
    if (evt.getPropertyName() == null
        || propertyDescriptor.getName().equals(evt.getPropertyName())) {
      Object oldValue = evt.getOldValue();
      Object newValue = evt.getNewValue();
      IDiff diff;
      if (evt.getPropertyName() == null || oldValue == null
          || newValue == null)
        diff = null;
      else
        diff = computeDiff(oldValue, newValue);
View Full Code Here

Examples of org.eclipse.core.databinding.observable.IDiff

61
62
63
64
65
66
67
68
69
70
71
      ChangeListener<Object> l = new ChangeListener<Object>() {

        @Override
        public void changed(ObservableValue<? extends Object> source,
            Object oldValue, Object newValue) {
          IDiff diff;
          if (oldValue == null || newValue == null)
            diff = null;
          else
            diff = computeDiff(oldValue, newValue);
          fireChange(source, diff);
View Full Code Here

Examples of org.eclipse.team.core.diff.IDiff

126
127
128
129
130
131
132
133
134
135
136
    iProject.refreshLocal(IResource.DEPTH_INFINITE,
        new NullProgressMonitor());

    IMergeContext mergeContext = prepareContext(workspaceFile, HEAD, HEAD);
    IDiff node = mergeContext.getDiffTree().getDiff(workspaceFile);
    assertNotNull(node);
    // First of all, "markAsMerged" is not supposed to have any effect on a
    // folder.
    // Second, it should only be used on IDiff obtained from the context,
    // not created for the occasion.
View Full Code Here

Examples of org.eclipse.team.core.diff.IDiff

172
173
174
175
176
177
178
179
180
181
182
        new NullProgressMonitor());
    // end setup

    IMergeContext mergeContext = prepareContext(workspaceFile, MASTER,
        BRANCH);
    IDiff node = mergeContext.getDiffTree().getDiff(workspaceFile);
    assertNotNull(node);

    IStatus mergeStatus = mergeContext.merge(node, false,
        new NullProgressMonitor());
    assertEquals(IStatus.OK, mergeStatus.getSeverity());
View Full Code Here

Examples of org.eclipse.team.core.diff.IDiff

228
229
230
231
232
233
234
235
236
237
238
    iProject.refreshLocal(IResource.DEPTH_INFINITE,
        new NullProgressMonitor());
    // end setup

    IMergeContext mergeContext = prepareModelContext(iFile1, MASTER, BRANCH);
    IDiff node = mergeContext.getDiffTree().getDiff(iFile1);
    assertNotNull(node);
    node = mergeContext.getDiffTree().getDiff(iFile2);
    assertNotNull(node);

    IResourceMappingMerger merger = new SampleModelMerger(
View Full Code Here

Examples of org.eclipse.team.core.diff.IDiff

282
283
284
285
286
287
288
289
290
291
292
        new NullProgressMonitor());
    // end setup

    IMergeContext mergeContext = prepareContext(workspaceFile, MASTER,
        BRANCH);
    IDiff node = mergeContext.getDiffTree().getDiff(workspaceFile);
    assertNotNull(node);

    IStatus mergeStatus = mergeContext.merge(node, false,
        new NullProgressMonitor());
    assertEquals(IStatus.ERROR, mergeStatus.getSeverity());
View Full Code Here

Examples of org.eclipse.team.core.diff.IDiff

333
334
335
336
337
338
339
340
341
342
343
    iProject.refreshLocal(IResource.DEPTH_INFINITE,
        new NullProgressMonitor());
    // end setup

    IMergeContext mergeContext = prepareModelContext(iFile1, MASTER, BRANCH);
    IDiff node = mergeContext.getDiffTree().getDiff(iFile1);
    assertNotNull(node);
    node = mergeContext.getDiffTree().getDiff(iFile2);
    assertNotNull(node);

    IResourceMappingMerger merger = new SampleModelMerger(
View Full Code Here

Examples of org.eclipse.team.core.diff.IDiff

405
406
407
408
409
410
411
412
413
414
415
    iProject.refreshLocal(IResource.DEPTH_INFINITE,
        new NullProgressMonitor());
    // end setup

    IMergeContext mergeContext = prepareModelContext(iFile1, MASTER, BRANCH);
    IDiff node = mergeContext.getDiffTree().getDiff(iFile1);
    assertNotNull(node);
    node = mergeContext.getDiffTree().getDiff(iFile2);
    assertNotNull(node);

    IResourceMappingMerger merger = new SampleModelMerger(
View Full Code Here

Examples of org.eclipse.team.core.diff.IDiff

351
352
353
354
355
356
357
358
359
360
361
    GitSynchronizeDataSet gsds = new GitSynchronizeDataSet(gsd);
    GitResourceVariantTreeSubscriber subscriber = new GitResourceVariantTreeSubscriber(
        gsds);
    subscriber.init(new NullProgressMonitor());

    IDiff diff = subscriber.getDiff(iFile2);
    assertTrue(diff instanceof IThreeWayDiff);

    IFileRevision sourceRevision = getSource(diff);
    IFileRevision destinationRevision = getDestination(diff);
    IFileRevision baseRevision = getBase(diff);
View Full Code Here
TOP
Copyright © 2018 www.massapi.com. All rights reserved.
All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.