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
|
<?xml version="1.0" encoding="UTF-8"?>
<merge:options
indent = " "
xmlns:merge="http://www.eclipse.org/org/eclipse/emf/codegen/jmerge/Options">
<!--
indent="	"
braceStyle="standard"
-->
<!-- Dictionary patterns -->
<merge:dictionaryPattern
name="orderedMembers"
select="Member/getComment"
match="\s*@\s*(ordered)\s*\n"/>
<!-- Pull Rules -->
<merge:pull
sourceGet="Type/getFlags"
targetPut="Type/setFlags"/>
<merge:pull
sourceTransfer="(\s*@\s*extends|\s*@\s*implements)(.*?)\n"
sourceGet="Type/getSuperInterfaces"
targetPut="Type/addSuperInterface"/>
<!-- Sort -->
<merge:sort markup="^ordered$" select="Member"/>
<!-- Sweep -->
<merge:sweep select="Member"/>
<merge:sweep markup="^org.eclipse.emf.ecore.util.EObjectCompositeEList$" select="Import"/>
<merge:sweep markup="^org.eclipse.emf.ecore.util.EObjectCompositeEListNew$" select="Import"/>
</merge:options>
|
