-
Notifications
You must be signed in to change notification settings - Fork 47
/
MergeAction.h
412 lines (344 loc) · 10.9 KB
/
MergeAction.h
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
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
#pragma once
#include <memory>
#include "ientity.h"
#include "imapmerge.h"
#include "../Clone.h"
#include "../scenelib.h"
namespace scene
{
namespace merge
{
// Represents a single step of a merge process, like adding a brush,
// removing an entity, setting a keyvalue, etc.
class MergeAction :
public virtual IMergeAction
{
private:
ActionType _type;
bool _isActive;
protected:
MergeAction(ActionType type) :
_type(type),
_isActive(true)
{}
public:
using Ptr = std::shared_ptr<MergeAction>;
ActionType getType() const override
{
return _type;
}
virtual void activate() override
{
_isActive = true;
}
virtual void deactivate() override
{
_isActive = false;
}
virtual bool isActive() const override
{
return _isActive;
}
};
// Various implementations of the above MergeAction base type following
class RemoveNodeFromParentAction :
public MergeAction
{
private:
INodePtr _nodeToRemove;
protected:
RemoveNodeFromParentAction(const INodePtr& nodeToRemove, ActionType type) :
MergeAction(type),
_nodeToRemove(nodeToRemove)
{
assert(_nodeToRemove);
}
public:
const INodePtr& getNodeToRemove() const
{
return _nodeToRemove;
}
void applyChanges() override
{
if (!isActive()) return;
removeNodeFromParent(_nodeToRemove);
}
INodePtr getAffectedNode() override
{
return getNodeToRemove();
}
};
class RemoveChildAction :
public RemoveNodeFromParentAction
{
public:
RemoveChildAction(const INodePtr& node) :
RemoveNodeFromParentAction(node, ActionType::RemoveChildNode)
{}
};
class RemoveEntityAction :
public RemoveNodeFromParentAction
{
public:
RemoveEntityAction(const INodePtr& node) :
RemoveNodeFromParentAction(node, ActionType::RemoveEntity)
{}
};
class AddCloneToParentAction :
public MergeAction
{
private:
INodePtr _node;
INodePtr _parent;
INodePtr _cloneToBeInserted;
protected:
// Will add the given node to the parent when applyChanges() is called
AddCloneToParentAction(const INodePtr& node, const INodePtr& parent, ActionType type) :
MergeAction(type),
_node(node),
_parent(parent)
{
assert(_node);
assert(Node_getCloneable(node));
// No post-clone callback since we don't care about selection groups right now
_cloneToBeInserted = cloneNodeIncludingDescendants(_node, PostCloneCallback());
if (!_cloneToBeInserted)
{
throw std::runtime_error("Node " + _node->name() + " is not cloneable");
}
// Reset all layers of the clone to the active one
auto activeLayer = parent->getRootNode()->getLayerManager().getActiveLayer();
_cloneToBeInserted->moveToLayer(activeLayer);
_cloneToBeInserted->foreachNode([=](const INodePtr& child)
{
child->moveToLayer(activeLayer); return true;
});
}
public:
void applyChanges() override
{
if (!isActive()) return;
addNodeToContainer(_cloneToBeInserted, _parent);
}
const INodePtr& getParent() const
{
return _parent;
}
const INodePtr& getSourceNodeToAdd() const
{
return _node;
}
INodePtr getAffectedNode() override
{
return _cloneToBeInserted;
}
};
class AddEntityAction :
public AddCloneToParentAction
{
public:
AddEntityAction(const INodePtr& node, const IMapRootNodePtr& targetRoot) :
AddCloneToParentAction(node, targetRoot, ActionType::AddEntity)
{}
};
class AddChildAction :
public AddCloneToParentAction
{
public:
AddChildAction(const INodePtr& node, const INodePtr& parent) :
AddCloneToParentAction(node, parent, ActionType::AddChildNode)
{}
};
class SetEntityKeyValueAction :
public MergeAction,
public virtual IEntityKeyValueMergeAction
{
private:
INodePtr _node;
std::string _key;
std::string _value;
public:
// Will call setKeyValue(key, value) on the targetnode when applyChanges() is called
SetEntityKeyValueAction(const INodePtr& node, const std::string& key, const std::string& value, ActionType mergeActionType) :
MergeAction(mergeActionType),
_node(node),
_key(key),
_value(value)
{
assert(_node);
assert(Node_isEntity(_node));
assert(!_key.empty());
}
void applyChanges() override
{
if (!isActive()) return;
// No post-clone callback since we don't care about selection groups right now
auto entity = Node_getEntity(_node);
if (!entity)
{
throw std::runtime_error("Node " + _node->name() + " is not an entity");
}
entity->setKeyValue(_key, _value);
}
const INodePtr& getEntityNode() const
{
return _node;
}
const std::string& getKey() const override
{
return _key;
}
const std::string& getValue() const override
{
return _value;
}
INodePtr getAffectedNode() override
{
return getEntityNode();
}
};
class AddEntityKeyValueAction :
public SetEntityKeyValueAction
{
public:
AddEntityKeyValueAction(const INodePtr& node, const std::string& key, const std::string& value) :
SetEntityKeyValueAction(node, key, value, ActionType::AddKeyValue)
{}
};
class RemoveEntityKeyValueAction :
public SetEntityKeyValueAction
{
public:
RemoveEntityKeyValueAction(const INodePtr& node, const std::string& key) :
SetEntityKeyValueAction(node, key, std::string(), ActionType::RemoveKeyValue)
{}
};
class ChangeEntityKeyValueAction :
public SetEntityKeyValueAction
{
public:
ChangeEntityKeyValueAction(const INodePtr& node, const std::string& key, const std::string& value) :
SetEntityKeyValueAction(node, key, value, ActionType::ChangeKeyValue)
{}
};
/**
* A ConflictResolutionAction encapsulates a source change that has a
* encountered a conflicting target change.
*
* The source change will only be applied if this action has been
* told to do so by calling setResolvedByUsingSource(true),
* otherwise nothing happens and the target change stays in effect.
*/
class ConflictResolutionAction :
public MergeAction,
public virtual IConflictResolutionAction
{
protected:
ConflictType _conflictType;
INodePtr _conflictingSourceEntity;
INodePtr _conflictingTargetEntity;
// The action the source diff is trying to apply
IMergeAction::Ptr _sourceAction;
// The action that happened in the target
IMergeAction::Ptr _targetAction;
ResolutionType _resolution;
protected:
ConflictResolutionAction(ConflictType conflictType, const INodePtr& conflictingSourceEntity,
const INodePtr& conflictingTargetEntity, const IMergeAction::Ptr& sourceAction) :
ConflictResolutionAction(conflictType, conflictingSourceEntity, conflictingTargetEntity, sourceAction, IMergeAction::Ptr())
{}
ConflictResolutionAction(ConflictType conflictType, const INodePtr& conflictingSourceEntity,
const INodePtr& conflictingTargetEntity, const IMergeAction::Ptr& sourceAction, const IMergeAction::Ptr& targetAction) :
MergeAction(ActionType::ConflictResolution),
_conflictType(conflictType),
_conflictingSourceEntity(conflictingSourceEntity),
_conflictingTargetEntity(conflictingTargetEntity),
_sourceAction(sourceAction),
_targetAction(targetAction),
_resolution(ResolutionType::Unresolved)
{}
public:
using Ptr = std::shared_ptr<ConflictResolutionAction>;
ConflictType getConflictType() const override
{
return _conflictType;
}
// The action the source diff is trying to apply
const IMergeAction::Ptr& getSourceAction() const override
{
return _sourceAction;
}
// The action that happened in the target (can be empty)
const IMergeAction::Ptr& getTargetAction() const override
{
return _targetAction;
}
const INodePtr& getConflictingTargetEntity() const override
{
return _conflictingTargetEntity;
}
const INodePtr& getConflictingSourceEntity() const override
{
return _conflictingSourceEntity;
}
INodePtr getAffectedNode() override
{
// We don't want to return empty references, so use the source entity if the target entity is no longer here
return _conflictingTargetEntity ? _conflictingTargetEntity : _conflictingSourceEntity;
}
ResolutionType getResolution() const override
{
return _resolution;
}
void setResolution(ResolutionType resolution) override
{
_resolution = resolution;
}
virtual bool isActive() const override
{
// The conflict resolution action is active when either not resolved yet
// or the wrapped and chosen action is active.
return _resolution == ResolutionType::Unresolved ||
_resolution == ResolutionType::ApplySourceChange && _sourceAction->isActive();
}
void applyChanges() override
{
if (!isActive()) return;
if (_resolution == ResolutionType::ApplySourceChange)
{
_sourceAction->applyChanges();
}
}
};
// An entity node is a conflicting subject in both maps
class EntityConflictResolutionAction :
public ConflictResolutionAction
{
public:
EntityConflictResolutionAction(ConflictType conflictType, const INodePtr& conflictingSourceEntity,
const INodePtr& conflictingTargetEntity, const MergeAction::Ptr& sourceAction) :
EntityConflictResolutionAction(conflictType, conflictingSourceEntity, conflictingTargetEntity, sourceAction, MergeAction::Ptr())
{}
EntityConflictResolutionAction(ConflictType conflictType,
const INodePtr& conflictingSourceEntity,
const INodePtr& conflictingTargetEntity,
const MergeAction::Ptr& sourceAction,
const MergeAction::Ptr& targetAction) :
ConflictResolutionAction(conflictType, conflictingSourceEntity, conflictingTargetEntity, sourceAction, targetAction)
{}
};
// An entity key value is a conflicting subject in both maps
class EntityKeyValueConflictResolutionAction :
public ConflictResolutionAction
{
public:
EntityKeyValueConflictResolutionAction(ConflictType conflictType,
const INodePtr& conflictingSourceEntity,
const INodePtr& conflictingTargetEntity,
const MergeAction::Ptr& sourceAction,
const MergeAction::Ptr& targetAction) :
ConflictResolutionAction(conflictType, conflictingSourceEntity, conflictingTargetEntity, sourceAction, targetAction)
{}
};
}
}