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
|
/**
* Copyright (c) 2004 IBM Corporation and others.
* 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:
* IBM - Initial API and implementation
*/
package org.eclipse.emf.test.tools.merger;
import source.ClassA;
import source.ClassB;
/**
* Source javadoc 1
* Source javadoc 2
* <!-- begin-user-doc -->
* Source user javadoc 3
* Source user javadoc 4
* <!-- end-user-doc -->
*
* @author EMF Team (source)
* @generated
*/
public class MergerExample
{
private int a1 = 1;
/**
* Source javadoc 5
*/
int a2 = 2;
/**
* Source javadoc 6
* @generated
*/
protected int a3 = 3;
/**
* Source javadoc 7
* <!-- begin-user-doc -->
* Source user javadoc 8
* <!-- end-user-doc -->
*/
public int a4 = 4;
/**
* Source javadoc 9
* <!-- begin-user-doc -->
* Source user javadoc 10
* <!-- end-user-doc -->
* @generated
*/
protected int a5 = 5;
/**
* Source javadoc 11
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected String id = "source";
/**
* Source javadoc 12
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected boolean newAttribute = true;
/**
* Source javadoc 13
* <!-- begin-user-doc -->
* Source user javadoc 14
* <!-- end-user-doc -->
* Source javadoc 15
* @return source
* @generated
*/
public boolean isID()
{
// begin-user-code
System.out.println("Source user code 1");
// end-user-code
System.out.println("Source code 2");
return id == "source";
}
/**
* Source javadoc 16
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* Source javadoc 17
* @param source
* @generated
*/
public void setID(boolean value)
{
System.out.println("Source code 3");
id = value ? "source" : "target";
}
/**
* Source javadoc 17
* <!-- begin-user-doc -->
* Source user javadoc 18
* <!-- end-user-doc -->
* Source javadoc 19
* @param source
* @unmodifiable
*/
protected Object sourceRequired()
{
System.out.println("Source code 4");
}
/**
* Source javadoc 20
* <!-- begin-user-doc -->
* Source user javadoc 21
* <!-- end-user-doc -->
* Source javadoc 22
* @generated
*/
private void methodWithTargetWithoutUserSections()
{
// begin-user-code
System.out.println("Source user code 5");
// end-user-code
System.out.println("Source code 6");
}
/**
* Source javadoc 23
* @generated
*/
private void methodWithSourceWithoutUserSections()
{
System.out.println("Source code 7");
}
/**
* Source javadoc 24
* @generated
*/
private void methodWithoutUserSections()
{
System.out.println("Source code 8");
}
}
|
