Public Git Hosting - egit/eclipse.git/blob - org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java

1 /*******************************************************************************

4 * are made available under the terms of the Eclipse Public License 2.0

5 * which accompanies this distribution, and is available at

6 * https://www.eclipse.org/legal/epl-2.0/

7 *

8 * SPDX-License-Identifier: EPL-2.0

9 *

10 * Contributors:

11 * Mathias Kinzler (SAP AG) - initial implementation

12 * Markus Keller <markus_keller@ch.ibm.com> - Show the repository name in the title of the Pull Result dialog

13 *******************************************************************************/

package org.eclipse.egit.ui.internal.pull;

import org.eclipse.egit.ui.Activator;

import org.eclipse.egit.ui.UIUtils;

import org.eclipse.egit.ui.internal.UIText;

import org.eclipse.egit.ui.internal.fetch.FetchResultDialog;

import org.eclipse.egit.ui.internal.merge.MergeResultDialog;

import org.eclipse.egit.ui.internal.rebase.RebaseResultDialog;

import org.eclipse.jface.dialogs.Dialog;

import org.eclipse.jface.dialogs.IDialogConstants;

import org.eclipse.jface.dialogs.IDialogSettings;

import org.eclipse.jface.layout.GridDataFactory;

import org.eclipse.jface.layout.GridLayoutFactory;

import org.eclipse.jgit.api.MergeResult;

import org.eclipse.jgit.api.MergeResult.MergeStatus;

import org.eclipse.jgit.api.PullResult;

import org.eclipse.jgit.api.RebaseResult;

import org.eclipse.jgit.api.RebaseResult.Status;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.transport.FetchResult;

import org.eclipse.osgi.util.NLS;

import org.eclipse.swt.SWT;

import org.eclipse.swt.graphics.Point;

import org.eclipse.swt.layout.GridData;

import org.eclipse.swt.widgets.Button;

import org.eclipse.swt.widgets.Composite;

import org.eclipse.swt.widgets.Control;

import org.eclipse.swt.widgets.Group;

import org.eclipse.swt.widgets.Label;

import org.eclipse.swt.widgets.Shell;

45 /**

46 * Display the result of a pull.

47 * <p>

48 * Simply combines fetch and merge result dialogs into one dialog.

49 */

