-
Notifications
You must be signed in to change notification settings - Fork 0
/
baz.cs
363 lines (290 loc) · 12.2 KB
/
baz.cs
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
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
using System;
using System.Collections.Generic;
using System.Windows;
using System.Windows.Controls;
using log4net;
using Codice.CM.Client.Differences.Graphic;
using Codice.CM.Merge.Gui;
using Codice.CM.Merge.Gui.Semantic;
using Codice.CM.Merge.Gui.TextBox;
using Codice.CM.Merge.Gui.TextBox.SyntaxHighlight;
using Codice.CM.Merge.Gui.Semantic.DiffIconButtons;
using Codice.CM.SemanticMerge.Gui.Controller;
using Codice.CM.SemanticMerge.Gui.Model;
using Codice.CM.SemanticMerge.Gui.Model.Sync;
using XDiffGui.Options;
using XDiffGui.Semantic;
namespace Codice.CM.SemanticMerge.Gui.Merge
{
internal interface IMoveExplanationCalculator
{
MoveMoveExplanation GetMoveMoveExplanation(MovedMovedConflict conflict);
}
internal class MergePanel :
ISyncDeclarationListener,
IDeclarationSynchronizer,
ISearchActivator,
IEditorOptionsListener,
IMoveExplanationCalculator
{
internal IDiffCodeSelector SrcDiffCodeSelector
{ get { return mContributorsView.SrcDiffCodeSelector; } }
internal IDiffCodeSelector DstDiffCodeSelector
{ get { return mContributorsView.DstDiffCodeSelector; } }
internal RowDefinition ContributorsRow { get { return mContributorsRow; } }
internal RowDefinition ResultRow { get { return mResultRow; } }
internal GridSplitter ResultSplitter { get { return mResultSplitter; } }
internal ContributorsHeaderPanel ContributorsHeaderPanel { get { return mContributorsHeaderPanel; } }
internal MergePanel(
ICurrentConflictUpdater currentConflictUpdater,
IConflictResolver conflictResolver,
IHeaderPrinter headerPrinter,
IIconPrinter iconPrinter,
IExplanationUpdater explanationUpdater,
IManualEditionSaver manualEditionSaver,
SemanticMergeSource.FileTrees fileTrees,
SemanticToolInfo toolInfo,
IDifferencesExecutor diffExecutor,
ISyntaxLanguageListener syntaxLanguageListener,
IFileNavigator fileNavigator)
{
mFileTrees = fileTrees;
mToolInfo = toolInfo;
mContributorsView = new ContributorsView(
currentConflictUpdater,
conflictResolver,
this,
headerPrinter,
explanationUpdater,
this,
this,
toolInfo,
diffExecutor,
fileNavigator);
mResultView = new ResultView(
currentConflictUpdater,
conflictResolver,
this,
headerPrinter,
iconPrinter,
explanationUpdater,
this,
this,
manualEditionSaver,
toolInfo,
diffExecutor,
syntaxLanguageListener,
fileNavigator);
}
internal Panel GetPanel()
{
if (mMainPanel == null)
{
mMainPanel = BuildComponents();
}
return mMainPanel;
}
internal void SetFont()
{
mContributorsView.SetFont();
mResultView.SetFont();
}
internal void SetupHeadersColors()
{
mContributorsHeaderPanel.SetupHeadersColors();
}
internal void SetSyntaxLanguage(Language language)
{
mContributorsView.SetSyntaxLanguage(language);
mResultView.SetSyntaxLanguage(language);
}
internal void SetSrcTextBoxText(string srcText)
{
mContributorsView.SetSrcTextBoxText(srcText);
}
internal void SetBaseTextBoxText(string baseText)
{
mContributorsView.SetBaseTextBoxText(baseText);
}
internal void SetDstTextBoxText(string dstText)
{
mContributorsView.SetDstTextBoxText(dstText);
}
internal void SetResultTextBoxText(string resultText)
{
mResultView.SetText(resultText);
}
internal void SetResultTextBoxEditable()
{
mResultView.SetEditable();
}
internal string GetResultContent()
{
return mResultView.GetContent();
}
internal void SetDrawingInfo(DrawingInfo drawingInfo)
{
mContributorsView.SetDrawingInfo(drawingInfo);
mResultView.SetDrawingInfo(drawingInfo);
mDeclarationSynchronizer.SetDeclarationMappings(drawingInfo.DeclarationMappings);
UpdateVirtualMapping(drawingInfo.Mapping);
}
internal void SetResultDiffIcons(List<DiffIcon> diffIcons)
{
mResultView.SetResultDiffIcons(diffIcons);
}
internal void UpdateInfoForSyncedDeclaration(
List<Conflict> conflicts, List<Difference> srcDiffs, List<Difference> dstDiffs)
{
mResultView.UpdateInfoForSyncedDeclaration(conflicts, srcDiffs, dstDiffs);
}
internal void UpdateVirtualMapping(ThreeWayVirtualLinesMapping mapping)
{
mContributorsScrollView.UpdateVirtualMapping(mapping);
}
internal void SetCurrentConflict(
CurrentConflictContributorDeclarationRanges contributorRanges,
DeclarationRange resultRange, bool hasUnsolvedConflicts)
{
mContributorsView.SetCurrentConflict(contributorRanges, hasUnsolvedConflicts);
mResultView.SetCurrentConflict(resultRange, hasUnsolvedConflicts);
}
internal void SetFileTrees(SemanticMergeSource.FileTrees fileTrees)
{
mFileTrees = fileTrees;
}
internal void Dispose()
{
mContributorsView.Dispose();
mResultView.Dispose();
if (mMainPanel == null)
return;
mContributorsHeaderPanel.Dispose();
mContributorsScrollView.Dispose();
mDeclarationSynchronizer.Dispose();
}
void ISyncDeclarationListener.OnSyncDeclarationClicked(
SyncDeclarationFrom syncDeclarationFrom, int line)
{
ContributorDeclarationRanges contributorRanges;
ResultDeclarationRange resultRange;
DeclarationRangesCalculatorByLine.GetDeclarationRanges(
mFileTrees, mContributorsScrollView.Mapping,
syncDeclarationFrom, line,
out contributorRanges,
out resultRange);
((IDeclarationSynchronizer)this).GoToLine(contributorRanges, resultRange);
}
void IDeclarationSynchronizer.GoToLine(
ContributorDeclarationRanges contributorRanges,
ResultDeclarationRange resultRange)
{
DeclarationRange resultDeclarationRange = (resultRange != null) ?
resultRange.Range : null;
mDeclarationSynchronizer.GoToLine(contributorRanges, resultDeclarationRange);
Codice.Tree.Declaration currentDeclaration = (resultRange != null) ?
resultRange.Declaration : contributorRanges.Declaration;
mResultView.SetCurrentDeclaration(currentDeclaration);
}
void ISearchActivator.ActivateSearch()
{
if (mResultView.ResultTextBox == mActiveTextBox)
{
mResultView.ActivateSearch();
return;
}
mContributorsView.ActivateSearch(mActiveTextBox);
}
void ISearchActivator.SetActiveTextBox(SyntaxTextBox activeTextBox)
{
mActiveTextBox = activeTextBox;
}
void IEditorOptionsListener.OnViewWhiteSpacesChanged(bool value)
{
mContributorsView.SetWhitespacesVisible(value);
mResultView.SetWhitepacesVisible(value);
}
void IEditorOptionsListener.OnConvertTabsToSpacesChanged(bool value)
{
mContributorsView.SetAutoConvertTabsToSpaces(value);
mResultView.SetAutoConvertTabsToSpaces(value);
}
void IEditorOptionsListener.OnTabSpacesChanged(int value)
{
mContributorsView.SetTabSpaces(value);
mResultView.SetTabSpaces(value);
}
void IEditorOptionsListener.OnColumnGuidesChanged(List<int> list)
{
mContributorsView.SetColumnGuides(list);
mResultView.SetColumnGuides(list);
}
void IEditorOptionsListener.OnViewBorderLinesChanged(bool value)
{
#warning Not implemented yet
}
MoveMoveExplanation IMoveExplanationCalculator.GetMoveMoveExplanation(
MovedMovedConflict conflict)
{
return MoveMoveExplanationBuilder.GetMoveExplanation(
mFileTrees.Src, mFileTrees.Base, mFileTrees.Dst, conflict);
}
Panel BuildComponents()
{
int ini = Environment.TickCount;
Grid result = new Grid();
mContributorsHeaderPanel = new ContributorsHeaderPanel(this, mContributorsView);
Grid contributorsHeaderPanel = mContributorsHeaderPanel.GetPanel(mToolInfo);
mContributorsHeaderRow = new RowDefinition();
mContributorsHeaderRow.Height = GridLength.Auto;
mContributorsRow = new RowDefinition();
RowDefinition resultSplitterRow = new RowDefinition();
resultSplitterRow.Height = GridLength.Auto;
mResultRow = new RowDefinition();
result.RowDefinitions.Add(mContributorsHeaderRow);
result.RowDefinitions.Add(mContributorsRow);
result.RowDefinitions.Add(resultSplitterRow);
result.RowDefinitions.Add(mResultRow);
mContributorsScrollView = new ContributorsScrollView(
mContributorsView, this, mContributorsHeaderPanel);
mContributorsView.SetScrollNavigator(mContributorsScrollView);
ScrollViewer contributorsViewer = XMergeControlBuilder.Scrolls.CreateScrollViewer();
contributorsViewer.CanContentScroll = true;
contributorsViewer.Content = mContributorsScrollView;
contributorsViewer.VerticalScrollBarVisibility = ScrollBarVisibility.Visible;
contributorsViewer.HorizontalScrollBarVisibility = ScrollBarVisibility.Visible;
mResultSplitter = XMergeControlBuilder.Splitters.CreateHorizontalSplitter();
mResultSplitter.ShowsPreview = true;
mResultSplitter.Height = SPLITTER_HEIGHT;
Panel resultPanel = mResultView.GetPanel(mContributorsRow,
mContributorsHeaderRow, mResultRow, mResultSplitter);
Grid.SetRow(contributorsHeaderPanel, 0);
Grid.SetRow(contributorsViewer, 1);
Grid.SetRow(mResultSplitter, 2);
Grid.SetRow(resultPanel, 3);
result.Children.Add(contributorsHeaderPanel);
result.Children.Add(contributorsViewer);
result.Children.Add(mResultSplitter);
result.Children.Add(resultPanel);
mDeclarationSynchronizer = new DeclarationSynchronizer(
mContributorsView, mContributorsScrollView, mResultView);
mLog.DebugFormat("BuildComponents time {0} ms", Environment.TickCount - ini);
return result;
}
ContributorsView mContributorsView;
RowDefinition mContributorsRow;
ContributorsHeaderPanel mContributorsHeaderPanel;
RowDefinition mContributorsHeaderRow;
ContributorsScrollView mContributorsScrollView;
ResultView mResultView;
RowDefinition mResultRow;
GridSplitter mResultSplitter;
DeclarationSynchronizer mDeclarationSynchronizer;
SemanticMergeSource.FileTrees mFileTrees;
Panel mMainPanel;
SyntaxTextBox mActiveTextBox;
SemanticToolInfo mToolInfo;
const double SPLITTER_HEIGHT = 5;
static readonly ILog mLog = LogManager.GetLogger("MergePanel");
}
}