use of com.collabnet.subversion.merge.MergeSummaryResult in project subclipse by subclipse.
the class MergeOutputDocument method createDocument.
private Document createDocument() {
try {
DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
Document doc = builder.newDocument();
// $NON-NLS-1$
Element rootElement = doc.createElement("mergeOutput");
rootElement.setAttribute("resource", // $NON-NLS-1$
mergeOutput.getResource().getFullPath().toString());
// $NON-NLS-1$
rootElement.setAttribute("date", mergeOutput.getMergeDate().toString());
String status = null;
if (// $NON-NLS-1$
mergeOutput.isInProgress())
// $NON-NLS-1$
status = "inProgress";
else if (// $NON-NLS-1$
mergeOutput.isAbnormalEnd())
// $NON-NLS-1$
status = "aborted";
else
// $NON-NLS-1$
status = "normal";
// $NON-NLS-1$
rootElement.setAttribute("status", status);
rootElement.setAttribute("revisionStart", // $NON-NLS-1$
Long.toString(mergeOutput.getLowerRevision()));
rootElement.setAttribute("revisionEnd", // $NON-NLS-1$
Long.toString(mergeOutput.getUpperRevision()));
// $NON-NLS-1$
Element workspaceElement = doc.createElement("workspace");
// $NON-NLS-1$
workspaceElement.setAttribute("url", mergeOutput.getWorkspaceUrl());
workspaceElement.setAttribute("revision", // $NON-NLS-1$
Long.toString(mergeOutput.getWorkspaceRevision()));
rootElement.appendChild(workspaceElement);
// $NON-NLS-1$
Element commandElement = doc.createElement("mergeCommand");
commandElement.appendChild(doc.createTextNode(mergeOutput.getMergeCommand()));
rootElement.appendChild(commandElement);
// $NON-NLS-1$
Element optionsElement = doc.createElement("mergeOptions");
optionsElement.setAttribute("force", // $NON-NLS-1$
getBoolean(mergeOutput.getMergeOptions().isForce()));
optionsElement.setAttribute("ignoreAncestry", // $NON-NLS-1$
getBoolean(mergeOutput.getMergeOptions().isIgnoreAncestry()));
optionsElement.setAttribute("recurse", // $NON-NLS-1$
getBoolean(mergeOutput.getMergeOptions().isRecurse()));
String depth;
switch(mergeOutput.getMergeOptions().getDepth()) {
case Depth.empty:
// $NON-NLS-1$
depth = "thisItem";
break;
case Depth.files:
// $NON-NLS-1$
depth = "fileChildren";
break;
case Depth.immediates:
// $NON-NLS-1$
depth = "immediateChildren";
break;
case Depth.infinity:
// $NON-NLS-1$
depth = "infinite";
break;
default:
// $NON-NLS-1$
depth = "workingCopy";
break;
}
// $NON-NLS-1$
optionsElement.setAttribute("depth", depth);
if (mergeOutput.getMergeOptions().getFromRevision() != null)
optionsElement.setAttribute("revisionFrom", // $NON-NLS-1$
mergeOutput.getMergeOptions().getFromRevision().toString());
if (mergeOutput.getMergeOptions().getToRevision() != null)
optionsElement.setAttribute("revisionTo", // $NON-NLS-1$
mergeOutput.getMergeOptions().getToRevision().toString());
// $NON-NLS-1$
Element fromUrlElement = doc.createElement("fromUrl");
fromUrlElement.appendChild(doc.createTextNode(mergeOutput.getMergeOptions().getFromUrl().toString()));
optionsElement.appendChild(fromUrlElement);
if (mergeOutput.getMergeOptions().getRevisions() != null) {
// $NON-NLS-1$
Element revisionRangesElement = doc.createElement("revisionRanges");
SVNRevisionRange[] revisionRanges = mergeOutput.getMergeOptions().getRevisions();
for (int i = 0; i < revisionRanges.length; i++) {
// $NON-NLS-1$
Element revisionRangeElement = doc.createElement("revisionRange");
revisionRangeElement.appendChild(doc.createTextNode(revisionRanges[i].toString()));
revisionRangesElement.appendChild(revisionRangeElement);
}
optionsElement.appendChild(revisionRangesElement);
}
if (!(mergeOutput.getMergeOptions().getToUrl() == null) && (!mergeOutput.getMergeOptions().getToUrl().toString().equals(mergeOutput.getMergeOptions().getFromUrl().toString()))) {
// $NON-NLS-1$
Element toUrlElement = doc.createElement("toUrl");
toUrlElement.appendChild(doc.createTextNode(mergeOutput.getMergeOptions().getToUrl().toString()));
optionsElement.appendChild(toUrlElement);
}
rootElement.appendChild(optionsElement);
// $NON-NLS-1$
Element summaryElement = doc.createElement("summary");
// $NON-NLS-1$
Element fileStatisticsElement = doc.createElement("fileStats");
// $NON-NLS-1$
Element propertyStatisticsElement = doc.createElement("propertiesStats");
// $NON-NLS-1$
Element treeConflictStatisticsElement = doc.createElement("treeConflictStats");
MergeSummaryResult[] summaryResults = mergeOutput.getMergeSummaryResults();
boolean fileStats = false;
boolean propStats = false;
boolean treeStats = false;
for (int i = 0; i < summaryResults.length; i++) {
if (summaryResults[i].getType() == MergeSummaryResult.FILE) {
fileStatisticsElement.setAttribute(summaryResults[i].getCategory().replaceAll(" ", "_"), // $NON-NLS-1$ //$NON-NLS-2$
summaryResults[i].getNumber());
fileStats = true;
}
if (summaryResults[i].getType() == MergeSummaryResult.PROPERTY) {
propertyStatisticsElement.setAttribute(summaryResults[i].getCategory().replaceAll(" ", "_"), // $NON-NLS-1$ //$NON-NLS-2$
summaryResults[i].getNumber());
propStats = true;
}
if (summaryResults[i].getType() == MergeSummaryResult.TREE) {
treeConflictStatisticsElement.setAttribute(summaryResults[i].getCategory().replaceAll(" ", "_"), // $NON-NLS-1$ //$NON-NLS-2$
summaryResults[i].getNumber());
treeStats = true;
}
}
if (fileStats)
summaryElement.appendChild(fileStatisticsElement);
if (propStats)
summaryElement.appendChild(propertyStatisticsElement);
if (treeStats)
summaryElement.appendChild(treeConflictStatisticsElement);
rootElement.appendChild(summaryElement);
// $NON-NLS-1$
Element resultsElement = doc.createElement("mergeResults");
// $NON-NLS-1$
Element textElement = doc.createElement("text");
// $NON-NLS-1$
Element mergedTextElement = doc.createElement("merged");
// $NON-NLS-1$
Element conflictedTextElement = doc.createElement("conflicted");
// $NON-NLS-1$
Element skippedTextElement = doc.createElement("skipped");
// $NON-NLS-1$
Element propertiesElement = doc.createElement("properties");
// $NON-NLS-1$
Element mergedPropertiesElement = doc.createElement("merged");
// $NON-NLS-1$
Element conflictedPropertiesElement = doc.createElement("conflicted");
// $NON-NLS-1$
Element skippedPropertiesElement = doc.createElement("skipped");
// $NON-NLS-1$
Element treeConflictsElement = doc.createElement("treeConflicts");
boolean treeConflicts = false;
boolean mergedText = false;
boolean conflictedText = false;
boolean skippedText = false;
boolean mergedProperties = false;
boolean conflictedProperties = false;
boolean skippedProperties = false;
MergeResult[] mergeResults = mergeOutput.getMergeResults();
for (int i = 0; i < mergeResults.length; i++) {
if (mergeResults[i].hasTreeConflict()) {
// $NON-NLS-1$
Element resultElement = doc.createElement("result");
resultElement.setAttribute("resource", // $NON-NLS-1$
mergeResults[i].getResource().getFullPath().toString());
resultElement.setAttribute("resolved", // $NON-NLS-1$
getBoolean(mergeResults[i].isTreeConflictResolved()));
treeConflictsElement.appendChild(resultElement);
treeConflicts = true;
}
if (mergeResults[i].getAction() != null && mergeResults[i].getAction().trim().length() > 0) {
// $NON-NLS-1$
Element resultElement = doc.createElement("result");
resultElement.setAttribute("resource", // $NON-NLS-1$
mergeResults[i].getResource().getFullPath().toString());
if (mergeResults[i].isConflicted()) {
resultElement.setAttribute("resolved", // $NON-NLS-1$
getBoolean(mergeResults[i].isResolved()));
if (mergeResults[i].getAction().equals(MergeResult.ACTION_ADD))
// $NON-NLS-1$ //$NON-NLS-2$
resultElement.setAttribute("added", "true");
else if (mergeResults[i].getAction().equals(MergeResult.ACTION_DELETE))
// $NON-NLS-1$ //$NON-NLS-2$
resultElement.setAttribute("deleted", "true");
conflictedTextElement.appendChild(resultElement);
conflictedText = true;
} else if (mergeResults[i].isSkip()) {
skippedTextElement.appendChild(resultElement);
skippedText = true;
} else {
if (mergeResults[i].getAction().equals(MergeResult.ACTION_ADD))
// $NON-NLS-1$ //$NON-NLS-2$
resultElement.setAttribute("added", "true");
else if (mergeResults[i].getAction().equals(MergeResult.ACTION_DELETE))
// $NON-NLS-1$ //$NON-NLS-2$
resultElement.setAttribute("deleted", "true");
mergedTextElement.appendChild(resultElement);
mergedText = true;
}
}
if (mergeResults[i].getPropertyAction() != null && mergeResults[i].getPropertyAction().trim().length() > 0) {
// $NON-NLS-1$
Element resultElement = doc.createElement("result");
resultElement.setAttribute("resource", // $NON-NLS-1$
mergeResults[i].getResource().getFullPath().toString());
if (mergeResults[i].isPropertyConflicted()) {
resultElement.setAttribute("resolved", // $NON-NLS-1$
getBoolean(mergeResults[i].isPropertyResolved()));
if (mergeResults[i].getPropertyAction().equals(MergeResult.ACTION_ADD))
// $NON-NLS-1$ //$NON-NLS-2$
resultElement.setAttribute("added", "true");
else if (mergeResults[i].getPropertyAction().equals(MergeResult.ACTION_DELETE))
// $NON-NLS-1$ //$NON-NLS-2$
resultElement.setAttribute("deleted", "true");
conflictedPropertiesElement.appendChild(resultElement);
conflictedProperties = true;
} else if (mergeResults[i].isSkip()) {
skippedPropertiesElement.appendChild(resultElement);
skippedProperties = true;
} else {
if (mergeResults[i].getPropertyAction().equals(MergeResult.ACTION_ADD))
// $NON-NLS-1$ //$NON-NLS-2$
resultElement.setAttribute("added", "true");
else if (mergeResults[i].getPropertyAction().equals(MergeResult.ACTION_DELETE))
// $NON-NLS-1$ //$NON-NLS-2$
resultElement.setAttribute("deleted", "true");
mergedPropertiesElement.appendChild(resultElement);
mergedProperties = true;
}
}
}
if (mergedText || conflictedText || skippedText) {
if (mergedText)
textElement.appendChild(mergedTextElement);
if (conflictedText)
textElement.appendChild(conflictedTextElement);
if (skippedText)
textElement.appendChild(skippedTextElement);
resultsElement.appendChild(textElement);
}
if (mergedProperties || conflictedProperties || skippedProperties) {
if (mergedProperties)
propertiesElement.appendChild(mergedPropertiesElement);
if (conflictedProperties)
propertiesElement.appendChild(conflictedPropertiesElement);
if (skippedProperties)
propertiesElement.appendChild(skippedPropertiesElement);
resultsElement.appendChild(propertiesElement);
}
if (treeConflicts) {
resultsElement.appendChild(treeConflictsElement);
}
rootElement.appendChild(resultsElement);
doc.appendChild(rootElement);
return doc;
} catch (Exception e) {
return null;
}
}
use of com.collabnet.subversion.merge.MergeSummaryResult in project subclipse by subclipse.
the class MergeSummaryWizardPage method createControl.
public void createControl(Composite parent) {
Composite outerContainer = new Composite(parent, SWT.NONE);
GridLayout outerLayout = new GridLayout();
outerLayout.numColumns = 1;
outerContainer.setLayout(outerLayout);
outerContainer.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
Composite composite = new Composite(outerContainer, SWT.NULL);
GridLayout layout = new GridLayout();
layout.numColumns = 1;
composite.setLayout(layout);
GridData data = new GridData(GridData.FILL_BOTH);
composite.setLayoutData(data);
int resolvedConflictsTotal = 0;
int skippedFilesTotal = 0;
int skippedFoldersTotal = 0;
int fileConflictsTotal = 0;
int treeConflictsTotal = 0;
int resolvedTreeConflictsTotal = 0;
int propertyConflictsTotal = 0;
int resolvedPropertyConflictsTotal = 0;
int fileMergesTotal = 0;
int propertyMergesTotal = 0;
int fileUpdatesTotal = 0;
int propertyUpdatesTotal = 0;
int fileDeletesTotal = 0;
int fileAddsTotal = 0;
int fileExistingTotal = 0;
for (int i = 0; i < mergeOutputs.length; i++) {
MergeSummaryResult[] mergeSummaryResults = mergeOutputs[i].getMergeSummaryResults();
for (int j = 0; j < mergeSummaryResults.length; j++) {
String category = mergeSummaryResults[j].getCategory();
int number = Integer.parseInt(mergeSummaryResults[j].getNumber());
if (mergeSummaryResults[j].getType() == MergeSummaryResult.TREE) {
if (category.startsWith("Resolved conflicts"))
// $NON-NLS-1$
resolvedTreeConflictsTotal += number;
else if (category.startsWith("Tree conflicts"))
// $NON-NLS-1$
treeConflictsTotal += number;
} else if (mergeSummaryResults[j].getType() == MergeSummaryResult.FILE) {
if (category.startsWith("Resolved conflicts"))
// $NON-NLS-1$
resolvedConflictsTotal += number;
else if (// $NON-NLS-1$
category.startsWith("Skipped files"))
// $NON-NLS-1$
skippedFilesTotal += number;
else if (category.startsWith("Skipped folders"))
// $NON-NLS-1$
skippedFoldersTotal += number;
else if (// $NON-NLS-1$
category.startsWith("Conflicts"))
// $NON-NLS-1$
fileConflictsTotal += number;
else if (// $NON-NLS-1$
category.startsWith("Merged"))
// $NON-NLS-1$
fileMergesTotal += number;
else if (// $NON-NLS-1$
category.startsWith("Updated"))
// $NON-NLS-1$
fileUpdatesTotal += number;
else if (// $NON-NLS-1$
category.startsWith("Deleted"))
// $NON-NLS-1$
fileDeletesTotal += number;
else if (// $NON-NLS-1$
category.startsWith("Added"))
// $NON-NLS-1$
fileAddsTotal += number;
else // $NON-NLS-1$
if (category.startsWith("Existing"))
fileExistingTotal += number;
} else {
if (// $NON-NLS-1$
category.startsWith("Conflicts"))
// $NON-NLS-1$
propertyConflictsTotal += number;
else if (category.startsWith("Resolved conflicts"))
// $NON-NLS-1$
resolvedPropertyConflictsTotal += number;
else if (// $NON-NLS-1$
category.startsWith("Merged"))
// $NON-NLS-1$
propertyMergesTotal += number;
else // $NON-NLS-1$
if (category.startsWith("Updated"))
propertyUpdatesTotal += number;
}
}
}
resolvedConflicts = Integer.toString(resolvedConflictsTotal);
resolvedPropertyConflicts = Integer.toString(resolvedPropertyConflictsTotal);
skippedFiles = Integer.toString(skippedFilesTotal);
skippedFolders = Integer.toString(skippedFoldersTotal);
fileConflicts = Integer.toString(fileConflictsTotal);
treeConflicts = Integer.toString(treeConflictsTotal);
resolvedTreeConflicts = Integer.toString(resolvedTreeConflictsTotal);
propertyConflicts = Integer.toString(propertyConflictsTotal);
fileMerges = Integer.toString(fileMergesTotal);
propertyMerges = Integer.toString(propertyMergesTotal);
fileUpdates = Integer.toString(fileUpdatesTotal);
propertyUpdates = Integer.toString(propertyUpdatesTotal);
fileDeletes = Integer.toString(fileDeletesTotal);
fileAdds = Integer.toString(fileAddsTotal);
fileExisting = Integer.toString(fileExistingTotal);
if (resumed) {
Label label = new Label(composite, SWT.WRAP);
label.setText(Messages.MergeSummaryWizardPage_note);
data = new GridData();
data.widthHint = 500;
label.setLayoutData(data);
new Label(composite, SWT.NONE);
}
Group fileGroup = new Group(composite, SWT.NULL);
fileGroup.setText(Messages.MergeSummaryWizardPage_fileStatistics);
GridLayout fileLayout = new GridLayout();
fileLayout.numColumns = 2;
fileGroup.setLayout(fileLayout);
data = new GridData(GridData.FILL_BOTH);
fileGroup.setLayoutData(data);
Label fileUpdateLabel = new Label(fileGroup, SWT.NONE);
fileUpdateLabel.setText(Messages.MergeSummaryWizardPage_updated);
data = new GridData();
data.horizontalAlignment = GridData.END;
fileUpdateLabel.setLayoutData(data);
Text fileUpdateText = new Text(fileGroup, SWT.NONE);
fileUpdateText.setEditable(false);
data = new GridData();
data.widthHint = 100;
fileUpdateText.setLayoutData(data);
fileUpdateText.setText(fileUpdates);
Label fileAddLabel = new Label(fileGroup, SWT.NONE);
fileAddLabel.setText(Messages.MergeSummaryWizardPage_added);
data = new GridData();
data.horizontalAlignment = GridData.END;
fileAddLabel.setLayoutData(data);
Text fileAddText = new Text(fileGroup, SWT.NONE);
fileAddText.setEditable(false);
data = new GridData();
data.widthHint = 100;
fileAddText.setLayoutData(data);
fileAddText.setText(fileAdds);
Label fileExistingLabel = new Label(fileGroup, SWT.NONE);
fileExistingLabel.setText(Messages.MergeSummaryWizardPage_existing);
data = new GridData();
data.horizontalAlignment = GridData.END;
fileExistingLabel.setLayoutData(data);
Text fileExistingText = new Text(fileGroup, SWT.NONE);
fileExistingText.setEditable(false);
data = new GridData();
data.widthHint = 100;
fileExistingText.setLayoutData(data);
fileExistingText.setText(fileExisting);
Label fileDeleteLabel = new Label(fileGroup, SWT.NONE);
fileDeleteLabel.setText(Messages.MergeSummaryWizardPage_deleted);
data = new GridData();
data.horizontalAlignment = GridData.END;
fileDeleteLabel.setLayoutData(data);
Text fileDeleteText = new Text(fileGroup, SWT.NONE);
fileDeleteText.setEditable(false);
data = new GridData();
data.widthHint = 100;
fileDeleteText.setLayoutData(data);
fileDeleteText.setText(fileDeletes);
Label fileMergeLabel = new Label(fileGroup, SWT.NONE);
fileMergeLabel.setText(Messages.MergeSummaryWizardPage_merged);
data = new GridData();
data.horizontalAlignment = GridData.END;
fileMergeLabel.setLayoutData(data);
Text fileMergeText = new Text(fileGroup, SWT.NONE);
fileMergeText.setEditable(false);
data = new GridData();
data.widthHint = 100;
fileMergeText.setLayoutData(data);
fileMergeText.setText(fileMerges);
Label fileConflictLabel = new Label(fileGroup, SWT.NONE);
fileConflictLabel.setText(Messages.MergeSummaryWizardPage_conflicts);
data = new GridData();
data.horizontalAlignment = GridData.END;
fileConflictLabel.setLayoutData(data);
Text fileConflictText = new Text(fileGroup, SWT.NONE);
fileConflictText.setEditable(false);
data = new GridData();
data.widthHint = 100;
fileConflictText.setLayoutData(data);
fileConflictText.setText(fileConflicts);
Label fileResolvedLabel = new Label(fileGroup, SWT.NONE);
fileResolvedLabel.setText(Messages.MergeSummaryWizardPage_resolvedConflicts);
data = new GridData();
data.horizontalAlignment = GridData.END;
fileResolvedLabel.setLayoutData(data);
Text fileResolvedText = new Text(fileGroup, SWT.NONE);
fileResolvedText.setEditable(false);
data = new GridData();
data.widthHint = 100;
fileResolvedText.setLayoutData(data);
fileResolvedText.setText(resolvedConflicts);
Label skippedFilesLabel = new Label(fileGroup, SWT.NONE);
skippedFilesLabel.setText(Messages.MergeSummaryWizardPage_skippedFiles);
data = new GridData();
data.horizontalAlignment = GridData.END;
skippedFilesLabel.setLayoutData(data);
Text skippedFilesText = new Text(fileGroup, SWT.NONE);
skippedFilesText.setEditable(false);
data = new GridData();
data.widthHint = 100;
skippedFilesText.setLayoutData(data);
skippedFilesText.setText(skippedFiles);
Label skippedFoldersLabel = new Label(fileGroup, SWT.NONE);
skippedFoldersLabel.setText(Messages.MergeSummaryWizardPage_skippedFolders);
data = new GridData();
data.horizontalAlignment = GridData.END;
skippedFoldersLabel.setLayoutData(data);
Text skippedFoldersText = new Text(fileGroup, SWT.NONE);
skippedFoldersText.setEditable(false);
data = new GridData();
data.widthHint = 100;
skippedFoldersText.setLayoutData(data);
skippedFoldersText.setText(skippedFolders);
Group propertyGroup = new Group(composite, SWT.NULL);
propertyGroup.setText(Messages.MergeSummaryWizardPage_propertyStatistics);
GridLayout propertyLayout = new GridLayout();
propertyLayout.numColumns = 2;
propertyGroup.setLayout(propertyLayout);
data = new GridData(GridData.FILL_BOTH);
propertyGroup.setLayoutData(data);
Label propertyUpdateLabel = new Label(propertyGroup, SWT.NONE);
propertyUpdateLabel.setText(Messages.MergeSummaryWizardPage_updated);
data = new GridData();
data.horizontalAlignment = GridData.END;
propertyUpdateLabel.setLayoutData(data);
Text propertyUpdateText = new Text(propertyGroup, SWT.NONE);
propertyUpdateText.setEditable(false);
data = new GridData();
data.widthHint = 100;
propertyUpdateText.setLayoutData(data);
propertyUpdateText.setText(propertyUpdates);
Label propertyMergeLabel = new Label(propertyGroup, SWT.NONE);
propertyMergeLabel.setText(Messages.MergeSummaryWizardPage_merged);
data = new GridData();
data.horizontalAlignment = GridData.END;
propertyMergeLabel.setLayoutData(data);
Text propertyMergeText = new Text(propertyGroup, SWT.NONE);
propertyMergeText.setEditable(false);
data = new GridData();
data.widthHint = 100;
propertyMergeText.setLayoutData(data);
propertyMergeText.setText(propertyMerges);
Label propertyConflictLabel = new Label(propertyGroup, SWT.NONE);
propertyConflictLabel.setText(Messages.MergeSummaryWizardPage_conflicts);
data = new GridData();
data.horizontalAlignment = GridData.END;
propertyConflictLabel.setLayoutData(data);
Text propertyConflictText = new Text(propertyGroup, SWT.NONE);
propertyConflictText.setEditable(false);
data = new GridData();
data.widthHint = 100;
propertyConflictText.setLayoutData(data);
propertyConflictText.setText(propertyConflicts);
Label propertyResolvedLabel = new Label(propertyGroup, SWT.NONE);
propertyResolvedLabel.setText(Messages.MergeSummaryWizardPage_resolvedConflicts);
data = new GridData();
data.horizontalAlignment = GridData.END;
propertyResolvedLabel.setLayoutData(data);
Text propertyResolvedText = new Text(propertyGroup, SWT.NONE);
propertyResolvedText.setEditable(false);
data = new GridData();
data.widthHint = 100;
propertyResolvedText.setLayoutData(data);
propertyResolvedText.setText(resolvedPropertyConflicts);
if (treeConflictsTotal > 0) {
Group treeGroup = new Group(composite, SWT.NULL);
treeGroup.setText(Messages.MergeSummaryWizardPage_treeConflictStatistics);
GridLayout treeLayout = new GridLayout();
treeLayout.numColumns = 2;
treeGroup.setLayout(treeLayout);
data = new GridData(GridData.FILL_BOTH);
treeGroup.setLayoutData(data);
Label treeConflictLabel = new Label(treeGroup, SWT.NONE);
treeConflictLabel.setText(Messages.MergeSummaryWizardPage_0);
data = new GridData();
data.horizontalAlignment = GridData.END;
treeConflictLabel.setLayoutData(data);
Text treeConflictText = new Text(treeGroup, SWT.NONE);
treeConflictText.setEditable(false);
data = new GridData();
data.widthHint = 100;
treeConflictText.setLayoutData(data);
treeConflictText.setText(treeConflicts);
Label resolvedTreeConflictLabel = new Label(treeGroup, SWT.NONE);
resolvedTreeConflictLabel.setText(Messages.MergeSummaryWizardPage_1);
data = new GridData();
data.horizontalAlignment = GridData.END;
resolvedTreeConflictLabel.setLayoutData(data);
Text resolvedTreeConflictText = new Text(treeGroup, SWT.NONE);
resolvedTreeConflictText.setEditable(false);
data = new GridData();
data.widthHint = 100;
resolvedTreeConflictText.setLayoutData(data);
resolvedTreeConflictText.setText(resolvedTreeConflicts);
}
if (mergeOutputs.length == 1)
setMessage(Messages.MergeSummaryWizardPage_messageMultiple + mergeOutputs[0].getResource().getFullPath().makeRelative().toOSString());
else
setMessage(Messages.MergeSummaryWizardPage_message);
setControl(outerContainer);
}
Aggregations