Package org.eclipse.egit.ui.internal.dialogs

Examples of org.eclipse.egit.ui.internal.dialogs.CheckoutConflictDialog


   * @param mergeResult
   * @return the created dialog
   */
  public static Dialog getDialog(Shell parentShell, Repository repository, MergeResult mergeResult) {
    if(mergeResult.getMergeStatus() == MergeStatus.CHECKOUT_CONFLICT)
      return new CheckoutConflictDialog(parentShell, repository, mergeResult.getCheckoutConflicts());
    else
      return new MergeResultDialog(parentShell, repository, mergeResult);
  }
View Full Code Here


        if (result.getStatus() == Status.CONFLICTS) {
          final Shell shell = getWizard().getContainer().getShell();

          shell.getDisplay().asyncExec(new Runnable() {
            public void run() {
              new CheckoutConflictDialog(shell, repository,
                  result.getConflictList()).open();
            }
          });
        }
      }
View Full Code Here

    if(result.getStatus() == Status.CONFLICTS) {
      PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
        public void run() {
          Shell shell = PlatformUI.getWorkbench()
              .getActiveWorkbenchWindow().getShell();
          new CheckoutConflictDialog(shell, repository, result.getConflicts()).open();
        }
      });

      return;
    }
View Full Code Here

TOP

Related Classes of org.eclipse.egit.ui.internal.dialogs.CheckoutConflictDialog

Copyright © 2018 www.massapicom. 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.