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
|
/*******************************************************************************
* Copyright (c) 2004, 2007 Boeing.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.widgets.xmerge;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED;
import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.osee.framework.core.enums.ConflictType;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.help.ui.OseeHelpContext;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.attribute.WordAttribute;
import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta;
import org.eclipse.osee.framework.skynet.core.conflict.ArtifactConflict;
import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict;
import org.eclipse.osee.framework.skynet.core.conflict.Conflict;
import org.eclipse.osee.framework.ui.plugin.util.HelpUtil;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
import org.eclipse.osee.framework.ui.skynet.render.IRenderer;
import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
import org.eclipse.osee.framework.ui.skynet.revert.RevertWizard;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.NonmodalWizardDialog;
import org.eclipse.swt.widgets.Shell;
/**
* @author Theron Virgin
*/
public class MergeUtility {
/*
* This has all of the GUI prompts that help a user know what's going on when they set a merge.
*/
public static final String CLEAR_PROMPT =
"This attribute has had Merge changes made are you sure you want to overwrite them? All changes will be lost.";
public static final String COMMITED_PROMPT =
"You can not change the value for a conflict that has been marked resolved or has already been commited. Change the conflict status if the source branch has not been commited and you wish to modify the value.";
public static final String ARTIFACT_DELETED_PROMPT =
"This Artifact has been changed on the source branch, but has been deleted on the destination branch. In order to commit this branch and resolve this conflict the Artifact will need to be reverted on the source branch. \n\nReverting the artifact is irreversible and you will need to restart OSEE after reverting to see changes.";
public static final String ATTRIBUTE_DELETED_PROMPT =
"This Attribute has been changed on the source branch, but has been deleted on the destination branch. In order to commit this branch and resolve this conflict the Attribute will need to be reverted on the source branch. \n\nReverting the attribute is irreversible and you will need to restart OSEE after reverting to see changes.";
public static final String INFORMATIONAL_CONFLICT =
"This Item has been deleted on the Source Branch, but has been changed on the destination branch. This conflict is informational only and will not prevent your from commiting, however when you commit it will delete the item on the destination branch.";
public static final String OPEN_MERGE_DIALOG =
"This will open a window that will allow in-document merging in Word. You will need to right click on every difference and either accept or reject the change. If you begin an in-document merge you will not be able to finalize the conflict until you resolve every change in the document.\n Computing a Merge will wipe out any merge changes you have made and start with a fresh diff of the two files. If you want to only view the changes use the difference options.\n Change that touch the entire file are better handled using copy and paste. \n\nWARNING: Word will occasionaly show incorrect changes especially when users have both modified the same block of text. Check your final version.";
public static void clearValue(Conflict conflict, Shell shell, boolean prompt) throws MultipleArtifactsExist, ArtifactDoesNotExist, Exception {
if (conflict == null) {
return;
}
if (okToOverwriteEditedValue(conflict, shell, prompt)) {
conflict.clearValue();
}
}
public static void setToDest(Conflict conflict, Shell shell, boolean prompt) throws MultipleArtifactsExist, ArtifactDoesNotExist, Exception {
if (conflict == null) {
return;
}
if (okToOverwriteEditedValue(conflict, shell, prompt)) {
conflict.setToDest();
}
}
public static void setToSource(Conflict conflict, Shell shell, boolean prompt) throws MultipleArtifactsExist, ArtifactDoesNotExist, Exception {
if (conflict == null) {
return;
}
if (okToOverwriteEditedValue(conflict, shell, prompt)) {
conflict.setToSource();
}
}
public static boolean okToOverwriteEditedValue(Conflict conflict, Shell shell, boolean prompt) throws OseeCoreException {
boolean proceed = true;
if (!conflict.statusEditable()) {
MessageDialog.openInformation(shell, "Attention", COMMITED_PROMPT);
return false;
}
if (!(conflict.mergeEqualsDestination() || conflict.mergeEqualsSource() || conflict.statusUntouched()) && prompt) {
proceed = MessageDialog.openConfirm(shell, "Confirm", CLEAR_PROMPT);
}
return proceed;
}
public static void showCompareFile(Artifact art1, Artifact art2, String filePrefix) throws OseeCoreException {
RendererManager.diffInJob(new ArtifactDelta(art1, art2),
new VariableMap(IRenderer.FILE_PREFIX_OPTION, filePrefix));
}
public static boolean showDeletedConflict(Conflict conflict, Shell shell) {
if (conflict.getConflictType().equals(ConflictType.ARTIFACT)) {
return showArtifactDeletedConflict(conflict, shell);
} else if (conflict.getConflictType().equals(ConflictType.ATTRIBUTE)) {
return showAttributeDeletedConflict(conflict, shell);
}
return false;
}
public static boolean showArtifactDeletedConflict(Conflict conflict, Shell shell) {
if (conflict.getConflictType().equals(ConflictType.ARTIFACT)) {
MessageDialog dialog =
new MessageDialog(shell, "Unresovable Conflict", null, ARTIFACT_DELETED_PROMPT, 1, new String[] {
"Revert Source Artifact",
"Handle Later"}, 1);
if (dialog.open() == 0) {
try {
List<List<Artifact>> artifacts = new LinkedList<List<Artifact>>();
List<Artifact> artifactList = new LinkedList<Artifact>();
artifactList.add(((ArtifactConflict) conflict).getSourceArtifact());
artifacts.add(artifactList);
RevertWizard wizard = new RevertWizard(artifacts);
NonmodalWizardDialog dialog2 = new NonmodalWizardDialog(Displays.getActiveShell(), wizard);
dialog2.create();
dialog2.open();
return true;
} catch (Exception ex) {
OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
}
}
}
return false;
}
public static boolean showAttributeDeletedConflict(Conflict conflict, Shell shell) {
if (conflict.getConflictType().equals(ConflictType.ATTRIBUTE)) {
MessageDialog dialog =
new MessageDialog(shell, "Unresovable Conflict", null, ATTRIBUTE_DELETED_PROMPT, 1, new String[] {
"Revert Source Attribute",
"Handle Later"}, 1);
if (dialog.open() == 0) {
try {
((AttributeConflict) conflict).revertSourceAttribute();
return true;
} catch (Exception ex) {
OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
}
}
}
return false;
}
public static boolean showInformationalConflict(Shell shell) {
MessageDialog dialog =
new MessageDialog(shell, "Informational Conflict", null, INFORMATIONAL_CONFLICT, 2, new String[] {"OK"}, 1);
dialog.open();
return false;
}
public static void launchMerge(final AttributeConflict attributeConflict, Shell shell) {
try {
if (attributeConflict.getAttribute() instanceof WordAttribute) {
if (!attributeConflict.statusEditable()) {
MessageDialog.openInformation(shell, "Attention", COMMITED_PROMPT);
return;
}
String[] buttons;
if (attributeConflict.mergeEqualsSource() || attributeConflict.mergeEqualsDestination() || attributeConflict.statusUntouched()) {
buttons = new String[] {"Begin New Merge", "Show Help", "Cancel"};
} else {
buttons = new String[] {"Continue with last Merge", "Begin New Merge", "Show Help", "Cancel"};
}
MessageDialog dialog =
new MessageDialog(Displays.getActiveShell().getShell(), "Merge Word Artifacts", null, OPEN_MERGE_DIALOG,
4, buttons, 2);
int response = dialog.open();
if (buttons.length == 3) {
response++;
}
if (response == 2) {
HelpUtil.displayHelp(OseeHelpContext.MERGE_MANAGER);
} else if (response == 1) {
Operations.executeAsJob(new ThreeWayWordMergeOperation(attributeConflict), true);
} else if (response == 0) {
RendererManager.openInJob(attributeConflict.getArtifact(), PresentationType.SPECIALIZED_EDIT);
attributeConflict.markStatusToReflectEdit();
}
}
} catch (Exception ex) {
OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
public static Artifact getStartArtifact(Conflict conflict) {
try {
if (conflict.getSourceBranch() == null) {
return null;
}
TransactionRecord baseTransaction = conflict.getSourceBranch().getBaseTransaction();
return ArtifactQuery.getHistoricalArtifactFromId(conflict.getArtifact().getGuid(), baseTransaction,
INCLUDE_DELETED);
} catch (OseeCoreException ex) {
OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
}
return null;
}
}
|
