Package org.eclipse.egit.ui.internal.merge

Examples of org.eclipse.egit.ui.internal.merge.MergeModeDialog.open()

42
43
44
45
46
47
48
49
50
51
52
        UIPreferences.MERGE_MODE);
    IPath[] locations = getSelectedLocations(event);
    CompareEditorInput input;
    if (mergeMode == 0) {
      MergeModeDialog dlg = new MergeModeDialog(getShell(event));
      if (dlg.open() != Window.OK)
        return null;
      input = new GitMergeEditorInput(dlg.useWorkspace(), locations);
    } else {
      boolean useWorkspace = mergeMode == 1;
      input = new GitMergeEditorInput(useWorkspace, locations);
View Full Code Here
573
574
575
576
577
578
579
580
581
582
583
        int mergeMode = Activator.getDefault().getPreferenceStore()
            .getInt(UIPreferences.MERGE_MODE);
        CompareEditorInput input;
        if (mergeMode == 0) {
          MergeModeDialog dlg = new MergeModeDialog(getParentShell());
          if (dlg.open() != Window.OK)
            return;
          input = new GitMergeEditorInput(dlg.useWorkspace(),
              locations);
        } else {
          boolean useWorkspace = mergeMode == 1;
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.