1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
|
/*******************************************************************************
* Copyright (c) 2000, 2010 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.wizards;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.*;
import org.eclipse.team.internal.ccvs.core.CVSTag;
import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
import org.eclipse.team.internal.ccvs.ui.IHelpContextIds;
import org.eclipse.team.internal.ccvs.ui.tags.*;
import org.eclipse.team.internal.ui.PixelConverter;
import org.eclipse.team.internal.ui.SWTUtils;
import org.eclipse.ui.PlatformUI;
public class MergeWizardPage extends CVSWizardPage {
private Text endTagField;
private Button endTagBrowseButton;
private TagSource tagSource;
private Text startTagField;
private Button startTagBrowseButton;
private TagRefreshButtonArea tagRefreshArea;
private CVSTag startTag;
private CVSTag endTag;
private Button previewButton;
private Button noPreviewButton;
protected boolean preview = true;
private Button onlyPreviewConflicts;
private boolean isOnlyPreviewConflicts = false;
public MergeWizardPage(String pageName, String title, ImageDescriptor titleImage, String description, TagSource tagSource) {
super(pageName, title, titleImage, description);
this.tagSource = tagSource;
}
@Override
public void createControl(Composite parent) {
final PixelConverter converter= SWTUtils.createDialogPixelConverter(parent);
final Composite composite = new Composite(parent, SWT.NONE);
composite.setLayout(SWTUtils.createGridLayout(1, converter, SWTUtils.MARGINS_DEFAULT));
// set F1 help
PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.MERGE_WIZARD_PAGE);
final Composite mainArea = new Composite(composite, SWT.NONE);
mainArea.setLayoutData(SWTUtils.createHFillGridData());
mainArea.setLayout(SWTUtils.createGridLayout(2, converter, SWTUtils.MARGINS_NONE));
createEndTagArea(mainArea);
createStartTagArea(mainArea);
SWTUtils.equalizeControls(converter, new Button [] { endTagBrowseButton, startTagBrowseButton } );
createPreviewOptionArea(composite, converter);
createTagRefreshArea(composite);
Dialog.applyDialogFont(composite);
setControl(composite);
}
private void createPreviewOptionArea(Composite parent, PixelConverter converter) {
final Composite composite= new Composite(parent, SWT.NONE);
composite.setLayoutData(SWTUtils.createHFillGridData());
composite.setLayout(SWTUtils.createGridLayout(1, converter, SWTUtils.MARGINS_NONE));
previewButton = SWTUtils.createRadioButton(composite, CVSUIMessages.MergeWizardPage_0);
if (MergeWizard.isShowModelSync()) {
onlyPreviewConflicts = SWTUtils.createCheckBox(composite, CVSUIMessages.MergeWizardPage_14);
GridData data = SWTUtils.createHFillGridData(1);
data.horizontalIndent = 10;
onlyPreviewConflicts.setLayoutData(data);
}
noPreviewButton = SWTUtils.createRadioButton(composite, CVSUIMessages.MergeWizardPage_1);
SelectionAdapter selectionAdapter = new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
preview = previewButton.getSelection();
updateEnablements();
}
};
previewButton.setSelection(preview);
noPreviewButton.setSelection(!preview);
previewButton.addSelectionListener(selectionAdapter);
noPreviewButton.addSelectionListener(selectionAdapter);
if (onlyPreviewConflicts != null) {
onlyPreviewConflicts.setEnabled(preview);
onlyPreviewConflicts.setSelection(isOnlyPreviewConflicts);
onlyPreviewConflicts.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
isOnlyPreviewConflicts = onlyPreviewConflicts.getSelection();
}
});
}
}
private void createTagRefreshArea(Composite composite) {
tagRefreshArea = new TagRefreshButtonArea(getShell(), getTagSource(), null) {
@Override
public void refresh(boolean background) {
super.refresh(background);
updateStartTag(startTagField.getText());
updateEndTag(endTagField.getText());
};
};
tagRefreshArea.setRunnableContext(getContainer());
tagRefreshArea.createArea(composite);
}
private void createEndTagArea(Composite parent) {
SWTUtils.createLabel(parent, CVSUIMessages.MergeWizardPage_2, 2);
endTagField = SWTUtils.createText(parent);
endTagField.addModifyListener(e -> updateEndTag(endTagField.getText()));
final int endTagIncludeFlags = TagSelectionArea.INCLUDE_VERSIONS | TagSelectionArea.INCLUDE_BRANCHES | TagSelectionArea.INCLUDE_HEAD_TAG;
TagContentAssistProcessor.createContentAssistant(endTagField, tagSource, endTagIncludeFlags);
endTagBrowseButton = createPushButton(parent, CVSUIMessages.MergeWizardPage_3);
endTagBrowseButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
TagSelectionDialog dialog = new TagSelectionDialog(getShell(), getTagSource(),
CVSUIMessages.MergeWizardPage_4,
CVSUIMessages.MergeWizardPage_5,
endTagIncludeFlags,
false, IHelpContextIds.MERGE_END_PAGE);
if (dialog.open() == Window.OK) {
CVSTag selectedTag = dialog.getResult();
setEndTag(selectedTag);
}
}
});
}
private void createStartTagArea(Composite parent) {
SWTUtils.createLabel(parent, CVSUIMessages.MergeWizardPage_6, 2);
startTagField = SWTUtils.createText(parent);
startTagField.addModifyListener(e -> updateStartTag(startTagField.getText()));
TagContentAssistProcessor.createContentAssistant(startTagField, tagSource, TagSelectionArea.INCLUDE_VERSIONS);
startTagBrowseButton = createPushButton(parent, CVSUIMessages.MergeWizardPage_7);
startTagBrowseButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
TagSelectionDialog dialog = new TagSelectionDialog(getShell(), getTagSource(),
CVSUIMessages.MergeWizardPage_8,
CVSUIMessages.MergeWizardPage_9,
TagSelectionDialog.INCLUDE_VERSIONS | TagSelectionDialog.INCLUDE_DATES,
false, IHelpContextIds.MERGE_START_PAGE);
if (dialog.open() == Window.OK) {
CVSTag selectedTag = dialog.getResult();
setStartTag(selectedTag);
}
}
});
}
protected void updateEndTag(String text) {
if (endTag == null || !endTag.getName().equals(text)) {
CVSTag tag = getTagFor(text, false);
setEndTag(tag);
}
updateEnablements();
}
protected void updateStartTag(String text) {
if (startTag == null || !startTag.getName().equals(text)) {
CVSTag tag = getTagFor(text, true);
setStartTag(tag);
}
updateEnablements();
}
private CVSTag getTagFor(String text, boolean versionsOnly) {
if (text.equals(CVSTag.DEFAULT.getName())) {
if (versionsOnly) return null;
return CVSTag.DEFAULT;
}
if (text.equals(CVSTag.BASE.getName())) {
if (versionsOnly) return null;
return CVSTag.BASE;
}
CVSTag[] tags;
if (versionsOnly) {
tags = tagSource.getTags(new int[] { CVSTag.VERSION, CVSTag.DATE });
} else {
tags = tagSource.getTags(new int[] { CVSTag.VERSION, CVSTag.BRANCH, CVSTag.DATE });
}
for (int i = 0; i < tags.length; i++) {
CVSTag tag = tags[i];
if (tag.getName().equals(text)) {
return tag;
}
}
return null;
}
protected void setEndTag(CVSTag selectedTag) {
if (selectedTag == null || endTag == null || !endTag.equals(selectedTag)) {
endTag = selectedTag;
if (endTagField != null) {
String name = endTagField.getText();
if (endTag != null)
name = endTag.getName();
if (!endTagField.getText().equals(name))
endTagField.setText(name);
if (startTag == null && endTag != null && endTag.getType() == CVSTag.BRANCH) {
CVSTag tag = findCommonBaseTag(endTag);
if (tag != null) {
setStartTag(tag);
}
}
}
updateEnablements();
}
}
protected void setStartTag(CVSTag selectedTag) {
if (selectedTag == null || startTag != null || endTag == null || !endTag.equals(selectedTag)) {
startTag = selectedTag;
if (startTagField != null) {
String name = startTagField.getText();
if (startTag != null)
name = startTag.getName();
if (!startTagField.getText().equals(name))
startTagField.setText(name);
}
updateEnablements();
}
}
private CVSTag findCommonBaseTag(CVSTag tag) {
CVSTag[] tags = tagSource.getTags(CVSTag.VERSION);
for (int i = 0; i < tags.length; i++) {
CVSTag potentialMatch = tags[i];
if (potentialMatch.getName().indexOf(tag.getName()) != -1) {
return potentialMatch;
}
}
return null;
}
private void updateEnablements() {
if (onlyPreviewConflicts != null)
onlyPreviewConflicts.setEnabled(preview);
if (endTag == null && endTagField.getText().length() > 0) {
setErrorMessage(CVSUIMessages.MergeWizardPage_10);
} else if (startTag == null && startTagField.getText().length() > 0) {
setErrorMessage(CVSUIMessages.MergeWizardPage_11);
} else if (endTag != null && startTag != null && startTag.equals(endTag)) {
setErrorMessage(CVSUIMessages.MergeWizardPage_12);
} else if (startTag == null && endTag != null && preview) {
setErrorMessage(CVSUIMessages.MergeWizardPage_13);
} else {
setErrorMessage(null);
}
setPageComplete((startTag != null || !preview) && endTag != null && (startTag == null || !startTag.equals(endTag)));
}
protected TagSource getTagSource() {
return tagSource;
}
private Button createPushButton(Composite parent, String label) {
final Button button = new Button(parent, SWT.PUSH);
button.setText(label);
button.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false));
return button;
}
public CVSTag getStartTag() {
return startTag;
}
public CVSTag getEndTag() {
return endTag;
}
public boolean isPreview() {
return preview;
}
public boolean isOnlyPreviewConflicts() {
return isOnlyPreviewConflicts;
}
}
|