50 public class PullResultDialog extends Dialog {

51 private final Repository repo;

53 private final PullResult result;

55 private boolean persistSize;

57 /**

58 * @param shell

59 * @param repo

60 * @param result

61 */

        public PullResultDialog(Shell shell, Repository repo, PullResult result) {

63 super(shell);

                setShellStyle(getShellStyle() & ~SWT.APPLICATION_MODAL | SWT.SHELL_TRIM);

65 setBlockOnOpen(false);

66 this.repo = repo;

67 this.result = result;

                persistSize = hasFetchResults() || hasMergeResults();

69 }

71 private boolean hasFetchResults() {

                final FetchResult fetchResult = result.getFetchResult();

73 return fetchResult != null

                                && !fetchResult.getTrackingRefUpdates().isEmpty();

75 }

77 private boolean hasMergeResults() {

                final MergeResult mergeResult = result.getMergeResult();

79 return mergeResult != null

                                && mergeResult.getMergeStatus() != MergeStatus.ALREADY_UP_TO_DATE;

81 }

83 private boolean hasRebaseResults() {

                final RebaseResult rebaseResult = result.getRebaseResult();

85 return rebaseResult != null

                                && rebaseResult.getStatus() != Status.UP_TO_DATE;

87 }

89 @Override

90 protected Control createDialogArea(Composite parent) {

                Composite main = new Composite(parent, SWT.NONE);

                GridLayoutFactory.swtDefaults().applyTo(main);

                GridDataFactory.fillDefaults().indent(0, 0).grab(true, true).applyTo(

94 main);

                Group fetchResultGroup = new Group(main, SWT.SHADOW_ETCHED_IN);

96 fetchResultGroup

                                .setText(UIText.PullResultDialog_FetchResultGroupHeader);

                GridLayoutFactory.fillDefaults().applyTo(fetchResultGroup);

                GridDataFactory.fillDefaults().grab(true, true).applyTo(

100 fetchResultGroup);

101 FetchResult fRes = result.getFetchResult();

102 if (hasFetchResults()) {

                        GridLayoutFactory.fillDefaults().applyTo(fetchResultGroup);

                        FetchResultDialog dlg = new FetchResultDialog(getParentShell(),

                                        repo, fRes, result.getFetchedFrom());

                        Control fresult = dlg.createFetchResultTable(fetchResultGroup);

107 Object layoutData = fresult.getLayoutData();

108 if (layoutData instanceof GridData)

                                GridDataFactory.createFrom((GridData) layoutData)

                                                .hint(SWT.DEFAULT, 130).applyTo(fresult);

111

112 } else {

                        GridLayoutFactory.swtDefaults().applyTo(fetchResultGroup);

                        Label noResult = new Label(fetchResultGroup, SWT.NONE);

                        if (result.getFetchedFrom().equals(".")) //$NON-NLS-1$

116 noResult

                                                .setText(UIText.PullResultDialog_NothingToFetchFromLocal);

118 else

                                noResult.setText(NLS.bind(

120 UIText.FetchResultDialog_labelEmptyResult, result

121 .getFetchedFrom()));

122

123 }

                Group mergeResultGroup = new Group(main, SWT.SHADOW_ETCHED_IN);

125 mergeResultGroup

                                .setText(UIText.PullResultDialog_MergeResultGroupHeader);

127 if (hasMergeResults()) {

                        GridDataFactory.fillDefaults().grab(true, true).applyTo(

129 mergeResultGroup);

                        GridLayoutFactory.fillDefaults().applyTo(mergeResultGroup);

                        MergeResultDialog dlg = new MergeResultDialog(getParentShell(),

132 repo, result.getMergeResult());

133 dlg.createDialogArea(mergeResultGroup);

                } else if (hasRebaseResults()) {

135 RebaseResultDialog.createFailedOrConflictsParts(mergeResultGroup,

136 result.getRebaseResult());

                        GridDataFactory.fillDefaults().grab(true, false).applyTo(

138 mergeResultGroup);

139 } else {

                        GridDataFactory.fillDefaults().grab(true, false).applyTo(

141 mergeResultGroup);

                        GridLayoutFactory.swtDefaults().applyTo(mergeResultGroup);

                        Label noResult = new Label(mergeResultGroup, SWT.NONE);

144 noResult

                                        .setText(UIText.PullResultDialog_MergeAlreadyUpToDateMessage);

146 }

147 return main;

148 }

149

150 @Override

151 protected void createButtonsForButtonBar(Composite parent) {

                Button okayButton = createButton(parent, IDialogConstants.OK_ID,

153 IDialogConstants.CLOSE_LABEL,

154 true);

155 okayButton.setFocus();

156 }

157

158 @Override

159 protected void configureShell(Shell newShell) {

                super.configureShell(newShell);

                newShell.setText(NLS.bind(

162 UIText.PullResultDialog_DialogTitle,

                                Activator.getDefault().getRepositoryUtil()

164 .getRepositoryName(repo)));

165 }

166

167 @Override

168 protected IDialogSettings getDialogBoundsSettings() {

                return UIUtils.getDialogBoundSettings(getClass());

170 }

171

172 @Override

173 protected int getDialogBoundsStrategy() {

174 int strategy = DIALOG_PERSISTLOCATION;

175 if (persistSize)

176 strategy |= DIALOG_PERSISTSIZE;

177 return strategy;

178 }

179

180 @Override

181 protected Point getInitialSize() {

182 if (!persistSize) {

183 // For "small" dialogs with label-only results, use the default

184 // height and the persisted width

                        Point size = super.getInitialSize();

                        size.x = getPersistedSize().x;

187 return size;

188 }

189 return super.getInitialSize();

190 }

191

192 private Point getPersistedSize() {

193 boolean oldPersistSize = persistSize;

194 // This affects getDialogBoundsStrategy

195 persistSize = true;

196 try {

                        Point persistedSize = super.getInitialSize();

198 return persistedSize;

199 } finally {

200 persistSize = oldPersistSize;

201 }

202 }

203 }