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
|
/**
* <copyright>
*
* Copyright (c) 2006 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
*
* </copyright>
*
* This is the target header
*/
/*
* target comment before import that will removed
*/
import b;
import a ;
import org.eclipse.emf.ecore.util.EObjectCompositeEListNew;
/**
* Test similar to merge5 and 6. There are extra inner and top-level classes that are brought
* from source to target.
*
* @implements Comparable
*
*/
protected abstract class EchoSoapBindingImpl implements echo.Echo, Comparable
{
/**
* source comment for newMethodA()
*/
public static void newMethodA()
{
// first line comment
int a;
if (true)
{
a = 0;
}
}
/**
* target javadoc
* for InnerClass1
*/
public class InnerClass1
{
/**
* target javadoc line 1
* line 2
* @ordered
*/
int b = 2;
/**
* @ordered
*/
int a
= 1;
}
// after a
// between a and b
// before b
/**
* javadoc b
*/
int b;// after b on the same line
// hanging before a
/*
* hanging block before a
*
*/
// before a
/**
* javadoc a
*/
int a; // after a on the same line
// after b
// between b and c
// before c
/**
* javadoc c
*/
int c;// after c on the same line
/**
* source comment for a()
* this method should be added to target
*/
void a()
{
// source line comment inside a()
}
// after e
// between e and f
// before f
/**
* javadoc f
*/
int f;// after f on the same line
// line after f
/*
* hanging block after f
*/
// line comment before a()
/**
* javadoc for a()
* this commented method should not be removed
*/
// public void a()
// {
// int a = 1;
// }
// line comment after a()
// hanging comment between a() and b()
// line after c
/*
* hanging block after c
*/
// before d
/**
* javadoc d
*/
int d; // after d on the same line
// after d
// between d and e
// line comment after c()
// hanging comment between c() and d()
// line comment before d()
/**
* javadoc for d()
*/
public void d()
{
} // line comment after d() on the same line
// line comment after d()
// hanging comment between d() and e()
// line comment after e(). Note that if this comment follows e() immediately, new members that are added after f() will not have empty line between them
// hanging comment between e() and f()
// line comment before f()
/**
* javadoc for f()
*/
public void f()
{
} // line comment after f() on the same line
/**
* source javadoc
* for InnerClass2
*
*/
public class InnerClass2
{
int a
= 1;
/**
*
* source javadoc line 1
* source javadoc line 2
*/
int b = 2;
}
/**
* source comment for newMethodB()
*/
public static void newMethodB()
{
// first line comment
int a;
if (true)
{
a = 0;
}
}
// line comment after f()
// hanging comment after f()
}
/**
* source javadoc
* for AnotherClass
*
*/
public class AnotherClass
{
int a
= 1;
/**
*
* source javadoc line 1
* source javadoc line 2
*/
int b = 2;
}
/**
* target comment for TopLevelClass2
*/
class TopLevelClass2
{
}
|
